From: Laszlo T. <ave...@us...> - 2006-07-04 19:46:43
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12717 Modified Files: GUIREC.py Log Message: pst: applied lotana's patch #1514822 on GUIREC Index: GUIREC.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst/GUIREC.py,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** GUIREC.py 29 Jun 2006 06:56:45 -0000 1.50 --- GUIREC.py 4 Jul 2006 19:46:39 -0000 1.51 *************** *** 1100,1113 **** CONType = 1 # We are leveling up one of those levels. Therefore, one of them has to be updated. ! if avatar_header['PrimClass'] == "Fighter": FighterLevel = NextLevel - 1 CONType = 0 ! elif avatar_header['PrimClass'] == "Mage": MageLevel = NextLevel - 1 else: ThiefLevel = NextLevel - 1 ! ConHPBon = GetConHPBonus (pc, NumOfPrimLevUp, CONType) ! # Now we need to update the saving throws with the best values from those tables. # The smaller the number, the better saving throw it is. --- 1100,1112 ---- CONType = 1 # We are leveling up one of those levels. Therefore, one of them has to be updated. ! if avatar_header['PrimClass'] == "FIGHTER": FighterLevel = NextLevel - 1 CONType = 0 ! elif avatar_header['PrimClass'] == "MAGE": MageLevel = NextLevel - 1 else: ThiefLevel = NextLevel - 1 ! ConHPBon = GetConHPBonus (pc, NumOfPrimLevUp, 0, CONType) # Now we need to update the saving throws with the best values from those tables. # The smaller the number, the better saving throw it is. *************** *** 1164,1168 **** HPGained = HPGained + GetSingleClassHP (Class, avatar_header['PrimLevel']) ! ConHPBon = GetConHPBonus (pc, NumOfPrimLevUp, 0) # Thac0 --- 1163,1171 ---- HPGained = HPGained + GetSingleClassHP (Class, avatar_header['PrimLevel']) ! if avatar_header['PrimClass'] == "FIGHTER": ! CONType = 0 ! else: ! CONType = 1 ! ConHPBon = GetConHPBonus (pc, NumOfPrimLevUp, 0, CONType) # Thac0 *************** *** 1307,1321 **** return GemRB.Roll (Rolls, Sides, Modif) ! def GetConHPBonus (pc, fighterlevels, otherlevels, type): ConHPBonTable = GemRB.LoadTable ("HPCONBON") con = str (GemRB.GetPlayerStat (pc, IE_CON)) ! if type == 0: # Pure fighter ! return GemRB.GetTableValue (ConHPBonTable, con, "WARRIOR") * fighterlevels ! if type == 1: # Mage, Priest or Thief ! return GemRB.GetTableValue (ConHPBonTable, con, "OTHER") * otherlevels ! return GemRB.GetTableValue (ConHPBonTable, con, "WARRIOR") * fighterlevels / 2 + GemRB.GetTableValue (ConHPBonTable, con, "OTHER") * otherlevels / 2 def GetThac0 (Class, Level): --- 1310,1324 ---- return GemRB.Roll (Rolls, Sides, Modif) ! def GetConHPBonus (pc, numPrimLevels, numSecoLevels, levelUpType): ConHPBonTable = GemRB.LoadTable ("HPCONBON") con = str (GemRB.GetPlayerStat (pc, IE_CON)) ! if levelUpType == 0: # Pure fighter ! return GemRB.GetTableValue (ConHPBonTable, con, "WARRIOR") * numPromLevels ! if levelUpType == 1: # Mage, Priest or Thief ! return GemRB.GetTableValue (ConHPBonTable, con, "OTHER") * numPrimLevels ! return GemRB.GetTableValue (ConHPBonTable, con, "WARRIOR") * numPrimLevels / 2 + GemRB.GetTableValue (ConHPBonTable, con, "OTHER") * numSecoLevels / 2 def GetThac0 (Class, Level): |