Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb: [4801] gemrb/trunk/gemrb
|
From: <ave...@us...> - 2007-09-26 22:17:18
|
Revision: 4801
http://gemrb.svn.sourceforge.net/gemrb/?rev=4801&view=rev
Author: avenger_teambg
Date: 2007-09-26 15:17:16 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
fixed some crashers in IniSpawn
fixed stats/splprot lists
improved farsight opcode
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py
gemrb/trunk/gemrb/GUIScripts/how/GUIMA.py
gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py
gemrb/trunk/gemrb/GUIScripts/tob/GUIMA.py
gemrb/trunk/gemrb/override/bg2/stats.ids
gemrb/trunk/gemrb/override/how/splprot.2da
gemrb/trunk/gemrb/override/how/stats.ids
gemrb/trunk/gemrb/override/iwd/splprot.2da
gemrb/trunk/gemrb/override/iwd/stats.ids
gemrb/trunk/gemrb/override/iwd2/splprot.2da
gemrb/trunk/gemrb/override/iwd2/stats.ids
gemrb/trunk/gemrb/override/tob/stats.ids
gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
gemrb/trunk/gemrb/plugins/Core/EffectQueue.h
gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp
gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp
gemrb/trunk/gemrb/plugins/Core/Interface.cpp
gemrb/trunk/gemrb/plugins/Core/MapControl.cpp
gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp
gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp
gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpc.cpp
Added Paths:
-----------
gemrb/trunk/gemrb/override/bg1/stats.ids
gemrb/trunk/gemrb/override/pst/stats.ids
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2007-09-26 22:17:16 UTC (rev 4801)
@@ -35,50 +35,36 @@
def RevealMap ():
global MapWindow
- global OldPortraitWindow, OldOptionsWindow
if CloseOtherWindow (ShowMap):
GemRB.UnloadWindow (MapWindow)
- GemRB.UnloadWindow (OptionsWindow)
- GemRB.UnloadWindow (PortraitWindow)
MapWindow = None
#this window type should block the game
GemRB.SetVar ("OtherWindow", -1)
GemRB.SetVisible (0,1)
GemRB.UnhideGUI ()
- GUICommonWindows.PortraitWindow = OldPortraitWindow
- OldPortraitWindow = None
- GUICommonWindows.OptionsWindow = OldOptionsWindow
- OldOptionsWindow = None
PosX = GemRB.GetVar ("MapControlX")
PosY = GemRB.GetVar ("MapControlY")
GemRB.RevealArea (PosX, PosY, 30, 1)
- GemRB.GamePause (1,0)
+ GemRB.GamePause (0,0)
return
###################################################
-# for clairvoyance effect
+# for farsight effect
###################################################
def ShowMap ():
- global MapWindow, OptionsWindow, PortraitWindow
- global OldPortraitWindow, OldOptionsWindow
+ global MapWindow
if CloseOtherWindow (ShowMap):
GemRB.UnloadWindow (MapWindow)
- GemRB.UnloadWindow (OptionsWindow)
- GemRB.UnloadWindow (PortraitWindow)
MapWindow = None
#this window type should block the game
GemRB.SetVar ("OtherWindow", -1)
GemRB.SetVisible (0,1)
GemRB.UnhideGUI ()
- GUICommonWindows.PortraitWindow = OldPortraitWindow
- OldPortraitWindow = None
- GUICommonWindows.OptionsWindow = OldOptionsWindow
- OldOptionsWindow = None
return
GemRB.HideGUI ()
@@ -89,12 +75,7 @@
#this window type blocks the game normally, but map window doesn't
GemRB.SetVar ("OtherWindow", MapWindow)
#saving the original portrait window
- OldOptionsWindow = GUICommonWindows.OptionsWindow
- OptionsWindow = GemRB.LoadWindow (0)
- SetupMenuWindowControls (OptionsWindow, 0, "ShowMap")
- OldPortraitWindow = GUICommonWindows.PortraitWindow
- PortraitWindow = OpenPortraitWindow (0)
- GemRB.SetWindowFrame (OptionsWindow)
+ GemRB.SetWindowFrame (MapWindow)
# World Map
Button = GemRB.GetControl (Window, 1)
@@ -109,12 +90,11 @@
# Map Control
GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1")
Map = GemRB.GetControl (Window, 2)
- GemRB.SetVar("ShowMapNotes",3)
- GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_VIEW_NOTES)
+ GemRB.SetVar("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP)
+ GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP)
GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
- GemRB.SetVisible (OptionsWindow, 2)
GemRB.SetVisible (Window, 1)
- GemRB.SetVisible (PortraitWindow, 2)
+ GemRB.GamePause (0,0)
return
###################################################
@@ -135,7 +115,6 @@
GemRB.LoadWindowPack ("GUIMAP")
MapWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", MapWindow)
- SetupMenuWindowControls (GUICommonWindows.OptionsWindow, 0, "OpenMapWindow")
# World Map
Button = GemRB.GetControl (Window, 1)
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2007-09-26 22:17:16 UTC (rev 4801)
@@ -59,11 +59,11 @@
PosY = GemRB.GetVar ("MapControlY")
GemRB.RevealArea (PosX, PosY, 30, 1)
- GemRB.GamePause (1,0)
+ GemRB.GamePause (0,0)
return
###################################################
-# for clairvoyance effect
+# for farsight effect
###################################################
def ShowMap ():
global MapWindow, OptionsWindow, PortraitWindow
@@ -124,6 +124,7 @@
GemRB.SetVisible (PortraitWindow, 3)
GemRB.SetVisible (Window, 3)
GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
+ GemRB.GamePause (0,0)
return
###################################################
@@ -280,11 +281,11 @@
str = "%s: %d"%(GemRB.GetString(23084),tmp["Distance"])
else:
str=""
-
+
GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str)
return
-def CloseWorldMapWindow():
+def CloseWorldMapWindow ():
global WorldMapWindow, WorldMapControl
GemRB.UnloadWindow (WorldMapWindow)
@@ -294,7 +295,7 @@
GemRB.UnhideGUI ()
return
-def WorldMapWindowCommon(Travel):
+def WorldMapWindowCommon (Travel):
global WorldMapWindow, WorldMapControl
if WorldMapWindow:
Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/how/GUIMA.py 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/GUIScripts/how/GUIMA.py 2007-09-26 22:17:16 UTC (rev 4801)
@@ -37,7 +37,92 @@
OldPortraitWindow = None
OldOptionsWindow = None
+def RevealMap ():
+ global MapWindow
+ global OldPortraitWindow, OldOptionsWindow
+
+ if CloseOtherWindow (ShowMap):
+ GemRB.UnloadWindow (MapWindow)
+ GemRB.UnloadWindow (OptionsWindow)
+ GemRB.UnloadWindow (PortraitWindow)
+
+ MapWindow = None
+ #this window type should block the game
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ GUICommonWindows.PortraitWindow = OldPortraitWindow
+ OldPortraitWindow = None
+ GUICommonWindows.OptionsWindow = OldOptionsWindow
+ OldOptionsWindow = None
+
+ PosX = GemRB.GetVar ("MapControlX")
+ PosY = GemRB.GetVar ("MapControlY")
+
+ GemRB.RevealArea (PosX, PosY, 30, 1)
+ GemRB.GamePause (0,0)
+ return
###################################################
+# for farsight effect
+###################################################
+def ShowMap ():
+ global MapWindow, OptionsWindow, PortraitWindow
+ global OldPortraitWindow, OldOptionsWindow
+
+ if CloseOtherWindow (ShowMap):
+ GemRB.UnloadWindow (MapWindow)
+ GemRB.UnloadWindow (OptionsWindow)
+ GemRB.UnloadWindow (PortraitWindow)
+
+ MapWindow = None
+ #this window type should block the game
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ GUICommonWindows.PortraitWindow = OldPortraitWindow
+ OldPortraitWindow = None
+ GUICommonWindows.OptionsWindow = OldOptionsWindow
+ OldOptionsWindow = None
+ return
+
+ GemRB.HideGUI ()
+ GemRB.SetVisible (0,0)
+
+ GemRB.LoadWindowPack ("GUIMAP", 640, 480)
+ MapWindow = Window = GemRB.LoadWindow (2)
+ #this window type blocks the game normally, but map window doesn't
+ GemRB.SetVar ("OtherWindow", MapWindow)
+ #saving the original portrait window
+ OldOptionsWindow = GUICommonWindows.OptionsWindow
+ OptionsWindow = GemRB.LoadWindow (0)
+ SetupMenuWindowControls (OptionsWindow, 0, "ShowMap")
+ OldPortraitWindow = GUICommonWindows.PortraitWindow
+ PortraitWindow = OpenPortraitWindow (0)
+ GemRB.SetWindowFrame (OptionsWindow)
+
+ # World Map
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+
+ # Hide or Show mapnotes
+ Button = GemRB.GetControl (Window, 3)
+ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+
+ Label = GemRB.GetControl (Window, 0x10000003)
+ GemRB.SetText (Window, Label, "")
+ # Map Control
+ GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0)
+ Map = GemRB.GetControl (Window, 2)
+ GemRB.SetVar("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP)
+ GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP)
+ GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
+ GemRB.SetVisible (OptionsWindow, 2)
+ GemRB.SetVisible (Window, 1)
+ GemRB.SetVisible (PortraitWindow, 2)
+ GemRB.GamePause (0,0)
+ return
+
+###################################################
def OpenMapWindow ():
global MapWindow, PortraitWindow, OptionsWindow
global OldPortraitWindow, OldOptionsWindow
@@ -98,7 +183,7 @@
return
def OpenWorldMapWindowInside ():
- OpenMapWindow()
+ OpenMapWindow ()
WorldMapWindowCommon (-1)
return
@@ -129,7 +214,7 @@
GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str)
return
-def CloseWorldMapWindow():
+def CloseWorldMapWindow ():
global WorldMapWindow, WorldMapControl
GemRB.UnloadWindow (WorldMapWindow)
@@ -157,6 +242,8 @@
GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel, "infofont")
WorldMapControl = GemRB.GetControl (Window, 4)
GemRB.SetAnimation (Window, WorldMapControl, "WMDAG")
+ GemRB.SetEvent (Window, WorldMapControl, IE_GUI_WORLDMAP_ON_PRESS, "MoveToNewArea")
+ GemRB.SetEvent (Window, WorldMapControl, IE_GUI_MOUSE_ENTER_WORLDMAP, "ChangeTooltip")
#north
Button = GemRB.GetControl (Window, 1)
Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py 2007-09-26 22:17:16 UTC (rev 4801)
@@ -31,7 +31,71 @@
WorldMapWindow = None
WorldMapControl = None
+def RevealMap ():
+ global MapWindow
+
+ if CloseOtherWindow (ShowMap):
+ GemRB.UnloadWindow (MapWindow)
+
+ MapWindow = None
+ #this window type should block the game
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+
+ PosX = GemRB.GetVar ("MapControlX")
+ PosY = GemRB.GetVar ("MapControlY")
+
+ GemRB.RevealArea (PosX, PosY, 30, 1)
+ GemRB.GamePause (0,0)
+ return
###################################################
+# for farsight effect
+###################################################
+def ShowMap ():
+ global MapWindow
+
+ if CloseOtherWindow (ShowMap):
+ GemRB.UnloadWindow (MapWindow)
+
+ MapWindow = None
+ #this window type should block the game
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ return
+
+ GemRB.HideGUI ()
+ GemRB.SetVisible (0,0)
+
+ GemRB.LoadWindowPack ("GUIMAP", 640, 480)
+ MapWindow = Window = GemRB.LoadWindow (2)
+ #this window type blocks the game normally, but map window doesn't
+ GemRB.SetVar ("OtherWindow", MapWindow)
+ #saving the original portrait window
+ GemRB.SetWindowFrame (MapWindow)
+
+ # World Map
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+
+ # Hide or Show mapnotes
+ Button = GemRB.GetControl (Window, 3)
+ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+
+ Label = GemRB.GetControl (Window, 0x10000003)
+ GemRB.SetText (Window, Label, "")
+ # Map Control
+ GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0)
+ Map = GemRB.GetControl (Window, 2)
+ GemRB.SetVar("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP)
+ GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP)
+ GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap")
+ GemRB.SetVisible (Window, 1)
+ GemRB.GamePause (0,0)
+ return
+
+###################################################
def OpenMapWindow ():
global MapWindow
@@ -46,7 +110,7 @@
return
GemRB.HideGUI ()
- GemRB.LoadWindowPack ("GUIMAP")
+ GemRB.LoadWindowPack ("GUIMAP", 640, 480)
MapWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", MapWindow)
@@ -64,12 +128,66 @@
print "MoveToPoint"
return
-def LeftPressMap ():
- print "MoveRectangle"
+def CloseNoteWindow ():
+ GemRB.UnloadWindow (NoteWindow)
+ GemRB.SetVisible (MapWindow, 1)
return
+def RemoveMapNote ():
+ PosX = GemRB.GetVar ("MapControlX")
+ PosY = GemRB.GetVar ("MapControlY")
+ GemRB.SetMapnote (PosX, PosY, 0, "")
+ CloseNoteWindow ()
+ return
+
+def SetMapNote ():
+ PosX = GemRB.GetVar ("MapControlX")
+ PosY = GemRB.GetVar ("MapControlY")
+ Label = GemRB.GetControl (NoteWindow, 1)
+ Text = GemRB.QueryText (NoteWindow, Label)
+ Color = GemRB.GetVar ("Color")
+ GemRB.SetMapnote (PosX, PosY, Color, Text)
+ CloseNoteWindow ()
+ return
+
+def SetFocusBack ():
+ GemRB.SetControlStatus (NoteWindow, NoteLabel, IE_GUI_CONTROL_FOCUSED)
+ return
+
def AddNoteWindow ():
- print "Add Note"
+ global NoteWindow, NoteLabel
+
+ Label = GemRB.GetControl (MapWindow, 0x10000003)
+ Text = GemRB.QueryText (MapWindow, Label)
+ NoteWindow = GemRB.LoadWindow (5)
+ NoteLabel = GemRB.GetControl (NoteWindow, 1)
+ GemRB.SetText (NoteWindow, NoteLabel, Text)
+ for i in range(8):
+ Label = GemRB.GetControl (NoteWindow, 4+i)
+ #the .chu is crappy, we have to reset the flags
+ #GemRB.SetButtonSprites (NoteWindow, Label, "FLAG1", i,0,1,2,0)
+ GemRB.SetButtonFlags (NoteWindow, Label, IE_GUI_BUTTON_RADIOBUTTON, OP_SET)
+ GemRB.SetVarAssoc (NoteWindow, Label, "Color", i)
+ GemRB.SetEvent (NoteWindow, Label, IE_GUI_BUTTON_ON_PRESS, "SetFocusBack")
+
+ #set
+ Label = GemRB.GetControl (NoteWindow, 0)
+ GemRB.SetEvent (NoteWindow, Label, IE_GUI_BUTTON_ON_PRESS,"SetMapNote")
+ GemRB.SetButtonFlags (NoteWindow, Label, IE_GUI_BUTTON_DEFAULT, OP_OR)
+ GemRB.SetText (NoteWindow, Label, 11973)
+
+ #cancel
+ Label = GemRB.GetControl (NoteWindow, 2)
+ GemRB.SetEvent (NoteWindow, Label, IE_GUI_BUTTON_ON_PRESS,"CloseNoteWindow")
+ GemRB.SetText (NoteWindow, Label, 13727)
+
+ #remove
+ Label = GemRB.GetControl (NoteWindow, 3)
+ GemRB.SetEvent (NoteWindow, Label, IE_GUI_BUTTON_ON_PRESS,"RemoveMapNote")
+ GemRB.SetText (NoteWindow, Label, 13957)
+
+ GemRB.ShowModal (NoteWindow, MODAL_SHADOW_GRAY)
+ GemRB.SetControlStatus (NoteWindow, NoteLabel, IE_GUI_CONTROL_FOCUSED)
return
def OpenWorldMapWindowInside ():
@@ -80,27 +198,60 @@
WorldMapWindowCommon (GemRB.GetVar ("Travel"))
return
+def MoveToNewArea ():
+ global WorldMapWindow, WorldMapControl
+
+ tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl)
+ print tmp
+ CloseWorldMapWindow ()
+ GemRB.CreateMovement (tmp["Destination"], tmp["Entrance"])
+ return
+
+def ChangeTooltip ():
+ global WorldMapWindow, WorldMapControl
+ global str
+
+ tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl)
+ print tmp
+ if (tmp):
+ str = "%s: %d"%(GemRB.GetString(23084),tmp["Distance"])
+ else:
+ str=""
+
+ GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str)
+ return
+
+def CloseWorldMapWindow ():
+ global WorldMapWindow, WorldMapControl
+
+ GemRB.UnloadWindow (WorldMapWindow)
+ WorldMapWindow = None
+ WorldMapControl = None
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ return
+
def WorldMapWindowCommon (Travel):
global WorldMapWindow, WorldMapControl
- GemRB.HideGUI()
-
if WorldMapWindow:
- GemRB.UnloadWindow (WorldMapWindow)
- WorldMapWindow = None
- GemRB.SetVar ("OtherWindow", -1)
- GemRB.UnhideGUI ()
+ CloseWorldMapWindow ()
return
- GemRB.LoadWindowPack ("GUIWMAP")
+ GemRB.HideGUI ()
+ GemRB.SetVisible (0,0)
+
+ GemRB.LoadWindowPack ("GUIWMAP", 640, 480)
WorldMapWindow = Window = GemRB.LoadWindow (0)
MapWindow = None
GemRB.SetVar ("OtherWindow", WorldMapWindow)
- GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel,"infofont")
+ GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel, "infofont")
WorldMapControl = GemRB.GetControl (Window, 4)
GemRB.SetAnimation (Window, WorldMapControl, "WMDAG")
-
+ GemRB.SetEvent (Window, WorldMapControl, IE_GUI_WORLDMAP_ON_PRESS, "MoveToNewArea")
+ GemRB.SetEvent (Window, WorldMapControl, IE_GUI_MOUSE_ENTER_WORLDMAP, "ChangeTooltip")
+
#north
Button = GemRB.GetControl (Window, 1)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapN")
@@ -111,11 +262,8 @@
# Done
Button = GemRB.GetControl (Window, 0)
- if Travel>=0:
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
- else:
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
- GemRB.UnhideGUI ()
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseWorldMapWindow")
+ GemRB.SetVisible (Window, 1)
return
def MapN():
Modified: gemrb/trunk/gemrb/GUIScripts/tob/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/tob/GUIMA.py 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/GUIScripts/tob/GUIMA.py 2007-09-26 22:17:16 UTC (rev 4801)
@@ -59,11 +59,11 @@
PosY = GemRB.GetVar ("MapControlY")
GemRB.RevealArea (PosX, PosY, 30, 1)
- GemRB.GamePause (1,0)
+ GemRB.GamePause (0,0)
return
###################################################
-# for clairvoyance effect
+# for farsight effect
###################################################
def ShowMap ():
global MapWindow, OptionsWindow, PortraitWindow
@@ -124,6 +124,7 @@
GemRB.SetVisible (PortraitWindow, 3)
GemRB.SetVisible (Window, 3)
GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
+ GemRB.GamePause (0,0)
return
###################################################
@@ -280,11 +281,11 @@
str = "%s: %d"%(GemRB.GetString(23084),tmp["Distance"])
else:
str=""
-
+
GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str)
return
-def CloseWorldMapWindow():
+def CloseWorldMapWindow ():
global WorldMapWindow, WorldMapControl
GemRB.UnloadWindow (WorldMapWindow)
@@ -294,7 +295,7 @@
GemRB.UnhideGUI ()
return
-def WorldMapWindowCommon(Travel):
+def WorldMapWindowCommon (Travel):
global WorldMapWindow, WorldMapControl
if WorldMapWindow:
Added: gemrb/trunk/gemrb/override/bg1/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/bg1/stats.ids (rev 0)
+++ gemrb/trunk/gemrb/override/bg1/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -0,0 +1,308 @@
+IDS
+0 HITPOINTS
+1 MAXHITPOINTS
+2 ARMORCLASS
+3 ACCRUSHINGMOD
+4 ACMISSILEMOD
+5 ACPIERCINGMOD
+6 ACSLASHINGMOD
+7 THAC0
+8 NUMBEROFATTACKS
+9 SAVEVSDEATH
+10 SAVEVSWANDS
+11 SAVEVSPOLY
+12 SAVEVSBREATH
+13 SAVEVSSPELL
+9 SAVEFORTITUDE
+10 SAVEREFLEX
+11 SAVEWILL
+14 RESISTFIRE
+15 RESISTCOLD
+16 RESISTELECTRICITY
+17 RESISTACID
+18 RESISTMAGIC
+19 RESISTMAGICFIRE
+20 RESISTMAGICCOLD
+21 RESISTSLASHING
+22 RESISTCRUSHING
+23 RESISTPIERCING
+24 RESISTMISSILE
+25 LORE
+26 LOCKPICKING
+27 STEALTH
+28 TRAPS
+29 PICKPOCKET
+30 FATIGUE
+31 INTOXICATION
+32 LUCK
+33 TRACKING
+34 LEVEL
+34 CLASSLEVELFIGHTER
+35 SEX
+36 STR
+37 STREXTRA
+38 INT
+39 WIS
+40 DEX
+41 CON
+42 CHR
+43 XPVALUE
+44 XP
+45 GOLD
+46 MORALEBREAK
+47 MORALERECOVERYTIME
+48 REPUTATION
+49 HATEDRACE
+50 DAMAGEBONUS
+51 SPELLFAILUREMAGE
+52 SPELLFAILUREPRIEST
+53 SPELLDURATIONMODMAGE
+54 SPELLDURATIONMODPRIEST
+55 TURNUNDEADLEVEL
+56 BACKSTABDAMAGEMULTIPLIER
+57 LAYONHANDSAMOUNT
+58 HELD
+59 POLYMORPHED
+60 TRANSLUCENT
+61 IDENTIFYMODE
+62 ENTANGLE
+63 SANCTUARY
+64 MINORGLOBE
+65 SHIELDGLOBE
+66 GREASE
+67 WEB
+68 LEVEL2
+68 CLASSLEVELMAGE
+69 LEVEL3
+69 CLASSLEVELTHIEF
+70 CASTERHOLD
+71 ENCUMBRANCE
+72 MISSILETHAC0BONUS
+73 MAGICDAMAGERESISTANCE
+74 RESISTPOISON
+75 DONOTJUMP
+76 AURACLEANSING
+77 MENTALSPEED
+78 PHYSICALSPEED
+79 CASTINGLEVELBONUSMAGE
+80 CASTINGLEVELBONUSCLERIC
+81 SEEINVISIBLE
+82 IGNOREDIALOGPAUSE
+83 MINHITPOINTS
+84 THAC0BONUSRIGHT
+85 THAC0BONUSLEFT
+86 DAMAGEBONUSRIGHT
+87 DAMAGEBONUSLEFT
+88 STONESKINS
+89 FEAT_BOW
+90 FEAT_CROSSBOW
+91 FEAT_SLING
+92 FEAT_AXE
+93 FEAT_MACE
+94 FEAT_FLAIL
+95 FEAT_POLEARM
+96 FEAT_HAMMER
+97 FEAT_STAFF
+98 FEAT_GREAT_SWORD
+99 FEAT_LARGE_SWORD
+100 FEAT_SMALL_SWORD
+101 FEAT_TOUGHNESS
+102 FEAT_COMBAT_CASTING
+103 FEAT_CLEAVE
+104 FEAT_ARMOUR
+105 FEAT_ENCHANTMENT
+106 FEAT_EVOCATION
+107 FEAT_NECROMANCY
+108 FEAT_TRANSMUTATION
+109 FEAT_SPELL_PENETRATION
+110 FEAT_EXTRA_RAGE
+111 FEAT_EXTRA_SHAPE
+112 FEAT_EXTRA_SMITING
+113 FEAT_EXTRA_TURNING
+114 FEAT_BASTARDSWORD
+89 PROFICIENCYBASTARDSWORD
+90 PROFICIENCYLONGSWORD
+91 PROFICIENCYSHORTSWORD
+92 PROFICIENCYAXE
+93 PROFICIENCYTWOHANDEDSWORD
+94 PROFICIENCYKATANA
+95 PROFICIENCYSCIMITARWAKISASHININJATO
+96 PROFICIENCYDAGGER
+97 PROFICIENCYWARHAMMER
+98 PROFICIENCYSPEAR
+99 PROFICIENCYHALBERD
+100 PROFICIENCYFLAILMORNINGSTAR
+101 PROFICIENCYMACE
+102 PROFICIENCYQUARTERSTAFF
+103 PROFICIENCYCROSSBOW
+104 PROFICIENCYLONGBOW
+105 PROFICIENCYSHORTBOW
+106 PROFICIENCYDART
+107 PROFICIENCYSLING
+108 PROFICIENCYBLACKJACK
+109 PROFICIENCYGUN
+110 PROFICIENCYMARTIALARTS
+111 PROFICIENCY2HANDED
+112 PROFICIENCYSWORDANDSHIELD
+113 PROFICIENCYSINGLEWEAPON
+114 PROFICIENCY2WEAPON
+115 EXTRAPROFICIENCY1
+115 ALCHEMY
+116 EXTRAPROFICIENCY2
+116 ANIMALS
+117 EXTRAPROFICIENCY3
+117 BLUFF
+118 EXTRAPROFICIENCY4
+118 CONCENTRATION
+119 EXTRAPROFICIENCY5
+119 DIPLOMACY
+120 EXTRAPROFICIENCY6
+120 INTIMIDATE
+121 EXTRAPROFICIENCY7
+121 SEARCH
+122 EXTRAPROFICIENCY8
+122 SPELLCRAFT
+123 EXTRAPROFICIENCY9
+123 MAGICDEVICE
+124 EXTRAPROFICIENCY10
+125 EXTRAPROFICIENCY11
+126 EXTRAPROFICIENCY12
+127 EXTRAPROFICIENCY13
+128 EXTRAPROFICIENCY14
+129 EXTRAPROFICIENCY15
+130 EXTRAPROFICIENCY16
+131 EXTRAPROFICIENCY17
+131 FEATS1
+132 EXTRAPROFICIENCY18
+132 FEATS2
+133 EXTRAPROFICIENCY19
+133 FEATS3
+134 EXTRAPROFICIENCY20
+134 FREESLOTS
+135 HIDEINSHADOWS
+136 DETECTILLUSIONS
+137 SETTRAPS
+138 PUPPETMASTERID
+139 PUPPETMASTERTYPE
+140 PUPPETTYPE
+141 PUPPETID
+142 CHECKFORBERSERK
+143 BERSERKSTAGE1
+144 BERSERKSTAGE2
+145 DAMAGELUCK
+146 CRITICALHITBONUS
+147 VISUALRANGE
+148 EXPLORE
+149 THRULLCHARM
+150 SUMMONDISABLE
+151 HITBONUS
+152 KIT
+153 FORCESURGE
+154 SURGEMOD
+155 IMPROVEDHASTE
+156 INTERNAL_0
+157 INTERNAL_1
+158 INTERNAL_2
+159 INTERNAL_3
+160 INTERNAL_4
+161 INTERNAL_5
+162 INTERNAL_6
+163 INTERNAL_7
+164 INTERNAL_8
+165 INTERNAL_9
+156 SCRIPTINGSTATE1
+157 SCRIPTINGSTATE2
+158 SCRIPTINGSTATE3
+159 SCRIPTINGSTATE4
+160 SCRIPTINGSTATE5
+161 SCRIPTINGSTATE6
+162 SCRIPTINGSTATE7
+163 SCRIPTINGSTATE8
+164 SCRIPTINGSTATE9
+165 SCRIPTINGSTATE10
+166 MELEETHAC0
+167 MELEEDAMAGE
+168 MISSILEDAMAGE
+169 NOCIRCLE
+170 FISTTHAC0
+171 FISTDAMAGE
+172 TITLE1
+173 TITLE2
+174 DISABLEOVERLAY
+175 DISABLEBACKSTAB
+176 XP_MAGE
+177 XP_THIEF
+178 DIALOGRANGE
+179 MOVEMENTRATE
+180 MORALE
+181 BOUNCE
+182 MIRRORIMAGES
+183 ENABLEOFFSCREENAI
+184 EXISTANCEDELAY
+185 ATTACKNUMBERDOUBLE
+186 DISABLECHUNKING
+187 NOTURNABLE
+189 CHAOSSHIELD
+190 NPCBUMP
+191 CANUSEANYITEM
+192 ALWAYSBACKSTAB
+194 SPELLFAILUREINNATE
+195 NOTRACKING
+196 DEADMAGIC
+197 DISABLETIMESTOP
+198 NOSEQUESTER
+199 STONESKINGOLEM
+200 LEVELDRAIN
+201 AVATARREMOVAL
+204 DISABLEDBUTTON
+205 ANIMATIONID
+206 STATE
+207 EXTSTATE
+208 METAL_COLOR
+208 COLORS
+209 MINOR_COLOR
+210 MAJOR_COLOR
+211 SKIN_COLOR
+212 LEATHER_COLOR
+213 ARMOR_COLOR
+214 HAIR_COLOR
+214 COLORCOUNT
+215 MC_FLAGS
+216 CLASSLEVELSUM
+217 ALIGNMENT
+218 UNSELECTABLE
+219 ARMORTYPE
+220 TEAM
+221 FACTION
+222 SUBRACE
+223 SPECIES
+224 HATEDRACE2
+225 HATEDRACE3
+226 HATEDRACE4
+227 HATEDRACE5
+228 HATEDRACE6
+229 HATEDRACE7
+230 HATEDRACE8
+231 RACE
+232 CLASS
+233 GENERAL
+234 EA
+235 SPECIFIC
+236 SAVEDXPOS
+237 SAVEDYPOS
+238 SAVEDFACE
+239 USERSTAT
+240 CLASSLEVELBARBARIAN
+241 CLASSLEVELBARD
+242 CLASSLEVELCLERIC
+243 CLASSLEVELDRUID
+244 CLASSLEVELMONK
+245 CLASSLEVELPALADIN
+246 CLASSLEVELRANGER
+247 CLASSLEVELSORCEROR
+250 SPLSTATE1
+251 SPLSTATE2
+252 SPLSTATE3
+253 SPLSTATE4
+254 SPLSTATE5
+255 SPLSTATE6
Modified: gemrb/trunk/gemrb/override/bg2/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/bg2/stats.ids 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/bg2/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -234,24 +234,30 @@
177 XP_THIEF
178 DIALOGRANGE
179 MOVEMENTRATE
-180 MORALE
-184 ENABLEOFFSCREENAI
-192 HATEDRACE2
-193 HATEDRACE3
-194 HATEDRACE4
-195 HATEDRACE5
-196 HATEDRACE6
-197 HATEDRACE7
-198 HATEDRACE8
-199 STONESKINSGOLEM
+180 MORALE
+181 BOUNCE
+182 MIRRORIMAGES
+183 ENABLEOFFSCREENAI
+184 EXISTANCEDELAY
+185 ATTACKNUMBERDOUBLE
+186 DISABLECHUNKING
+187 NOTURNABLE
+189 CHAOSSHIELD
+190 NPCBUMP
+191 CANUSEANYITEM
+192 ALWAYSBACKSTAB
+194 SPELLFAILUREINNATE
+195 NOTRACKING
+196 DEADMAGIC
+197 DISABLETIMESTOP
+198 NOSEQUESTER
+199 STONESKINGOLEM
200 LEVELDRAIN
-201 RACE
-202 CLASS
-203 GENERAL
-204 EA
-205 SPECIFIC
-206 ANIMATION_ID
-207 STATE_ID
+201 AVATARREMOVAL
+204 DISABLEDBUTTON
+205 ANIMATIONID
+206 STATE
+207 EXTSTATE
208 METAL_COLOR
208 COLORS
209 MINOR_COLOR
@@ -265,27 +271,27 @@
216 CLASSLEVELSUM
217 ALIGNMENT
218 UNSELECTABLE
-219 ARMOR_TYPE
+219 ARMORTYPE
220 TEAM
221 FACTION
222 SUBRACE
223 SPECIES
-224 PRIESTBONUS1
-225 PRIESTBONUS2
-226 PRIESTBONUS3
-227 PRIESTBONUS4
-228 PRIESTBONUS5
-229 PRIESTBONUS6
-230 PRIESTBONUS7
-231 WIZARDBONUS1
-232 WIZARDBONUS2
-233 WIZARDBONUS3
-234 WIZARDBONUS4
-235 WIZARDBONUS5
-236 WIZARDBONUS6
-237 WIZARDBONUS7
-238 WIZARDBONUS8
-239 WIZARDBONUS9
+224 HATEDRACE2
+225 HATEDRACE3
+226 HATEDRACE4
+227 HATEDRACE5
+228 HATEDRACE6
+229 HATEDRACE7
+230 HATEDRACE8
+231 RACE
+232 CLASS
+233 GENERAL
+234 EA
+235 SPECIFIC
+236 SAVEDXPOS
+237 SAVEDYPOS
+238 SAVEDFACE
+239 USERSTAT
240 CLASSLEVELBARBARIAN
241 CLASSLEVELBARD
242 CLASSLEVELCLERIC
@@ -294,6 +300,9 @@
245 CLASSLEVELPALADIN
246 CLASSLEVELRANGER
247 CLASSLEVELSORCEROR
-253 SAVEDXPOS
-254 SAVEDYPOS
-255 SAVEDFACE
+250 SPLSTATE1
+251 SPLSTATE2
+252 SPLSTATE3
+253 SPLSTATE4
+254 SPLSTATE5
+255 SPLSTATE6
Modified: gemrb/trunk/gemrb/override/how/splprot.2da
===================================================================
--- gemrb/trunk/gemrb/override/how/splprot.2da 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/how/splprot.2da 2007-09-26 22:17:16 UTC (rev 4801)
@@ -69,8 +69,8 @@
65 RACE 160 5 race/not_orc
66 EXTSTATE ? 9 extstate/deaf
67 EXTSTATE ? 8 extstate/not_deaf
-68 GENDER 6 1 gender/summoned
-69 GENDER 6 5 gender/not_summoned
+68 SEX 6 1 gender/summoned
+69 SEX 6 5 gender/not_summoned
70 RACE 184 1 race/mindflayer
71 RACE 184 5 race/not_mindflayer
72 STATE 0x1000 9 state/silenced
Modified: gemrb/trunk/gemrb/override/how/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/how/stats.ids 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/how/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -234,24 +234,30 @@
177 XP_THIEF
178 DIALOGRANGE
179 MOVEMENTRATE
-180 MORALE
-184 ENABLEOFFSCREENAI
-192 HATEDRACE2
-193 HATEDRACE3
-194 HATEDRACE4
-195 HATEDRACE5
-196 HATEDRACE6
-197 HATEDRACE7
-198 HATEDRACE8
-199 STONESKINSGOLEM
+180 MORALE
+181 BOUNCE
+182 MIRRORIMAGES
+183 ENABLEOFFSCREENAI
+184 EXISTANCEDELAY
+185 ATTACKNUMBERDOUBLE
+186 DISABLECHUNKING
+187 NOTURNABLE
+189 CHAOSSHIELD
+190 NPCBUMP
+191 CANUSEANYITEM
+192 ALWAYSBACKSTAB
+194 SPELLFAILUREINNATE
+195 NOTRACKING
+196 DEADMAGIC
+197 DISABLETIMESTOP
+198 NOSEQUESTER
+199 STONESKINGOLEM
200 LEVELDRAIN
-201 RACE
-202 CLASS
-203 GENERAL
-204 EA
-205 SPECIFIC
-206 ANIMATION_ID
-207 STATE_ID
+201 AVATARREMOVAL
+204 DISABLEDBUTTON
+205 ANIMATIONID
+206 STATE
+207 EXTSTATE
208 METAL_COLOR
208 COLORS
209 MINOR_COLOR
@@ -265,27 +271,27 @@
216 CLASSLEVELSUM
217 ALIGNMENT
218 UNSELECTABLE
-219 ARMOR_TYPE
+219 ARMORTYPE
220 TEAM
221 FACTION
222 SUBRACE
223 SPECIES
-224 PRIESTBONUS1
-225 PRIESTBONUS2
-226 PRIESTBONUS3
-227 PRIESTBONUS4
-228 PRIESTBONUS5
-229 PRIESTBONUS6
-230 PRIESTBONUS7
-231 WIZARDBONUS1
-232 WIZARDBONUS2
-233 WIZARDBONUS3
-234 WIZARDBONUS4
-235 WIZARDBONUS5
-236 WIZARDBONUS6
-237 WIZARDBONUS7
-238 WIZARDBONUS8
-239 WIZARDBONUS9
+224 HATEDRACE2
+225 HATEDRACE3
+226 HATEDRACE4
+227 HATEDRACE5
+228 HATEDRACE6
+229 HATEDRACE7
+230 HATEDRACE8
+231 RACE
+232 CLASS
+233 GENERAL
+234 EA
+235 SPECIFIC
+236 SAVEDXPOS
+237 SAVEDYPOS
+238 SAVEDFACE
+239 USERSTAT
240 CLASSLEVELBARBARIAN
241 CLASSLEVELBARD
242 CLASSLEVELCLERIC
@@ -294,6 +300,9 @@
245 CLASSLEVELPALADIN
246 CLASSLEVELRANGER
247 CLASSLEVELSORCEROR
-253 SAVEDXPOS
-254 SAVEDYPOS
-255 SAVEDFACE
+250 SPLSTATE1
+251 SPLSTATE2
+252 SPLSTATE3
+253 SPLSTATE4
+254 SPLSTATE5
+255 SPLSTATE6
Modified: gemrb/trunk/gemrb/override/iwd/splprot.2da
===================================================================
--- gemrb/trunk/gemrb/override/iwd/splprot.2da 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/iwd/splprot.2da 2007-09-26 22:17:16 UTC (rev 4801)
@@ -69,8 +69,8 @@
65 RACE 160 5 race/not_orc
66 EXTSTATE ? 9 extstate/deaf
67 EXTSTATE ? 8 extstate/not_deaf
-68 GENDER 6 1 gender/summoned
-69 GENDER 6 5 gender/not_summoned
+68 SEX 6 1 gender/summoned
+69 SEX 6 5 gender/not_summoned
70 RACE 184 1 race/mindflayer
71 RACE 184 5 race/not_mindflayer
72 STATE 0x1000 9 state/silenced
Modified: gemrb/trunk/gemrb/override/iwd/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/iwd/stats.ids 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/iwd/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -234,24 +234,30 @@
177 XP_THIEF
178 DIALOGRANGE
179 MOVEMENTRATE
-180 MORALE
-184 ENABLEOFFSCREENAI
-192 HATEDRACE2
-193 HATEDRACE3
-194 HATEDRACE4
-195 HATEDRACE5
-196 HATEDRACE6
-197 HATEDRACE7
-198 HATEDRACE8
-199 STONESKINSGOLEM
+180 MORALE
+181 BOUNCE
+182 MIRRORIMAGES
+183 ENABLEOFFSCREENAI
+184 EXISTANCEDELAY
+185 ATTACKNUMBERDOUBLE
+186 DISABLECHUNKING
+187 NOTURNABLE
+189 CHAOSSHIELD
+190 NPCBUMP
+191 CANUSEANYITEM
+192 ALWAYSBACKSTAB
+194 SPELLFAILUREINNATE
+195 NOTRACKING
+196 DEADMAGIC
+197 DISABLETIMESTOP
+198 NOSEQUESTER
+199 STONESKINGOLEM
200 LEVELDRAIN
-201 RACE
-202 CLASS
-203 GENERAL
-204 EA
-205 SPECIFIC
-206 ANIMATION_ID
-207 STATE_ID
+201 AVATARREMOVAL
+204 DISABLEDBUTTON
+205 ANIMATIONID
+206 STATE
+207 EXTSTATE
208 METAL_COLOR
208 COLORS
209 MINOR_COLOR
@@ -265,27 +271,27 @@
216 CLASSLEVELSUM
217 ALIGNMENT
218 UNSELECTABLE
-219 ARMOR_TYPE
+219 ARMORTYPE
220 TEAM
221 FACTION
222 SUBRACE
223 SPECIES
-224 PRIESTBONUS1
-225 PRIESTBONUS2
-226 PRIESTBONUS3
-227 PRIESTBONUS4
-228 PRIESTBONUS5
-229 PRIESTBONUS6
-230 PRIESTBONUS7
-231 WIZARDBONUS1
-232 WIZARDBONUS2
-233 WIZARDBONUS3
-234 WIZARDBONUS4
-235 WIZARDBONUS5
-236 WIZARDBONUS6
-237 WIZARDBONUS7
-238 WIZARDBONUS8
-239 WIZARDBONUS9
+224 HATEDRACE2
+225 HATEDRACE3
+226 HATEDRACE4
+227 HATEDRACE5
+228 HATEDRACE6
+229 HATEDRACE7
+230 HATEDRACE8
+231 RACE
+232 CLASS
+233 GENERAL
+234 EA
+235 SPECIFIC
+236 SAVEDXPOS
+237 SAVEDYPOS
+238 SAVEDFACE
+239 USERSTAT
240 CLASSLEVELBARBARIAN
241 CLASSLEVELBARD
242 CLASSLEVELCLERIC
@@ -294,6 +300,9 @@
245 CLASSLEVELPALADIN
246 CLASSLEVELRANGER
247 CLASSLEVELSORCEROR
-253 SAVEDXPOS
-254 SAVEDYPOS
-255 SAVEDFACE
+250 SPLSTATE1
+251 SPLSTATE2
+252 SPLSTATE3
+253 SPLSTATE4
+254 SPLSTATE5
+255 SPLSTATE6
Modified: gemrb/trunk/gemrb/override/iwd2/splprot.2da
===================================================================
--- gemrb/trunk/gemrb/override/iwd2/splprot.2da 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/iwd2/splprot.2da 2007-09-26 22:17:16 UTC (rev 4801)
@@ -69,8 +69,8 @@
65 RACE 160 5 race/not_orc
66 EXTSTATE ? 9 extstate/deaf
67 EXTSTATE ? 8 extstate/not_deaf
-68 GENDER 6 1 gender/summoned
-69 GENDER 6 5 gender/not_summoned
+68 SEX 6 1 gender/summoned
+69 SEX 6 5 gender/not_summoned
70 RACE 184 1 race/mindflayer
71 RACE 184 5 race/not_mindflayer
72 STATE 0x1000 9 state/silenced
Modified: gemrb/trunk/gemrb/override/iwd2/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/iwd2/stats.ids 2007-09-22 15:13:46 UTC (rev 4800)
+++ gemrb/trunk/gemrb/override/iwd2/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -234,24 +234,30 @@
177 XP_THIEF
178 DIALOGRANGE
179 MOVEMENTRATE
-180 MORALE
-184 ENABLEOFFSCREENAI
-192 HATEDRACE2
-193 HATEDRACE3
-194 HATEDRACE4
-195 HATEDRACE5
-196 HATEDRACE6
-197 HATEDRACE7
-198 HATEDRACE8
-199 STONESKINSGOLEM
+180 MORALE
+181 BOUNCE
+182 MIRRORIMAGES
+183 ENABLEOFFSCREENAI
+184 EXISTANCEDELAY
+185 ATTACKNUMBERDOUBLE
+186 DISABLECHUNKING
+187 NOTURNABLE
+189 CHAOSSHIELD
+190 NPCBUMP
+191 CANUSEANYITEM
+192 ALWAYSBACKSTAB
+194 SPELLFAILUREINNATE
+195 NOTRACKING
+196 DEADMAGIC
+197 DISABLETIMESTOP
+198 NOSEQUESTER
+199 STONESKINGOLEM
200 LEVELDRAIN
-201 RACE
-202 CLASS
-203 GENERAL
-204 EA
-205 SPECIFIC
-206 ANIMATION_ID
-207 STATE_ID
+201 AVATARREMOVAL
+204 DISABLEDBUTTON
+205 ANIMATIONID
+206 STATE
+207 EXTSTATE
208 METAL_COLOR
208 COLORS
209 MINOR_COLOR
@@ -265,27 +271,27 @@
216 CLASSLEVELSUM
217 ALIGNMENT
218 UNSELECTABLE
-219 ARMOR_TYPE
+219 ARMORTYPE
220 TEAM
221 FACTION
222 SUBRACE
223 SPECIES
-224 PRIESTBONUS1
-225 PRIESTBONUS2
-226 PRIESTBONUS3
-227 PRIESTBONUS4
-228 PRIESTBONUS5
-229 PRIESTBONUS6
-230 PRIESTBONUS7
-231 WIZARDBONUS1
-232 WIZARDBONUS2
-233 WIZARDBONUS3
-234 WIZARDBONUS4
-235 WIZARDBONUS5
-236 WIZARDBONUS6
-237 WIZARDBONUS7
-238 WIZARDBONUS8
-239 WIZARDBONUS9
+224 HATEDRACE2
+225 HATEDRACE3
+226 HATEDRACE4
+227 HATEDRACE5
+228 HATEDRACE6
+229 HATEDRACE7
+230 HATEDRACE8
+231 RACE
+232 CLASS
+233 GENERAL
+234 EA
+235 SPECIFIC
+236 SAVEDXPOS
+237 SAVEDYPOS
+238 SAVEDFACE
+239 USERSTAT
240 CLASSLEVELBARBARIAN
241 CLASSLEVELBARD
242 CLASSLEVELCLERIC
@@ -294,6 +300,9 @@
245 CLASSLEVELPALADIN
246 CLASSLEVELRANGER
247 CLASSLEVELSORCEROR
-253 SAVEDXPOS
-254 SAVEDYPOS
-255 SAVEDFACE
+250 SPLSTATE1
+251 SPLSTATE2
+252 SPLSTATE3
+253 SPLSTATE4
+254 SPLSTATE5
+255 SPLSTATE6
Added: gemrb/trunk/gemrb/override/pst/stats.ids
===================================================================
--- gemrb/trunk/gemrb/override/pst/stats.ids (rev 0)
+++ gemrb/trunk/gemrb/override/pst/stats.ids 2007-09-26 22:17:16 UTC (rev 4801)
@@ -0,0 +1,308 @@
+IDS
+0 HITPOINTS
+1 MAXHITPOINTS
+2 ARMORCLASS
+3 ACCRUSHINGMOD
+4 ACMISSILEMOD
+5 ACPIERCINGMOD
+6 ACSLASHINGMOD
+7 THAC0
+8 NUMBEROFATTACKS
+9 SAVEVSDEATH
+10 SAVEVSWANDS
+11 SAVEVSPOLY
+12 SAVEVSBREATH
+13 SAVEVSSPELL
+9 SAVEFORTITUDE
+10 SAVEREFLEX
+11 SAVEWILL
+14 RESISTFIRE
+15 RESISTCOLD
+16 RESISTELECTRICITY
+17 RESISTACID
+18 RESISTMAGIC
+19 RESISTMAGICFIRE
+20 RESISTMAGICCOLD
+21 RESISTSLASHING
+22 RESISTCRUSHING
+23 RESISTPIERCING
+24 RESISTMISSILE
+25 LORE
+26 LOCKPICKING
+27 STEALTH
+28 TRAPS
+29 PICKPOCKET
+30 FATIGUE
+31 INTOXICATION
+32 LUCK
+33 TRACKING
+34 LEVEL
+34 CLASSLEVELFIGHTER
+35 SEX
+36 STR
+37 STREXTRA
+38 INT
+39 WIS
+40 DEX
+41 CON
+42 CHR
+43 XPVALUE
+44 XP
+45 GOLD
+46 MORALEBREAK
+47 MORALERECOVERYTIME
+48 REPUTATION
+49 HATEDRACE
+50 DAMAGEBONUS
+51 SPELLFAILUREMAGE
+52 SPELLFAILUREPRIEST
+53 SPELLDURATIONMODMAGE
+54 SPELLDURATIONMODPRIEST
+55 TURNUNDEADLEVEL
+56 BACKSTABDAMAGEMULTIPLIER
+57 LAYONHANDSAMOUNT
+58 HELD
+59 POLYMORPHED
+60 TRANSLUCENT
+61 IDENTIFYMODE
+62 ENTANGLE
+63 SANCTUARY
+64 MINORGLOBE
+65 SHIELDGLOBE
+66 GREASE
+67 WEB
+68 LEVEL2
+68 CLASSLEVELMAGE
+69 LEVEL3
+69 CLASSLEVELTHIEF
+70 CASTERHOLD
+71 ENCUMBRANCE
+72 MISSILETHAC0BONUS
+73 MAGICDAMAGERESISTANCE
+74 RESISTPOISON
+75 DONOTJUMP
+76 AURACLEANSING
+77 MENTALSPEED
+78 PHYSICALSPEED
+79 CASTINGLEVELBONUSMAGE
+80 CASTINGLEVELBONUSCLERIC
+81 SEEINVISIBLE
+82 IGNOREDIALOGPAUSE
+83 MINHITPOINTS
+84 THAC0BONUSRIGHT
+85 THAC0BONUSLEFT
+86 DAMAGEBONUSRIGHT
+87 DAMAGEBONUSLEFT
+88 STONESKINS
+89 FEAT_BOW
+90 FEAT_CROSSBOW
+91 FEAT_SLING
+92 FEAT_AXE
+93 FEAT_MACE
+94 FEAT_FLAIL
+95 FEAT_POLEARM
+96 FEAT_HAMMER
+97 FEAT_STAFF
+98 FEAT_GREAT_SWORD
+99 FEAT_LARGE_SWORD
+100 FEAT_SMALL_SWORD
+101 FEAT_TOUGHNESS
+102 FEAT_COMBAT_CASTING
+103 FEAT_CLEAVE
+104 FEAT_ARMOUR
+105 FEAT_ENCHANTMENT
+106 FEAT_EVOCATION
+107 FEAT_NECROMANCY
+108 FEAT_TRANSMUTATION
+109 FEAT_SPELL_PENETRATION
+110 FEAT_EXTRA_RAGE
+111 FEAT_EXTRA_SHAPE
+112 FEAT_EXTRA_SMITING
+113 FEAT_EXTRA_TURNING
+114 FEAT_BASTARDSWORD
+89 PROFICIENCYBASTARDSWORD
+90 PROFICIENCYLONGSWORD
+91 PROFICIENCYSHORTSWORD
+92 PROFICIENCYAXE
+93 PROFICIENCYTWOHANDEDSWORD
+94 PROFICIENCYKATANA
+95 PROFICIENCYSCIMITARWAKISASHININJATO
+96 PROFICIENCYDAGGER
+97 PROFICIENCYWARHAMMER
+98 PROFICIENCYSPEAR
+99 PROFICIENCYHALBERD ...
[truncated message content] |