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

MoveLifeHandler update

Browse Source 
EXPERIMENTAL PATCH: Applied an improved version of the MoveLifeHandler. This update requires proper investigation and feedback for acceptance.
This commit is contained in:
ronancpl
2018-03-12 16:16:07 -03:00
parent 77234e29df
commit 67ab83a09b
2 changed files with 124 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/net/server/channel/handlers/MoveLifeHandler.java
View File

@@ -27,9 +27,10 @@ import java.awt.Point;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import server.life.MapleMonster; import server.life.MapleMonster;
import server.life.MobAttackInfo;
import server.life.MobAttackInfoFactory;
import server.life.MobSkill; import server.life.MobSkill;
import server.life.MobSkillFactory; import server.life.MobSkillFactory;
import server.maps.MapleMap;
import server.maps.MapleMapObject; import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType; import server.maps.MapleMapObjectType;
import server.movement.LifeMovementFragment; import server.movement.LifeMovementFragment;
@@ -38,44 +39,70 @@ import tools.Pair;
import tools.Randomizer; import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
/**
* @author Danny (Leifde)
* @author ExtremeDevilz
*/
public final class MoveLifeHandler extends AbstractMovementPacketHandler { public final class MoveLifeHandler extends AbstractMovementPacketHandler {
@Override @Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleMap map = c.getPlayer().getMap();
List<MapleCharacter> banishPlayers = new ArrayList<>();
int objectid = slea.readInt(); int objectid = slea.readInt();
short moveid = slea.readShort(); short moveid = slea.readShort();
MapleMapObject mmo = c.getPlayer().getMap().getMapObject(objectid);
MapleMapObject mmo = map.getMapObject(objectid);
if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) { if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) {
return; return;
} }
MapleMonster monster = (MapleMonster) mmo; MapleMonster monster = (MapleMonster) mmo;
List<LifeMovementFragment> res; List<LifeMovementFragment> res = null;
byte skillByte = slea.readByte(); List<MapleCharacter> banishPlayers = new ArrayList<>();
byte skill = slea.readByte(); byte pNibbles = slea.readByte();
int skill_1 = slea.readByte() & 0xFF; byte rawActivity = slea.readByte();
byte skill_2 = slea.readByte(); byte useSkillId = slea.readByte();
byte skill_3 = slea.readByte(); byte useSkillLevel = slea.readByte();
byte skill_4 = slea.readByte(); short pOption = slea.readShort();
slea.read(8); slea.skip(8);
if (rawActivity >= 0) {
rawActivity = (byte) (rawActivity & 0xFF >> 1);
}
boolean isAttack = inRangeInclusive(rawActivity, 12, 20);
boolean isSkill = inRangeInclusive(rawActivity, 21, 25);
byte attackId = (byte) (isAttack ? rawActivity - 12 : -1);
boolean nextMovementCouldBeSkill = (pNibbles & 0x0F) != 0;
boolean pUnk = (pNibbles & 0xF0) != 0;
int nextCastSkill = useSkillId;
int nextCastSkillLevel = useSkillLevel;
MobSkill toUse = null; MobSkill toUse = null;
if (skillByte == 1 && monster.getNoSkills() > 0) {
int random = Randomizer.nextInt(monster.getNoSkills()); int percHpLeft = (int) ((monster.getHp() / monster.getMaxHp()) * 100);
Pair<Integer, Integer> skillToUse = monster.getSkills().get(random);
toUse = MobSkillFactory.getMobSkill(skillToUse.getLeft(), skillToUse.getRight()); if (nextMovementCouldBeSkill && monster.getNoSkills() > 0) {
int percHpLeft = (monster.getHp() / monster.getMaxHp()) * 100; int Random = Randomizer.nextInt(monster.getNoSkills());
if (toUse.getHP() < percHpLeft || !monster.canUseSkill(toUse)) { Pair<Integer, Integer> skillToUse = monster.getSkills().get(Random);
nextCastSkill = skillToUse.getLeft();
nextCastSkillLevel = skillToUse.getRight();
toUse = MobSkillFactory.getMobSkill(nextCastSkill, nextCastSkillLevel);
if (isSkill || isAttack) {
if (nextCastSkill != toUse.getSkillId() || nextCastSkillLevel != toUse.getSkillLevel()) {
//toUse.resetAnticipatedSkill();
return;
} else if (toUse.getHP() < percHpLeft) {
toUse = null; toUse = null;
} else if (monster.canUseSkill(toUse)) {
toUse.applyEffect(c.getPlayer(), monster, true, banishPlayers);
//System.out.println("Applied: " + nextCastSkill + " Level: " + nextCastSkillLevel);
}
} else {
MobAttackInfo mobAttack = MobAttackInfoFactory.getMobAttackInfo(monster, attackId);
//System.out.println("Attacked");
} }
} }
if ((skill_1 >= 100 && skill_1 <= 200) && monster.hasSkill(skill_1, skill_2)) {
MobSkill skillData = MobSkillFactory.getMobSkill(skill_1, skill_2);
if (skillData != null && monster.canUseSkill(skillData)) {
skillData.applyEffect(c.getPlayer(), monster, true, banishPlayers);
}
}
slea.readByte(); slea.readByte();
slea.readInt(); // whatever slea.readInt(); // whatever
short start_x = slea.readShort(); // hmm.. startpos? short start_x = slea.readShort(); // hmm.. startpos?
@@ -83,12 +110,12 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
Point startPos = new Point(start_x, start_y); Point startPos = new Point(start_x, start_y);
res = parseMovement(slea); res = parseMovement(slea);
if (monster.getController() != c.getPlayer()) { if (monster.getController() != c.getPlayer()) {
if (monster.isAttackedBy(c.getPlayer())) {// aggro and controller change if (monster.isAttackedBy(c.getPlayer())) {
monster.switchController(c.getPlayer(), true); monster.switchController(c.getPlayer(), true);
} else { } else {
return; return;
} }
} else if (skill == -1 && monster.isControllerKnowsAboutAggro() && !monster.isMobile() && !monster.isFirstAttack()) { } else if (rawActivity == -1 && monster.isControllerKnowsAboutAggro() && !monster.isMobile() && !monster.isFirstAttack()) {
monster.setControllerHasAggro(false); monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false); monster.setControllerKnowsAboutAggro(false);
} }
@@ -102,13 +129,17 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
monster.setControllerKnowsAboutAggro(true); monster.setControllerKnowsAboutAggro(true);
} }
if (res != null) { if (res != null) {
map.broadcastMessage(c.getPlayer(), MaplePacketCreator.moveMonster(skillByte, skill, skill_1, skill_2, skill_3, skill_4, objectid, startPos, res), monster.getPosition()); c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.moveMonster(objectid, nextMovementCouldBeSkill, rawActivity, useSkillId, useSkillLevel, pOption, startPos, res), monster.getPosition());
updatePosition(res, monster, -1); updatePosition(res, monster, -1);
map.moveMonster(monster, monster.getPosition()); c.getPlayer().getMap().moveMonster(monster, monster.getPosition());
} }
for (MapleCharacter chr : banishPlayers) { for (MapleCharacter chr : banishPlayers) {
chr.changeMapBanish(monster.getBanish().getMap(), monster.getBanish().getPortal(), monster.getBanish().getMsg()); chr.changeMapBanish(monster.getBanish().getMap(), monster.getBanish().getPortal(), monster.getBanish().getMsg());
} }
} }
public static boolean inRangeInclusive(Byte pVal, Integer pMin, Integer pMax) {
return !(pVal < pMin) || (pVal > pMax);
}
} }

