Minor bug fixes.

Fixes fleet commander stats calculations for planet discovery and trading. Fleet commander gains experience by finding planets. Ruler needs to more diplomatic trades before gains negotiator perk.
tuomount · May 18, 2024 · 1a2265e · 1a2265e
1 parent eaf5694
commit 1a2265e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/main/java/org/openRealmOfStars/player/diplomacy/DiplomaticTrade.java b/src/main/java/org/openRealmOfStars/player/diplomacy/DiplomaticTrade.java
@@ -2623,7 +2623,7 @@ public static int calculateMapValue(final StarMap starMap,
   private static void checkNegotiatorPerk(final PlayerInfo info) {
     if (info.getRuler() != null
         && info.getRuler().getStats().getStat(
-        StatType.DIPLOMATIC_TRADE) >= 4
+        StatType.DIPLOMATIC_TRADE) >= 8
         && !info.getRuler().hasPerk(Perk.NEGOTIATOR)) {
       Perk perk = Perk.NEGOTIATOR;
       Leader leader = info.getRuler();
@@ -2898,15 +2898,9 @@ private int doTrade(final NegotiationList offerList, final PlayerInfo info,
       if (giver.getRuler() != null) {
         giver.getRuler().getStats().addOne(StatType.WAR_DECLARATIONS);
       }
-    } else if (countAsDiplomaticTrade) {
-      if (giver.getRuler() != null) {
-        giver.getRuler().getStats().addOne(StatType.DIPLOMATIC_TRADE);
-        checkNegotiatorPerk(giver);
-      }
-      if (info.getRuler() != null) {
-        info.getRuler().getStats().addOne(StatType.DIPLOMATIC_TRADE);
-        checkNegotiatorPerk(info);
-      }
+    } else if (countAsDiplomaticTrade && info.getRuler() != null) {
+      info.getRuler().getStats().addOne(StatType.DIPLOMATIC_TRADE);
+      checkNegotiatorPerk(info);
     }
     if (planetTraded) {
       if (majorDeals != null) {

diff --git a/src/main/java/org/openRealmOfStars/starMap/StarMap.java b/src/main/java/org/openRealmOfStars/starMap/StarMap.java
@@ -53,6 +53,7 @@
 import org.openRealmOfStars.player.leader.Leader;
 import org.openRealmOfStars.player.leader.LeaderUtility;
 import org.openRealmOfStars.player.leader.Perk;
+import org.openRealmOfStars.player.leader.stats.StatType;
 import org.openRealmOfStars.player.message.Message;
 import org.openRealmOfStars.player.message.MessageType;
 import org.openRealmOfStars.player.ship.Ship;
@@ -2703,6 +2704,9 @@ private void messageBasedOnTiles(final PlayerInfo info, final int sx,
           sb.append(" gained ");
           sb.append(exp);
           sb.append(" amount of experience.");
+          fleet.getCommander().addExperience(exp);
+          fleet.getCommander().getStats().addOne(
+              StatType.NUMBER_OF_PLANETS_EXPLORED);
         }
         Message msg = new Message(MessageType.FLEET,
             sb.toString(), Icons.getIconByName(Icons.ICON_PLANET));
@@ -2734,6 +2738,9 @@ private void messageBasedOnTiles(final PlayerInfo info, final int sx,
           sb.append(" gained ");
           sb.append(exp);
           sb.append(" amount of experience.");
+          fleet.getCommander().addExperience(exp);
+          fleet.getCommander().getStats().addOne(
+              StatType.NUMBER_OF_PLANETS_EXPLORED);
         }
         Message msg = new Message(MessageType.FLEET,
             sb.toString(), Icons.getIconByName(Icons.ICON_PLANET));

diff --git a/src/main/java/org/openRealmOfStars/starMap/StarMapUtilities.java b/src/main/java/org/openRealmOfStars/starMap/StarMapUtilities.java
@@ -29,6 +29,7 @@
 import org.openRealmOfStars.player.diplomacy.DiplomacyBonusType;
 import org.openRealmOfStars.player.fleet.Fleet;
 import org.openRealmOfStars.player.leader.Perk;
+import org.openRealmOfStars.player.leader.stats.StatType;
 import org.openRealmOfStars.player.message.Message;
 import org.openRealmOfStars.player.message.MessageType;
 import org.openRealmOfStars.player.race.trait.TraitIds;
@@ -758,6 +759,7 @@ public static void doTradeWithShips(final DiplomacyBonusList diplomacy,
         info.setTotalCredits(info.getTotalCredits() + credits);
         if (fleet.getCommander() != null) {
           fleet.getCommander().addExperience(credits);
+          fleet.getCommander().getStats().addOne(StatType.NUMBER_OF_TRADES);
         }
         planet.getPlanetPlayerInfo().setTotalCredits(
             planet.getPlanetPlayerInfo().getTotalCredits()
@@ -799,6 +801,7 @@ public static void doTradeWithShips(final DiplomacyBonusList diplomacy,
         }
         if (fleet.getCommander() != null) {
           fleet.getCommander().addExperience(credits);
+          fleet.getCommander().getStats().addOne(StatType.NUMBER_OF_TRADES);
         }
         info.setTotalCredits(info.getTotalCredits() + credits);
         Message msg = new Message(MessageType.PLANETARY,

diff --git a/src/main/resources/resources/changelog.txt b/src/main/resources/resources/changelog.txt
@@ -24,6 +24,10 @@
 - Bugfixes -
 
 * Realm wide espionage is now called intelligence. Commander doing espionage on planets is called espionage.
+* Fleet commander did not gains statistics for finding planets.
+* Fleet commander did not get experience by finding planets.
+* Ruler got too easily negotiator perk when doing diplomatic trades.
+* Fleet commander did not gains statistics for trading.
 
 # Open Realm of Stars 0.25.0