[Gemrb-commits] SF.net SVN: gemrb:[7149] gemrb/trunk/gemrb/GUIScripts

[<lyn...@us...>]

Revision: 7149
          http://gemrb.svn.sourceforge.net/gemrb/?rev=7149&view=rev
Author:   lynxlupodian
Date:     2009-09-13 21:13:07 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
shared SetupThaco

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/LUCommon.py
    gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
    gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py

Modified: gemrb/trunk/gemrb/GUIScripts/LUCommon.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/LUCommon.py	2009-09-13 20:59:20 UTC (rev 7148)
+++ gemrb/trunk/gemrb/GUIScripts/LUCommon.py	2009-09-13 21:13:07 UTC (rev 7149)
@@ -252,3 +252,59 @@
 	# fix hacked characters that have more xp than the xp cap
 	return 40
 
+def SetupThaco (pc, Level=None):
+	"""Updates an actors THAC0 based upon level.
+
+	Level should contain the actors current level.
+	If Level is None it is filled with the actors current level."""
+
+	#storing levels as an array makes them easier to deal with
+	if not Level:
+		Levels = [GemRB.GetPlayerStat (pc, IE_LEVEL)-1, \
+			GemRB.GetPlayerStat (pc, IE_LEVEL2)-1, \
+			GemRB.GetPlayerStat (pc, IE_LEVEL3)-1]
+	else:
+		Levels = []
+		for level in Level:
+			Levels.append (level-1)
+
+	#get some basic values
+	Class = [GemRB.GetPlayerStat (pc, IE_CLASS)]
+	ThacoTable = GemRB.LoadTableObject ("THAC0")
+
+	#adjust the class for multi/dual chars
+	Multi = IsMultiClassed (pc, 1)
+	Dual = IsDualClassed (pc, 1)
+	NumClasses = 1
+	if Multi[0]>1: #get each of the multi-classes
+		NumClasses = Multi[0]
+		Class = [Multi[1], Multi[2], Multi[3]]
+	elif Dual[0]: #only worry about the newer class
+		Class = [ClassTable.GetValue (Dual[2], 5)]
+		#assume Level is correct if passed
+		if IsDualSwap(pc) and not Level:
+			Levels = [Levels[1], Levels[0], Levels[2]]
+	if NumClasses>len(Levels):
+		return
+
+	#make sure to limit the levels to the table allowable
+	MaxLevel = ThacoTable.GetColumnCount ()-1
+	for i in range (len(Levels)):
+		if Levels[i] > MaxLevel:
+			Levels[i] = MaxLevel
+
+	CurrentThaco = GemRB.GetPlayerStat (pc, IE_TOHIT, 1)
+	NewThaco = 0
+	for i in range (NumClasses):
+		#loop through each class and update the save value if we have
+		#a better thac0
+		ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class[i]))
+		TmpThaco = ThacoTable.GetValue (ClassName, str(Levels[i]+1))
+		if TmpThaco < CurrentThaco:
+			NewThaco = 1
+			CurrentThaco = TmpThaco
+
+	#only update if we have a better thac0
+	if NewThaco:
+		GemRB.SetPlayerStat (pc, IE_TOHIT, CurrentThaco)
+	return

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2009-09-13 20:59:20 UTC (rev 7148)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py	2009-09-13 21:13:07 UTC (rev 7149)
@@ -680,63 +680,6 @@
 	GemRB.SetTimedEvent ("CheckDragging",1)
 	return
 
