[Gcblue-commits] gcb_wx/scripts AI.py, 1.27, 1.28 HotKey.py, 1.8, 1.9 Menu.py, 1.24, 1.25 UnitComma
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/scripts AI.py, 1.27, 1.28 HotKey.py, 1.8, 1.9 Menu.py, 1.24, 1.25 UnitCommands.py, 1.28, 1.29
|
From: Dewitt C. <ddc...@us...> - 2006-09-05 01:04:27
|
Update of /cvsroot/gcblue/gcb_wx/scripts In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24958/scripts Modified Files: AI.py HotKey.py Menu.py UnitCommands.py Log Message: Index: HotKey.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/HotKey.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** HotKey.py 18 Jun 2006 00:47:42 -0000 1.8 --- HotKey.py 5 Sep 2006 01:04:24 -0000 1.9 *************** *** 11,18 **** SetFractionalSpeed(UnitInfo, 0.3, 1) elif (key == '2'): ! SetFractionalSpeed(UnitInfo, 0.80, 1) elif (key == '3'): ! SetFractionalSpeed(UnitInfo, 1.0, 1) elif (key == '4'): SetFractionalSpeed(UnitInfo, 1.1, 1) # afterburners or emergency power elif (key == 'e'): --- 11,20 ---- SetFractionalSpeed(UnitInfo, 0.3, 1) elif (key == '2'): ! SetFractionalSpeed(UnitInfo, 0.50, 1) elif (key == '3'): ! SetFractionalSpeed(UnitInfo, 0.80, 1) elif (key == '4'): + SetFractionalSpeed(UnitInfo, 1.0, 1) + elif (key == '5'): SetFractionalSpeed(UnitInfo, 1.1, 1) # afterburners or emergency power elif (key == 'e'): *************** *** 41,44 **** --- 43,60 ---- elif (key == 'C'): UnitInfo.ClearOrders() + # Raven58's mods: + elif (key == 'H'): + UnitInfo.SetAlt(10000) + elif (key == 'L'): + UnitInfo.SetAlt(150) + elif (key == 'M'): + UnitInfo.SetAlt(4000) + elif (key == 'v'): + ReverseOurCourse(UnitInfo) + elif (key == 'b'): + UnitInfo.AddTask('BombTarget', 3.0) + elif (key == 't'): + UnitInfo.SetAlt(4000) + ToggleRadars(UnitInfo) else: msg = 'unrecognized key: %s' % key Index: AI.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/AI.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** AI.py 17 Aug 2006 01:29:11 -0000 1.27 --- AI.py 5 Sep 2006 01:04:24 -0000 1.28 *************** *** 858,883 **** ! def InterceptTarget(UI): targetid = UI.GetTarget() if targetid == -1: return target_info = UI.GetTargetTrackInfo() # check if effective weapon is available launcher_info = UI.GetBestLauncher() launcher = launcher_info.Launcher if (launcher == -1): # if (no effective launcher is available) UI.SetTarget(-1) # clear target return - # check how many weapons are engaging target and abort if more than 4 - # debug_file = open('log/pydebug.txt', 'a') # debug_file.write('target: %d, engaged: %d\n' % (targetid, target_info.GetEngagedCount()) ) # debug_file.close() - if (target_info.GetEngagedCount() > 2): - UI.SetTarget(-1) # clear target - return # if sub, check launch depth requirements --- 858,905 ---- ! def InterceptTarget(TI): ! UI = TI.GetPlatformInterface() ! ! ! iteration = TI.GetMemoryValue(1) # will return 0 first time ! if (iteration == 0): # do initialization ! TI.SetMemoryText('Description', 'Close distance and engage target') ! TI.SetMemoryValue(2, 0) # 0 if target not engaged, 1 otherwise ! TI.SetMemoryValue(4, 0) # launcher is fire and forget (flee after attack) ! ! iteration = iteration + 1 ! TI.SetMemoryValue(1, iteration) ! ! targetid = UI.GetTarget() if targetid == -1: + TI.EndTask() return target_info = UI.GetTargetTrackInfo() + if (not target_info.IsValid()): + UI.DisplayMessage('Ending attack, lost target') + TI.EndTask() + return + + if (target_info.IsDestroyed()): + UI.DisplayMessage('Ending attack, target destroyed') + TI.EndTask() + return + + # check if effective weapon is available launcher_info = UI.GetBestLauncher() launcher = launcher_info.Launcher if (launcher == -1): # if (no effective launcher is available) + UI.DisplayMessage('Aborting attack, no effective weapons') UI.SetTarget(-1) # clear target + TI.EndTask() return # debug_file = open('log/pydebug.txt', 'a') # debug_file.write('target: %d, engaged: %d\n' % (targetid, target_info.GetEngagedCount()) ) # debug_file.close() # if sub, check launch depth requirements *************** *** 895,898 **** --- 917,922 ---- if (UI.IsSub()): SetFractionalSpeed(UI, 0.5) + elif (UI.IsAir() and (UI.GetFuel() > 0.5)): + UI.SetThrottle(1.1) # use AB if enough fuel left else: UI.SetSpeedToMax() *************** *** 901,924 **** UI.SetAlt(-launcher_info.MaxDepth_m + 1) else: ! target_is_engaged = UI.GetVar(0) # engagement status stored in user var 0 if target_is_engaged: ! wait_count = UI.GetVar(1) ! if (wait_count < 12): ! UI.SetVar(1,wait_count+1) # increment wait count UI.SetActionText('Atk-wait') if UI.IsAir(): ! SetHeadingOffTarget(UI, 30.0) # set heading 30 deg from current target bearing ! SetFractionalSpeed(UI,0.5) return else: ! UI.SetVar(0,0) # re-engage target ! UI.SetVar(1,0) if UI.IsAir(): ! SetFractionalSpeed(UI,1.0) # attack target range_km = 0.0 ! launch_mode = launcher_info.LaunchMode # 0 - datum, 1 - seeker, 2 - bomb, 3 - other if target_info.IsAir(): --- 925,951 ---- UI.SetAlt(-launcher_info.MaxDepth_m + 1) else: ! target_is_engaged = TI.GetMemoryValue(2) if target_is_engaged: ! # wait to re-engage until all engaging weapons are gone ! if (target_info.GetEngagedCount() > 0): UI.SetActionText('Atk-wait') + if UI.IsAir(): ! if (TI.GetMemoryValue(4) == 1): # flee target if fire-and-forget weapon ! SetHeadingOffTarget(UI, 180.0) # set heading 180 deg from current target bearing ! SetFractionalSpeed(UI, 1.0) ! else: ! SetHeadingOffTarget(UI, 30.0) # set heading 30 deg from current target bearing ! SetFractionalSpeed(UI, 0.5) return else: ! TI.SetMemoryValue(2, 0) # re-engage target if UI.IsAir(): ! SetFractionalSpeed(UI, 1.0) # attack target range_km = 0.0 ! launch_mode = launcher_info.LaunchMode # 0 - datum, 1 - seeker FF, 2 - seeker non-FF, 3 - bomb, 4 - error if target_info.IsAir(): *************** *** 938,952 **** UI.SendDatumToLauncher(lon,lat,alt,launcher) UI.Launch(launcher, launch_qty) ! UI.SetVar(0,1) UI.SetActionText('Datum launch') ! elif launch_mode == 1: # handoff to active seeker target_accepted = UI.HandoffTargetToLauncher(launcher) if (target_accepted): UI.Launch(launcher, launch_qty) ! UI.SetVar(0,1) UI.SetActionText('Handoff launch') ! else: ! TTI = UI.SetHeadingToInterceptTarget() ! UI.SetActionText('Attack %d (%3.0f s)' % (targetid, TTI)) --- 965,990 ---- UI.SendDatumToLauncher(lon,lat,alt,launcher) UI.Launch(launcher, launch_qty) ! TI.SetMemoryValue(2, 1) ! TI.SetMemoryValue(4, 1) # fire and forget UI.SetActionText('Datum launch') ! elif (launch_mode == 1) or (launch_mode == 2): # handoff to weapon seeker target_accepted = UI.HandoffTargetToLauncher(launcher) if (target_accepted): UI.Launch(launcher, launch_qty) ! TI.SetMemoryValue(2, 1) ! if (launch_mode == 1): ! TI.SetMemoryValue(4, 1) # fire and forget ! else: ! TI.SetMemoryValue(4, 0) # need platform guidance ! UI.SetActionText('Handoff launch') ! elif (launch_mode == 3): ! UI.DisplayMessage('Starting bomb run') ! AddBombTargetTask(UI) ! TI.EndTask() ! else: ! UI.DisplayMessage('Bad launch mode, aborting attack') ! TI.EndTask() ! Index: UnitCommands.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** UnitCommands.py 27 Aug 2006 21:28:54 -0000 1.28 --- UnitCommands.py 5 Sep 2006 01:04:24 -0000 1.29 *************** *** 224,227 **** --- 224,231 ---- + def AttackTarget(UI, target_id): + UI.SetTarget(target_id) + UI.AddTask('InterceptTarget', 2.0, 0) + def SelectTarget(UI, target_id): UI.SetTarget(target_id) *************** *** 230,233 **** --- 234,240 ---- def ClearTarget(UI): UI.SetTarget(-1) + + def SpeedAB(UI): + SetFractionalSpeed(UI, 1.1) def Speed100(UI): *************** *** 411,414 **** --- 418,430 ---- return 1 return 0 + + # TLL - added. 'v' in hotkey menu + def ReverseOurCourse(UI): + current_heading = UI.GetHeading() + 180 + if (current_heading >= 360): + current_heading = current_heading - 360 + UI.SetHeading(current_heading) + + Index: Menu.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Menu.py 17 Aug 2006 01:29:11 -0000 1.24 --- Menu.py 5 Sep 2006 01:04:24 -0000 1.25 *************** *** 81,86 **** UnitMenu.BeginSubMenu() UnitMenu.AddItem('30% [1]','Speed30') ! UnitMenu.AddItem('80% [2]','Speed80') ! UnitMenu.AddItem('Max [3]','Speed100') UnitMenu.EndSubMenu() --- 81,88 ---- 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() *************** *** 111,117 **** UnitMenu.AddItem('Set altitude','') UnitMenu.BeginSubMenu() ! UnitMenu.AddItem('High','AltitudeHigh') ! UnitMenu.AddItem('Medium','AltitudeMedium') ! UnitMenu.AddItem('Low','AltitudeLow') UnitMenu.AddItem('Very low','AltitudeVeryLow') UnitMenu.EndSubMenu() --- 113,119 ---- UnitMenu.AddItem('Set altitude','') UnitMenu.BeginSubMenu() ! UnitMenu.AddItem('High [H]','AltitudeHigh') ! UnitMenu.AddItem('Medium [M]','AltitudeMedium') ! UnitMenu.AddItem('Low [L]','AltitudeLow') UnitMenu.AddItem('Very low','AltitudeVeryLow') UnitMenu.EndSubMenu() *************** *** 205,208 **** --- 207,212 ---- def BuildLaunchMenu(UnitMenu, UnitInfo): + UnitMenu.AddItemUI('Attack target', 'AttackTarget', 'Target') + UnitMenu.AddItem('Engage datum with','') UnitMenu.BeginSubMenu() *************** *** 267,272 **** UnitMenu.BeginSubMenu() UnitMenu.AddItem('30% [1]','Speed30') ! UnitMenu.AddItem('80% [2]','Speed80') ! UnitMenu.AddItem('Max [3]','Speed100') UnitMenu.EndSubMenu() --- 271,278 ---- 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() *************** *** 288,294 **** UnitMenu.AddItem('Set altitude','') UnitMenu.BeginSubMenu() ! UnitMenu.AddItem('High','AltitudeHigh') ! UnitMenu.AddItem('Medium','AltitudeMedium') ! UnitMenu.AddItem('Low','AltitudeLow') UnitMenu.AddItem('Very low','AltitudeVeryLow') UnitMenu.EndSubMenu() --- 294,300 ---- UnitMenu.AddItem('Set altitude','') UnitMenu.BeginSubMenu() ! UnitMenu.AddItem('High [H]','AltitudeHigh') ! UnitMenu.AddItem('Medium [M]','AltitudeMedium') ! UnitMenu.AddItem('Low [L]','AltitudeLow') UnitMenu.AddItem('Very low','AltitudeVeryLow') UnitMenu.EndSubMenu() |
