Reworked Autoassigner & Hero's Will & Trade + Visual NX + New commands

Reworked autoassigner (improved limits between required secondary and
surplus primary stats). Hero's will removes most of diseases, tonic
removes slow. Added visual info for collected NX cards. Added commands
cake (cake boss with customizable HP) and setgmlevel. Reworked Trade
system now checking for slots smartly (instead of just checking for
empty slots).

build/built-jar.properties

@@ -1,4 +1,4 @@
-#Fri, 25 Aug 2017 21:04:38 -0300
+#Thu, 31 Aug 2017 23:23:01 -0300
 
 
 C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2=

docs/feature_list.txt

@@ -55,12 +55,12 @@ Server potentials:
 * Gain fame by quests.
 * Every monsterbook card is now droppable by overworld mobs.
 * Monsterbook displays drop data info conformant with the underlying DB (needs custom wz). See more on the MobBookUpdate feature.
-* Mastery book announcer displaying droppers of needed books of a player, read underlying DB.
+* Mastery book announcer displays droppers of needed books of a player, by reading underlying DB.
 * Every skill/mastery book is now droppable by mobs.
 * Inventory auto-gather and auto-sorting feature.
 * Enhanced AP auto-assigner: exactly matches AP with the needed for the player's current level, surplus assigned to the primary attribute.
 * Added Boss HP Bar for dozens of bosses (needs provided custom wz).
-* If multiple bosses on the same area, client will prioritize Boss HP bar of the target of the player.
+* If multiple bosses are on the same area, client will prioritize Boss HP bar of the target of the player.
 * Custom jail system (needs provided custom wz).
 * Delete Character 100% (requires ENABLE_PIC activated).
 * Boats, elevator and other travelling mechanics fully working.

docs/mcpq/2042002.js

