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

Horntail PQ & Exped + Equip levelup fix

Browse Source 
Added Horntail PQ and boss fight. Fixed short integer overflow of
equipment stats on client messing up player stats.
This commit is contained in:
ronancpl
2017-07-20 12:02:59 -03:00
parent 8fab2a6e3e
commit c09bc02c85
137 changed files with 1154 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/command/Commands.java
View File

@@ -837,18 +837,11 @@ public class Commands {
player.setMp(player.getMaxMp());
player.updateSingleStat(MapleStat.MP, player.getMaxMp());
} else if (sub[0].equals("buffmap")) {
for (MapleCharacter chr : player.getMap().getCharacters()){
//GM Skills : Haste(Super) - Holy Symbol - Bless - Hyper Body - Echo of Hero
SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(chr);
SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(chr);
SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(chr);
SkillFactory.getSkill(9101008).getEffect(SkillFactory.getSkill(9101008).getMaxLevel()).applyTo(chr);
SkillFactory.getSkill(1005).getEffect(SkillFactory.getSkill(1005).getMaxLevel()).applyTo(chr);
chr.setHp(chr.getMaxHp());
chr.updateSingleStat(MapleStat.HP, chr.getMaxHp());
chr.setMp(chr.getMaxMp());
chr.updateSingleStat(MapleStat.MP, chr.getMaxMp());
}
SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(9101008).getEffect(SkillFactory.getSkill(9101008).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(1005).getEffect(SkillFactory.getSkill(1005).getMaxLevel()).applyTo(player, true);
} else if (sub[0].equals("buff")) {
if (sub.length < 2){
player.yellowMessage("Syntax: !buff <buffid>");
@@ -905,7 +898,6 @@ public class Commands {
eu.setHp(incval);
eu.setMp(incval);
eu.setSpeed(incval);
eu.setHands(incval);
eu.setWatk(incval);
eu.setDex(incval);
eu.setInt(incval);

72
src/client/inventory/Equip.java
View File

@@ -376,63 +376,79 @@ public class Equip extends Item {
boolean gotVicious = false, gotSlot = false;
String lvupStr = "'" + MapleItemInformationProvider.getInstance().getName(this.getItemId()) + "' is now level " + itemLevel + "! ";
Integer statUp, maxStat = ServerConstants.MAX_EQUIPMNT_STAT;
for (Pair<StatUpgrade, Integer> stat : stats) {
switch (stat.getLeft()) {
case incDEX:
dex += stat.getRight();
lvupStr += "+" + stat.getRight() + "DEX ";
statUp = Math.min(stat.getRight(), maxStat - dex);
dex += statUp;
lvupStr += "+" + statUp + "DEX ";
break;
case incSTR:
str += stat.getRight();
lvupStr += "+" + stat.getRight() + "STR ";
statUp = Math.min(stat.getRight(), maxStat - str);
str += statUp;
lvupStr += "+" + statUp + "STR ";
break;
case incINT:
_int += stat.getRight();
lvupStr += "+" + stat.getRight() + "INT ";
statUp = Math.min(stat.getRight(), maxStat - _int);
_int += statUp;
lvupStr += "+" + statUp + "INT ";
break;
case incLUK:
luk += stat.getRight();
lvupStr += "+" + stat.getRight() + "LUK ";
statUp = Math.min(stat.getRight(), maxStat - luk);
luk += statUp;
lvupStr += "+" + statUp + "LUK ";
break;
case incMHP:
hp += stat.getRight();
lvupStr += "+" + stat.getRight() + "HP ";
statUp = Math.min(stat.getRight(), maxStat - hp);
hp += statUp;
lvupStr += "+" + statUp + "HP ";
break;
case incMMP:
mp += stat.getRight();
lvupStr += "+" + stat.getRight() + "MP ";
statUp = Math.min(stat.getRight(), maxStat - mp);
mp += statUp;
lvupStr += "+" + statUp + "MP ";
break;
case incPAD:
watk += stat.getRight();
lvupStr += "+" + stat.getRight() + "WATK ";
statUp = Math.min(stat.getRight(), maxStat - watk);
watk += statUp;
lvupStr += "+" + statUp + "WATK ";
break;
case incMAD:
matk += stat.getRight();
lvupStr += "+" + stat.getRight() + "MATK ";
statUp = Math.min(stat.getRight(), maxStat - matk);
matk += statUp;
lvupStr += "+" + statUp + "MATK ";
break;
case incPDD:
wdef += stat.getRight();
lvupStr += "+" + stat.getRight() + "WDEF ";
statUp = Math.min(stat.getRight(), maxStat - wdef);
wdef += statUp;
lvupStr += "+" + statUp + "WDEF ";
break;
case incMDD:
mdef += stat.getRight();
lvupStr += "+" + stat.getRight() + "MDEF ";
statUp = Math.min(stat.getRight(), maxStat - mdef);
mdef += statUp;
lvupStr += "+" + statUp + "MDEF ";
break;
case incEVA:
avoid += stat.getRight();
lvupStr += "+" + stat.getRight() + "AVOID ";
statUp = Math.min(stat.getRight(), maxStat - avoid);
avoid += statUp;
lvupStr += "+" + statUp + "AVOID ";
break;
case incACC:
acc += stat.getRight();
lvupStr += "+" + stat.getRight() + "ACC ";
statUp = Math.min(stat.getRight(), maxStat - acc);
acc += statUp;
lvupStr += "+" + statUp + "ACC ";
break;
case incSpeed:
speed += stat.getRight();
lvupStr += "+" + stat.getRight() + "SPEED ";
statUp = Math.min(stat.getRight(), maxStat - speed);
speed += statUp;
lvupStr += "+" + statUp + "SPEED ";
break;
case incJump:
jump += stat.getRight();
lvupStr += "+" + stat.getRight() + "JUMP ";
statUp = Math.min(stat.getRight(), maxStat - jump);
jump += statUp;
lvupStr += "+" + statUp + "JUMP ";
break;
case incVicious: