From e02ede58da072bc3c3cc32ddb959e62027938f03 Mon Sep 17 00:00:00 2001 From: ronancpl Date: Sun, 26 May 2019 15:17:53 -0300 Subject: [PATCH] Normalize credit comments --- docs/feature_list.md | 6 +++--- docs/mychanges_ptbr.txt | 5 ++++- scripts/npc/1012114.js | 2 +- scripts/npc/1032102.js | 2 +- scripts/npc/1061100.js | 2 +- scripts/npc/1090000.js | 2 +- scripts/npc/1092019.js | 2 +- scripts/npc/2040030.js | 2 +- scripts/npc/2042000.js | 2 +- scripts/npc/2042001.js | 2 +- scripts/npc/2042002.js | 2 +- scripts/npc/2100007.js | 2 +- scripts/npc/2110005.js | 2 +- scripts/npc/2131000.js | 2 +- scripts/npc/2131002.js | 2 +- scripts/npc/2132000.js | 2 +- scripts/npc/9201006.js | 2 +- scripts/npc/9201007.js | 2 +- scripts/npc/9201009.js | 2 +- scripts/npc/9201010.js | 2 +- scripts/npc/9201014.js | 2 +- scripts/quest/20408.js | 2 +- scripts/reactor/8098000.js | 2 +- src/client/MapleCharacter.java | 6 +++--- src/client/MapleMount.java | 2 +- src/client/inventory/Equip.java | 2 +- .../manipulator/MapleInventoryManipulator.java | 4 ++-- src/client/processor/FredrickProcessor.java | 2 +- src/constants/EquipSlot.java | 2 +- src/constants/ServerConstants.java | 6 +++--- src/net/mina/MaplePacketDecoder.java | 2 +- src/net/server/channel/handlers/MesoDropHandler.java | 2 +- .../channel/handlers/MobDamageMobFriendlyHandler.java | 2 +- .../channel/handlers/MonsterCarnivalHandler.java | 2 +- .../channel/handlers/PlayerInteractionHandler.java | 2 +- .../server/channel/handlers/RemoteStoreHandler.java | 2 +- src/net/server/channel/handlers/RingActionHandler.java | 4 ++-- .../server/channel/handlers/SummonDamageHandler.java | 2 +- .../server/channel/handlers/UseCashItemHandler.java | 2 +- .../server/channel/handlers/UseGachaExpHandler.java | 4 +++- src/net/server/channel/handlers/UseSolomonHandler.java | 4 +++- src/net/server/channel/handlers/WeddingHandler.java | 2 +- src/net/server/world/World.java | 2 +- src/scripting/npc/NPCConversationManager.java | 2 +- src/server/MapleItemInformationProvider.java | 10 +++++++--- src/server/MapleTrade.java | 2 +- src/server/maps/MapleTVEffect.java | 2 +- src/server/partyquest/MapleCarnivalFactory.java | 2 +- src/server/partyquest/MonsterCarnival.java | 2 +- src/tools/MaplePacketCreator.java | 4 ++-- src/tools/packets/Wedding.java | 4 +++- tools/SpiderDropFetcher/src/dropspider/Main.java | 2 +- 52 files changed, 76 insertions(+), 63 deletions(-) diff --git a/docs/feature_list.md b/docs/feature_list.md index 35b5017b61..2b247a965e 100644 --- a/docs/feature_list.md +++ b/docs/feature_list.md @@ -184,8 +184,8 @@ Server potentials: * Implemented old GMS AP assigning for novices level 10 or below. Usage of the edited localhost is mandatory on this. * Implemented SP capping for players that passed the job upgrade level. After upgrading jobs, the missing SP amount is replenished. * Bypassable PIN/PIC system for players that were already authenticated and are currently loggedin and active. -* Accounts can be created automatically when trying to login on an inexistent account -- credits to shavit. -* Usage of Bcrypt (up-to-date) as the main password hashing algorithm, replacing old SHA's -- credits to shavit. +* Accounts can be created automatically when trying to login on an inexistent account - credits to shavit. +* Usage of Bcrypt (up-to-date) as the main password hashing algorithm, replacing old SHA's - credits to shavit. Custom NPCs: @@ -203,7 +203,7 @@ Server Commands: * Spawn Zakum/Horntail/Pinkbean. * Several new commands. * Rank command highlighting users either by world or server-wide. -* Revamped command files layout -- thanks Arthur L. +* Revamped command files layout - thanks Arthur L. * Optimized Search command, caching search range contents and added map search functionality. External tools: diff --git a/docs/mychanges_ptbr.txt b/docs/mychanges_ptbr.txt index 5a1d1fa2ce..4c5584f724 100644 --- a/docs/mychanges_ptbr.txt +++ b/docs/mychanges_ptbr.txt @@ -1871,4 +1871,7 @@ Implementado convite de Party Search sensível ao mapa onde os jogadores líder Corrigido pets sendo indevidamente removido da DB ao realizar operações de retirada do inventário. 15 Maio 2019, -Revisado, via testes unitários, robustez dos registros/buscas de jogadores e fluidez do sistema de Party Search. \ No newline at end of file +Revisado, via testes unitários, robustez dos registros/buscas de jogadores e fluidez do sistema de Party Search. + +26 Maio 2019, +Normalizado comentários de créditos. \ No newline at end of file diff --git a/scripts/npc/1012114.js b/scripts/npc/1012114.js index f077c3a636..9318bf1b05 100644 --- a/scripts/npc/1012114.js +++ b/scripts/npc/1012114.js @@ -1,7 +1,7 @@ /* Growlie (that fatass uhh.. hungry lion or whatever) - FightDesign @RageZONE + @author FightDesign (RageZONE) @author Ronan */ diff --git a/scripts/npc/1032102.js b/scripts/npc/1032102.js index fc5020fa67..f21adf1da7 100644 --- a/scripts/npc/1032102.js +++ b/scripts/npc/1032102.js @@ -1,5 +1,5 @@ /* - Made by RMZero213 of RaGEZONE forums. + @author RMZero213 (RaGEZONE) Just keep this header here and don't claim that you made it. */ diff --git a/scripts/npc/1061100.js b/scripts/npc/1061100.js index 321aebbaac..fe97b0f069 100644 --- a/scripts/npc/1061100.js +++ b/scripts/npc/1061100.js @@ -25,7 +25,7 @@ -- By --------------------------------------------------------------------------------------------- Unknown -- Version Info ----------------------------------------------------------------------------------- - 1.3 - More Cleanup by Moogra (12/17/09) + 1.3 - More Cleanup by Moogra - 12/17/09 1.2 - Cleanup and Statement fix by Moogra 1.1 - Statement fix [Information] 1.0 - First Version by Unknown diff --git a/scripts/npc/1090000.js b/scripts/npc/1090000.js index 60b573219d..480692d19e 100644 --- a/scripts/npc/1090000.js +++ b/scripts/npc/1090000.js @@ -36,7 +36,7 @@ jobType = 5; var advQuest = 0; function start() { if (cm.isQuestStarted(6330)) { - if (cm.getEventInstance() != null) { // missing script for skill test found thanks to Lost(tm) + if (cm.getEventInstance() != null) { // missing script for skill test found thanks to Lost™ advQuest = 5; // string visibility thanks to iPunchEm & Glvelturall cm.sendNext("Not bad at all. Let's discuss this outside!"); cm.setQuestProgress(6330, 0, 1); diff --git a/scripts/npc/1092019.js b/scripts/npc/1092019.js index f0152d9b94..48e61e6c3a 100644 --- a/scripts/npc/1092019.js +++ b/scripts/npc/1092019.js @@ -59,7 +59,7 @@ function action(mode, type, selection) { else status--; - if (status == 0) { // missing script for skill test found thanks to Lost(tm) + if (status == 0) { // missing script for skill test found thanks to Lost™ if (!cm.isQuestStarted(6400)) { cm.sendOk("Who are you talking to me? If you're just bored, go bother somebody else."); cm.dispose(); diff --git a/scripts/npc/2040030.js b/scripts/npc/2040030.js index 16724ce257..ca362dd3f8 100644 --- a/scripts/npc/2040030.js +++ b/scripts/npc/2040030.js @@ -1,4 +1,4 @@ -/* Author: aaroncsn - MapleSea Like, Need to add creation of minigame +/* Author: aaroncsn NPC Name: Wisp Map(s): Ludibrium: Eos Tower Entrance(220000400) Description: Pet Master diff --git a/scripts/npc/2042000.js b/scripts/npc/2042000.js index e6bf0728c6..010bdd7d89 100644 --- a/scripts/npc/2042000.js +++ b/scripts/npc/2042000.js @@ -2,7 +2,7 @@ -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Drago (MapleStorySA) 2.0 - Second Version by Ronan (HeavenMS) - 3.0 - Third Version by Jayd - translated CPQ contents to English & added Pirate items + 3.0 - Third Version by Jayd - translated CPQ contents to English and added Pirate items Special thanks to 頼晏 (ryantpayton) for also stepping in to translate CPQ scripts. --------------------------------------------------------------------------------------------------- **/ diff --git a/scripts/npc/2042001.js b/scripts/npc/2042001.js index d055d281e2..35c7190b56 100644 --- a/scripts/npc/2042001.js +++ b/scripts/npc/2042001.js @@ -2,7 +2,7 @@ -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Drago (MapleStorySA) 2.0 - Second Version by Ronan (HeavenMS) - 3.0 - Third Version by Jayd - translated CPQ contents to English & added Pirate items + 3.0 - Third Version by Jayd - translated CPQ contents to English and added Pirate items --------------------------------------------------------------------------------------------------- **/ diff --git a/scripts/npc/2042002.js b/scripts/npc/2042002.js index dac501d13b..4a24bb8a19 100644 --- a/scripts/npc/2042002.js +++ b/scripts/npc/2042002.js @@ -2,7 +2,7 @@ -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Drago (MapleStorySA) 2.0 - Second Version by Ronan (HeavenMS) - 3.0 - Third Version by Jayd - translated CPQ contents to English & added Pirate items + 3.0 - Third Version by Jayd - translated CPQ contents to English and added Pirate items --------------------------------------------------------------------------------------------------- **/ diff --git a/scripts/npc/2100007.js b/scripts/npc/2100007.js index 55a32b25c3..e3931f5ec4 100644 --- a/scripts/npc/2100007.js +++ b/scripts/npc/2100007.js @@ -1,4 +1,4 @@ -/* Author: aaroncsn - MapleSea Like, Incomplete, Needs skin id +/* Author: aaroncsn NPC Name: Laila Map(s): The Burning Road: Ariant(2600000000) Description: Skin Care Specialist diff --git a/scripts/npc/2110005.js b/scripts/npc/2110005.js index 5c3c3de363..37aecf9d55 100644 --- a/scripts/npc/2110005.js +++ b/scripts/npc/2110005.js @@ -26,7 +26,7 @@ 1.3 - Actually fixed by Alan (SharpAceX) 1.2 - Fixed and recoded by Moogra 1.1 - Shortened by Moogra - 1.0 - First Version by Maple4U, who actually can't code at all + 1.0 - First Version by Maple4U - who stepped up and coded first version of several Magatia NPCs --------------------------------------------------------------------------------------------------- */ diff --git a/scripts/npc/2131000.js b/scripts/npc/2131000.js index 09beb06a21..5c0180bd25 100644 --- a/scripts/npc/2131000.js +++ b/scripts/npc/2131000.js @@ -1,4 +1,4 @@ -/* Author: aaroncsn - MapleSea Like, Incomplete +/* Author: aaroncsn NPC Name: Athena Pierce Map(s): Altair Camp: Conference Hall(300000010) Description: Unknown diff --git a/scripts/npc/2131002.js b/scripts/npc/2131002.js index 9d32980e37..b6f86ad3b1 100644 --- a/scripts/npc/2131002.js +++ b/scripts/npc/2131002.js @@ -1,4 +1,4 @@ -/* Author: aaroncsn - MapleSea Like, Incomplete +/* Author: aaroncsn NPC Name: Euryth Map(s): Elin Forest:Altair Camp(300000000) Description: Unknown diff --git a/scripts/npc/2132000.js b/scripts/npc/2132000.js index d6a5376d15..e85d945797 100644 --- a/scripts/npc/2132000.js +++ b/scripts/npc/2132000.js @@ -1,4 +1,4 @@ -/* Author: aaroncsn - MapleSea Like, Incomplete +/* Author: aaroncsn NPC Name: Kanderun Map(s): Elin Forest:Entrance to Rocky Mountain(300010400) Description: Unknown diff --git a/scripts/npc/9201006.js b/scripts/npc/9201006.js index 761cc2fa19..93d4b07e5a 100644 --- a/scripts/npc/9201006.js +++ b/scripts/npc/9201006.js @@ -22,7 +22,7 @@ /** Debbie -- By --------------------------------------------------------------------------------------------- - Angel (get31720 ragezone) + Angel (get31720) -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Angel 2.0 - Second Version by happydud3 & XotiCraze diff --git a/scripts/npc/9201007.js b/scripts/npc/9201007.js index 077c98b2b4..63517179a1 100644 --- a/scripts/npc/9201007.js +++ b/scripts/npc/9201007.js @@ -22,7 +22,7 @@ /** Assistant Nancy -- By --------------------------------------------------------------------------------------------- - Angel (get31720 ragezone) + Angel (get31720) -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Angel 2.0 - Second Version by happydud3 & XotiCraze diff --git a/scripts/npc/9201009.js b/scripts/npc/9201009.js index 815aa0ad92..1f46fff691 100644 --- a/scripts/npc/9201009.js +++ b/scripts/npc/9201009.js @@ -22,7 +22,7 @@ /** Assistant Nancy -- By --------------------------------------------------------------------------------------------- - Angel (get31720 ragezone) + Angel (get31720) -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Angel 2.0 - Second Version by happydud3 & XotiCraze diff --git a/scripts/npc/9201010.js b/scripts/npc/9201010.js index 2ba82e7726..f2041d2d3c 100644 --- a/scripts/npc/9201010.js +++ b/scripts/npc/9201010.js @@ -22,7 +22,7 @@ /** Assistant Travis -- By --------------------------------------------------------------------------------------------- - Angel (get31720 ragezone) + Angel (get31720) -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Angel 2.0 - Second Version by happydud3 & XotiCraze diff --git a/scripts/npc/9201014.js b/scripts/npc/9201014.js index 8fd5c1d715..879884b108 100644 --- a/scripts/npc/9201014.js +++ b/scripts/npc/9201014.js @@ -22,7 +22,7 @@ /** Pila Present -- By --------------------------------------------------------------------------------------------- - Angel (get31720 ragezone) + get31720 (RaGEZONE) -- Version Info ----------------------------------------------------------------------------------- 1.0 - First Version by Angel 2.0 - Second Version by happydud3 & XotiCraze diff --git a/scripts/quest/20408.js b/scripts/quest/20408.js index c30be527c4..b788af7791 100644 --- a/scripts/quest/20408.js +++ b/scripts/quest/20408.js @@ -20,7 +20,7 @@ var status = -1; -function start(mode, type, selection) { // missing script for questid found thanks to Lost(tm) +function start(mode, type, selection) { // missing script for questid found thanks to Lost™ if (mode == -1) { qm.dispose(); } else { diff --git a/scripts/reactor/8098000.js b/scripts/reactor/8098000.js index 1e9927cf16..c9c357bb74 100644 --- a/scripts/reactor/8098000.js +++ b/scripts/reactor/8098000.js @@ -21,7 +21,7 @@ */ /* * @author RMZero213 - base - * @author Moogra - fixed, clean up + * @author Moogra - fixed and clean up */ function act() { var map = rm.getPlayer().getMapId(); diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java index 8e134781f5..906d02c5b2 100644 --- a/src/client/MapleCharacter.java +++ b/src/client/MapleCharacter.java @@ -2153,7 +2153,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public static boolean deleteCharFromDB(MapleCharacter player, int senderAccId) { int cid = player.getId(); - if(!Server.getInstance().haveCharacterEntry(senderAccId, cid)) { // thanks zera (EpiphanyMS) for pointing a critical exploit with non-authored character deletion request + if(!Server.getInstance().haveCharacterEntry(senderAccId, cid)) { // thanks zera (EpiphanyMS) for pointing a critical exploit with non-authed character deletion request return false; } @@ -3156,7 +3156,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public boolean canHoldMeso(int gain) { // thanks lucasziron found pointing out a need to check space availability for mesos on player transactions + public boolean canHoldMeso(int gain) { // thanks lucasziron for pointing out a need to check space availability for mesos on player transactions long nextMeso = (long) meso.get() + gain; return nextMeso <= Integer.MAX_VALUE; } @@ -9599,7 +9599,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!mquest.isSameDayRepeatable() && !MapleQuest.isExploitableQuest(questid)) { awardQuestPoint(ServerConstants.QUEST_POINT_PER_QUEST_COMPLETE); } - quest.setCompleted(quest.getCompleted() + 1); // count quest completed Jayd's idea + quest.setCompleted(quest.getCompleted() + 1); // Jayd's idea - count quest completed announce(MaplePacketCreator.completeQuest(questid, quest.getCompletionTime())); } else if (quest.getStatus().equals(MapleQuestStatus.Status.NOT_STARTED)) { diff --git a/src/client/MapleMount.java b/src/client/MapleMount.java index 52f4bd1e3a..41934014c1 100644 --- a/src/client/MapleMount.java +++ b/src/client/MapleMount.java @@ -22,7 +22,7 @@ package client; /** - * @author PurpleMadness Patrick :O + * @author PurpleMadness (Patrick) :O */ public class MapleMount { private int itemid; diff --git a/src/client/inventory/Equip.java b/src/client/inventory/Equip.java index ec5c6941ae..71a600f547 100644 --- a/src/client/inventory/Equip.java +++ b/src/client/inventory/Equip.java @@ -309,7 +309,7 @@ public class Equip extends Item { } private boolean isNotWeaponAffinity(StatUpgrade name) { - // WATK/MATK expected gains lessens outside of weapon affinity (physical/magic): Vcoc's idea + // Vcoc's idea - WATK/MATK expected gains lessens outside of weapon affinity (physical/magic) if (ItemConstants.isWeapon(this.getItemId())) { if (name.equals(StatUpgrade.incPAD)) { diff --git a/src/client/inventory/manipulator/MapleInventoryManipulator.java b/src/client/inventory/manipulator/MapleInventoryManipulator.java index ccc3646161..3427402004 100644 --- a/src/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/client/inventory/manipulator/MapleInventoryManipulator.java @@ -48,7 +48,7 @@ import tools.MaplePacketCreator; /** * * @author Matze - * @author Ronan - improved check space feature & removed redundant object calls + * @author Ronan - improved check space feature and removed redundant object calls */ public class MapleInventoryManipulator { @@ -427,7 +427,7 @@ public class MapleInventoryManipulator { announceModifyInventory(c, item, fromDrop, allowZero); } else { int petid = item.getPetId(); - if (petid > -1) { // thanks Vcoc for finding a d/c issue with equipped pets & pets remaining on DB here + if (petid > -1) { // thanks Vcoc for finding a d/c issue with equipped pets and pets remaining on DB here int petIdx = chr.getPetIndex(petid); if(petIdx > -1) { MaplePet pet = chr.getPet(petIdx); diff --git a/src/client/processor/FredrickProcessor.java b/src/client/processor/FredrickProcessor.java index 429000e075..7c86a44a3e 100644 --- a/src/client/processor/FredrickProcessor.java +++ b/src/client/processor/FredrickProcessor.java @@ -50,7 +50,7 @@ import tools.Pair; /** * - * @author RonanLana - synchronization of Fredrick modules & operation results + * @author RonanLana - synchronization of Fredrick modules and operation results */ public class FredrickProcessor { diff --git a/src/constants/EquipSlot.java b/src/constants/EquipSlot.java index e1fb37c835..178759d1d3 100644 --- a/src/constants/EquipSlot.java +++ b/src/constants/EquipSlot.java @@ -2,7 +2,7 @@ package constants; /** * - * @author The Spookster + * @author The Spookster (The Real Spookster) */ public enum EquipSlot { diff --git a/src/constants/ServerConstants.java b/src/constants/ServerConstants.java index 1d6cb3ae55..2092456d12 100644 --- a/src/constants/ServerConstants.java +++ b/src/constants/ServerConstants.java @@ -104,7 +104,7 @@ public class ServerConstants { public static final boolean USE_ERASE_UNTRADEABLE_DROP = true; //Forces flagged untradeable items to disappear when dropped. public static final boolean USE_ERASE_PET_ON_EXPIRATION = false;//Forces pets to be removed from inventory when expire time comes, rather than converting it to a doll. public static final boolean USE_BUFF_MOST_SIGNIFICANT = true; //When applying buffs, the player will stick with the highest stat boost among the listed, rather than overwriting stats. - public static final boolean USE_BUFF_EVERLASTING = false; //Every applied buff on players holds expiration time so high it'd be considered permanent. Suggestion thanks to Vcoc. + public static final boolean USE_BUFF_EVERLASTING = false; //Every applied buff on players holds expiration time so high it'd be considered permanent. Thanks Vcoc for this suggestion. public static final boolean USE_MULTIPLE_SAME_EQUIP_DROP = true;//Enables multiple drops by mobs of the same equipment, number of possible drops based on the quantities provided at the drop data. public static final boolean USE_BANISHABLE_TOWN_SCROLL = true; //Enables town scrolls to act as if it's a "player banish", rendering the antibanish scroll effect available. public static final boolean USE_ENABLE_FULL_RESPAWN = true; //At respawn task, always respawn missing mobs when they're available. Spawn count doesn't depend on how many players are currently there. @@ -202,9 +202,9 @@ public class ServerConstants { public static final boolean USE_ULTRA_THREE_SNAILS = true; //Massive damage on shell toss. //Other Skills Configuration - public static final boolean USE_FULL_ARAN_SKILLSET = false; //Enables starter availability to all Aran job skills. Suggestion thanks to Masterrulax. + public static final boolean USE_FULL_ARAN_SKILLSET = false; //Enables starter availability to all Aran job skills. Thanks Masterrulax for this suggestion. 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. Suggestion thanks to Celestial. + public static final boolean USE_ANTI_IMMUNITY_CRASH = true; //Crash skills additionally removes the mob's invincibility buffs. Thanks Celestial for this suggestion. public static final boolean USE_UNDISPEL_HOLY_SHIELD = true;//Holy shield buff also prevents players from suffering dispel from mobs. //Character Configuration diff --git a/src/net/mina/MaplePacketDecoder.java b/src/net/mina/MaplePacketDecoder.java index 0acffa2881..782406ba62 100644 --- a/src/net/mina/MaplePacketDecoder.java +++ b/src/net/mina/MaplePacketDecoder.java @@ -75,7 +75,7 @@ public class MaplePacketDecoder extends CumulativeProtocolDecoder { rcvdCrypto.crypt(decryptedPacket); MapleCustomEncryption.decryptData(decryptedPacket); out.write(decryptedPacket); - if (ServerConstants.USE_DEBUG_SHOW_PACKET){ // packet traffic log: Atoot's idea, applied using auto-identation thanks to lrenex + if (ServerConstants.USE_DEBUG_SHOW_PACKET){ // Atoot's idea: packet traffic log, applied using auto-identation thanks to lrenex int packetLen = decryptedPacket.length; int pHeader = readFirstShort(decryptedPacket); String pHeaderStr = Integer.toHexString(pHeader).toUpperCase(); diff --git a/src/net/server/channel/handlers/MesoDropHandler.java b/src/net/server/channel/handlers/MesoDropHandler.java index a7c5bfed43..e401d00582 100644 --- a/src/net/server/channel/handlers/MesoDropHandler.java +++ b/src/net/server/channel/handlers/MesoDropHandler.java @@ -43,7 +43,7 @@ public final class MesoDropHandler extends AbstractMaplePacketHandler { slea.skip(4); int meso = slea.readInt(); - if (c.tryacquireClient()) { // thanks imbee for noticing players not being able to throw mesos too fast, dampening gameplay of some classes + if (c.tryacquireClient()) { // thanks imbee for noticing players not being able to throw mesos too fast try { if (meso <= player.getMeso() && meso > 9 && meso < 50001) { player.gainMeso(-meso, false, true, false); diff --git a/src/net/server/channel/handlers/MobDamageMobFriendlyHandler.java b/src/net/server/channel/handlers/MobDamageMobFriendlyHandler.java index 672c2496f9..2ef5516842 100644 --- a/src/net/server/channel/handlers/MobDamageMobFriendlyHandler.java +++ b/src/net/server/channel/handlers/MobDamageMobFriendlyHandler.java @@ -31,7 +31,7 @@ import client.MapleClient; /** * - * @author Xotic & BubblesDev + * @author Xotic (XoticStory) & BubblesDev */ public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandler { diff --git a/src/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/net/server/channel/handlers/MonsterCarnivalHandler.java index 9c5aaace66..9b723af165 100644 --- a/src/net/server/channel/handlers/MonsterCarnivalHandler.java +++ b/src/net/server/channel/handlers/MonsterCarnivalHandler.java @@ -40,7 +40,7 @@ import tools.data.input.SeekableLittleEndianAccessor; /** - *@author Drago/Dragohe4rt + *@author Drago (Dragohe4rt) */ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler { diff --git a/src/net/server/channel/handlers/PlayerInteractionHandler.java b/src/net/server/channel/handlers/PlayerInteractionHandler.java index cc0d4c9ba3..cb86025992 100644 --- a/src/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/net/server/channel/handlers/PlayerInteractionHandler.java @@ -53,7 +53,7 @@ import java.sql.SQLException; /** * * @author Matze - * @author Ronan - concurrency safety & reviewed minigames + * @author Ronan - concurrency safety and reviewed minigames */ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler { public enum Action { diff --git a/src/net/server/channel/handlers/RemoteStoreHandler.java b/src/net/server/channel/handlers/RemoteStoreHandler.java index 2c74a687ce..0a24fe84d7 100644 --- a/src/net/server/channel/handlers/RemoteStoreHandler.java +++ b/src/net/server/channel/handlers/RemoteStoreHandler.java @@ -31,7 +31,7 @@ import tools.data.input.SeekableLittleEndianAccessor; /** * - * @author kevintjuh93 :3 + * @author kevintjuh93 - :3 */ public class RemoteStoreHandler extends AbstractMaplePacketHandler { @Override diff --git a/src/net/server/channel/handlers/RingActionHandler.java b/src/net/server/channel/handlers/RingActionHandler.java index 36e632c1cb..dc7676c39a 100644 --- a/src/net/server/channel/handlers/RingActionHandler.java +++ b/src/net/server/channel/handlers/RingActionHandler.java @@ -48,7 +48,7 @@ import tools.packets.Wedding; /** * @author Jvlaple * @author Ronan - major overhaul on Ring handling mechanics - * @author Drago/Dragohe4rt - on Wishlist + * @author Drago (Dragohe4rt) - on Wishlist */ public final class RingActionHandler extends AbstractMaplePacketHandler { private static int getBoxId(int useItemId) { @@ -466,7 +466,7 @@ public final class RingActionHandler extends AbstractMaplePacketHandler { case 9: try { - // By Drago/Dragohe4rt + // By -- Drago (Dragohe4rt) // Groom and Bride's Wishlist MapleCharacter player = c.getPlayer(); diff --git a/src/net/server/channel/handlers/SummonDamageHandler.java b/src/net/server/channel/handlers/SummonDamageHandler.java index 5604eee16a..ef67108f08 100644 --- a/src/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/net/server/channel/handlers/SummonDamageHandler.java @@ -76,7 +76,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { List allDamage = new ArrayList<>(); byte direction = slea.readByte(); int numAttacked = slea.readByte(); - slea.skip(8); //Thanks Gerald :D, I failed lol (mob x,y and summon x,y) + slea.skip(8); // I failed lol (mob x,y and summon x,y), Thanks Gerald for (int x = 0; x < numAttacked; x++) { int monsterOid = slea.readInt(); // attacked oid slea.skip(18); diff --git a/src/net/server/channel/handlers/UseCashItemHandler.java b/src/net/server/channel/handlers/UseCashItemHandler.java index 929637f2da..11e8a63ca8 100644 --- a/src/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/net/server/channel/handlers/UseCashItemHandler.java @@ -317,7 +317,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler { break; } remove(c, position, itemId); - } else if (itemType == 508) { // graduation banner, thanks to tmskdl12. Also, thanks ratency for first pointing lack of Kite handling + } else if (itemType == 508) { // thanks tmskdl12 for graduation banner; thanks ratency for first pointing lack of Kite handling MapleKite kite = new MapleKite(player, slea.readMapleAsciiString(), itemId); if (!GameConstants.isFreeMarketRoom(player.getMapId())) { diff --git a/src/net/server/channel/handlers/UseGachaExpHandler.java b/src/net/server/channel/handlers/UseGachaExpHandler.java index 514539d67e..61b8c27bf5 100644 --- a/src/net/server/channel/handlers/UseGachaExpHandler.java +++ b/src/net/server/channel/handlers/UseGachaExpHandler.java @@ -30,7 +30,9 @@ import tools.data.input.SeekableLittleEndianAccessor; /** * - * @author kevintjuh93; modified by Ronan + * @author kevintjuh93 + * + * Modified by -- Ronan - concurrency protection */ public class UseGachaExpHandler extends AbstractMaplePacketHandler { diff --git a/src/net/server/channel/handlers/UseSolomonHandler.java b/src/net/server/channel/handlers/UseSolomonHandler.java index 68a89f3d11..972e7dc69a 100644 --- a/src/net/server/channel/handlers/UseSolomonHandler.java +++ b/src/net/server/channel/handlers/UseSolomonHandler.java @@ -34,7 +34,9 @@ import tools.data.input.SeekableLittleEndianAccessor; /** * - * @author XoticStory; modified by kevintjuh93, Ronan + * @author XoticStory + * + * Modified by -- kevintjuh93, Ronan */ public final class UseSolomonHandler extends AbstractMaplePacketHandler { diff --git a/src/net/server/channel/handlers/WeddingHandler.java b/src/net/server/channel/handlers/WeddingHandler.java index 1dae1aa6e6..c0526d614c 100644 --- a/src/net/server/channel/handlers/WeddingHandler.java +++ b/src/net/server/channel/handlers/WeddingHandler.java @@ -26,7 +26,7 @@ import java.util.List; /** * - * @author By Drago/Dragohe4rt + * @author Drago (Dragohe4rt) */ public final class WeddingHandler extends AbstractMaplePacketHandler { diff --git a/src/net/server/world/World.java b/src/net/server/world/World.java index db516bca89..28881d22f4 100644 --- a/src/net/server/world/World.java +++ b/src/net/server/world/World.java @@ -100,7 +100,7 @@ import net.server.coordinator.MaplePartySearchCoordinator; /** * * @author kevintjuh93 - * @author Ronan - thread-oriented world schedules, guild queue, marriages & party chars + * @author Ronan - thread-oriented (world schedules + guild queue + marriages + party chars) */ public class World { diff --git a/src/scripting/npc/NPCConversationManager.java b/src/scripting/npc/NPCConversationManager.java index b8c1dedeef..f341b4b77c 100644 --- a/src/scripting/npc/NPCConversationManager.java +++ b/src/scripting/npc/NPCConversationManager.java @@ -622,7 +622,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { return sbe != SkillBookEntry.UNAVAILABLE ? " Obtainable through #rquestline#k." : ""; } - // By Drago/Dragohe4rt CPQ + WED + // (CPQ + WED wishlist) by -- Drago (Dragohe4rt) public int cpqCalcAvgLvl(int map) { int num = 0; int avg = 0; diff --git a/src/server/MapleItemInformationProvider.java b/src/server/MapleItemInformationProvider.java index 8758e6797e..af56453398 100644 --- a/src/server/MapleItemInformationProvider.java +++ b/src/server/MapleItemInformationProvider.java @@ -910,10 +910,14 @@ public class MapleItemInformationProvider { } } } - + + /* + Issue with clean slate found thanks to Masterrulax + Vicious added in the clean slate check thanks to Crypter (CrypterDEV) + */ public boolean canUseCleanSlate(Equip nEquip) { Map eqstats = this.getEquipStats(nEquip.getItemId()); - return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquip.getVicious()); // issue with clean slate found thanks to Masterrulax, vicious added in the check thanks to Crypter (CrypterDEV) + return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquip.getVicious()); } public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) { @@ -1522,7 +1526,7 @@ public class MapleItemInformationProvider { } } - public Pair> getItemReward(int itemId) {//Thanks Celino, used some stuffs :) + public Pair> getItemReward(int itemId) {//Thanks Celino - used some stuffs :) if (rewardCache.containsKey(itemId)) { return rewardCache.get(itemId); } diff --git a/src/server/MapleTrade.java b/src/server/MapleTrade.java index bba71f378e..911cb0caec 100644 --- a/src/server/MapleTrade.java +++ b/src/server/MapleTrade.java @@ -44,7 +44,7 @@ import tools.Pair; /** * * @author Matze - * @author Ronan - concurrency safety & check available slots & trade results + * @author Ronan - concurrency safety + check available slots + trade results */ public class MapleTrade { diff --git a/src/server/maps/MapleTVEffect.java b/src/server/maps/MapleTVEffect.java index 3e87d53c5e..6198dd6e26 100644 --- a/src/server/maps/MapleTVEffect.java +++ b/src/server/maps/MapleTVEffect.java @@ -29,7 +29,7 @@ import tools.MaplePacketCreator; /* * MapleTVEffect - * @author MrXotic + * @author MrXotic (XoticStory) * @author Ronan - made MapleTV mechanics synchronous */ public class MapleTVEffect { diff --git a/src/server/partyquest/MapleCarnivalFactory.java b/src/server/partyquest/MapleCarnivalFactory.java index 7f006f1714..1ee329aae3 100644 --- a/src/server/partyquest/MapleCarnivalFactory.java +++ b/src/server/partyquest/MapleCarnivalFactory.java @@ -14,7 +14,7 @@ import provider.MapleDataTool; import server.life.MobSkill; /** - *@author Drago/Dragohe4rt + *@author Drago (Dragohe4rt) */ public class MapleCarnivalFactory { diff --git a/src/server/partyquest/MonsterCarnival.java b/src/server/partyquest/MonsterCarnival.java index 19ecefd217..3363fcea8f 100644 --- a/src/server/partyquest/MonsterCarnival.java +++ b/src/server/partyquest/MonsterCarnival.java @@ -14,7 +14,7 @@ import server.maps.MapleReactor; import tools.MaplePacketCreator; /** - * @author Drago/Dragohe4rt + * @author Drago (Dragohe4rt) */ public class MonsterCarnival { diff --git a/src/tools/MaplePacketCreator.java b/src/tools/MaplePacketCreator.java index a04f087288..4e4d9f56eb 100644 --- a/src/tools/MaplePacketCreator.java +++ b/src/tools/MaplePacketCreator.java @@ -2205,7 +2205,7 @@ public class MaplePacketCreator { mplew.write(game.getGameType().getValue()); mplew.writeInt(game.getObjectId()); // gameid/shopid mplew.writeMapleAsciiString(game.getDescription()); // desc - mplew.writeBool(!game.getPassword().isEmpty()); // password here, thanks GabrielSin! + mplew.writeBool(!game.getPassword().isEmpty()); // password here, thanks GabrielSin mplew.write(game.getPieceType()); mplew.write(ammount); mplew.write(2); //player capacity @@ -2219,7 +2219,7 @@ public class MaplePacketCreator { mplew.writeInt(hm.getObjectId()); mplew.writeMapleAsciiString(hm.getDescription()); mplew.write(hm.getItemId() % 100); - mplew.write(roomInfo); // visitor capacity here, thanks GabrielSin! + mplew.write(roomInfo); // visitor capacity here, thanks GabrielSin } public static byte[] updateHiredMerchantBox(MapleHiredMerchant hm) { diff --git a/src/tools/packets/Wedding.java b/src/tools/packets/Wedding.java index 437892b2d1..9374bb5c71 100644 --- a/src/tools/packets/Wedding.java +++ b/src/tools/packets/Wedding.java @@ -17,7 +17,9 @@ import tools.data.output.MaplePacketLittleEndianWriter; /** * CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs. * - * @author Eric edited by Drago/Dragohe4rt on Wishlist + * @author Eric + * + * Edited wishlists by -- Drago (Dragohe4rt) */ public class Wedding extends MaplePacketCreator { private static final short MARRIAGE_REQUEST = 0x48; diff --git a/tools/SpiderDropFetcher/src/dropspider/Main.java b/tools/SpiderDropFetcher/src/dropspider/Main.java index 1d0ae2dfa6..0476000c3c 100644 --- a/tools/SpiderDropFetcher/src/dropspider/Main.java +++ b/tools/SpiderDropFetcher/src/dropspider/Main.java @@ -226,7 +226,7 @@ public class Main { ArrayList item_ids = DataTool.itemIdsFromName(item_name); if(scroll && item_ids.isEmpty()) { - // Try adding on the % again. Thanks nexon... + // Try adding on the % again. Ty nexon... if(scrollType == 0) item_name += " 100%"; if(scrollType == 1) item_name += " 60%"; if(scrollType == 2) item_name += " 10%";