17
src/tools/MaplePacketCreator.java
View File

@@ -2082,6 +2082,22 @@ public class MaplePacketCreator {
return mplew.getPacket(); return mplew.getPacket();
} }
public static byte[] moveMonster(int oid, boolean skillPossible, int skill, int skillId, int skillLevel, int pOption, Point startPos, List<LifeMovementFragment> moves) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.MOVE_MONSTER.getValue());
mplew.writeInt(oid);
mplew.write(0);
mplew.writeBool(skillPossible);
mplew.write(skill);
mplew.write(skillId);
mplew.write(skillLevel);
mplew.writeShort(pOption);
mplew.writePos(startPos);
serializeMovementList(mplew, moves);
return mplew.getPacket();
}
/*
public static byte[] moveMonster(int useskill, int skill, int skill_1, int skill_2, int skill_3, int skill_4, int oid, Point startPos, List<LifeMovementFragment> moves) { public static byte[] moveMonster(int useskill, int skill, int skill_1, int skill_2, int skill_3, int skill_4, int oid, Point startPos, List<LifeMovementFragment> moves) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter(); final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.MOVE_MONSTER.getValue()); mplew.writeShort(SendOpcode.MOVE_MONSTER.getValue());
@@ -2097,6 +2113,7 @@ public class MaplePacketCreator {
serializeMovementList(mplew, moves); serializeMovementList(mplew, moves);
return mplew.getPacket(); return mplew.getPacket();
} }
*/
public static byte[] summonAttack(int cid, int summonOid, byte direction, List<SummonAttackEntry> allDamage) { public static byte[] summonAttack(int cid, int summonOid, byte direction, List<SummonAttackEntry> allDamage) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter(); final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();