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

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

Revision: 5172
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5172&view=rev
Author:   lynxlupodian
Date:     2008-06-05 12:20:43 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
bg2: always store the mageschool in MAGESCHOOL - not just for gnomes
use this info to detect specialist mages and give them that extra spell/level

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/GUICommon.py
    gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py

Modified: gemrb/trunk/gemrb/GUIScripts/GUICommon.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/GUICommon.py	2008-06-05 19:13:17 UTC (rev 5171)
+++ gemrb/trunk/gemrb/GUIScripts/GUICommon.py	2008-06-05 19:20:43 UTC (rev 5172)
@@ -17,9 +17,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Id$
+#
+# GUICommon.py - common functions for GUIScripts of all game types
 
 import GemRB
-# GUICommon.py - common functions for GUIScripts of all game types
+from GUIDefines import *
 
 OtherWindowFn = None
 #global OtherWindowFn
@@ -100,6 +102,12 @@
 	Table=GemRB.LoadTable (TableName)
 	for i in range(GemRB.GetTableColumnCount (0)):
 		value = GemRB.GetTableValue (Table, Level, i)
+		# specialist mages get an extra spell if they already know that level
+		# FIXME: get a general routine to find specialists
+		school = GemRB.GetVar("MAGESCHOOL")
+		if Type == IE_SPELL_TYPE_WIZARD and school != 0:
+			if value > 0:
+				value += 1
 		GemRB.SetMemorizableSpellsCount (pc, value, Type, i)
 	return
 

Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py	2008-06-05 19:13:17 UTC (rev 5171)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py	2008-06-05 19:20:43 UTC (rev 5172)
@@ -113,7 +113,14 @@
 	return
 
 def KitPress():
+	global ClassID
+
 	Kit = GemRB.GetVar("Class Kit")
+	if ClassID == 1 and Kit != 0:
+		GemRB.SetVar("MAGESCHOOL", Kit-21) # hack: -21 to make the generalist 0
+	else:
+		GemRB.SetVar("MAGESCHOOL", 0) # so bards don't get schools
+		
 	if Kit == 0:
 		KitName = GemRB.GetTableValue(ClassList, GemRB.GetVar("Class")-1, 1)
 	else:


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