Skip to content

Commit df9c6b2

Browse files
stone-alexstone-alex
committed
- hiding/showing actions based on player status.
1 parent e73a66f commit df9c6b2

File tree

1 file changed

+37
-25
lines changed

1 file changed

+37
-25
lines changed

‎app/src/main/java/elite/intel/ai/brain/AiActionsMap.java‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -141,26 +141,34 @@ public Map<String, String> actionMap() {
141141
map.put("show, open or display social panel", SHOW_SOCIAL_PANEL.getAction());
142142
map.put("show, open or display history panel", SHOW_HISTORY_PANEL.getAction());
143143
map.put("show, open or display squadron panel", SHOW_SQUADRON.getAction());
144-
map.put("show, open or display commander, central, role panel,", SHOW_COMMANDER_PANEL.getAction());
145-
map.put("show, open or display fighter panel", SHOW_FIGHTER_PANEL.getAction());
146-
map.put("show, open or display crew panel", SHOW_CREW.getAction());
147-
map.put("show, open or display home panel", SHOW_INTERNAL_PANEL.getAction());
148-
map.put("show, open or display modules panel", SHOW_MODULES_PANEL.getAction());
149-
map.put("show, open or display fire groups", SHOW_FIRE_GROUPS.getAction());
150-
map.put("show, open or display inventory panel", SHOW_INVENTORY_PANEL.getAction());
151-
map.put("show, open or display storage panel", SHOW_STORAGE_PANEL.getAction());
144+
if (status.isInMainShip()) {
145+
map.put("show, open or display fighter panel", SHOW_FIGHTER_PANEL.getAction());
146+
}
147+
if (status.isInSrv() || status.isInMainShip()) {
148+
map.put("show, open or display commander, central, role panel,", SHOW_COMMANDER_PANEL.getAction());
149+
map.put("show, open or display crew panel", SHOW_CREW.getAction());
150+
map.put("show, open or display home panel", SHOW_INTERNAL_PANEL.getAction());
151+
map.put("show, open or display modules panel", SHOW_MODULES_PANEL.getAction());
152+
map.put("show, open or display fire groups", SHOW_FIRE_GROUPS.getAction());
153+
map.put("show, open or display inventory panel", SHOW_INVENTORY_PANEL.getAction());
154+
map.put("show, open or display storage panel", SHOW_STORAGE_PANEL.getAction());
155+
}
156+
152157
map.put("show, open or display status panel", SHOW_STATUS_PANEL.getAction());
153158
map.put("show, open or display carrier management panel", DISPLAY_CARRIER_MANAGEMENT.getAction());
154159
map.put("show, open or display galaxy map", OPEN_GALAXY_MAP.getAction());
155160
map.put("show, open or display local / stat system map", OPEN_SYSTEM_MAP.getAction());
161+
156162
if (status.isInMainShip()) {
157163
map.put("show, open or display station services panel", SHOW_STATION_SERVICES.getAction());
158164
}
159165
map.put("exit close panel", EXIT_CLOSE.getAction());
160-
map.put("power to shields, max shields, boost shields", INCREASE_SHIELDS_POWER.getAction());
161-
map.put("power to engines, max engines, boost engines", INCREASE_ENGINES_POWER.getAction());
162-
map.put("power to weapons, max weapons, boost weapons", INCREASE_WEAPONS_POWER.getAction());
163166

167+
if (status.isInMainShip() || status.isInSrv()) {
168+
map.put("power to shields, max shields, boost shields", INCREASE_SHIELDS_POWER.getAction());
169+
map.put("power to engines, max engines, boost engines", INCREASE_ENGINES_POWER.getAction());
170+
map.put("power to weapons, max weapons, boost weapons", INCREASE_WEAPONS_POWER.getAction());
171+
}
164172
// pirate massacre missions
165173
map.put("navigate to mission provider system", RECON_PROVIDER_SYSTEM.getAction());
166174
map.put("navigate to pirate mission provider", NAVIGATE_TO_PIRATE_MISSION_PROVIDER.getAction());
@@ -170,19 +178,22 @@ public Map<String, String> actionMap() {
170178
map.put("recon hunting ground", RECON_TARGET_SYSTEM.getAction());
171179
map.put("ignore hunting ground", IGNORE_HUNTING_GROUND.getAction());
172180
map.put("confirm hunting ground", CONFIRM_HUNTING_GROUND.getAction());
173-
map.put("deploy hardpoints, weapons hot, combat ready, weapons free, weapons out, arm weapons, weapons ready", DEPLOY_HARDPOINTS.getAction());
174-
181+
if (status.isInMainShip()) {
182+
map.put("deploy hardpoints, weapons hot, combat ready, weapons free, weapons out, arm weapons, weapons ready", DEPLOY_HARDPOINTS.getAction());
183+
}
175184
// vehicle deployment
176185
if (status.isInMainShip()) {
177186
map.put("deploy SRV, deploy vehicle, launch SRV, send out SRV, drop SRV", DEPLOY_SRV.getAction());
187+
map.put("retract hardpoints, weapons cold, weapons away, stand down, holster weapons, weapons down, safe weapons", RETRACT_HARDPOINTS.getAction());
188+
map.put("deploy heat sink, launch heat sink, dump heat", DEPLOY_HEAT_SINK.getAction());
178189
}
179190
if (status.isInSrv()) {
180191
map.put("recover SRV, board ship, return SRV, retrieve SRV, SRV dock", RECOVER_SRV.getAction());
181192
}
182-
map.put("disembark", DISEMBARK.getAction());
183-
map.put("deploy heat sink, launch heat sink, dump heat", DEPLOY_HEAT_SINK.getAction());
184-
map.put("equalize power, balance power, reset power, distribute power equally", RESET_POWER.getAction());
185-
map.put("retract hardpoints, weapons cold, weapons away, stand down, holster weapons, weapons down, safe weapons", RETRACT_HARDPOINTS.getAction());
193+
if (status.isInSrv() || status.isInMainShip()) {
194+
map.put("disembark", DISEMBARK.getAction());
195+
map.put("equalize power, balance power, reset power, distribute power equally", RESET_POWER.getAction());
196+
}
186197

187198
// science / mining / biology
188199
map.put("add mining target {key:X}", ADD_MINING_TARGET.getAction());
@@ -198,14 +209,15 @@ public Map<String, String> actionMap() {
198209
map.put("delete codex entry, delete this codex, delete this entry, delete this organic", DELETE_CODEX_ENTRY.getAction());
199210

200211
// combat
201-
map.put("target fsd {key:fsd}, target engines {key:drive}, target Power Distributor {key:power distributor} target power plant {key:powerplant}, target powerplant {key:powerplant}, target life support {key:life support}, ", TARGET_SUB_SYSTEM.getAction());
202-
map.put("target wingman 1, wingman alpha", TARGET_WINGMAN0.getAction());
203-
map.put("target wingman 2, wingman bravo", TARGET_WINGMAN1.getAction());
204-
map.put("target wingman 3, wingman charlie", TARGET_WINGMAN2.getAction());
205-
map.put("wing nav lock, lock wingman nav, follow wingman", WING_NAV_LOCK.getAction());
206-
map.put("priority target, target highest threat, target most dangerous, select hostile, next enemy, select enemy", SELECT_HIGHEST_THREAT.getAction());
207-
208-
// fighter
212+
if (status.isInMainShip()) {
213+
map.put("target fsd {key:fsd}, target engines {key:drive}, target Power Distributor {key:power distributor} target power plant {key:powerplant}, target powerplant {key:powerplant}, target life support {key:life support}, ", TARGET_SUB_SYSTEM.getAction());
214+
map.put("target wingman 1, wingman alpha", TARGET_WINGMAN0.getAction());
215+
map.put("target wingman 2, wingman bravo", TARGET_WINGMAN1.getAction());
216+
map.put("target wingman 3, wingman charlie", TARGET_WINGMAN2.getAction());
217+
map.put("wing nav lock, lock wingman nav, follow wingman", WING_NAV_LOCK.getAction());
218+
map.put("priority target, target highest threat, target most dangerous, select hostile, next enemy, select enemy", SELECT_HIGHEST_THREAT.getAction());
219+
}
220+
// fighter orders
209221
if (status.isInMainShip()) {
210222
map.put("deploy fighter, launch fighter, send out fighter", DEPLOY_FIGHTER.getAction());
211223
map.put("order fighter defend ship, fighter defend, fighter defensive", FIGHTER_REQUEST_DEFENSIVE_BEHAVIOUR.getAction());

0 commit comments

Comments
 (0)