[Gcblue-commits] gcb_wx/scenarios TaiwanTest.py,1.4,1.5

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/scenarios
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4256/scenarios

Modified Files:
	TaiwanTest.py 
Log Message:


Index: TaiwanTest.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scenarios/TaiwanTest.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TaiwanTest.py	9 Jul 2005 14:44:42 -0000	1.4
--- TaiwanTest.py	20 Jul 2005 16:24:53 -0000	1.5
***************
*** 283,289 ****
      
      # alliance 1 goals
!     goal_1 = SM.TimeGoal()
!     goal_1.SetFailTimeout(1800) # 30 min time limit
!     SM.SetAllianceGoal(side_a, goal_1)
      
      # alliance 2 goals
--- 283,293 ----
      
      # alliance 1 goals
!     goal_1a = SM.DestroyGoal('Hangzhou')
! 
!     goal_1 = SM.CompoundGoal(0)   # 0 - AND, 1 - OR
!     goal_1.AddGoal(goal_1a)
! 
!     SM.SetAllianceGoal(1, goal_1)
! 
      
      # alliance 2 goals