-def SetupThaco (pc, Level=None):
-	"""Updates an actors THAC0 based upon level.
-
-	Level should contain the actors current level.
-	If Level is None it is filled with the actors current level."""
-
-	#storing levels as an array makes them easier to deal with
-	if not Level:
-		Levels = [GemRB.GetPlayerStat (pc, IE_LEVEL)-1, \
-			GemRB.GetPlayerStat (pc, IE_LEVEL2)-1, \
-			GemRB.GetPlayerStat (pc, IE_LEVEL3)-1]
-	else:
-		Levels = []
-		for level in Level:
-			Levels.append (level-1)
-
-	#get some basic values
-	Class = [GemRB.GetPlayerStat (pc, IE_CLASS)]
-	ThacoTable = GemRB.LoadTableObject ("THAC0")
-
-	#adjust the class for multi/dual chars
-	Multi = IsMultiClassed (pc, 1)
-	Dual = IsDualClassed (pc, 1)
-	NumClasses = 1
-	if Multi[0]>1: #get each of the multi-classes
-		NumClasses = Multi[0]
-		Class = [Multi[1], Multi[2], Multi[3]]
-	elif Dual[0]: #only worry about the newer class
-		Class = [ClassTable.GetValue (Dual[2], 5)]
-		#assume Level is correct if passed
-		if IsDualSwap(pc) and not Level:
-			Levels = [Levels[1], Levels[0], Levels[2]]
-	if NumClasses>len(Levels):
-		return
-
-	#make sure to limit the levels to the table allowable
-	MaxLevel = ThacoTable.GetColumnCount ()-1
-	for i in range (len(Levels)):
-		if Levels[i] > MaxLevel:
-			Levels[i] = MaxLevel
-
-	CurrentThaco = GemRB.GetPlayerStat (pc, IE_TOHIT, 1)
-	NewThaco = 0
-	for i in range (NumClasses):
-		#loop through each class and update the save value if we have
-		#a better thac0
-		ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class[i]))
-		TmpThaco = ThacoTable.GetValue (ClassName, str(Levels[i]+1))
-		if TmpThaco < CurrentThaco:
-			NewThaco = 1
-			CurrentThaco = TmpThaco
-
-	#only update if we have a better thac0
-	if NewThaco:
-		GemRB.SetPlayerStat (pc, IE_TOHIT, CurrentThaco)
-	return
-
 def SetupLore (pc, LevelDiff=None):
 	"""Updates an actors lore based upon level.
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2009-09-13 20:59:20 UTC (rev 7148)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py	2009-09-13 21:13:07 UTC (rev 7149)
@@ -740,63 +740,6 @@
 	GemRB.SetTimedEvent ("CheckDragging",1)
 	return
 
-def SetupThaco (pc, Level=None):
-	"""Updates an actors THAC0 based upon level.
-
-	Level should contain the actors current level.
-	If Level is None it is filled with the actors current level."""
-
-	#storing levels as an array makes them easier to deal with
-	if not Level:
-		Levels = [GemRB.GetPlayerStat (pc, IE_LEVEL)-1, \
-			GemRB.GetPlayerStat (pc, IE_LEVEL2)-1, \
-			GemRB.GetPlayerStat (pc, IE_LEVEL3)-1]
-	else:
-		Levels = []
-		for level in Level:
-			Levels.append (level-1)
-
-	#get some basic values
-	Class = [GemRB.GetPlayerStat (pc, IE_CLASS)]
-	ThacoTable = GemRB.LoadTableObject ("THAC0")
-
-	#adjust the class for multi/dual chars
-	Multi = IsMultiClassed (pc, 1)
-	Dual = IsDualClassed (pc, 1)
-	NumClasses = 1
-	if Multi[0]>1: #get each of the multi-classes
-		NumClasses = Multi[0]
-		Class = [Multi[1], Multi[2], Multi[3]]
-	elif Dual[0]: #only worry about the newer class
-		Class = [ClassTable.GetValue (Dual[2], 5)]
-		#assume Level is correct if passed
-		if IsDualSwap(pc) and not Level:
-			Levels = [Levels[1], Levels[0], Levels[2]]
-	if NumClasses>len(Levels):
-		return
-
-	#make sure to limit the levels to the table allowable
-	MaxLevel = ThacoTable.GetColumnCount ()-1
-	for i in range (len(Levels)):
-		if Levels[i] > MaxLevel:
-			Levels[i] = MaxLevel
-
-	CurrentThaco = GemRB.GetPlayerStat (pc, IE_TOHIT, 1)
-	NewThaco = 0
-	for i in range (NumClasses):
-		#loop through each class and update the save value if we have
-		#a better thac0
-		ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class[i]))
-		TmpThaco = ThacoTable.GetValue (ClassName, str(Levels[i]+1))
-		if TmpThaco < CurrentThaco:
-			NewThaco = 1
-			CurrentThaco = TmpThaco
-
-	#only update if we have a better thac0
-	if NewThaco:
-		GemRB.SetPlayerStat (pc, IE_TOHIT, CurrentThaco)
-	return
-
 def SetupLore (pc, LevelDiff=None):
 	"""Updates an actors lore based upon level.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.