From: <ave...@us...> - 2008-02-18 17:17:01
|
Revision: 5059 http://gemrb.svn.sourceforge.net/gemrb/?rev=5059&view=rev Author: avenger_teambg Date: 2008-02-18 09:17:03 -0800 (Mon, 18 Feb 2008) Log Message: ----------- probably fixed bug #1895769 Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-02-17 17:58:19 UTC (rev 5058) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-02-18 17:17:03 UTC (rev 5059) @@ -155,6 +155,8 @@ if TableName != "*": KitValue = GemRB.GetTableValue(KitTable, KitIndex, 6) + if KitValue == "*": + KitValue = 0x4000 SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_WIZARD, 1) Learnable = GetLearnableMageSpells( KitValue, t, 1) SpellBook = GemRB.GetVar ("MageSpellBook") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-07 10:04:37
|
Revision: 5182 http://gemrb.svn.sourceforge.net/gemrb/?rev=5182&view=rev Author: lynxlupodian Date: 2008-06-07 03:04:45 -0700 (Sat, 07 Jun 2008) Log Message: ----------- bg2: implemented the starting tob inventory; need to find out a way to map the slots from 25stweap.2da to the real ones, GemRB_CreateItem needs to be fixed so it will drop items on the ground Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-06 20:39:00 UTC (rev 5181) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-07 10:04:45 UTC (rev 5182) @@ -42,12 +42,20 @@ ClassTable = GemRB.LoadTable ("classes") ClassIndex = GemRB.GetVar ("Class")-1 Class = GemRB.GetTableValue (ClassTable, ClassIndex, 5) + ClassName = GemRB.GetTableRowName (ClassTable, ClassIndex) GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) - KitIndex = GemRB.GetVar ("Class Kit") + KitIndex = GetKitIndex (MyChar) + if KitIndex == 0: + EquipmentColName = ClassName + else: + EquipmentColName = GemRB.GetTableValue (KitTable, KitIndex, 0) + TmpTable = GemRB.LoadTable ("clskills") #mage spells TableName = GemRB.GetTableValue (TmpTable, Class, 2, 0) + # TODO check if this is really needed + KitIndex = GemRB.GetVar ("Class Kit") if TableName != "*": KitValue = GemRB.GetTableValue(KitTable, KitIndex, 6) if KitValue == "*": @@ -85,6 +93,7 @@ GemRB.SetPlayerStat (MyChar, IE_GOLD, t*GemRB.GetTableValue (TmpTable,Class,3) ) GemRB.UnloadTable (AlignmentTable) GemRB.UnloadTable (ClassTable) + GemRB.UnloadTable (KitTable) GemRB.UnloadTable (RaceTable) GemRB.UnloadTable (TmpTable) @@ -147,6 +156,29 @@ SmallPortrait = GemRB.GetToken ("SmallPortrait") GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait) + # add the starting inventory for tob + if GameIsTOB(): + EquipmentTable = GemRB.LoadTable ("25stweap") + #loop over rows - item slots + for slot in range(0, GemRB.GetTableRowCount (EquipmentTable)): + slotname = GemRB.GetTableRowName (EquipmentTable, slot) + item = GemRB.GetTableValue (EquipmentTable, slotname, EquipmentColName) + if item == "*": + continue + # if an item contains a comma, the rest of the value is the stack + if "," in item: + item = item.split(",") + count = int(item[1]) + item = item[0] + # TODO get the right slotid, so the item gets equipped; + # also important since there are only 16 backpack slots + # and possibly 20 items to give (no dropping)! + GemRB.CreateItem(MyChar, item, -1, count, 0, 0) + else: + GemRB.CreateItem(MyChar, item, -1, 1, 0, 0) + + GemRB.UnloadTable (EquipmentTable) + playmode = GemRB.GetVar ("PlayMode") if playmode >=0: #LETS PLAY!! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-13 19:44:03
|
Revision: 5202 http://gemrb.svn.sourceforge.net/gemrb/?rev=5202&view=rev Author: lynxlupodian Date: 2008-06-13 12:43:54 -0700 (Fri, 13 Jun 2008) Log Message: ----------- bg2: put the starting tob inventory in the appropriate slots; doesn't work, there seems to be a bug in GetSlots -> all creation is skipped Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-13 19:35:41 UTC (rev 5201) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-13 19:43:54 UTC (rev 5202) @@ -2,6 +2,7 @@ import GemRB from CharGenCommon import * from ie_stats import * +from ie_slots import * from GUICommon import * CharGenWindow = 0 @@ -150,24 +151,31 @@ # add the starting inventory for tob if GameIsTOB(): EquipmentTable = GemRB.LoadTable ("25stweap") + # a map of slots in the table to the real slots + # SLOT_BAG is invalid, so use the inventory (first occurence) + # SLOT_INVENTORY: use -1 instead, that's what CreateItem expects + RealSlots = [ SLOT_ARMOUR, SLOT_SHIELD, SLOT_HELM, -1, SLOT_RING, \ + SLOT_RING, SLOT_CLOAK, SLOT_BOOT, SLOT_AMULET, SLOT_GLOVE, \ + SLOT_BELT, SLOT_QUIVER, SLOT_QUIVER, SLOT_QUIVER, \ + -1, -1, -1, -1, -1, SLOT_WEAPON ] #loop over rows - item slots for slot in range(0, GemRB.GetTableRowCount (EquipmentTable)): slotname = GemRB.GetTableRowName (EquipmentTable, slot) item = GemRB.GetTableValue (EquipmentTable, slotname, EquipmentColName) if item == "*": continue + realslot = GemRB.GetSlots (MyChar, RealSlots[slot]) + if realslot == (): # this shouldn't happen! + continue + print "MMC", realslot, RealSlots[slot], slot # if an item contains a comma, the rest of the value is the stack if "," in item: item = item.split(",") count = int(item[1]) item = item[0] - # TODO get the right slotid, so the item gets equipped; - # also important since there are only 16 backpack slots - # and possibly 20 items to give (no dropping)! - GemRB.CreateItem(MyChar, item, -1, count, 0, 0) else: - GemRB.CreateItem(MyChar, item, -1, 1, 0, 0) - + count = 0 + GemRB.CreateItem(MyChar, item, realslot, count, 0, 0) GemRB.UnloadTable (EquipmentTable) playmode = GemRB.GetVar ("PlayMode") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-06-13 21:47:39
|
Revision: 5204 http://gemrb.svn.sourceforge.net/gemrb/?rev=5204&view=rev Author: avenger_teambg Date: 2008-06-13 14:47:29 -0700 (Fri, 13 Jun 2008) Log Message: ----------- use the new flag from GetSlots Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-13 21:24:29 UTC (rev 5203) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-13 21:47:29 UTC (rev 5204) @@ -164,10 +164,10 @@ item = GemRB.GetTableValue (EquipmentTable, slotname, EquipmentColName) if item == "*": continue - realslot = GemRB.GetSlots (MyChar, RealSlots[slot]) + realslot = GemRB.GetSlots (MyChar, RealSlots[slot], -1) + print "MMC", realslot, RealSlots[slot], slot if realslot == (): # this shouldn't happen! continue - print "MMC", realslot, RealSlots[slot], slot # if an item contains a comma, the rest of the value is the stack if "," in item: item = item.split(",") @@ -175,7 +175,7 @@ item = item[0] else: count = 0 - GemRB.CreateItem(MyChar, item, realslot, count, 0, 0) + GemRB.CreateItem(MyChar, item, realslot[0], count, 0, 0) GemRB.UnloadTable (EquipmentTable) playmode = GemRB.GetVar ("PlayMode") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-14 13:01:49
|
Revision: 5206 http://gemrb.svn.sourceforge.net/gemrb/?rev=5206&view=rev Author: lynxlupodian Date: 2008-06-14 06:01:54 -0700 (Sat, 14 Jun 2008) Log Message: ----------- bg2: fix the tob equipment class check (was too early) and sorcerers, since they are missing from the equipment table Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-14 12:37:03 UTC (rev 5205) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-14 13:01:54 UTC (rev 5206) @@ -45,11 +45,6 @@ Class = GemRB.GetTableValue (ClassTable, ClassIndex, 5) ClassName = GemRB.GetTableRowName (ClassTable, ClassIndex) GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) - KitIndex = GetKitIndex (MyChar) - if KitIndex == 0: - EquipmentColName = ClassName - else: - EquipmentColName = GemRB.GetTableValue (KitTable, KitIndex, 0) TmpTable = GemRB.LoadTable ("clskills") #mage spells @@ -150,6 +145,14 @@ # add the starting inventory for tob if GameIsTOB(): + KitIndex = GetKitIndex (MyChar) + if KitIndex == 0: + EquipmentColName = ClassName + # sorcerers are missing from the table, use the mage equipment instead + if EquipmentColName == "SORCERER": + EquipmentColName = "MAGE" + else: + EquipmentColName = GemRB.GetTableValue (KitTable, KitIndex, 0) EquipmentTable = GemRB.LoadTable ("25stweap") # a map of slots in the table to the real slots # SLOT_BAG is invalid, so use the inventory (first occurence) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-14 14:27:32
|
Revision: 5207 http://gemrb.svn.sourceforge.net/gemrb/?rev=5207&view=rev Author: lynxlupodian Date: 2008-06-14 07:27:37 -0700 (Sat, 14 Jun 2008) Log Message: ----------- bg2: moved a table unload to later in the last part of cg Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-14 13:01:54 UTC (rev 5206) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-06-14 14:27:37 UTC (rev 5207) @@ -80,7 +80,6 @@ GemRB.SetPlayerStat (MyChar, IE_GOLD, t*GemRB.GetTableValue (TmpTable,Class,3) ) GemRB.UnloadTable (AlignmentTable) GemRB.UnloadTable (ClassTable) - GemRB.UnloadTable (KitTable) GemRB.UnloadTable (RaceTable) GemRB.UnloadTable (TmpTable) @@ -181,6 +180,7 @@ GemRB.CreateItem(MyChar, item, realslot[0], count, 0, 0) GemRB.UnloadTable (EquipmentTable) + GemRB.UnloadTable (KitTable) playmode = GemRB.GetVar ("PlayMode") if playmode >=0: #LETS PLAY!! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |