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

MonsterTypes loaded into Mob.

Browse Source
This commit is contained in:
MagicBot
2023-04-09 13:43:12 -04:00
parent 4fe6040707
commit 30175be56a
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/NPCManager.java
+4 -4
View File
@@ -38,12 +38,12 @@ public enum NPCManager {
// Early exit // Early exit
if (mob.runeSetID == 0) if (mob.runeSet == 0)
return; return;
//Apply all rune effects. //Apply all rune effects.
if (NPCManager._runeSetMap.get(mob.runeSetID).contains(252623)) { if (NPCManager._runeSetMap.get(mob.runeSet).contains(252623)) {
mob.isPlayerGuard = true; mob.isPlayerGuard = true;
mob.setNoAggro(true); mob.setNoAggro(true);
} }
@@ -56,8 +56,8 @@ public enum NPCManager {
// Apply effects from RuneSet // Apply effects from RuneSet
if (mob.runeSetID != 0) if (mob.runeSet != 0)
for (int runeID : _runeSetMap.get(mob.runeSetID)) for (int runeID : _runeSetMap.get(mob.runeSet))
applyEffectsForRune(mob, runeID); applyEffectsForRune(mob, runeID);
// Not sure why but apply Warrior effects for some reason? // Not sure why but apply Warrior effects for some reason?
src/engine/objects/Mob.java
+9 -3
View File
@@ -9,6 +9,7 @@
package engine.objects; package engine.objects;
import ch.claude_martin.enumbitset.EnumBitSet;
import engine.Enum; import engine.Enum;
import engine.Enum.*; import engine.Enum.*;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
@@ -31,7 +32,6 @@ import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.ManageCityAssetsMsg; import engine.net.client.msg.ManageCityAssetsMsg;
import engine.net.client.msg.PetMsg; import engine.net.client.msg.PetMsg;
import engine.net.client.msg.PlaceAssetMsg; import engine.net.client.msg.PlaceAssetMsg;
import engine.net.client.msg.chat.ChatSystemMsg;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
@@ -105,9 +105,12 @@ public class Mob extends AbstractIntelligenceAgent {
private DateTime upgradeDateTime = null; private DateTime upgradeDateTime = null;
private boolean lootSync = false; private boolean lootSync = false;
public int equipmentSetID = 0; public int equipmentSetID = 0;
public int runeSetID = 0; public int runeSet = 0;
public int bootySet = 0; public int bootySet = 0;
public EnumBitSet<MonsterType> notEnemy = EnumBitSet.just(MonsterType.NONE);
public EnumBitSet<Enum.MonsterType> enemy = EnumBitSet.just(MonsterType.NONE);;
/** /**
* No Id Constructor * No Id Constructor
*/ */
@@ -285,9 +288,12 @@ public class Mob extends AbstractIntelligenceAgent {
this.setParentZone(ZoneManager.getZoneByUUID(this.parentZoneID)); this.setParentZone(ZoneManager.getZoneByUUID(this.parentZoneID));
this.equipmentSetID = rs.getInt("equipmentSet"); this.equipmentSetID = rs.getInt("equipmentSet");
this.runeSetID = rs.getInt("runeSet"); this.runeSet = rs.getInt("runeSet");
this.bootySet = rs.getInt("bootySet"); this.bootySet = rs.getInt("bootySet");
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
if (this.contract != null) if (this.contract != null)
this.equipmentSetID = this.contract.getEquipmentSet(); this.equipmentSetID = this.contract.getEquipmentSet();
src/engine/objects/MobBase.java
-2
View File
@@ -112,8 +112,6 @@ public class MobBase extends AbstractGameObject {
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class); this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
this.noAggro = EnumBitSet.asEnumBitSet(rs.getLong("noaggro"), Enum.AggroType.class); this.noAggro = EnumBitSet.asEnumBitSet(rs.getLong("noaggro"), Enum.AggroType.class);
// From cache data
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class); this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class); this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);