@@ -0,0 +1,315 @@
+var DISABLED = false;
+
+var SavedLocationType = Packages.server.maps.SavedLocationType;
+
+var MonsterCarnival = Packages.server.partyquest.mcpq.MonsterCarnival;
+var MCTracker = Packages.server.partyquest.mcpq.MCTracker;
+var MCParty = Packages.server.partyquest.mcpq.MCParty;
+var MCField = Packages.server.partyquest.mcpq.MCField;
+
+var status = -1;
+var store = false;
+var ctx = -1; 
+var storeInfo;
+var purchaseId;
+var purchaseCost;
+
+var coinId = 4001129;
+var coinIcon = "#i" + coinId + "#";
+var infoMaps = [220000000, 200000000, 103000000, 540000000]; // ludi, orbis, kerning, singapore
+var gradeS = 600
+var gradeA = 500
+var gradeB = 400
+var gradeC = 300
+var gradeD = 200
+var gradeE = 100
+
+var expRewards = [[150000, 100000], // S Winner/Loser
+                  [100000, 70000], // A Winner/Loser
+                  [75000, 43250], // B Winner/Loser
+                  [50000, 25000], // C Winner/Loser
+                  [25000, 12500], // D Winner/Loser
+                  [12500, 6250],  // E Winner/Loser
+                  [5000, 2500]    // F Winner/Loser
+                  ];
+
+// Exchange stores
+var warrior = [[1302004, 7], [1402006, 7], [1302009, 10], [1402007, 10],
+               [1302010, 20], [1402003, 20], [1312006, 7], [1412004, 7],
+               [1312007, 10], [1412005, 10], [1312018, 20], [1412003, 20],
+               [1322015, 7], [1422008, 7], [1322016, 10], [1422007, 10],
+               [1322017, 20], [1422005, 20], [1432003, 7], [1442003, 7],
+               [1432005, 10], [1442009, 10], [1442005, 20], [1432004, 20]];
+
+var magician = [[1372001, 7], [1382018, 7], [1372012, 10], [1382019, 10],
+                [1382001, 20], [1372007, 20]];
+
+var archer = [[1452006, 7], [1452007, 10], [1452008, 20], [1462005, 7],
+              [1462006, 10], [1462007, 20]];
+
+var thief = [[1472013, 7], [1472017, 10], [1472021, 20], [1332014, 7],
+             [1332011, 10], [1332031, 10], [1332016, 20], [1332034, 20]];
+
+var pirate = [[1482005, 7], [1482006, 10], [1482007, 20], [1492005, 7],
+              [1492006, 10], [1492007, 20]];
+
+var necklace = [[1122007, 50], [2041211, 40]];
+
+var infoText = "You wish to know about the Monster Carnival? Very well. The Monster Carnival is a place of trilling battles and exciting competiton against people just as strong and motivated as yourself. You must summon monsters and defeat the monsters summoned by the opposing party. That's the essence of the Monster Carnival. Once you enter the Carnival Field, the task is to earn CP by hunter monsters from the opposing party and use those CP's to distract the opposing party from hunting monsters. There are three ways to distract the other party; Summon a Monster, Skill or Protector. Please remember this though, it's never a good idea to save up CP just for the sake of it. The CP's you've used will also help determine the winner and the loser of the carnival.";
+var no = "You do not have enough Maple Coins for this item. Come back to me when you acquire more!";
+
+function getGrade(cp) {
+    if (cp >= gradeS) {
+        return 0;
+    } else if (cp >= gradeA) {
+        return 1;
+    } else if (cp >= gradeB) {
+        return 2;
+    } else if (cp >= gradeC) {
+        return 3;
+    } else if (cp >= gradeD) {
+        return 4;
+    } else if (cp >= gradeE) {
+        return 5;
+    } else {
+        return 6;
+    }
+}
+
+function isTownMap(map) {
+    for (var i = 0; i < infoMaps.length; i++) {
+        if (infoMaps[i] == map) {
+            return true;
+        }
+    }
+    return false;
+}
+
+function isExitMap(map) {
+    return map == 980000010;
+}
+
+function isWinnerMap(map) {
+    return (map >= 980000000 && map <= 980000700 && map % 10 == 3);
+}
+
+function isLoserMap(map) {
+    return (map >= 980000000 && map <= 980000700 && map % 10 == 4);
+}
+
+var CONTEXT_NONE = -1;
+var CONTEXT_TOWN = 0;
+var CONTEXT_EXIT = 1;
+var CONTEXT_WIN  = 2;
+var CONTEXT_LOSE = 3;
+
+function start() {  
+    if (DISABLED) {
+        cm.sendOk("CPQ is temporarily unavailable.");
+        cm.dispose();
+        return;
+    }
+    m = cm.getMapId();
+    if (isTownMap(m)) {
+        ctx = CONTEXT_TOWN;
+    } else if (isExitMap(m)) {
+        ctx = CONTEXT_EXIT;
+    } else if (isWinnerMap(m)) {
+        ctx = CONTEXT_WIN;
+    } else if (isLoserMap(m)) {
+        ctx = CONTEXT_LOSE;
+    } else {
+        ctx = CONTEXT_NONE;
+    }
+
+    action(1, 0, 0);
+}
+
+function doLoserMap(mode, type, selection) {
+    if (cm.getPlayer().getMCPQParty() == null) {
+        cm.warp(MonsterCarnival.MAP_LOBBY);
+        cm.dispose();
+        return;
+    }
+
+    if (mode == -1) {
+        cm.dispose();
+    } else {
+        if (mode == 1) status++;
+        else status--;
+
+        if (status == 0) {
+            cm.sendNext("Unfortunately, you did not manage to win this round. Better luck next time!");
+        } else if (status == 1) {
+            var points = cm.getPlayer().getMCPQParty().getTotalCP();
+            var grade = getGrade(points);
+            var letterGrade = "ABCDF"[grade];
+            var expReward = expRewards[grade][1];
+
+            cm.sendNext("Your grade is: #b" + letterGrade + "\r\n\r\n#kEXP Reward: " + expReward);
+            cm.gainExp(expReward);
+        } else if (status == 2) {
+            cm.warp(MonsterCarnival.MAP_LOBBY);
+            cm.dispose();
+        }
+    }
+}
+
+function doWinnerMap(mode, type, selection) {
+    if (cm.getPlayer().getMCPQParty() == null) {
+        cm.warp(MonsterCarnival.MAP_LOBBY);
+        cm.dispose();
+        return;
+    }
+
+    if (mode == -1) {
+        cm.dispose();
+    } else {
+        if (mode == 1) status++;
+        else status--;
+
+        if (status == 0) {
+            cm.sendNext("Congratulations! You managed to defeat the enemy team!");
+        } else if (status == 1) {
+            var points = cm.getPlayer().getMCPQParty().getTotalCP();
+            var grade = getGrade(points);
+            var letterGrade = "ABCDF"[grade];
+            var expReward = expRewards[grade][0];
+
+            cm.sendNext("Your grade is: #b" + letterGrade + "\r\n\r\n#kEXP Reward: " + expReward);
+            cm.gainExp(expReward);
+        } else if (status == 2) {
+            cm.warp(MonsterCarnival.MAP_LOBBY);
+            cm.dispose();
+        }
+    }
+}
+
+function doTown(mode, type, selection) {
+    if (mode == -1) {
+        cm.sendOk("Be sure to vote for the server every 24 hours!");
+        cm.dispose();
+    } else {
+        if (mode == 1) status++;
+        else status--;
+
+        if (status == 0) {
+            cm.sendSimple("What would you like to do? If you have never participated in the Monster Carnival, you'll need to know a thing or two about it before joining.\r\n\r\n#b#L0#Go to the Monster Carnival Field#l\r\n#L1#Learn about the Monster Carnival#l\r\n#L2#Trade Maple Coin#l");
+        } else if (status == 1) {
+            if (selection == 0) {
+                if (cm.getChar().getLevel() < MonsterCarnival.MIN_LEVEL || cm.getChar().getLevel() > MonsterCarnival.MAX_LEVEL) {
+                    cm.sendOk("You must be between level " + MonsterCarnival.MIN_LEVEL + " and level " + MonsterCarnival.MAX_LEVEL + " to enter.");
+                    cm.dispose();
+                    return;
+                }
+                cm.getChar().saveLocation(SavedLocationType.MONSTER_CARNIVAL);
+                cm.warp(MonsterCarnival.MAP_LOBBY, 4);
+                cm.dispose();
+                return;
+            } else if (selection == 1) {
+                cm.sendPrev(infoText);
+                cm.dispose();
+                return;
+            } else if (selection == 2) {
+                store = true;
+                cm.sendSimple("Select a category:\r\n" +
+                    "#L101##bTrade Maple Coins for Warrior Weapons\r\n" +
+                    "#L102#Trade Maple Coins for Magician Weapons\r\n" +
+                    "#L103#Trade Maple Coins for Bowman Weapons\r\n" +
+                    "#L104#Trade Maple Coins for Thief Weapons\r\n" +
+                    "#L105#Trade Maple Coins for Pirate Weapons\r\n" +
+                    "#L106#Trade Maple Coins for a Necklace");
+            }
+        } else if (status == 2) {
+            if (store) {
+                switch (selection) {
+                    case 101:
+                        storeInfo = warrior;
+                        break;
+                    case 102:
+                        storeInfo = magician;
+                        break;
+                    case 103:
+                        storeInfo = archer;
+                        break;
+                    case 104:
+                        storeInfo = thief;
+                        break;
+                    case 105:
+                        storeInfo = pirate;
+                        break;
+                    case 106:
+                        storeInfo = necklace;
+                        break;
+                    default:
+                        storeInfo = [];
+                }
+                if (storeInfo.length == 0) {
+                    cm.sendOk("That store doesn't exist.");
+                    cm.dispose();
+                    return;
+                }
+                var storeText = "";
+                for (var i = 0; i < storeInfo.length; ++i) {
+                    var wepId = storeInfo[i][0];
+                    var cost = storeInfo[i][1];
+                    storeText += "#L" + i + "##v" + wepId + "# - #z" + wepId + "# - " + cost + " " + coinIcon + "#l\r\n";
+                }
+                cm.sendSimple(storeText);
+            } else {
+                MCTracker.log("[MCPQ_Info] CONTEXT_TOWN: Invalid status 2");
+            }
+        } else if (status == 3) {
+            if (store) {
+                purchaseId = storeInfo[selection][0];
+                purchaseCost = storeInfo[selection][1];
+
+                if (cm.haveItem(coinId, purchaseCost)) {
+                    cm.sendYesNo("Are you sure you want to purchase #i" + purchaseId + "#? You will have #r#e" + (cm.itemQuantity(coinId) - purchaseCost) + " " + coinIcon + "##k#n remaining.");
+                } else {
+                    cm.sendOk("You don't have enough " + coinIcon + ".");
+                    cm.dispose();
+                }
+            } else {
+                MCTracker.log("[MCPQ_Info] CONTEXT_TOWN: Invalid status 3");
+            }
+        } else if (status == 4) {
+            if (store) {
+                if (cm.haveItem(coinId, purchaseCost)) {
+                    cm.gainItem(coinId, -purchaseCost);
+                    cm.gainItem(purchaseId);
+                    cm.sendOk("Congratulations! Enjoy your new item.");
+                    cm.dispose();
+                }
+            } else {
+                MCTracker.log("[MCPQ_Info] CONTEXT_TOWN: Invalid status 4");
+            }
+        }
+    }
+}
+
+function doExit() {
+    cm.warp(MonsterCarnival.MAP_LOBBY);
+    cm.sendOk("Hope you had fun in the Carnival PQ!");
+    cm.dispose();
+}
+
+function action(mode, type, selection) {
+    switch (ctx) {
+        case CONTEXT_TOWN:
+            doTown(mode, type, selection);
+            break;
+        case CONTEXT_EXIT:
+            doExit();
+            break;
+        case CONTEXT_LOSE:
+            doLoserMap(mode, type, selection);
+            break;
+        case CONTEXT_WIN:
+            doWinnerMap(mode, type, selection);
+            break;
+        default:
+            MCTracker.log("[MCPQ_INFO] Invalid context (value: " + ctx + ")");
+            cm.dispose();
+    } 
+}

