BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix-runesandbooties' into magicbox1.5

Browse Source
This commit is contained in:
MagicBot
2023-04-08 06:26:39 -04:00
parent bfb6b0f5eb 88bf38b858
commit 9d6b3ab3ff
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/BootySetEntry.java
+9 -1
View File
@@ -14,15 +14,23 @@ import java.sql.SQLException;
public class BootySetEntry { public class BootySetEntry {
public String bootyType;
public int lowGold;
public int highGold;
public int itemBase; public int itemBase;
public int lootTable;
public float dropChance; public float dropChance;
/** /**
* ResultSet Constructor * ResultSet Constructor
*/ */
public BootySetEntry(ResultSet rs) throws SQLException { public BootySetEntry(ResultSet rs) throws SQLException {
this.bootyType = (rs.getString("bootyType"));
this.lowGold = (rs.getInt("lowGold"));
this.highGold = (rs.getInt("highGold"));
this.itemBase = (rs.getInt("itemBase")); this.itemBase = (rs.getInt("itemBase"));
this.lootTable = (rs.getInt("lootTable"));
this.dropChance = (rs.getFloat("dropChance")); this.dropChance = (rs.getFloat("dropChance"));
} }
src/engine/objects/MobBase.java
+4 -1
View File
@@ -60,7 +60,8 @@ public class MobBase extends AbstractGameObject {
private float run = 0; private float run = 0;
private float walkCombat = 0; private float walkCombat = 0;
private float runCombat = 0; private float runCombat = 0;
public int bootySet;
public String fsm = "";
/** /**
* ResultSet Constructor * ResultSet Constructor
*/ */
@@ -84,6 +85,8 @@ public class MobBase extends AbstractGameObject {
this.attackRating = rs.getInt("atr"); this.attackRating = rs.getInt("atr");
this.defenseRating = rs.getInt("defense"); this.defenseRating = rs.getInt("defense");
this.attackRange = rs.getFloat("attackRange"); this.attackRange = rs.getFloat("attackRange");
this.bootySet = rs.getInt("bootySet");
this.fsm = rs.getString("fsm");
if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){ if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){
MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID); MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID);