add initiative to Campaign and pull it into Gamethread

MegaMek · Nov 28, 2024 · 7127244 · 7127244
1 parent 6975c49
commit 7127244
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/MekHQ/src/mekhq/AtBGameThread.java b/MekHQ/src/mekhq/AtBGameThread.java
@@ -132,6 +132,7 @@ public void run() {
 
                 client.getLocalPlayer().setCamouflage(app.getCampaign().getCamouflage().clone());
                 client.getLocalPlayer().setColour(app.getCampaign().getColour());
+                client.getLocalPlayer().setConstantInitBonus(campaign.getInitiativeBonus());
 
                 if (started) {
                     client.getGame().getOptions().loadOptions();

diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -204,6 +204,7 @@ public void run() {
                 client.getLocalPlayer().setStartingAnyNWy(scenario.getStartingAnyNWy());
                 client.getLocalPlayer().setStartingAnySEx(scenario.getStartingAnySEx());
                 client.getLocalPlayer().setStartingAnySEy(scenario.getStartingAnySEy());
+                client.getLocalPlayer().setConstantInitBonus(campaign.getInitiativeBonus());
 
                 client.getLocalPlayer().setTeam(1);
 

diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -265,6 +265,7 @@ public class Campaign implements ITechManager {
     private int crimeRating;
     private int crimePirateModifier;
     private LocalDate dateOfLastCrime;
+    private int initiativeBonus;
     private final CampaignSummary campaignSummary;
     private final Quartermaster quartermaster;
     private StoryArc storyArc;
@@ -306,6 +307,7 @@ public Campaign() {
         crimeRating = 0;
         crimePirateModifier = 0;
         dateOfLastCrime = null;
+        initiativeBonus = 10;
         setRankSystemDirect(Ranks.getRankSystemFromCode(Ranks.DEFAULT_SYSTEM_CODE));
         forces = new Force(name);
         forceIds.put(0, forces);
@@ -4465,6 +4467,22 @@ private void processReputationChanges() {
         }
     }
 
+    public int getInitiativeBonus(){
+        System.out.println("reached here"+ initiativeBonus);
+        return initiativeBonus;
+    }
+     public void setInitiativeBonus(int bonus){
+        initiativeBonus = bonus;
+    }
+
+    public void initiativeBonusIncrement(boolean change){
+        if(change){
+            setInitiativeBonus(++initiativeBonus);
+        }else{
+             setInitiativeBonus(--initiativeBonus);
+        }
+    }
+
     /**
      * This method processes the random dependents for a campaign. It shuffles the active dependents list and performs
      * actions based on the campaign options and unit rating modifiers.