Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn mob id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 12:15:36 +01:00
parent 4efd356cbf
commit 8d10e3d1b0
18 changed files with 205 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -29,6 +29,7 @@ import client.status.MonsterStatusEffect;
import config.YamlConfig;
import constants.game.GameConstants;
import constants.id.ItemId;
import constants.id.MobId;
import constants.skills.*;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -237,7 +238,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
if (GameConstants.isDojoBoss(monster.getId())) {
if (MobId.isDojoBoss(monster.getId())) {
if (attack.skill == 1009 || attack.skill == 10001009 || attack.skill == 20001009) {
int dmgLimit = (int) Math.ceil(0.3 * monster.getMaxHp());
List<Integer> _onedList = new LinkedList<>();

15
src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java
View File

@@ -22,6 +22,7 @@
package net.server.channel.handlers;
import client.Client;
import constants.id.MobId;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.event.EventInstanceManager;
@@ -51,19 +52,19 @@ public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; // Formula planned by Beng.
if (monster.getHp() - damage < 1) { // friendly dies
if (monster.getId() == 9300102) {
if (monster.getId() == MobId.WATCH_HOG) {
map.broadcastMessage(PacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time..."));
} else if (monster.getId() == 9300061) { //moon bunny
} else if (monster.getId() == MobId.MOON_BUNNY) { //moon bunny
map.broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick."));
} else if (monster.getId() == 9300093) { //tylus
} else if (monster.getId() == MobId.TYLUS) { //tylus
map.broadcastMessage(PacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush."));
} else if (monster.getId() == 9300137) { //juliet
} else if (monster.getId() == MobId.JULIET) { //juliet
map.broadcastMessage(PacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat."));
} else if (monster.getId() == 9300138) { //romeo
} else if (monster.getId() == MobId.ROMEO) { //romeo
map.broadcastMessage(PacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat."));
} else if (monster.getId() == 9400322 || monster.getId() == 9400327 || monster.getId() == 9400332) { //snowman
} else if (monster.getId() == MobId.GIANT_SNOWMAN_LV1_EASY || monster.getId() == MobId.GIANT_SNOWMAN_LV1_MEDIUM || monster.getId() == MobId.GIANT_SNOWMAN_LV1_HARD) {
map.broadcastMessage(PacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle."));
} else if (monster.getId() == 9300162) { //delli
} else if (monster.getId() == MobId.DELLI) { //delli
map.broadcastMessage(PacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground..."));
}

3
src/main/java/net/server/channel/handlers/MonsterBombHandler.java
View File

@@ -22,6 +22,7 @@
package net.server.channel.handlers;
import client.Client;
import constants.id.MobId;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.Monster;
@@ -35,7 +36,7 @@ public final class MonsterBombHandler extends AbstractPacketHandler {
if (!c.getPlayer().isAlive() || monster == null) {
return;
}
if (monster.getId() == 8500003 || monster.getId() == 8500004) {
if (monster.getId() == MobId.HIGH_DARKSTAR || monster.getId() == MobId.LOW_DARKSTAR) {
monster.getMap().broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), 4));
c.getPlayer().getMap().removeMapObject(oid);
}

21
src/main/java/net/server/channel/handlers/UseCatchItemHandler.java
View File

@@ -27,6 +27,7 @@ import client.autoban.AutobanManager;
import client.inventory.InventoryType;
import client.inventory.manipulator.InventoryManipulator;
import constants.id.ItemId;
import constants.id.MobId;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -58,7 +59,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
}
switch (itemId) {
case ItemId.PHEROMONE_PERFUME:
if (mob.getId() == 9300101) {
if (mob.getId() == MobId.TAMABLE_HOG) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true);
@@ -67,7 +68,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.POUCH:
if (mob.getId() == 9500197) {
if (mob.getId() == MobId.GHOST) {
if ((abm.getLastSpam(10) + 1000) < currentServerTime()) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
@@ -83,7 +84,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
}
break;
case ItemId.ARPQ_ELEMENT_ROCK:
if (mob.getId() == 9300157) {
if (mob.getId() == MobId.ARPQ_SCORPION) {
if ((abm.getLastSpam(10) + 800) < currentServerTime()) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
if (chr.canHold(ItemId.ARPQ_SPIRIT_JEWEL, 1)) {
@@ -108,7 +109,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
}
break;
case ItemId.MAGIC_CANE:
if (mob.getId() == 9500320) {
if (mob.getId() == MobId.LOST_RUDOLPH) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -121,7 +122,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.TRANSPARENT_MARBLE_1:
if (mob.getId() == 9300187) {
if (mob.getId() == MobId.KING_SLIME_DOJO) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -134,7 +135,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.TRANSPARENT_MARBLE_2:
if (mob.getId() == 9300189) {
if (mob.getId() == MobId.FAUST_DOJO) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -147,7 +148,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.TRANSPARENT_MARBLE_3:
if (mob.getId() == 9300191) {
if (mob.getId() == MobId.MUSHMOM_DOJO) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -160,7 +161,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.EPQ_PURIFICATION_MARBLE:
if (mob.getId() == 9300175) {
if (mob.getId() == MobId.POISON_FLOWER) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -173,7 +174,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
break;
case ItemId.FISH_NET:
if (mob.getId() == 9500336) {
if (mob.getId() == MobId.P_JUNIOR) {
if ((abm.getLastSpam(10) + 3000) < currentServerTime()) {
abm.spam(10);
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
@@ -203,7 +204,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
mob.getMap().killMonster(mob, null, false);
InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true);
InventoryManipulator.addById(c, itemGanho, (short) 1, "", -1);
} else if (mob.getId() != 9500336) {
} else if (mob.getId() != MobId.P_JUNIOR) {
if (mobHp != 0) {
abm.spam(10);
c.sendPacket(PacketCreator.catchMessage(0));