[Gcblue-commits] gcb_wx/scripts AI.py, 1.30, 1.31 AirManagement.py, 1.1, 1.2 Landing.py, 1.3, 1.4 UnitCommands.py, 1.31, 1.32

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

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

Modified Files:
	AI.py AirManagement.py Landing.py UnitCommands.py 
Log Message:


Index: AirManagement.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/AirManagement.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AirManagement.py	17 Aug 2006 01:29:11 -0000	1.1
--- AirManagement.py	20 Nov 2006 00:18:47 -0000	1.2
***************
*** 9,13 ****
  
      TI.SetUpdateInterval(20)
-     
  
      nUnits = FP.GetUnitCount()
--- 9,12 ----
***************
*** 18,23 ****
          UI_n = FP.GetUnitPlatformInterface(n)
          if (UI_n.GetFuel() < 1.0) and (not UI_n.IsRefueling()):
!             UI_n.DisplayMessage('Refueling %s' % unitName)
              UI_n.LoadOther('Fuel')
              
  
--- 17,23 ----
          UI_n = FP.GetUnitPlatformInterface(n)
          if (UI_n.GetFuel() < 1.0) and (not UI_n.IsRefueling()):
!             #UI_n.DisplayMessage('Refueling %s' % unitName)
              UI_n.LoadOther('Fuel')
+             return # only start one refueling at a time
              
  

Index: AI.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/AI.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** AI.py	24 Oct 2006 01:34:37 -0000	1.30
--- AI.py	20 Nov 2006 00:18:47 -0000	1.31
***************
*** 474,484 ****
      UI.DisplayMessage('Dropping all bombs')
  
- 
- 
      nLaunchers = UI.GetLauncherCount()
  
      for n in range(0, nLaunchers):
          launcher_info = UI.GetLauncherInfo(n)
!         if (launcher_info.LaunchMode == 2):
              UI.SendDatumToLauncher(tgt_lon,tgt_lat,tgt_alt,n)
              UI.Launch(n, 32)
--- 474,482 ----
      UI.DisplayMessage('Dropping all bombs')
  
      nLaunchers = UI.GetLauncherCount()
  
      for n in range(0, nLaunchers):
          launcher_info = UI.GetLauncherInfo(n)
!         if (launcher_info.LaunchMode == 3):
              UI.SendDatumToLauncher(tgt_lon,tgt_lat,tgt_alt,n)
              UI.Launch(n, 32)

Index: UnitCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** UnitCommands.py	24 Oct 2006 01:34:37 -0000	1.31
--- UnitCommands.py	20 Nov 2006 00:18:47 -0000	1.32
***************
*** 464,469 ****
      for n in range(0, nLaunchers):
          info = UI.GetLauncherInfo(n)
!         # LaunchMode == 2 is gravity bomb
!         if (info.LaunchMode == 2) and (info.Quantity > 0): 
              return 1
      return 0
--- 464,469 ----
      for n in range(0, nLaunchers):
          info = UI.GetLauncherInfo(n)
!         # LaunchMode == 3 is gravity bomb
!         if (info.LaunchMode == 3) and (info.Quantity > 0): 
              return 1
      return 0

Index: Landing.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Landing.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Landing.py	24 Oct 2006 01:34:37 -0000	1.3
--- Landing.py	20 Nov 2006 00:18:47 -0000	1.4
***************
*** 56,60 ****
      if (land_state <= 1):
          if (land_state == 0):
!             UI.DisplayMessage('Landing on platform %d' % track_info.ID) 
          UI.SetAlt(1200 + alt_m)
          TI.SetMemoryValue(2, 1)
--- 56,61 ----
      if (land_state <= 1):
          if (land_state == 0):
!             base_name = UI.LookupFriendlyName(track_info.ID)
!             UI.DisplayMessage('Landing %s' % base_name) 
          UI.SetAlt(1200 + alt_m)
          TI.SetMemoryValue(2, 1)