[os-devel] SF.net SVN: ospace:[332] branches/ospace_0.5

[<da...@us...>]

Revision: 332
          http://ospace.svn.sourceforge.net/ospace/?rev=332&view=rev
Author:   dahaic
Date:     2012-07-19 21:14:40 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
- NEW phase of buildings is now correctly respected in all cases.
  (fix for github issue #1)
- Removed duplicate entries in the GalaxyNames.txt file.

Modified Paths:
--------------
    branches/ospace_0.5/ChangeLog.txt
    branches/ospace_0.5/server/data/GalaxyNames.txt
    branches/ospace_0.5/server/lib/ige/ospace/IPlanet.py
    branches/ospace_0.5/server/lib/ige/ospace/ISystem.py

Modified: branches/ospace_0.5/ChangeLog.txt
===================================================================
--- branches/ospace_0.5/ChangeLog.txt	2012-06-11 20:24:23 UTC (rev 331)
+++ branches/ospace_0.5/ChangeLog.txt	2012-07-19 21:14:40 UTC (rev 332)
@@ -6,6 +6,11 @@
 - $Author$
 - $Revision$
 
+[2012-07-19]
+- NEW phase of buildings is now correctly respected in all cases.
+  (fix for github issue #1) [dahaic]
+- Removed duplicate entries in the GalaxyNames.txt file. [dahaic]
+
 [2012-06-11]
 - GalaxyNames.txt file needed by Galaxer is now included. [dahaic]
 

Modified: branches/ospace_0.5/server/data/GalaxyNames.txt
===================================================================
--- branches/ospace_0.5/server/data/GalaxyNames.txt	2012-06-11 20:24:23 UTC (rev 331)
+++ branches/ospace_0.5/server/data/GalaxyNames.txt	2012-07-19 21:14:40 UTC (rev 332)
@@ -11,18 +11,3 @@
 Kelenor
 Larion
 Merlis
-
-Argo
-Beidos
-Ceelia
-Daela
-Everen
-Ferun
-Garis
-Hiron
-Inera
-Jinx
-Kelenor
-Larion
-Merlis
-

Modified: branches/ospace_0.5/server/lib/ige/ospace/IPlanet.py
===================================================================
--- branches/ospace_0.5/server/lib/ige/ospace/IPlanet.py	2012-06-11 20:24:23 UTC (rev 331)
+++ branches/ospace_0.5/server/lib/ige/ospace/IPlanet.py	2012-07-19 21:14:40 UTC (rev 332)
@@ -306,6 +306,15 @@
 	moveStruct.public = 1
 	moveStruct.accLevel = AL_FULL
 
+	def processINITPhase(self, tran, obj, data):
+		# get rid of the NEW states
+		for struct in obj.slots:
+			struct[STRUCT_IDX_STATUS] &= ~STRUCT_STATUS_NEW
+
+	processINITPhase.public = 1
+	processINITPhase.accLevel = AL_ADMIN
+
+
 	def processPRODPhase(self, tran, obj, data):
 		if obj.plType == "A":
 			self.cmd(obj).generateAsteroid(tran, obj)
@@ -368,6 +377,8 @@
 		# reset of "morale modifier by buildings" value
 		obj.moraleModifiers[1] = 0
 		for struct in obj.slots:
+			if struct[STRUCT_IDX_STATUS] & STRUCT_STATUS_NEW:
+				continue
 			tech = Rules.techs[struct[STRUCT_IDX_TECHID]]
 			# compute struct effectivity
 			techEff = Utils.getTechEff(tran, struct[STRUCT_IDX_TECHID], obj.owner)

Modified: branches/ospace_0.5/server/lib/ige/ospace/ISystem.py
===================================================================
--- branches/ospace_0.5/server/lib/ige/ospace/ISystem.py	2012-06-11 20:24:23 UTC (rev 331)
+++ branches/ospace_0.5/server/lib/ige/ospace/ISystem.py	2012-07-19 21:14:40 UTC (rev 332)
@@ -233,6 +233,8 @@
 	def processINITPhase(self, tran, obj, data):
 		obj.scannerPwrs = {}
 
+		return obj.planets
+
 	processINITPhase.public = 1
 	processINITPhase.accLevel = AL_ADMIN
 

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