[Gemrb-commits] gemrb: branch master updated. v0.7.2-207-gc81b77d

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c81b77d2ea2de539ab3956ce090e80f1e62400d3 (commit)

Summary of changes:
 gemrb/GUIScripts/iwd2/CharGen9.py |    2 +-
 gemrb/GUIScripts/iwd2/Class.py    |    1 -
 gemrb/GUIScripts/iwd2/GUIREC.py   |   35 +++++++++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 6 deletions(-)
      from  edd4dbd2f83327d1f8249647daa80eaddce6f354 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c81b77d2ea2de539ab3956ce090e80f1e62400d3

commit c81b77d2ea2de539ab3956ce090e80f1e62400d3
Author: Avenger <ave...@so...>
Date:   Sun Dec 30 21:20:03 2012 +0100

    display resistances

diff --git a/gemrb/GUIScripts/iwd2/CharGen9.py b/gemrb/GUIScripts/iwd2/CharGen9.py
index 55f5049..fed45bd 100644
--- a/gemrb/GUIScripts/iwd2/CharGen9.py
+++ b/gemrb/GUIScripts/iwd2/CharGen9.py
@@ -157,7 +157,7 @@ def NextPress():
 	kitrow = GemRB.GetVar ("Class")-1
 	kit = CommonTables.Classes.GetValue(kitrow, 2)
 	GemRB.SetPlayerStat (MyChar, IE_KIT, kit )
-	if (kit==0x4000):
+	if (CommonTables.Classes.GetValue(kitrow, 3) == 0):
 		#baseclass
 		clssname = CommonTables.Classes.GetRowName (Class-1)
 	else:
diff --git a/gemrb/GUIScripts/iwd2/Class.py b/gemrb/GUIScripts/iwd2/Class.py
index 8e0caae..d5ea609 100644
--- a/gemrb/GUIScripts/iwd2/Class.py
+++ b/gemrb/GUIScripts/iwd2/Class.py
@@ -185,7 +185,6 @@ def NextPress():
 	ClassColumn = CommonTables.Classes.GetValue (ClassName, "CLASS")
 	if ClassColumn <= 0:  #it was already a base class
 		ClassColumn = GemRB.GetVar("Class")
-		GemRB.SetVar("Class", CommonTables.Classes.FindValue(2, 0x4000) ) #it is a baseclass, so clear the kit
 	GemRB.SetVar("BaseClass", ClassColumn)
 	if ClassWindow:
 		ClassWindow.Unload()
diff --git a/gemrb/GUIScripts/iwd2/GUIREC.py b/gemrb/GUIScripts/iwd2/GUIREC.py
index 2514b2c..3ef9ec2 100644
--- a/gemrb/GUIScripts/iwd2/GUIREC.py
+++ b/gemrb/GUIScripts/iwd2/GUIREC.py
@@ -234,6 +234,13 @@ def DisplaySavingThrows (pc):
 	RecordsTextArea.Append (delimited_txt(17382, ":", PlusMinusStat(tmp), 0))
 
 # screenshots at http:// lparchive.org/Icewind-Dale-2/Update%2013/
+def GNZS(pc, s1, st):
+	value = GemRB.GetPlayerStat (pc, st)
+	if value:
+		RecordsTextArea.Append (s1, -1)
+		RecordsTextArea.Append (": "+ str(value) )
+	return
+
 def DisplayGeneral (pc):
 	Window = RecordsWindow
 
@@ -367,10 +374,30 @@ def DisplayGeneral (pc):
 	RecordsTextArea.Append (": " + PlusMinusStat(tmp) ) #con bonus to hitpoints
 	RecordsTextArea.Append ("\n")
 
-	RecordsTextArea.Append (15581,-1) #spell resistance
-	tmp = GemRB.GetPlayerStat (pc, IE_MAGICDAMAGERESISTANCE)
-	RecordsTextArea.Append (": "+str(tmp) )
-
+	#Fire
+	GNZS(pc, 14012, IE_RESISTFIRE)
+	#Magic Fire
+	GNZS(pc, 14077, IE_RESISTMAGICFIRE)
+	#Cold
+	GNZS(pc, 14014, IE_RESISTCOLD)
+	#Magic Cold
+	GNZS(pc, 14078, IE_RESISTMAGICCOLD)
+	#Electricity
+	GNZS(pc, 14013, IE_RESISTELECTRICITY)
+	#Acid
+	GNZS(pc, 14015, IE_RESISTACID)
+	#Spell
+	GNZS(pc, 15581, IE_MAGICDAMAGERESISTANCE)
+	# Missile
+	GNZS(pc, 11767, IE_RESISTMISSILE)
+	# Slashing
+	GNZS(pc, 11768, IE_RESISTSLASHING)
+	# Piercing
+	GNZS(pc, 11769, IE_RESISTPIERCING)
+	# Crushing
+	GNZS(pc, 11770, IE_RESISTCRUSHING)
+	# Poison
+	GNZS(pc, 14017, IE_RESISTPOISON)
 	return
 
 # some of the displayed stats are manually indented

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator