From 9ab286166e71f9a27962650fee76af97a93158e5 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Thu, 29 Feb 2024 19:11:35 -0600
Subject: [PATCH] zerg multiplier debug text
---
src/engine/gameManager/ZergManager.java | 50 +++++++++++++++++++------
src/engine/objects/City.java | 12 +++---
src/engine/objects/Mine.java | 6 +--
3 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/src/engine/gameManager/ZergManager.java b/src/engine/gameManager/ZergManager.java
index 8305eecb..46952e18 100644
--- a/src/engine/gameManager/ZergManager.java
+++ b/src/engine/gameManager/ZergManager.java
@@ -2,9 +2,10 @@ package engine.gameManager;
import engine.objects.Bane;
import engine.objects.Guild;
+import engine.objects.PlayerCharacter;
public class ZergManager {
- public static float getMultiplier5Man(int count){
+ public static float getMultiplier5Man(int count, PlayerCharacter pc){
float multiplier = 1.0f;
switch(count){
case 1:
@@ -34,10 +35,14 @@ public class ZergManager {
multiplier -= 1.0f;
break;
}
- return multiplier;
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
- public static float getMultiplier10Man(int count){
+ public static float getMultiplier10Man(int count, PlayerCharacter pc){
float multiplier = 1.0f;
if(count <=4)
return 0.0f;
@@ -88,10 +93,14 @@ public class ZergManager {
multiplier -= 1.0f;
break;
}
- return multiplier;
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
- public static float getMultiplier20Man(int count){
+ public static float getMultiplier20Man(int count, PlayerCharacter pc){
float multiplier = 1.0f;
if(count < 10){
multiplier += 1.25f;
@@ -162,7 +171,11 @@ public class ZergManager {
break;
}
}
- return multiplier;
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
public static int getBaneCapSize(Guild defender){
@@ -193,18 +206,31 @@ public class ZergManager {
}
return capSize;
}
- public static float getMultiplier30Man(int count){
+ public static float getMultiplier30Man(int count, PlayerCharacter pc){
float multiplier = 1.0f;
- return multiplier;
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
- public static float getMultiplier40Man(int count){
+ public static float getMultiplier40Man(int count, PlayerCharacter pc){
float multiplier = 1.0f;
- return multiplier;
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
- public static float getMultiplierUnlimited(int count){
+ public static float getMultiplierUnlimited(int count, PlayerCharacter pc){
float multiplier = 1.0f;
- return multiplier;
+
+ ChatManager.chatSystemInfo(pc,"Zerg Multiplier Set: " + multiplier);
+ if(multiplier == 0.0f)
+ return 1.0f;
+ else
+ return multiplier;
}
}
diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java
index 22b33036..455508dc 100644
--- a/src/engine/objects/City.java
+++ b/src/engine/objects/City.java
@@ -1446,22 +1446,22 @@ public class City extends AbstractWorldObject {
int count = this.dividedPlayers.get(player.getGuild().getNation()).size();
switch(this.getBane().capSize){
case 5:
- player.ZergMultiplier = ZergManager.getMultiplier5Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier5Man(count,player);
break;
case 10:
- player.ZergMultiplier = ZergManager.getMultiplier10Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier10Man(count,player);
break;
case 20:
- player.ZergMultiplier = ZergManager.getMultiplier20Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier20Man(count,player);
break;
case 30:
- player.ZergMultiplier = ZergManager.getMultiplier30Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier30Man(count,player);
break;
case 40:
- player.ZergMultiplier = ZergManager.getMultiplier40Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier40Man(count,player);
break;
case 9999999:
- player.ZergMultiplier = ZergManager.getMultiplierUnlimited(count);
+ player.ZergMultiplier = ZergManager.getMultiplierUnlimited(count,player);
break;
}
} else{
diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java
index b0258de6..ec3eff57 100644
--- a/src/engine/objects/Mine.java
+++ b/src/engine/objects/Mine.java
@@ -642,13 +642,13 @@ public class Mine extends AbstractGameObject {
int count = this.dividedPlayers.get(player.getGuild().getNation()).size();
switch(this.capSize){
case 5:
- player.ZergMultiplier = ZergManager.getMultiplier5Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier5Man(count,player);
break;
case 10:
- player.ZergMultiplier = ZergManager.getMultiplier10Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier10Man(count,player);
break;
case 20:
- player.ZergMultiplier = ZergManager.getMultiplier20Man(count);
+ player.ZergMultiplier = ZergManager.getMultiplier20Man(count,player);
break;
}
} else{