From 2e4bf0823c60dfe4ab2c864c7984e9c3cca65fe4 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 7 Feb 2024 15:52:42 -0600 Subject: [PATCH] standard 1000 inventory weight && fixed XP rates 5x/10x --- src/engine/devcmd/cmds/InfoCmd.java | 2 +- src/engine/gameManager/LootManager.java | 21 +++++++++++++------- src/engine/objects/CharacterItemManager.java | 2 +- src/engine/objects/PlayerCharacter.java | 5 ++++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/engine/devcmd/cmds/InfoCmd.java b/src/engine/devcmd/cmds/InfoCmd.java index 5cb88ef9..b3408255 100644 --- a/src/engine/devcmd/cmds/InfoCmd.java +++ b/src/engine/devcmd/cmds/InfoCmd.java @@ -280,7 +280,7 @@ public class InfoCmd extends AbstractDevCmd { output += newline; output += "Inventory Weight:" + (targetPC.getCharItemManager().getInventoryWeight() + targetPC.getCharItemManager().getEquipWeight()); output += newline; - output += "Max Inventory Weight:" + ((int) targetPC.statStrBase * 3); + output += "Max Inventory Weight:" + targetPC.getInventoryCapacity(); output += newline; output += "ALTITUDE :" + targetPC.getAltitude(); output += newline; diff --git a/src/engine/gameManager/LootManager.java b/src/engine/gameManager/LootManager.java index a569324d..e19d2eaa 100644 --- a/src/engine/gameManager/LootManager.java +++ b/src/engine/gameManager/LootManager.java @@ -57,13 +57,20 @@ public enum LootManager { // Cache drop rate values from Config manager. - NORMAL_DROP_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_DROP_RATE.getValue()); - NORMAL_EXP_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_EXP_RATE.getValue()); - NORMAL_GOLD_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_GOLD_RATE.getValue()); - HOTZONE_DROP_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_DROP_RATE.getValue()); - HOTZONE_EXP_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_EXP_RATE.getValue()); - HOTZONE_GOLD_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_GOLD_RATE.getValue()); - + //NORMAL_DROP_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_DROP_RATE.getValue()); + //NORMAL_EXP_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_EXP_RATE.getValue()); + //NORMAL_GOLD_RATE = Float.parseFloat(ConfigManager.MB_NORMAL_GOLD_RATE.getValue()); + //HOTZONE_DROP_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_DROP_RATE.getValue()); + //HOTZONE_EXP_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_EXP_RATE.getValue()); + //HOTZONE_GOLD_RATE = Float.parseFloat(ConfigManager.MB_HOTZONE_GOLD_RATE.getValue()); + + //hardcoded drop rates + NORMAL_DROP_RATE = 5.0f; + NORMAL_EXP_RATE = 5.0f; + NORMAL_GOLD_RATE = 5.0f; + HOTZONE_DROP_RATE = 10.0f; + HOTZONE_EXP_RATE = 10.0f; + HOTZONE_GOLD_RATE = 10.0f; } public static void GenerateMobLoot(Mob mob) { diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index b4b6fcfa..ab682ece 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -2131,7 +2131,7 @@ public class CharacterItemManager { tradeWeight = tradeWeight + tradeCharacter.getCharItemManager().getTradingWeight(); tradeWeight = tradeWeight - this.getTradingWeight(); - return tradeWeight <= (int) playerCharacter.statStrBase * 3; + return tradeWeight <= playerCharacter.getInventoryCapacity(); } public boolean hasRoomBank(short weight) { diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 26b51540..6240af5d 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -2189,8 +2189,11 @@ public class PlayerCharacter extends AbstractCharacter { } + //public int getInventoryCapacity() { + // return statStrBase * 3; + //} public int getInventoryCapacity() { - return statStrBase * 3; + return 1000; } public int getInventoryCapacityRemaining() {