0.96a, better key names in HUD, fixed issue with one of the examples.

scardwell15 · May 5, 2023 · 5fc0f4f · 5fc0f4f
1 parent 5098374
commit 5fc0f4f
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 15 deletions.
diff --git a/combatactivators.version b/combatactivators.version
@@ -6,6 +6,6 @@
     {
         "major":1,
         "minor":0,
-        "patch":2
+        "patch":3
     }
 }
diff --git a/image.png b/image.png
diff --git a/jars/CombatActivators.jar b/jars/CombatActivators.jar
diff --git a/mod_info.json b/mod_info.json
@@ -3,9 +3,9 @@
     "name": "Combat Activators",
     "author": "President Matt Damon",
     "utility": "true",
-    "version": { "major":"1", "minor": "0", "patch": "2" },
+    "version": { "major":"1", "minor": "0", "patch": "3" },
     "description": "Abilities that can be activated during combat.",
-    "gameVersion": "0.95.1a-RC6",
+    "gameVersion": "0.96a",
     "jars":["jars/CombatActivators.jar"],
     "modPlugin":"activators.CombatActivatorsModPlugin",
     "dependencies": [

diff --git a/src/activators/ActivatorManager.kt b/src/activators/ActivatorManager.kt
@@ -1,5 +1,6 @@
 package activators
 
+import activators.examples.AmmoFeedersActivator
 import com.fs.starfarer.api.Global
 import com.fs.starfarer.api.combat.ShipAPI
 import com.fs.starfarer.api.combat.ViewportAPI
@@ -12,7 +13,7 @@ object ActivatorManager {
 
     fun initialize() {
         reloadKeys()
-        Global.getSector().listenerManager.addListener(LunaKeybindSettingsListener(), true)
+        LunaSettings.addListener(LunaKeybindSettingsListener())
     }
 
     @JvmStatic
@@ -53,8 +54,7 @@ object ActivatorManager {
 
     @JvmStatic
     fun drawActivatorsUI(viewport: ViewportAPI) {
-        if (Global.getCombatEngine().combatUI != null
-            && (Global.getCombatEngine().combatUI.isShowingCommandUI || Global.getCombatEngine().combatUI.isShowingDeploymentDialog)) {
+        if (Global.getCombatEngine().combatUI == null || Global.getCombatEngine().combatUI.isShowingCommandUI || Global.getCombatEngine().combatUI.isShowingDeploymentDialog) {
             return
         }
 

diff --git a/src/activators/CombatActivator.java b/src/activators/CombatActivator.java
@@ -571,15 +571,42 @@ public Color getHUDColor() {
         return MagicLibRendering.GREENCOLOR;
     }
 
+    public String getKeyText() {
+        int keycode = -1;
+        if (getKeyIndex() >= 0 && ActivatorManager.INSTANCE.getKeyList().size() > getKeyIndex()) {
+            keycode = ActivatorManager.INSTANCE.getKeyList().get(getKeyIndex());
+        }
+
+        switch (keycode) {
+            case -1:
+                return "N/A";
+            case Keyboard.KEY_LMENU:
+                return "L-ALT";
+            case Keyboard.KEY_RMENU:
+                return "R-ALT";
+            case Keyboard.KEY_LCONTROL:
+                return "L-CTRL";
+            case Keyboard.KEY_RCONTROL:
+                return "R-CTRL";
+            case Keyboard.KEY_LSHIFT:
+                return "L-SHIFT";
+            case Keyboard.KEY_RSHIFT:
+                return "R-SHIFT";
+            case Keyboard.KEY_CAPITAL:
+                return "CAPS";
+            case Keyboard.KEY_RETURN:
+                return "ENTER";
+            case Keyboard.KEY_BACK:
+                return "BKSPC";
+            default:
+                return Keyboard.getKeyName(keycode).toUpperCase();
+        }
+    }
+
     public void drawHUDBar(ViewportAPI viewport, Vector2f barLoc) {
         MagicLibRendering.setTextAligned(LazyFont.TextAlignment.LEFT);
 
-        String keyText = getKey();
-        if (getKeyIndex() >= 0) {
-            if (ActivatorManager.INSTANCE.getKeyList().size() > getKeyIndex()) {
-                keyText = Keyboard.getKeyName(ActivatorManager.INSTANCE.getKeyList().get(getKeyIndex()));
-            }
-        }
+        String keyText = getKeyText();
 
         String nameText = String.format("%s (%s)", getDisplayText(), keyText);
         float nameWidth = MagicLibRendering.getTextWidth(nameText);

diff --git a/src/activators/CombatActivatorsModPlugin.kt b/src/activators/CombatActivatorsModPlugin.kt
@@ -1,10 +1,12 @@
 package activators
 
 import com.fs.starfarer.api.BaseModPlugin
-import com.fs.starfarer.api.Global
 
 class CombatActivatorsModPlugin: BaseModPlugin() {
-    override fun onGameLoad(newGame: Boolean) {
+    override fun onApplicationLoad() {
         ActivatorManager.initialize()
     }
+
+    override fun onGameLoad(newGame: Boolean) {
+    }
 }
diff --git a/src/activators/examples/AmmoFeedersActivator.java b/src/activators/examples/AmmoFeedersActivator.java
@@ -50,7 +50,13 @@ public boolean shouldActivateAI(float amount) {
     @Override
     public void onActivate() {
         stats.getBallisticWeaponFluxCostMod().modifyMult(this.getDisplayText(), 0.5f);
-        stats.getBallisticRoFMult().modifyMult(this.getDisplayText(), 0.5f);
+        stats.getBallisticRoFMult().modifyMult(this.getDisplayText(), 2f);
+    }
+
+    @Override
+    public void onFinished() {
+        stats.getBallisticWeaponFluxCostMod().unmodify(this.getDisplayText());
+        stats.getBallisticRoFMult().unmodify(this.getDisplayText());
     }
 
     @Override