[Gcblue-commits] gcb_wx/scripts AI.py,1.28,1.29 Menu.py,1.25,1.26

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

Update of /cvsroot/gcblue/gcb_wx/scripts
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23922/scripts

Modified Files:
	AI.py Menu.py 
Log Message:


Index: AI.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/AI.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** AI.py	5 Sep 2006 01:04:24 -0000	1.28
--- AI.py	16 Sep 2006 14:01:24 -0000	1.29
***************
*** 1015,1019 ****
          UI.Launch(launcher, launch_qty)
          UI.SetActionText('Datum launch')
!     elif launch_mode == 1:  # handoff to active seeker
          target_accepted = UI.HandoffTargetToLauncher(launcher)
          if (target_accepted):
--- 1015,1019 ----
          UI.Launch(launcher, launch_qty)
          UI.SetActionText('Datum launch')
!     elif (launch_mode == 1) or (launch_mode == 2):  # handoff to active seeker
          target_accepted = UI.HandoffTargetToLauncher(launcher)
          if (target_accepted):

Index: Menu.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Menu.py	5 Sep 2006 01:04:24 -0000	1.25
--- Menu.py	16 Sep 2006 14:01:24 -0000	1.26
***************
*** 76,89 ****
  
  
!     UnitMenu.AddItemUI('Change heading [h]','SetHeading','Heading')
!     # Speed submenu
!     UnitMenu.AddItem('Set speed','')
!     UnitMenu.BeginSubMenu()
!     UnitMenu.AddItem('30% [1]','Speed30')
!     UnitMenu.AddItem('50% [2]','Speed50')
!     UnitMenu.AddItem('80% [3]','Speed80')
!     UnitMenu.AddItem('100% [4]','Speed100')
!     UnitMenu.AddItem('Max [5]','SpeedAB')
!     UnitMenu.EndSubMenu()
      
      # Target submenu
--- 76,90 ----
  
  
!     if (not UnitInfo.IsFixed()):
!         UnitMenu.AddItemUI('Change heading [h]','SetHeading','Heading')
!         # Speed submenu
!         UnitMenu.AddItem('Set speed','')
!         UnitMenu.BeginSubMenu()
!         UnitMenu.AddItem('30% [1]','Speed30')
!         UnitMenu.AddItem('50% [2]','Speed50')
!         UnitMenu.AddItem('80% [3]','Speed80')
!         UnitMenu.AddItem('100% [4]','Speed100')
!         UnitMenu.AddItem('Max [5]','SpeedAB')
!         UnitMenu.EndSubMenu()
      
      # Target submenu
***************
*** 99,109 ****
      # Orders test
      UnitMenu.AddItem('Tasks','')
!     UnitMenu.BeginSubMenu() 
!     UnitMenu.AddItemUI('ZigZag patrol','AddPatrolOrder','Null')
!     UnitMenu.AddItemUI('Patrol station','AddPatrolStation', 'Datum')
!     UnitMenu.AddItemUI('Add waypoint [w]', 'AddWaypointOrder', 'Datum')
      UnitMenu.AddItemUI('EngageAll [e]', 'AddEngageAllOrder','Null')
!     UnitMenu.AddItemUI('Missile alert', 'AddMissileWarnTask','Null')
!     UnitMenu.AddItemUI('Clear waypoints','ClearWaypoints','Null')
      UnitMenu.AddItemUI('Clear all tasks','ClearTasks','Null')
      UnitMenu.EndSubMenu() 
--- 100,113 ----
      # Orders test
      UnitMenu.AddItem('Tasks','')
!     UnitMenu.BeginSubMenu()
!     
      UnitMenu.AddItemUI('EngageAll [e]', 'AddEngageAllOrder','Null')
!     if (not UnitInfo.IsFixed()):
!         UnitMenu.AddItemUI('ZigZag patrol','AddPatrolOrder','Null')
!         UnitMenu.AddItemUI('Patrol station','AddPatrolStation', 'Datum')
!         UnitMenu.AddItemUI('Add waypoint [w]', 'AddWaypointOrder', 'Datum')
! 
!         UnitMenu.AddItemUI('Missile alert', 'AddMissileWarnTask','Null')
!         UnitMenu.AddItemUI('Clear waypoints','ClearWaypoints','Null')
      UnitMenu.AddItemUI('Clear all tasks','ClearTasks','Null')
      UnitMenu.EndSubMenu()