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

Experimental Character/Client Closure + Morph & Crash skills patch

Browse Source 
Player Trade is now enabled inside PQ & events.
Refactored minigame code, now using enums rather than strings for logistics.
Fixed Transformations not applying stat buffs properly.
Warrior's Crash skills now acts accordingly with their description (rather than applying all combined debuffs).
Added a server flag for Crash skills, to apply mob immunity debuffs as well.
Fixed Shark Wave not stacking charges.
Dragon Roar now properly stuns the mobs (stun effect won't show up, though).
Refactored empty method on MapleCharacter, now freeing more resources.
[EXPERIMENTAL] Upon lifetime's end of the object, empty function will be called alongside MapleClient's clear, should issues arise from that, it's TBD.
This commit is contained in:
ronancpl
2018-06-23 13:00:28 -03:00
parent c4d6531177
commit d50b7b6960
30 changed files with 387 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/client/MapleCharacter.java
View File

@@ -88,6 +88,7 @@ import server.maps.MapleMapFactory;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapleMiniGame;
import server.maps.MapleMiniGame.MiniGameResult;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.maps.MapleSummon;
@@ -3600,9 +3601,18 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
toUpdateEffects.add(new Pair<>(mse.getBuffSourceId(), retrievedEffects.get(mse.getBuffSourceId())));
}
List<Pair<MapleBuffStat, Integer>> activeStatups = new LinkedList<>();
for(Pair<Integer, Pair<MapleStatEffect, Long>> lmse: toUpdateEffects) {
Pair<MapleStatEffect, Long> msel = lmse.getRight();
msel.getLeft().updateBuffEffect(this, getActiveStatupsFromSourceid(lmse.getLeft()), msel.getRight());
for(Pair<MapleBuffStat, Integer> statup : getActiveStatupsFromSourceid(lmse.getLeft())) {
if(!isSingletonStatup(statup.getLeft())) {
activeStatups.add(statup);
}
}
msel.getLeft().updateBuffEffect(this, activeStatups, msel.getRight());
activeStatups.clear();
}
if (this.isRidingBattleship()) {
@@ -4450,21 +4460,21 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
return miniGame;
}
public int getMiniGamePoints(String type, boolean omok) {
public int getMiniGamePoints(MiniGameResult type, boolean omok) {
if (omok) {
switch (type) {
case "wins":
case WIN:
return omokwins;
case "losses":
case LOSS:
return omoklosses;
default:
return omokties;
}
} else {
switch (type) {
case "wins":
case WIN:
return matchcardwins;
case "losses":
case LOSS:
return matchcardlosses;
default:
return matchcardties;
@@ -5460,7 +5470,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
this.yellowMessage("You reached level " + level + ". Congratulations! As a token of your success, your inventory has been expanded a little bit.");
}
}
if (level % 20 == 0 && ServerConstants.USE_ADD_RATES_BY_LEVEL == true) { //For the drop & meso rate
if (level % 20 == 0 && ServerConstants.USE_ADD_RATES_BY_LEVEL == true) { //For the rate upgrade
revertLastPlayerRates();
setPlayerRates();
this.yellowMessage("You managed to get level " + level + "! Getting experience and items seems a little easier now, huh?");
@@ -8613,33 +8623,42 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public final void empty(final boolean remove) {
if (dragonBloodSchedule != null) {
dragonBloodSchedule.cancel(false);
}
if (hpDecreaseTask != null) {
hpDecreaseTask.cancel(false);
}
if (beholderHealingSchedule != null) {
beholderHealingSchedule.cancel(false);
}
if (beholderBuffSchedule != null) {
beholderBuffSchedule.cancel(false);
}
if (berserkSchedule != null) {
berserkSchedule.cancel(false);
}
if (recoveryTask != null) {
recoveryTask.cancel(false);
}
if (extraRecoveryTask != null) {
extraRecoveryTask.cancel(false);
}
if (dragonBloodSchedule != null) { dragonBloodSchedule.cancel(true); }
dragonBloodSchedule = null;
if (hpDecreaseTask != null) { hpDecreaseTask.cancel(true); }
hpDecreaseTask = null;
if (beholderHealingSchedule != null) { beholderHealingSchedule.cancel(true); }
beholderHealingSchedule = null;
if (beholderBuffSchedule != null) { beholderBuffSchedule.cancel(true); }
beholderBuffSchedule = null;
if (berserkSchedule != null) { berserkSchedule.cancel(true); }
berserkSchedule = null;
unregisterChairBuff();
cancelBuffExpireTask();
cancelDiseaseExpireTask();
cancelSkillCooldownTask();
cancelExpirationTask();
if (questExpireTask != null) { questExpireTask.cancel(true); }
questExpireTask = null;
if (recoveryTask != null) { recoveryTask.cancel(true); }
recoveryTask = null;
if (extraRecoveryTask != null) { extraRecoveryTask.cancel(true); }
extraRecoveryTask = null;
// already done on unregisterChairBuff
/* if (chairRecoveryTask != null) { chairRecoveryTask.cancel(true); }
chairRecoveryTask = null; */
if (pendantOfSpirit != null) { pendantOfSpirit.cancel(true); }
pendantOfSpirit = null;
petLock.lock();
try {

17
src/client/MapleClient.java
View File

@@ -843,7 +843,7 @@ public class MapleClient {
player.saveCooldowns();
player.saveToDB(true);
player = null;
clear();
return;
}
@@ -935,25 +935,32 @@ public class MapleClient {
player.saveCooldowns();
player.saveToDB();
}
player = null;
}
}
if (!serverTransition && isLoggedIn()) {
updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
session.removeAttribute(MapleClient.CLIENT_KEY); // prevents double dcing during login
session.close(false);
}
engines.clear();
clear();
} else {
engines.clear();
}
}
private void clear() { //usable when defining client = null shortly after
// player hard reference removal thanks to Steve (kaito1410)
if (this.player != null) {
this.player.empty(true); // clears schedules and stuff
}
Server.getInstance().unregisterLoginState(this);
this.accountName = null;
this.macs = null;
this.hwid = null;
this.birthday = null;
//this.engines = null;
this.engines = null;
this.player = null;
this.receive = null;
this.send = null;

5
src/client/MapleJob.java
View File

@@ -120,8 +120,9 @@ public enum MapleJob {
|| DAWNWARRIOR1 == beginners || NIGHTWALKER1 == beginners || BLAZEWIZARD1 == beginners;
}
public boolean isA(MapleJob basejob) {
return getId() >= basejob.getId() && getId() / 100 == basejob.getId() / 100;
public boolean isA(MapleJob basejob) { // thanks Steve (kaito1410) for pointing out an improvement here
int basebranch = basejob.getId() / 10;
return (getId() / 10 == basebranch && getId() >= basejob.getId()) || (basebranch % 10 == 0 && getId() / 100 == basejob.getId() / 100);
}
public int getJobNiche() {

48
src/constants/CharsetConstants.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package constants;
/*
* Courtesy of GabrielSin (gabrielsin@playellin.net)
* Ellin
* MapleStory Server
* CharsetConstants
*/
public class CharsetConstants {
public static MapleLanguageType MAPLE_TYPE = MapleLanguageType.LANGUAGE_PT_BR;
public enum MapleLanguageType {
LANGUAGE_PT_BR(1, "ISO-8859-1"),
LANGUAGE_US(2, "US-ASCII");
final byte type;
final String ascii;
private MapleLanguageType(int type, String ascii) {
this.type = (byte) type;
this.ascii = ascii;
}
public String getAscii() {
return ascii;
}
public byte getType() {
return type;
}
public static MapleLanguageType getByType(byte type) {
for (MapleLanguageType l : MapleLanguageType.values()) {
if (l.getType() == type) {
return l;
}
}
return LANGUAGE_PT_BR;
}
}
}

1
src/constants/ServerConstants.java
View File

@@ -140,6 +140,7 @@ public class ServerConstants {
//Other Skills Configuration
public static final boolean USE_FAST_REUSE_HERO_WILL = true;//Greatly reduce cooldown on Hero's Will.
public static final boolean USE_ANTI_IMMUNITY_CRASH = true; //Crash skills additionally removes the mob's invincibility buffs.
//Character Configuration
public static final boolean USE_ADD_SLOTS_BY_LEVEL = true; //Slots are added each 20 levels.

1
src/constants/skills/ThunderBreaker.java
View File

@@ -38,4 +38,5 @@ public class ThunderBreaker {
public static final int TRANSFORMATION = 15111002;
public static final int SPEED_INFUSION = 15111005;
public static final int SPARK = 15111006;
public static final int SHARK_WAVE = 15111007;
}

7
src/net/server/PlayerStorage.java
View File

@@ -21,6 +21,7 @@
*/
package net.server;
import client.MapleClient;
import client.MapleCharacter;
import java.util.Collection;
import java.util.Iterator;
@@ -93,7 +94,11 @@ public class PlayerStorage {
try {
final Iterator<MapleCharacter> chrit = storage.values().iterator();
while (chrit.hasNext()) {
chrit.next().getClient().disconnect(true, false);
MapleClient client = chrit.next().getClient();
if(client != null) {
client.disconnect(true, false);
}
chrit.remove();
}
} finally {

17
src/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import server.TimerManager;
import server.life.Element;
@@ -43,7 +42,6 @@ import server.maps.MapleMap;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.partyquest.Pyramid;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -55,13 +53,9 @@ import client.MapleStat;
import client.Skill;
import client.SkillFactory;
import client.autoban.AutobanFactory;
import client.inventory.Equip;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import client.status.MonsterStatus;
import client.status.MonsterStatusEffect;
import constants.GameConstants;
import constants.ItemConstants;
import constants.ServerConstants;
import constants.skills.Aran;
import constants.skills.Assassin;
@@ -304,7 +298,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
} else if (attack.skill == Marauder.ENERGY_DRAIN || attack.skill == ThunderBreaker.ENERGY_DRAIN || attack.skill == NightWalker.VAMPIRE || attack.skill == Assassin.DRAIN) {
player.addHP(Math.min(monster.getMaxHp(), Math.min((int) ((double) totDamage * (double) SkillFactory.getSkill(attack.skill).getEffect(player.getSkillLevel(SkillFactory.getSkill(attack.skill))).getX() / 100.0), player.getMaxHp() / 2)));
} else if (attack.skill == Bandit.STEAL) {
} else if (attack.skill == Bandit.STEAL) {
Skill steal = SkillFactory.getSkill(Bandit.STEAL);
if (monster.getStolen().size() < 1) { // One steal per mob <3
if (steal.getEffect(player.getSkillLevel(steal)).makeChanceResult()) {
@@ -480,9 +474,12 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
}
}
if (totDamageToOneMonster > 0 && attackEffect != null && attackEffect.getMonsterStati().size() > 0) {
if (attackEffect.makeChanceResult()) {
monster.applyStatus(player, new MonsterStatusEffect(attackEffect.getMonsterStati(), theSkill, null, false), attackEffect.isPoison(), attackEffect.getDuration());
if (totDamageToOneMonster > 0 && attackEffect != null) {
Map<MonsterStatus, Integer> attackEffectStati = attackEffect.getMonsterStati();
if(!attackEffectStati.isEmpty()) {
if (attackEffect.makeChanceResult()) {
monster.applyStatus(player, new MonsterStatusEffect(attackEffectStati, theSkill, null, false), attackEffect.isPoison(), attackEffect.getDuration());
}
}
}
if (attack.skill == Paladin.HEAVENS_HAMMER) {

1
src/net/server/channel/handlers/CancelChairHandler.java
View File

@@ -33,6 +33,7 @@ public final class CancelChairHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
int id = slea.readShort();
MapleCharacter mc = c.getPlayer();
if(!mc.isLoggedinWorld()) return;
if (id == -1) { // Cancel Chair
mc.setChair(0);

58
src/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -31,8 +31,6 @@ import client.inventory.manipulator.MapleKarmaManipulator;
import constants.ItemConstants;
import constants.ServerConstants;
import java.util.Arrays;
import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider;
import server.MapleTrade;
@@ -40,8 +38,8 @@ import constants.GameConstants;
import server.maps.FieldLimit;
import server.maps.MapleHiredMerchant;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapleMiniGame;
import server.maps.MapleMiniGame.MiniGameType;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import tools.FilePrinter;
@@ -111,6 +109,22 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
}
}
private static int estabilishMiniroomStatus(MapleCharacter chr, boolean isMinigame) {
if (isMinigame && FieldLimit.CANNOTMINIGAME.check(chr.getMap().getFieldLimit())) {
return 11;
}
if (chr.getChalkboard() != null) {
return 13;
}
if(chr.getEventInstance() != null) {
return 5;
}
return 0;
}
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
byte mode = slea.readByte();
@@ -122,17 +136,13 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
return;
}
if(chr.getEventInstance() != null) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(5));
return;
}
byte createType = slea.readByte();
if (createType == 3) {// trade
MapleTrade.startTrade(chr);
} else if (createType == 1) { // omok mini game
if (chr.getChalkboard() != null || FieldLimit.CANNOTMINIGAME.check(chr.getMap().getFieldLimit())) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(11));
int status = estabilishMiniroomStatus(chr, true);
if (status > 0) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status));
return;
}
@@ -143,13 +153,14 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
MapleMiniGame game = new MapleMiniGame(chr, desc, pw);
chr.setMiniGame(game);
game.setPieceType(type);
game.setGameType("omok");
game.setGameType(MiniGameType.OMOK);
chr.getMap().addMapObject(game);
chr.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(chr, 1, 0));
game.sendOmok(c, type);
} else if (createType == 2) { // matchcard
if (chr.getChalkboard() != null || FieldLimit.CANNOTMINIGAME.check(chr.getMap().getFieldLimit())) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(11));
int status = estabilishMiniroomStatus(chr, true);
if (status > 0) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status));
return;
}
@@ -166,16 +177,23 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
} else if (type == 2) {
game.setMatchesToWin(15);
}
game.setGameType("matchcard");
game.setGameType(MiniGameType.MATCH_CARD);
chr.setMiniGame(game);
chr.getMap().addMapObject(game);
chr.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(chr, 1, 0));
game.sendMatchCard(c, type);
} else if (createType == 4 || createType == 5) { // shop
if (!chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapleMapObjectType.SHOP, MapleMapObjectType.HIRED_MERCHANT)).isEmpty()) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(14));
if(!GameConstants.isFreeMarketRoom(chr.getMapId())) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(15));
return;
}
int status = estabilishMiniroomStatus(chr, false);
if (status > 0) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(status));
return;
}
String desc = slea.readMapleAsciiString();
slea.skip(3);
int itemId = slea.readInt();
@@ -184,7 +202,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
return;
}
if (GameConstants.isFreeMarketRoom(chr.getMapId()) || itemId > 5030000 && itemId < 5030012 || itemId > 5140000 && itemId < 5140006) {
if (itemId > 5030000 && itemId < 5030012 || itemId > 5140000 && itemId < 5140006) {
if (createType == 4) {
MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
chr.setPlayerShop(shop);
@@ -230,15 +248,15 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
String pw = slea.available() > 1 ? slea.readMapleAsciiString() : "";
MapleMiniGame game = (MapleMiniGame) ob;
if(game.checkPassword(pw) || game.checkPassword(chr.getName())) {
if(game.checkPassword(pw)) {
if (game.hasFreeSlot() && !game.isVisitor(chr)) {
game.addVisitor(chr);
chr.setMiniGame(game);
switch (game.getGameType()) {
case "omok":
case OMOK:
game.sendOmok(c, game.getPieceType());
break;
case "matchcard":
case MATCH_CARD:
game.sendMatchCard(c, game.getPieceType());
break;
}

8
src/net/server/channel/handlers/RangedAttackHandler.java
View File

@@ -30,6 +30,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleBuffStat;
import client.MapleCharacter;
import client.MapleClient;
import client.MapleJob;
import client.Skill;
import client.SkillFactory;
import client.inventory.Item;
@@ -77,6 +78,13 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
if (attack.skill == Buccaneer.ENERGY_ORB || attack.skill == ThunderBreaker.SPARK || attack.skill == Shadower.TAUNT || attack.skill == NightLord.TAUNT) {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false);
applyAttack(attack, chr, 1);
} else if (attack.skill == ThunderBreaker.SHARK_WAVE && chr.getSkillLevel(ThunderBreaker.SHARK_WAVE) > 0) {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false);
applyAttack(attack, chr, 1);
for (int i = 0; i < attack.numAttacked; i++) {
chr.handleEnergyChargeGain();
}
} else if (attack.skill == Aran.COMBO_SMASH || attack.skill == Aran.COMBO_FENRIR || attack.skill == Aran.COMBO_TEMPEST) {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.rangedAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, 0, attack.allDamage, attack.speed, attack.direction, attack.display), false);
if (attack.skill == Aran.COMBO_SMASH && chr.getCombo() >= 30) {

21
src/server/MapleStatEffect.java
View File

@@ -376,9 +376,6 @@ public class MapleStatEffect {
case DragonKnight.DRAGON_BLOOD:
statups.add(new Pair<>(MapleBuffStat.DRAGONBLOOD, Integer.valueOf(ret.x)));
break;
case DragonKnight.DRAGON_ROAR:
ret.hpR = -x / 100.0;
break;
case Hero.STANCE:
case Paladin.STANCE:
case DarkKnight.STANCE:
@@ -571,7 +568,7 @@ public class MapleStatEffect {
case Crusader.ARMOR_CRASH:
case DragonKnight.POWER_CRASH:
case WhiteKnight.MAGIC_CRASH:
monsterStatus.put(MonsterStatus.SEAL_SKILL, Integer.valueOf(1));
monsterStatus.put(MonsterStatus.SEAL_SKILL, Integer.valueOf(1));
break;
case Rogue.DISORDER:
monsterStatus.put(MonsterStatus.WATK, Integer.valueOf(ret.x));
@@ -588,6 +585,10 @@ public class MapleStatEffect {
monsterStatus.put(MonsterStatus.WATK, Integer.valueOf(ret.x));
monsterStatus.put(MonsterStatus.WDEF, Integer.valueOf(ret.y));
break;
case DragonKnight.DRAGON_ROAR:
ret.hpR = -x / 100.0;
monsterStatus.put(MonsterStatus.STUN, Integer.valueOf(1));
break;
case Crusader.AXE_COMA:
case Crusader.SWORD_COMA:
case Crusader.SHOUT:
@@ -1007,7 +1008,7 @@ public class MapleStatEffect {
public final void applyComboBuff(final MapleCharacter applyto, int combo) {
final List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ARAN_COMBO, combo));
applyto.getClient().announce(MaplePacketCreator.giveBuff(sourceid, 99999, stat));
applyto.announce(MaplePacketCreator.giveBuff(sourceid, 99999, stat));
final long starttime = System.currentTimeMillis();
// final CancelEffectAction cancelAction = new CancelEffectAction(applyto, this, starttime);
@@ -1021,8 +1022,7 @@ public class MapleStatEffect {
long leftDuration = (starttime + localDuration) - System.currentTimeMillis();
if(leftDuration > 0) {
byte[] buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), (int)leftDuration, activeStats);
target.getClient().announce(buff);
target.announce(MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), (int)leftDuration, activeStats));
}
}
@@ -1080,7 +1080,12 @@ public class MapleStatEffect {
localsourceid = ridingMountId;
localstatups = Collections.singletonList(new Pair<>(MapleBuffStat.MONSTER_RIDING, 0));
} else if (isSkillMorph()) {
localstatups = Collections.singletonList(new Pair<>(MapleBuffStat.MORPH, getMorph(applyto)));
for(int i = 0; i < localstatups.size(); i++) {
if(localstatups.get(i).getLeft().equals(MapleBuffStat.MORPH)) {
localstatups.set(i, new Pair<>(MapleBuffStat.MORPH, getMorph(applyto)));
break;
}
}
}
if (primary) {
localDuration = alchemistModifyVal(applyfrom, localDuration, false);

42
src/server/life/MapleMonster.java
View File

@@ -30,11 +30,14 @@ import client.SkillFactory;
import client.status.MonsterStatus;
import client.status.MonsterStatusEffect;
import constants.ServerConstants;
import constants.skills.Crusader;
import constants.skills.DragonKnight;
import constants.skills.FPMage;
import constants.skills.ILMage;
import constants.skills.NightLord;
import constants.skills.NightWalker;
import constants.skills.Shadower;
import constants.skills.WhiteKnight;
import java.awt.Point;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -990,22 +993,35 @@ public class MapleMonster extends AbstractLoadedMapleLife {
effect.setCancelTask(timerManager.schedule(cancelTask, duration));
}
private void debuffMobStat(MonsterStatus stat) {
if (isBuffed(stat)) {
final MonsterStatusEffect oldEffect = stati.get(stat);
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
map.broadcastMessage(packet, getPosition());
MapleCharacter controller = getController();
if (controller != null && !controller.isMapObjectVisible(MapleMonster.this)) {
controller.getClient().announce(packet);
}
stati.remove(stat);
}
}
public void debuffMob(int skillid) {
//skillid is not going to be used for now until I get warrior debuff working
MonsterStatus[] stats = {MonsterStatus.WEAPON_ATTACK_UP, MonsterStatus.WEAPON_DEFENSE_UP, MonsterStatus.MAGIC_ATTACK_UP, MonsterStatus.MAGIC_DEFENSE_UP};
MonsterStatus[] stats = {MonsterStatus.WEAPON_ATTACK_UP, MonsterStatus.WEAPON_DEFENSE_UP, MonsterStatus.MAGIC_ATTACK_UP};
statiLock.lock();
try {
for (int i = 0; i < stats.length; i++) {
if (isBuffed(stats[i])) {
final MonsterStatusEffect oldEffect = stati.get(stats[i]);
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
map.broadcastMessage(packet, getPosition());
MapleCharacter controller = getController();
if (controller != null && !controller.isMapObjectVisible(MapleMonster.this)) {
controller.getClient().announce(packet);
}
stati.remove(stats[i]);
int i = (skillid == Crusader.ARMOR_CRASH ? 1 : (skillid == WhiteKnight.MAGIC_CRASH ? 2 : 0));
debuffMobStat(stats[i]);
if(ServerConstants.USE_ANTI_IMMUNITY_CRASH) {
if (skillid == Crusader.ARMOR_CRASH) {
if(!isBuffed(MonsterStatus.WEAPON_REFLECT)) debuffMobStat(MonsterStatus.WEAPON_IMMUNITY);
if(!isBuffed(MonsterStatus.MAGIC_REFLECT)) debuffMobStat(MonsterStatus.MAGIC_IMMUNITY);
} else if (skillid == WhiteKnight.MAGIC_CRASH) {
if(!isBuffed(MonsterStatus.MAGIC_REFLECT)) debuffMobStat(MonsterStatus.MAGIC_IMMUNITY);
} else {
if(!isBuffed(MonsterStatus.WEAPON_REFLECT)) debuffMobStat(MonsterStatus.WEAPON_IMMUNITY);
}
}
} finally {

52
src/server/maps/MapleMiniGame.java
View File

@@ -31,12 +31,13 @@ import tools.MaplePacketCreator;
/**
*
* @author Matze
* @author Ronan (refactored String GameType to enum MiniGameType)
*/
public class MapleMiniGame extends AbstractMapleMapObject {
private MapleCharacter owner;
private MapleCharacter visitor;
private String password;
private String GameType = null;
private MiniGameType GameType = MiniGameType.UNDEFINED;
private int[] piece = new int[250];
private List<Integer> list4x3 = new ArrayList<>();
private List<Integer> list5x4 = new ArrayList<>();
@@ -49,6 +50,23 @@ public class MapleMiniGame extends AbstractMapleMapObject {
private int ownerpoints = 0;
private int matchestowin = 0;
public static enum MiniGameType {
UNDEFINED(0), OMOK(1), MATCH_CARD(2);
private int value = 0;
private MiniGameType(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}
public static enum MiniGameResult {
WIN, LOSS, TIE;
}
public MapleMiniGame(MapleCharacter owner, String description, String password) {
this.owner = owner;
this.description = description;
@@ -70,16 +88,16 @@ public class MapleMiniGame extends AbstractMapleMapObject {
public boolean isOwner(MapleCharacter c) {
return owner.equals(c);
}
public void addVisitor(MapleCharacter challenger) {
visitor = challenger;
if (GameType.equals("omok")) {
this.getOwner().getClient().announce(MaplePacketCreator.getMiniGameNewVisitor(challenger, 1));
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 2, 0));
}
if (GameType.equals("matchcard")) {
this.getOwner().getClient().announce(MaplePacketCreator.getMatchCardNewVisitor(challenger, 1));
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 2, 0));
MapleCharacter owner = this.getOwner();
if (GameType == MiniGameType.OMOK) {
owner.announce(MaplePacketCreator.getMiniGameNewVisitor(challenger, 1));
owner.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 2, 0));
} else if (GameType == MiniGameType.MATCH_CARD) {
owner.announce(MaplePacketCreator.getMatchCardNewVisitor(challenger, 1));
owner.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 2, 0));
}
}
@@ -87,10 +105,9 @@ public class MapleMiniGame extends AbstractMapleMapObject {
if (visitor == challenger) {
visitor = null;
this.getOwner().getClient().announce(MaplePacketCreator.getMiniGameRemoveVisitor());
if (GameType.equals("omok")) {
if (GameType == MiniGameType.OMOK) {
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 1, 0));
}
if (GameType.equals("matchcard")) {
} else if (GameType == MiniGameType.MATCH_CARD) {
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 1, 0));
}
}
@@ -156,9 +173,9 @@ public class MapleMiniGame extends AbstractMapleMapObject {
return piecetype;
}
public void setGameType(String game) {
public void setGameType(MiniGameType game) {
GameType = game;
if (game.equals("matchcard")) {
if (GameType == MiniGameType.MATCH_CARD) {
if (matchestowin == 6) {
for (int i = 0; i < 6; i++) {
list4x3.add(i);
@@ -178,7 +195,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
}
}
public String getGameType() {
public MiniGameType getGameType() {
return GameType;
}
@@ -217,8 +234,9 @@ public class MapleMiniGame extends AbstractMapleMapObject {
}
public void broadcast(final byte[] packet) {
if (owner.getClient() != null && owner.getClient().getSession() != null) {
owner.getClient().announce(packet);
MapleClient c = owner.getClient();
if (c != null && c.getSession() != null) {
c.announce(packet);
}
broadcastToVisitor(packet);
}

77
src/tools/MaplePacketCreator.java
View File

@@ -68,6 +68,7 @@ import server.maps.MapleMap;
import server.maps.MapleMapItem;
import server.maps.MapleMist;
import server.maps.MapleMiniGame;
import server.maps.MapleMiniGame.MiniGameResult;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.maps.MapleReactor;
@@ -672,7 +673,6 @@ public class MaplePacketCreator {
* Gets a successful authentication packet.
*
* @param c
* @param account The account name.
* @return the successful authentication packet
*/
public static byte[] getAuthSuccess(MapleClient c) {
@@ -683,9 +683,8 @@ public class MaplePacketCreator {
mplew.writeInt(c.getAccID());
mplew.write(c.getGender());
mplew.writeBool(c.getGMLevel() > 0);
mplew.write((c.getGMLevel() > 0 && Server.getInstance().canFly(c.getAccID())) ? 0x80 : 0); // Admin Byte. 0x80,0x40,0x20.. Rubbish.
mplew.writeBool(c.getGMLevel() > 1); // thanks Steve(kaito1410) for pointing this out
mplew.write((c.getGMLevel() > 1 && Server.getInstance().canFly(c.getAccID())) ? 0x80 : 0); // Admin Byte. 0x80,0x40,0x20.. Rubbish.
mplew.write(0); // Country Code.
mplew.writeMapleAsciiString(c.getAccountName());
@@ -1967,9 +1966,9 @@ public class MaplePacketCreator {
MapleMiniGame miniGame = chr.getMiniGame();
if (miniGame != null && miniGame.isOwner(chr)) {
if (miniGame.hasFreeSlot()) {
spawnAnnounceBox(mplew, miniGame, 1, 0, 1, 0);
spawnAnnounceBox(mplew, miniGame, 0, 1, 0);
} else {
spawnAnnounceBox(mplew, miniGame, 1, 0, 2, 1);
spawnAnnounceBox(mplew, miniGame, 0, 2, 1);
}
} else {
mplew.write(0);
@@ -2141,8 +2140,8 @@ public class MaplePacketCreator {
mplew.write(0);
}
private static void addAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int gametype, int type, int ammount, int joinable) {
mplew.write(gametype);
private static void addAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int type, int ammount, int joinable) {
mplew.write(game.getGameType().getValue());
mplew.writeInt(game.getObjectId()); // gameid/shopid
mplew.writeMapleAsciiString(game.getDescription()); // desc
mplew.writeMapleAsciiString(game.getPassword());
@@ -2152,14 +2151,14 @@ public class MaplePacketCreator {
mplew.write(joinable);
}
private static void spawnAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int gametype, int type, int ammount, int joinable) {
mplew.write(gametype);
private static void spawnAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int type, int ammount, int joinable) {
mplew.write(game.getGameType().getValue());
mplew.writeInt(game.getObjectId()); // gameid/shopid
mplew.writeMapleAsciiString(game.getDescription()); // desc
mplew.write(0);
mplew.writeBool(!game.getPassword().isEmpty()); // password here, thanks GabrielSin!
mplew.write(type);
mplew.write(ammount);
mplew.write(2);
mplew.write(2); //player capacity
mplew.write(joinable);
}
@@ -4937,17 +4936,17 @@ public class MaplePacketCreator {
mplew.write(0xFF);
mplew.write(0);
mplew.writeInt(1);
mplew.writeInt(minigame.getOwner().getMiniGamePoints("wins", true));
mplew.writeInt(minigame.getOwner().getMiniGamePoints("ties", true));
mplew.writeInt(minigame.getOwner().getMiniGamePoints("losses", true));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.WIN, true));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.TIE, true));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.LOSS, true));
mplew.writeInt(2000);
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
mplew.write(1);
mplew.writeInt(1);
mplew.writeInt(visitor.getMiniGamePoints("wins", true));
mplew.writeInt(visitor.getMiniGamePoints("ties", true));
mplew.writeInt(visitor.getMiniGamePoints("losses", true));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, true));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.TIE, true));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.LOSS, true));
mplew.writeInt(2000);
}
mplew.write(0xFF);
@@ -5047,9 +5046,9 @@ public class MaplePacketCreator {
addCharLook(mplew, c, false);
mplew.writeMapleAsciiString(c.getName());
mplew.writeInt(1);
mplew.writeInt(c.getMiniGamePoints("wins", true));
mplew.writeInt(c.getMiniGamePoints("ties", true));
mplew.writeInt(c.getMiniGamePoints("losses", true));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.WIN, true));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.TIE, true));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.LOSS, true));
mplew.writeInt(2000);
return mplew.getPacket();
}
@@ -5075,14 +5074,14 @@ public class MaplePacketCreator {
}
mplew.write(0); // owner
mplew.writeInt(1); // unknown
mplew.writeInt(game.getOwner().getMiniGamePoints("wins", omok) + win); // wins
mplew.writeInt(game.getOwner().getMiniGamePoints("ties", omok) + tie); // ties
mplew.writeInt(game.getOwner().getMiniGamePoints("losses", omok) + lose); // losses
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.WIN, omok) + win); // wins
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.TIE, omok) + tie); // ties
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.LOSS, omok) + lose); // losses
mplew.writeInt(2000); // points
mplew.writeInt(1); // start of visitor; unknown
mplew.writeInt(game.getVisitor().getMiniGamePoints("wins", omok) + lose); // wins
mplew.writeInt(game.getVisitor().getMiniGamePoints("ties", omok) + tie); // ties
mplew.writeInt(game.getVisitor().getMiniGamePoints("losses", omok) + win); // losses
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.WIN, omok) + lose); // wins
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.TIE, omok) + tie); // ties
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.LOSS, omok) + win); // losses
mplew.writeInt(2000); // points
game.getOwner().setMiniGamePoints(game.getVisitor(), result, omok);
return mplew.getPacket();
@@ -5136,17 +5135,17 @@ public class MaplePacketCreator {
mplew.write(0xFF);
mplew.write(0);
mplew.writeInt(2);
mplew.writeInt(minigame.getOwner().getMiniGamePoints("wins", false));
mplew.writeInt(minigame.getOwner().getMiniGamePoints("ties", false));
mplew.writeInt(minigame.getOwner().getMiniGamePoints("losses", false));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.WIN, false));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.TIE, false));
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.LOSS, false));
mplew.writeInt(2000);
if (minigame.getVisitor() != null) {
MapleCharacter visitor = minigame.getVisitor();
mplew.write(1);
mplew.writeInt(2);
mplew.writeInt(visitor.getMiniGamePoints("wins", false));
mplew.writeInt(visitor.getMiniGamePoints("ties", false));
mplew.writeInt(visitor.getMiniGamePoints("losses", false));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, false));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.TIE, false));
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.LOSS, false));
mplew.writeInt(2000);
}
mplew.write(0xFF);
@@ -5182,9 +5181,9 @@ public class MaplePacketCreator {
addCharLook(mplew, c, false);
mplew.writeMapleAsciiString(c.getName());
mplew.writeInt(1);
mplew.writeInt(c.getMiniGamePoints("wins", false));
mplew.writeInt(c.getMiniGamePoints("ties", false));
mplew.writeInt(c.getMiniGamePoints("losses", false));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.WIN, false));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.TIE, false));
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.LOSS, false));
mplew.writeInt(2000);
return mplew.getPacket();
}
@@ -5267,7 +5266,7 @@ public class MaplePacketCreator {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.UPDATE_CHAR_BOX.getValue());
mplew.writeInt(c.getId());
addAnnounceBox(mplew, c.getMiniGame(), 1, 0, ammount, type);
addAnnounceBox(mplew, c.getMiniGame(), 0, ammount, type);
return mplew.getPacket();
}
@@ -5283,11 +5282,11 @@ public class MaplePacketCreator {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.UPDATE_CHAR_BOX.getValue());
mplew.writeInt(c.getId());
addAnnounceBox(mplew, c.getMiniGame(), 2, 0, ammount, type);
addAnnounceBox(mplew, c.getMiniGame(), 0, ammount, type);
return mplew.getPacket();
}
public static byte[] removeMatchcardBox(MapleCharacter c) {
public static byte[] removeMatchCardBox(MapleCharacter c) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.UPDATE_CHAR_BOX.getValue());
mplew.writeInt(c.getId());

3
src/tools/data/output/GenericLittleEndianWriter.java
View File

@@ -23,6 +23,7 @@ package tools.data.output;
import java.awt.Point;
import java.nio.charset.Charset;
import constants.CharsetConstants.MapleLanguageType;
/**
* Provides a generic writer of a little-endian sequence of bytes.
@@ -32,7 +33,7 @@ import java.nio.charset.Charset;
* @since Revision 323
*/
public class GenericLittleEndianWriter implements LittleEndianWriter {
private static Charset ASCII = Charset.forName("US-ASCII");
private static Charset ASCII = Charset.forName(MapleLanguageType.LANGUAGE_US.getAscii());
private ByteOutputStream bos;
/**