[Gcblue-commits] gcb_wx/scripts Landing.py, 1.1, 1.2 UnitCommands.py, 1.27, 1.28

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

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

Modified Files:
	Landing.py UnitCommands.py 
Log Message:
Added attributes (hidden and permanent) to AI tasks so that automation tasks can be hidden and not distract player

Index: UnitCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** UnitCommands.py	18 Jun 2006 00:47:42 -0000	1.27
--- UnitCommands.py	27 Aug 2006 21:28:54 -0000	1.28
***************
*** 32,36 ****
  
  def AddEngageAllOrder(UI):
!     UI.AddTask('EngageAll', 2.0)
  
  def ToggleEngageAll(UI):
--- 32,36 ----
  
  def AddEngageAllOrder(UI):
!     UI.AddTask('EngageAll', 2.0, 0)
  
  def ToggleEngageAll(UI):
***************
*** 38,45 ****
          UI.DeleteTask('EngageAll')
      else:
!         UI.AddTask('EngageAll', 2.0)
      
  def AddBombTargetTask(UI):
!     UI.AddTask('BombTarget', 3.0)
  
  def AddBombDatumTask(UI, lon, lat):
--- 38,45 ----
          UI.DeleteTask('EngageAll')
      else:
!         UI.AddTask('EngageAll', 2.0, 0)
      
  def AddBombTargetTask(UI):
!     UI.AddTask('BombTarget', 3.0, 0)
  
  def AddBombDatumTask(UI, lon, lat):
***************
*** 47,51 ****
      BB.Write('DatumLongitude', '%f' % lon)
      BB.Write('DatumLatitude', '%f' % lat)
!     UI.AddTask('BombDatum', 3.0)
  
  def AddBombDatumTaskDeg(UI, lon, lat):
--- 47,51 ----
      BB.Write('DatumLongitude', '%f' % lon)
      BB.Write('DatumLatitude', '%f' % lat)
!     UI.AddTask('BombDatum', 3.0, 0)
  
  def AddBombDatumTaskDeg(UI, lon, lat):
***************
*** 54,58 ****
      BB.Write('DatumLongitude', '%f' % (deg_to_rad*lon))
      BB.Write('DatumLatitude', '%f' % (deg_to_rad*lat))
!     UI.AddTask('BombDatum', 3.0)
  
  
--- 54,58 ----
      BB.Write('DatumLongitude', '%f' % (deg_to_rad*lon))
      BB.Write('DatumLatitude', '%f' % (deg_to_rad*lat))
!     UI.AddTask('BombDatum', 3.0, 0)
  
  
***************
*** 65,69 ****
      BB.Write('Bingo', '%f' % bingo_fuel)
      BB.Write('RTBtime', '%f' % (current_time + rtb_time))
!     UI.AddTask('ReturnToBase', 2.0)
  
  
--- 65,69 ----
      BB.Write('Bingo', '%f' % bingo_fuel)
      BB.Write('RTBtime', '%f' % (current_time + rtb_time))
!     UI.AddTask('ReturnToBase', 2.0, 0)
  
  
***************
*** 98,107 ****
  def AddPatrolOrder(UI):
      if (UI.IsSub()):
!         UI.AddTask('SubPatrol', 1.0)
      else:
!         UI.AddTask('Patrol', 1.0)
  
  def AddPatrolStation(UI, lon, lat):
!     UI.AddTask('PatrolCircle', 1.0)
      BB = UI.GetBlackboardInterface()
      BB.Write('StationLongitude', '%f' % lon)
--- 98,107 ----
  def AddPatrolOrder(UI):
      if (UI.IsSub()):
!         UI.AddTask('SubPatrol', 1.0, 0)
      else:
!         UI.AddTask('Patrol', 1.0, 0)
  
  def AddPatrolStation(UI, lon, lat):
!     UI.AddTask('PatrolCircle', 1.0, 0)
      BB = UI.GetBlackboardInterface()
      BB.Write('StationLongitude', '%f' % lon)
***************
*** 110,114 ****
  
  def AddPatrolStationDeg(UI, lon, lat):
!     UI.AddTask('PatrolCircle', 1.0)
      BB = UI.GetBlackboardInterface()
      BB.Write('StationLongitude', '%f' % (deg_to_rad*lon))
--- 110,114 ----
  
  def AddPatrolStationDeg(UI, lon, lat):
!     UI.AddTask('PatrolCircle', 1.0, 0)
      BB = UI.GetBlackboardInterface()
      BB.Write('StationLongitude', '%f' % (deg_to_rad*lon))
***************
*** 118,124 ****
  def AddLandingOrder(UI, dest_id):
      if (UI.IsHelo()):
!         UI.AddTask('LandHelo', 3.0)
      else:
!         UI.AddTask('Land', 3.0)
          
      dest_name = UI.LookupFriendlyName(dest_id)
--- 118,124 ----
  def AddLandingOrder(UI, dest_id):
      if (UI.IsHelo()):
!         UI.AddTask('LandHelo', 3.0, 0)
      else:
!         UI.AddTask('Land', 3.0, 0)
          
      dest_name = UI.LookupFriendlyName(dest_id)
***************
*** 127,131 ****
  
  def AddMissileWarnTask(UI):
!     UI.AddTask('MissileWarning', 0.0)
  
  
--- 127,131 ----
  
  def AddMissileWarnTask(UI):
!     UI.AddTask('MissileWarning', 0.0, 0)
  
  
***************
*** 148,154 ****
  def MoveToAndPatrol(UI, lon, lat):
      ClearTasks(UI)
!     UI.AddTask('Patrol', 1.0)
!     UI.AddTask('Nav', 2.0)
!     UI.AddTask('EngageAll', 3.0)
      AddWaypointOrder(UI, lon, lat)
  
--- 148,154 ----
  def MoveToAndPatrol(UI, lon, lat):
      ClearTasks(UI)
!     UI.AddTask('Patrol', 1.0, 0)
!     UI.AddTask('Nav', 2.0, 0)
!     UI.AddTask('EngageAll', 3.0, 0)
      AddWaypointOrder(UI, lon, lat)
  

Index: Landing.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Landing.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Landing.py	18 Jun 2006 00:47:42 -0000	1.1
--- Landing.py	27 Aug 2006 21:28:54 -0000	1.2
***************
*** 199,203 ****
          home_base = BB.ReadMessage('Home')
          BB.Write('LandTarget', home_base)
!         UI.AddTask('Land', 2.0)
          TI.EndTask()
  
--- 199,203 ----
          home_base = BB.ReadMessage('Home')
          BB.Write('LandTarget', home_base)
!         UI.AddTask('Land', 2.0, 0)
          TI.EndTask()
  
***************
*** 210,214 ****
      BB = UI.GetBlackboardInterface()
      BB.Write('LandTarget', base_name)
!     UI.AddTask('Land', 3.0)
  
  def CancelLanding(UI):
--- 210,214 ----
      BB = UI.GetBlackboardInterface()
      BB.Write('LandTarget', base_name)
!     UI.AddTask('Land', 3.0, 0)
  
  def CancelLanding(UI):