MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Removed leftover junk from mobbase.

Browse Source
This commit is contained in:
MagicBot
2023-04-24 03:26:35 -04:00
parent 620fad57fe
commit 6b146bfdc4
4 changed files with 5 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/MobBase.java
+4 -71
View File
@@ -31,15 +31,9 @@ public class MobBase extends AbstractGameObject {
private float damageMin;
private float damageMax;
private float hitBoxRadius;
private final int lootTable;
private final float scale;
private int minGold;
private int maxGold;
private EnumBitSet<Enum.MobFlagType> flags;
private int mask;
private int goldMod;
private int seeInvis;
private int spawnTime = 0;
@@ -47,12 +41,9 @@ public class MobBase extends AbstractGameObject {
private int atr = 0;
private float minDmg = 0;
private float maxDmg = 0;
private ArrayList<MobBaseEffects> raceEffectsList;
private float attackRange;
private boolean isNecroPet = false;
private MobBaseStats mobBaseStats;
private ArrayList<RuneBase> runes;
private HashMap<Integer, Integer> staticPowers;
private float walk = 0;
@@ -75,12 +66,12 @@ public class MobBase extends AbstractGameObject {
this.firstName = rs.getString("name");
this.level = rs.getByte("level");
this.lootTable = rs.getInt("lootTableID");
this.goldMod = rs.getInt("goldMod");
this.spawnTime = rs.getInt("spawnTime");
LevelDefault levelDefault = LevelDefault.getLevelDefault(this.level);
this.healthMax = rs.getInt("health");
this.damageMin = rs.getFloat("minDmg");
this.damageMax = rs.getFloat("maxDmg");
@@ -92,26 +83,9 @@ public class MobBase extends AbstractGameObject {
this.fsm = Enum.MobBehaviourType.valueOf(rs.getString("fsm"));
if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){
MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID);
if (goldEntry != null){
this.minGold = goldEntry.getMin();
this.maxGold = goldEntry.getMax();
}
}
else
if (levelDefault != null) {
this.minGold = (levelDefault.goldMin * this.goldMod / 100);
this.maxGold = (levelDefault.goldMax * this.goldMod / 100);
} else {
this.minGold = 10;
this.maxGold = 30;
}
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
this.seeInvis = rs.getInt("seeInvis");
this.scale = rs.getFloat("scale");
@@ -137,9 +111,7 @@ public class MobBase extends AbstractGameObject {
if (Enum.MobFlagType.RAT.elementOf(this.flags))
this.mask += MBServerStatics.MASK_RAT;
this.raceEffectsList = DbManager.MobBaseQueries.LOAD_STATIC_EFFECTS(this.loadID);
this.mobBaseStats = DbManager.MobBaseQueries.LOAD_STATS(this.loadID);
DbManager.MobBaseQueries.LOAD_ALL_MOBBASE_LOOT(this.loadID);
DbManager.MobBaseQueries.LOAD_ALL_MOBBASE_SPEEDS(this);
}
@@ -174,14 +146,6 @@ public class MobBase extends AbstractGameObject {
return equip;
}
public HashMap<Integer, Integer> getStaticPowers() {
return staticPowers;
}
public void updateStaticEffects() {
this.raceEffectsList = DbManager.MobBaseQueries.LOAD_STATIC_EFFECTS(this.getObjectUUID());
}
public void updatePowers() {
this.staticPowers = DbManager.MobBaseQueries.LOAD_STATIC_POWERS(this.getObjectUUID());
}
@@ -209,10 +173,6 @@ public class MobBase extends AbstractGameObject {
return this.level;
}
public int getLootTable() {
return this.lootTable;
}
public float getHealthMax() {
return this.healthMax;
}
@@ -233,22 +193,11 @@ public class MobBase extends AbstractGameObject {
return this.defenseRating;
}
public int getMinGold() {
return this.minGold;
}
public int getMaxGold() {
return this.maxGold;
}
public EnumBitSet<Enum.MobFlagType> getFlags() {
return this.flags;
}
public int getGoldMod() {
return this.goldMod;
}
public float getScale() {
return this.scale;
}
@@ -265,8 +214,6 @@ public class MobBase extends AbstractGameObject {
return this.spawnTime;
}
/*
* Database
*/
@@ -324,20 +271,6 @@ public class MobBase extends AbstractGameObject {
this.defense = defense;
}
/**
* @return the raceEffectsList
*/
public ArrayList<MobBaseEffects> getRaceEffectsList() {
return raceEffectsList;
}
/**
* @return the runes
*/
public ArrayList<RuneBase> getRunes() {
return runes;
}
public float getAttackRange() {
return attackRange;
}
src/engine/objects/MobbaseGoldEntry.java
-57
View File
@@ -1,57 +0,0 @@
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
// Magicbane Emulator Project © 2013 - 2022
// www.magicbane.com
package engine.objects;
import engine.gameManager.DbManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
public class MobbaseGoldEntry {
private float chance;
private int min;
private int max;
public static HashMap<Integer, MobbaseGoldEntry> MobbaseGoldMap = new HashMap<>();
/**
* ResultSet Constructor
*/
public MobbaseGoldEntry(ResultSet rs) throws SQLException {
this.chance = rs.getFloat("chance");
this.min = rs.getInt("min");
this.max = (rs.getInt("max"));
}
public static void LoadMobbaseGold() {
MobbaseGoldMap = DbManager.MobBaseQueries.LOAD_GOLD_FOR_MOBBASE();
}
public float getChance() {
return chance;
}
public int getMin() {
return min;
}
public int getMax() {
return max;
}
}