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

src/engine/objects/BootySetEntry.java

@@ -14,15 +14,23 @@ import java.sql.SQLException;
 
 public class BootySetEntry {
 
-
+	public String bootyType;
+	public int lowGold;
+	public int highGold;
 	public int itemBase;
+	public  int lootTable;
 	public float dropChance;
+
 	/**
 	 * ResultSet Constructor
 	 */
 
 	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.lootTable = (rs.getInt("lootTable"));
 		this.dropChance = (rs.getFloat("dropChance"));
 	}
 

src/engine/objects/MobBase.java

@@ -60,7 +60,8 @@ public class MobBase extends AbstractGameObject {
 	private float run = 0;
 	private float walkCombat = 0;
 	private float runCombat = 0;
-
+	public int bootySet;
+	public String fsm = "";
 	/**
 	 * ResultSet Constructor
 	 */
@@ -84,6 +85,8 @@ public class MobBase extends AbstractGameObject {
 		this.attackRating = rs.getInt("atr");
 		this.defenseRating = rs.getInt("defense");
 		this.attackRange = rs.getFloat("attackRange");
+		this.bootySet = rs.getInt("bootySet");
+		this.fsm = rs.getString("fsm");
 
 		if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){
 			MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID);