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

Implemented EllinPQ + some bug fixes

Browse Source 
Implemented EllinPQ, adjusted several drop rates and data, fixes some
bugs at quests at client-side.
This commit is contained in:
ronancpl
2017-04-22 16:35:27 -03:00
parent 72ef73a949
commit 828a8a02a2
82 changed files with 753 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/server/channel/handlers/AutoAssignHandler.java
View File

@@ -75,8 +75,8 @@ public class AutoAssignHandler extends AbstractMaplePacketHandler {
//c.getPlayer().message("----------------------------------------SDL: " + eqpStr + eqpDex + eqpLuk + " BASE STATS --> STR: " + chr.getStr() + " DEX: " + chr.getDex() + " INT: " + chr.getInt() + " LUK: " + chr.getLuk());
//c.getPlayer().message("SUM EQUIP STATS -> STR: " + str + " DEX: " + dex + " LUK: " + luk + " INT: " + int_);
//---------- Ronan Lana's AUTOASSIGN -------------
//this method excels for possibility to assign APs properly and not blocking the requirements when swapping one guaranteed equipment.
// ---------- Ronan Lana's AUTOASSIGN -------------
// This method excels for assigning APs in such a way to cover all equipments AP requirements.
if (chr.getRemainingAp() < 1) {
return;
}

4
src/net/server/channel/handlers/BeholderHandler.java
View File

@@ -37,7 +37,7 @@ public final class BeholderHandler extends AbstractMaplePacketHandler {//Summon
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
//System.out.println(slea.toString());
Collection<MapleSummon> summons = c.getPlayer().getSummons().values();
Collection<MapleSummon> summons = c.getPlayer().getSummonsValues();
int oid = slea.readInt();
MapleSummon summon = null;
for (MapleSummon sum : summons) {
@@ -53,7 +53,7 @@ public final class BeholderHandler extends AbstractMaplePacketHandler {//Summon
slea.readByte(); //Not sure.
} //show to others here
} else {
c.getPlayer().getSummons().clear();
c.getPlayer().clearSummons();
}
}
}

2
src/net/server/channel/handlers/CloseRangeDamageHandler.java
View File

@@ -145,7 +145,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
Skill skill = SkillFactory.getSkill(attack.skill);
MapleStatEffect effect_ = skill.getEffect(player.getSkillLevel(skill));
if (effect_.getCooldown() > 0) {
if (player.skillisCooling(attack.skill)) {
if (player.skillIsCooling(attack.skill)) {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));

2
src/net/server/channel/handlers/DamageSummonHandler.java
View File

@@ -38,7 +38,7 @@ public final class DamageSummonHandler extends AbstractMaplePacketHandler {
int monsterIdFrom = slea.readInt();
if (SkillFactory.getSkill(skillid) != null) {
MapleCharacter player = c.getPlayer();
MapleSummon summon = player.getSummons().get(skillid);
MapleSummon summon = player.getSummonByKey(skillid);
if (summon != null) {
summon.addHP(-damage);
if (summon.getHP() <= 0) {

2
src/net/server/channel/handlers/MagicDamageHandler.java
View File

@@ -67,7 +67,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
Skill skill = SkillFactory.getSkill(attack.skill);
MapleStatEffect effect_ = skill.getEffect(player.getSkillLevel(skill));
if (effect_.getCooldown() > 0) {
if (player.skillisCooling(attack.skill)) {
if (player.skillIsCooling(attack.skill)) {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));

2
src/net/server/channel/handlers/MoveSummonHandler.java
View File

@@ -38,7 +38,7 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler {
Point startPos = new Point(slea.readShort(), slea.readShort());
List<LifeMovementFragment> res = parseMovement(slea);
MapleCharacter player = c.getPlayer();
Collection<MapleSummon> summons = player.getSummons().values();
Collection<MapleSummon> summons = player.getSummonsValues();
MapleSummon summon = null;
for (MapleSummon sum : summons) {
if (sum.getObjectId() == oid) {

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

@@ -198,7 +198,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
Skill skill = SkillFactory.getSkill(attack.skill);
MapleStatEffect effect_ = skill.getEffect(player.getSkillLevel(skill));
if (effect_.getCooldown() > 0) {
if (player.skillisCooling(attack.skill)) {
if (player.skillIsCooling(attack.skill)) {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));

2
src/net/server/channel/handlers/ReactorHitHandler.java
View File

@@ -41,7 +41,7 @@ public final class ReactorHitHandler extends AbstractMaplePacketHandler {
int skillid = slea.readInt();
MapleReactor reactor = c.getPlayer().getMap().getReactorByOid(oid);
if (reactor != null && reactor.isAlive()) {
reactor.hitReactor(charPos, stance, skillid, c, false);
reactor.hitReactor(charPos, stance, skillid, c);
}
}
}

2
src/net/server/channel/handlers/SpecialMoveHandler.java
View File

@@ -73,7 +73,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler {
MapleStatEffect effect = skill.getEffect(skillLevel);
if (effect.getCooldown() > 0) {
if (chr.skillisCooling(skillid)) {
if (chr.skillIsCooling(skillid)) {
return;
} else if (skillid != Corsair.BATTLE_SHIP) {
c.announce(MaplePacketCreator.skillCooldown(skillid, effect.getCooldown()));

2
src/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -63,7 +63,7 @@ public final class SummonDamageHandler extends AbstractMaplePacketHandler {
return;
}
MapleSummon summon = null;
for (MapleSummon sum : player.getSummons().values()) {
for (MapleSummon sum : player.getSummonsValues()) {
if (sum.getObjectId() == oid) {
summon = sum;
}