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

Start mobequip refactor

Browse Source
This commit is contained in:
MagicBot
2024-03-18 09:38:33 -04:00
parent 7fa8c3bfff
commit 0590ae64e7
20 changed files with 79 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/PrintEffectsCmd.java
+2 -2
View File
@@ -25,9 +25,9 @@ public class PrintEffectsCmd extends AbstractDevCmd {
// super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
}
public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
public static ItemBase getWeaponBase(int slot, HashMap<Integer, Item> equip) {
if (equip.containsKey(slot)) {
MobEquipment item = equip.get(slot);
Item item = equip.get(slot);
if (item != null && item.getItemBase() != null) {
return item.getItemBase();
}
src/engine/devcmd/cmds/PrintEquipCmd.java
+2 -2
View File
@@ -65,7 +65,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
Mob tarMob = (Mob) tar;
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Enum.EquipSlotType slot : tarMob.getEquip().keySet()) {
MobEquipment equip = tarMob.getEquip().get(slot);
Item equip = tarMob.getEquip().get(slot);
throwbackInfo(pc, equip.templateID + " : " + equip.template.item_base_name + ", slot: " + slot);
}
return;
@@ -75,7 +75,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
NPC tarMob = (NPC) tar;
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Enum.EquipSlotType slot : tarMob.getEquip().keySet()) {
MobEquipment equip = tarMob.getEquip().get(slot);
Item equip = tarMob.getEquip().get(slot);
throwbackInfo(pc, equip.templateID + " : " + equip.template.item_base_name + ", slot: " + slot);
}
return;
src/engine/devcmd/cmds/PrintRunesCmd.java
+2 -2
View File
@@ -25,9 +25,9 @@ public class PrintRunesCmd extends AbstractDevCmd {
// super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
}
public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
public static ItemBase getWeaponBase(int slot, HashMap<Integer, Item> equip) {
if (equip.containsKey(slot)) {
MobEquipment item = equip.get(slot);
Item item = equip.get(slot);
if (item != null && item.getItemBase() != null) {
return item.getItemBase();
}
src/engine/devcmd/cmds/PrintStatsCmd.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class PrintStatsCmd extends AbstractDevCmd {
out += "Defense: " + tar.getDefenseRating() + newline;
//get weapons
HashMap<Enum.EquipSlotType, MobEquipment> equip = tar.getEquip();
HashMap<Enum.EquipSlotType, Item> equip = tar.getEquip();
if(equip != null){
if (equip.get(2) != null && !ItemTemplate.isShield(equip.get(2).template)) {
src/engine/devcmd/cmds/SimulateBootyCmd.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class SimulateBootyCmd extends AbstractDevCmd {
failures++;
}
if (mob.getEquip() != null) {
for (MobEquipment me : mob.getEquip().values()) {
for (Item me : mob.getEquip().values()) {
if (me.getDropChance() == 0)
continue;