Enhanced map bounds + HolidayPQ + Battleship
Fixed Abdula not showing book info for Arans. Fixed map bounds, now it hopefully doesn't let items pass through the walkable area anymore. Implemented HolidayPQ. Added a custom item sandbox system, to be used with items generated by the "drop" command. Added the whole-map buff when using the Happy Birthday item. Fixed several battleship issues: - Battleship now shows HP properly at the buff icon. - Cleared some inconsistencies on battleship when interacting with the enhanced buff system. - Battleship now hands out defensive buffs properly.
This commit is contained in:
@@ -275,6 +275,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
|
||||
*
|
||||
* @param from the player that dealt the damage
|
||||
* @param damage
|
||||
* @param stayAlive
|
||||
*/
|
||||
public synchronized void damage(MapleCharacter from, int damage, boolean stayAlive) {
|
||||
Integer trueDamage = applyAndGetHpDamage(damage, stayAlive);
|
||||
@@ -293,7 +294,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
|
||||
|
||||
broadcastMobHpBar(from);
|
||||
}
|
||||
|
||||
|
||||
public void heal(int hp, int mp) {
|
||||
Integer hpHealed = applyAndGetHpDamage(-hp, false);
|
||||
if(hpHealed == null) return;
|
||||
@@ -305,7 +306,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
|
||||
}
|
||||
setMp(mp2Heal);
|
||||
|
||||
if(hp > 0) getMap().broadcastMessage(MaplePacketCreator.healMonster(getObjectId(), hp));
|
||||
if(hp > 0) getMap().broadcastMessage(MaplePacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp()));
|
||||
|
||||
maxHpPlusHeal.addAndGet(hpHealed);
|
||||
dispatchMonsterHealed(hpHealed);
|
||||
@@ -695,7 +696,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
|
||||
public boolean hasBossHPBar() {
|
||||
return isBoss() && getTagColor() > 0;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void sendSpawnData(MapleClient c) {
|
||||
if (!isAlive()) {
|
||||
|
||||
Reference in New Issue
Block a user