From 6e814c1dcd96b1ccc8e97351a4648f3198c849c7 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 7 Aug 2023 10:17:50 -0400 Subject: [PATCH] Refactor to install new loot tables. --- src/engine/loot/GenTable.java | 26 ------------------------- src/engine/loot/GenTableRow.java | 28 --------------------------- src/engine/loot/ItemTable.java | 29 ---------------------------- src/engine/loot/ItemTableRow.java | 28 --------------------------- src/engine/loot/ModTable.java | 29 ---------------------------- src/engine/loot/ModTableRow.java | 26 ------------------------- src/engine/loot/ModTypeTable.java | 26 ------------------------- src/engine/loot/ModTypeTableRow.java | 24 ----------------------- 8 files changed, 216 deletions(-) delete mode 100644 src/engine/loot/GenTable.java delete mode 100644 src/engine/loot/GenTableRow.java delete mode 100644 src/engine/loot/ItemTable.java delete mode 100644 src/engine/loot/ItemTableRow.java delete mode 100644 src/engine/loot/ModTable.java delete mode 100644 src/engine/loot/ModTableRow.java delete mode 100644 src/engine/loot/ModTypeTable.java delete mode 100644 src/engine/loot/ModTypeTableRow.java diff --git a/src/engine/loot/GenTable.java b/src/engine/loot/GenTable.java deleted file mode 100644 index af2a97e4..00000000 --- a/src/engine/loot/GenTable.java +++ /dev/null @@ -1,26 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.util.ArrayList; - -public class GenTable { - public ArrayList rows = new ArrayList(); - - public GenTableRow getRowForRange(int roll) { - - GenTableRow outRow = null; - - for (GenTableRow iteration : this.rows) - if (roll >= iteration.minRoll && roll <= iteration.maxRoll) - outRow = iteration; - - return outRow; - } -} diff --git a/src/engine/loot/GenTableRow.java b/src/engine/loot/GenTableRow.java deleted file mode 100644 index 85443caa..00000000 --- a/src/engine/loot/GenTableRow.java +++ /dev/null @@ -1,28 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.sql.ResultSet; -import java.sql.SQLException; - -public class GenTableRow { - public int minRoll; - public int maxRoll; - public int itemTableID; - public int pModTable; - public int sModTable; - - public GenTableRow(ResultSet rs) throws SQLException { - this.minRoll = rs.getInt("minRoll"); - this.maxRoll = rs.getInt("maxRoll"); - this.itemTableID = rs.getInt("itemTableID"); - this.pModTable = rs.getInt("pModTableID"); - this.sModTable = rs.getInt("sModTableID"); - } -} diff --git a/src/engine/loot/ItemTable.java b/src/engine/loot/ItemTable.java deleted file mode 100644 index b3a248f2..00000000 --- a/src/engine/loot/ItemTable.java +++ /dev/null @@ -1,29 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.util.ArrayList; - -public class ItemTable { - public ArrayList rows = new ArrayList<>(); - - public ItemTableRow getRowForRange(int roll) { - - if (roll > 320) - roll = 320; - - ItemTableRow outRow = null; - - for (ItemTableRow iteration : this.rows) - if (roll >= iteration.minRoll && roll <= iteration.maxRoll) - outRow = iteration; - - return outRow; - } -} diff --git a/src/engine/loot/ItemTableRow.java b/src/engine/loot/ItemTableRow.java deleted file mode 100644 index 9655e287..00000000 --- a/src/engine/loot/ItemTableRow.java +++ /dev/null @@ -1,28 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.sql.ResultSet; -import java.sql.SQLException; - -public class ItemTableRow { - public int minRoll; - public int maxRoll; - public int cacheID; - public int minSpawn; - public int maxSpawn; - - public ItemTableRow(ResultSet rs) throws SQLException { - this.minRoll = rs.getInt("minRoll"); - this.maxRoll = rs.getInt("maxRoll"); - this.cacheID = rs.getInt("itemBaseUUID"); - this.minSpawn = rs.getInt("minSpawn"); - this.maxSpawn = rs.getInt("maxSpawn"); - } -} diff --git a/src/engine/loot/ModTable.java b/src/engine/loot/ModTable.java deleted file mode 100644 index 2dee3c86..00000000 --- a/src/engine/loot/ModTable.java +++ /dev/null @@ -1,29 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.util.ArrayList; - -public class ModTable { - public ArrayList rows = new ArrayList(); - - public ModTableRow getRowForRange(int roll) { - - if (roll > 320) - roll = 320; - - ModTableRow outRow = null; - - for (ModTableRow iteration : this.rows) - if (roll >= iteration.minRoll && roll <= iteration.maxRoll) - outRow = iteration; - - return outRow; - } -} diff --git a/src/engine/loot/ModTableRow.java b/src/engine/loot/ModTableRow.java deleted file mode 100644 index 0c3927a4..00000000 --- a/src/engine/loot/ModTableRow.java +++ /dev/null @@ -1,26 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.sql.ResultSet; -import java.sql.SQLException; - -public class ModTableRow { - public int minRoll; - public int maxRoll; - public String action; - public int level; - - public ModTableRow(ResultSet rs) throws SQLException { - this.minRoll = rs.getInt("minRoll"); - this.maxRoll = rs.getInt("maxRoll"); - this.action = rs.getString("action"); - this.level = rs.getInt("level"); - } -} diff --git a/src/engine/loot/ModTypeTable.java b/src/engine/loot/ModTypeTable.java deleted file mode 100644 index 0e40e395..00000000 --- a/src/engine/loot/ModTypeTable.java +++ /dev/null @@ -1,26 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.util.ArrayList; - -public class ModTypeTable { - public ArrayList rows = new ArrayList<>(); - - public ModTypeTableRow getRowForRange(int roll) { - - ModTypeTableRow outRow = null; - - for (ModTypeTableRow iteration : this.rows) - if (roll >= iteration.minRoll && roll <= iteration.maxRoll) - return iteration; - - return outRow; - } -} diff --git a/src/engine/loot/ModTypeTableRow.java b/src/engine/loot/ModTypeTableRow.java deleted file mode 100644 index 7c395ed0..00000000 --- a/src/engine/loot/ModTypeTableRow.java +++ /dev/null @@ -1,24 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - -package engine.loot; - -import java.sql.ResultSet; -import java.sql.SQLException; - -public class ModTypeTableRow { - public int minRoll; - public int maxRoll; - public int modTableID; - - public ModTypeTableRow(ResultSet rs) throws SQLException { - this.minRoll = rs.getInt("minRoll"); - this.maxRoll = rs.getInt("maxRoll"); - this.modTableID = rs.getInt("subTableID"); - } -}