docs/mychanges_ptbr.txt

@@ -481,4 +481,23 @@ Consertado pets n
 Acesso à DB usando HikariCP (melhor ganho em desempenho e código mais enxuto).
 Resolvido bugs com hatch egg e evolvePet.
 Adicionado energy bar e skills funcionais no Dojo.
-Consertado cash pet food retirando stats de mount em Character Info.
+Consertado cash pet food retirando stats de mount em Character Info.
+
+26 Agosto 2017,
+Consertado bug no sistema de exp de pets.
+Refatorado sistema de trades, agora verificando por slots disponíveis similarmente ao sistema usado pelas rewards de quests.
+
+27 Agosto 2017,
+Hero's Will retira a maioria dos diseases. Tonico retira slow além de weakness.
+Consertado comando itemvac coletando quest itens e itens de outros jogadores.
+Novo comando: cake. Chama cake boss com valor customizável de HP.
+
+28 Agosto 2017,
+Parties agora podem sair do Dojo sem precisar esperar o timeout expirar.
+Ao entrar no Dojo, jogadores tem energy points resetados pra zero.
+Adicionado informação de NX ganho ao coletar cupons.
+Pets em outros slots agora equipam devidamente.
+
+31 Agosto 2017,
+Refatorado autoassigner para focar nos stats primários a partir da avaliação do valor base do stat secundário com o 1º e 2º equips mais forte, ao invés de somente o 1º.
+Corrigido bug de acesso concorrente no sistema de rate cupons.

