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

Rename and clean up MapleMist

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:34:30 +02:00
parent 2a8fd5219a
commit 4cb15ab99d
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/server/MapleStatEffect.java
View File

@@ -1029,7 +1029,7 @@ public class MapleStatEffect {
} }
} else if (isMist()) { } else if (isMist()) {
Rectangle bounds = calculateBoundingBox(sourceid == NightWalker.POISON_BOMB ? pos : applyfrom.getPosition(), applyfrom.isFacingLeft()); Rectangle bounds = calculateBoundingBox(sourceid == NightWalker.POISON_BOMB ? pos : applyfrom.getPosition(), applyfrom.isFacingLeft());
MapleMist mist = new MapleMist(bounds, applyfrom, this); Mist mist = new Mist(bounds, applyfrom, this);
applyfrom.getMap().spawnMist(mist, getDuration(), mist.isPoisonMist(), false, mist.isRecoveryMist()); applyfrom.getMap().spawnMist(mist, getDuration(), mist.isPoisonMist(), false, mist.isRecoveryMist());
} else if (isTimeLeap()) { } else if (isTimeLeap()) {
applyto.removeAllCooldownsExcept(Buccaneer.TIME_LEAP, true); applyto.removeAllCooldownsExcept(Buccaneer.TIME_LEAP, true);

4
src/main/java/server/life/MobSkill.java
View File

@@ -30,7 +30,7 @@ import net.server.services.type.ChannelServices;
import server.maps.MapObject; import server.maps.MapObject;
import server.maps.MapObjectType; import server.maps.MapObjectType;
import server.maps.MapleMap; import server.maps.MapleMap;
import server.maps.MapleMist; import server.maps.Mist;
import tools.ArrayMap; import tools.ArrayMap;
import tools.Randomizer; import tools.Randomizer;
@@ -194,7 +194,7 @@ public class MobSkill {
} }
break; break;
case 131: // Mist case 131: // Mist
monster.getMap().spawnMist(new MapleMist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false); monster.getMap().spawnMist(new Mist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false);
break; break;
case 132: case 132:
disease = Disease.CONFUSE; disease = Disease.CONFUSE;

2
src/main/java/server/maps/MapleMap.java
View File

@@ -2069,7 +2069,7 @@ public class MapleMap {
}, null); }, null);
} }
public void spawnMist(final MapleMist mist, final int duration, boolean poison, boolean fake, boolean recovery) { public void spawnMist(final Mist mist, final int duration, boolean poison, boolean fake, boolean recovery) {
addMapObject(mist); addMapObject(mist);
broadcastMessage(fake ? mist.makeFakeSpawnData(30) : mist.makeSpawnData()); broadcastMessage(fake ? mist.makeFakeSpawnData(30) : mist.makeSpawnData());
TimerManager tMan = TimerManager.getInstance(); TimerManager tMan = TimerManager.getInstance();

23
src/main/java/server/maps/MapleMist.java → src/main/java/server/maps/Mist.java
View File

@@ -35,19 +35,20 @@ import tools.PacketCreator;
import java.awt.*; import java.awt.*;
/** /**
*
* @author LaiLaiNoob * @author LaiLaiNoob
*/ */
public class MapleMist extends AbstractMapObject { public class Mist extends AbstractMapObject {
private Rectangle mistPosition; private final Rectangle mistPosition;
private Character owner = null; private Character owner = null;
private Monster mob = null; private Monster mob = null;
private MapleStatEffect source; private MapleStatEffect source;
private MobSkill skill; private MobSkill skill;
private boolean isMobMist, isPoisonMist, isRecoveryMist; private final boolean isMobMist;
private int skillDelay; private boolean isPoisonMist;
private boolean isRecoveryMist;
private final int skillDelay;
public MapleMist(Rectangle mistPosition, Monster mob, MobSkill skill) { public Mist(Rectangle mistPosition, Monster mob, MobSkill skill) {
this.mistPosition = mistPosition; this.mistPosition = mistPosition;
this.mob = mob; this.mob = mob;
this.skill = skill; this.skill = skill;
@@ -57,7 +58,7 @@ public class MapleMist extends AbstractMapObject {
skillDelay = 0; skillDelay = 0;
} }
public MapleMist(Rectangle mistPosition, Character owner, MapleStatEffect source) { public Mist(Rectangle mistPosition, Character owner, MapleStatEffect source) {
this.mistPosition = mistPosition; this.mistPosition = mistPosition;
this.owner = owner; this.owner = owner;
this.source = source; this.source = source;
@@ -69,11 +70,11 @@ public class MapleMist extends AbstractMapObject {
case Evan.RECOVERY_AURA: case Evan.RECOVERY_AURA:
isRecoveryMist = true; isRecoveryMist = true;
break; break;
case Shadower.SMOKE_SCREEN: // Smoke Screen case Shadower.SMOKE_SCREEN: // Smoke Screen
isPoisonMist = false; isPoisonMist = false;
break; break;
case FPMage.POISON_MIST: // FP mist case FPMage.POISON_MIST: // FP mist
case BlazeWizard.FLAME_GEAR: // Flame Gear case BlazeWizard.FLAME_GEAR: // Flame Gear
case NightWalker.POISON_BOMB: // Poison Bomb case NightWalker.POISON_BOMB: // Poison Bomb
@@ -105,9 +106,9 @@ public class MapleMist extends AbstractMapObject {
} }
public boolean isRecoveryMist() { public boolean isRecoveryMist() {
return isRecoveryMist; return isRecoveryMist;
} }
public int getSkillDelay() { public int getSkillDelay() {
return skillDelay; return skillDelay;
} }

2
src/main/java/tools/PacketCreator.java
View File

@@ -3981,7 +3981,7 @@ public class PacketCreator {
return p; return p;
} }
public static Packet spawnMist(int objId, int ownerChrId, int skill, int level, MapleMist mist) { public static Packet spawnMist(int objId, int ownerChrId, int skill, int level, Mist mist) {
OutPacket p = OutPacket.create(SendOpcode.SPAWN_MIST); OutPacket p = OutPacket.create(SendOpcode.SPAWN_MIST);
p.writeInt(objId); p.writeInt(objId);
p.writeInt(mist.isMobMist() ? 0 : mist.isPoisonMist() ? 1 : mist.isRecoveryMist() ? 4 : 2); // mob mist = 0, player poison = 1, smokescreen = 2, unknown = 3, recovery = 4 p.writeInt(mist.isMobMist() ? 0 : mist.isPoisonMist() ? 1 : mist.isRecoveryMist() ? 4 : 2); // mob mist = 0, player poison = 1, smokescreen = 2, unknown = 3, recovery = 4