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

Merge branch 'pr/459'

Browse Source
This commit is contained in:
ronancpl
2019-05-02 12:49:13 -03:00
parent 7ae5dd659a 58efa571ab
commit 615caa7937
1 changed files with 190 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/MapleItemInformationProvider.java
View File

@@ -913,7 +913,7 @@ public class MapleItemInformationProvider {
public boolean canUseCleanSlate(Equip nEquip) { public boolean canUseCleanSlate(Equip nEquip) {
Map<String, Integer> eqstats = this.getEquipStats(nEquip.getItemId()); Map<String, Integer> eqstats = this.getEquipStats(nEquip.getItemId());
return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < eqstats.get("tuc"); // issue with clean slate found thanks to Masterrulax return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquipe.getVicious()); // issue with clean slate found thanks to Masterrulax
} }
public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) { public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) {
@@ -924,13 +924,22 @@ public class MapleItemInformationProvider {
Map<String, Integer> stats = this.getEquipStats(scrollId); Map<String, Integer> stats = this.getEquipStats(scrollId);
if (((nEquip.getUpgradeSlots() > 0 || ItemConstants.isCleanSlate(scrollId))) || assertGM) { if (((nEquip.getUpgradeSlots() > 0 || ItemConstants.isCleanSlate(scrollId))) || assertGM) {
double prop = (double)stats.get("success"); double prop = (double) stats.get("success");
if (vegaItemId == 5610000) {
if(prop == 10.0) prop = 30.0; switch(vegaItemId) {
} else if (vegaItemId == 5610001) { case 5610000:
if(prop == 60.0) prop = 90.0; if (prop == 10.0f) {
} else if (vegaItemId == 2049100) { prop = 30.0f;
prop = 100.0; }
break;
case 5610001:
if (prop == 60.0f) {
prop = 90.0f;
}
break;
case 2049100:
prop = 100.0f;
break;
} }
if(assertGM || rollSuccessChance(prop)) { if(assertGM || rollSuccessChance(prop)) {