nbproject/private/private.xml

@@ -3,9 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/constants/GameConstants.java</file>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/constants/ServerConstants.java</file>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/client/MapleCharacter.java</file>
+            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/wz/Etc.wz/Commodity.img.xml</file>
         </group>
     </open-files>
 </project-private>

scripts/npc/1012105.js

@@ -22,29 +22,47 @@
 /* Ms. Tan
 	Henesys Skin Change.
 */
-var status = 0;
+var status;
 var skin = Array(0, 1, 2, 3, 4);
 var price = 1000000;
 
 function start() {
-    cm.sendSimple("Well, hello! Welcome to the Henesys Skin-Care! Would you like to have a firm, tight, healthy looking skin like mine?  With a #b#t5153000##k, you can let us take care of the rest and have the kind of skin you've always wanted~!\r\n#L1#I would like to buy a #b#t5153000##k for " + price + " mesos, please!#l\r\n\#L2#I already have a Coupon!#l");
+        status = -1;
+        action(1, 0, 0);
 }
 
 function action(mode, type, selection) {
-    if (mode < 1)
-        cm.dispose();
-    else {
-        status++;
-        if (status == 1)
-            cm.sendStyle("With our specialized machine, you can see yourself after the treatment in advance. What kind of skin-treatment would you like to do? Choose the style of your liking.", skin);
-        else {
-            if (cm.haveItem(5153000)){
-                cm.gainItem(5153000, -1);
-                cm.setSkin(selection);
-                cm.sendOk("Enjoy your new and improved skin!");
-            } else
-                cm.sendOk("Um... you don't have the skin-care coupon you need to receive the treatment. Sorry, but I am afraid we can't do it for you...");
-            cm.dispose();
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                
+                if (status == 0) {
+                        cm.sendSimple("Well, hello! Welcome to the Henesys Skin-Care! Would you like to have a firm, tight, healthy looking skin like mine?  With a #b#t5153000##k, you can let us take care of the rest and have the kind of skin you've always wanted~!\r\n#L1#I already have a Coupon!#l");
+                }
+                else if (status == 1) {
+                        if (cm.haveItem(5153000)){
+                                cm.sendStyle("With our specialized machine, you can see yourself after the treatment in advance. What kind of skin-treatment would you like to do? Choose the style of your liking.", skin);
+                        } else {
+                                cm.sendOk("Um... you don't have the skin-care coupon you need to receive the treatment. Sorry, but I am afraid we can't do it for you...");
+                                cm.dispose();
+                                return;
+                        }
+                }
+                else {
+                        cm.gainItem(5153000, -1);
+                        cm.setSkin(selection);
+                        cm.sendOk("Enjoy your new and improved skin!");
+                        cm.dispose();
+                }
         }
-    }
 }