Normalize credit comments
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -1872,3 +1872,6 @@ Corrigido pets sendo indevidamente removido da DB ao realizar operações de ret
|
||||
|
||||
15 Maio 2019,
|
||||
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.
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
Growlie (that fatass uhh.. hungry lion or whatever)
|
||||
FightDesign @RageZONE
|
||||
|
||||
@author FightDesign (RageZONE)
|
||||
@author Ronan
|
||||
*/
|
||||
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Author: aaroncsn - MapleSea Like, Need to add creation of minigame
|
||||
/* Author: aaroncsn <MapleSea Like, Need to add creation of minigame>
|
||||
NPC Name: Wisp
|
||||
Map(s): Ludibrium: Eos Tower Entrance(220000400)
|
||||
Description: Pet Master
|
||||
|
||||
@@ -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.
|
||||
---------------------------------------------------------------------------------------------------
|
||||
**/
|
||||
|
||||
@@ -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
|
||||
---------------------------------------------------------------------------------------------------
|
||||
**/
|
||||
|
||||
|
||||
@@ -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
|
||||
---------------------------------------------------------------------------------------------------
|
||||
**/
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Author: aaroncsn - MapleSea Like, Incomplete, Needs skin id
|
||||
/* Author: aaroncsn <MapleSea Like, Incomplete, Needs skin id>
|
||||
NPC Name: Laila
|
||||
Map(s): The Burning Road: Ariant(2600000000)
|
||||
Description: Skin Care Specialist
|
||||
|
||||
@@ -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
|
||||
---------------------------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Author: aaroncsn - MapleSea Like, Incomplete
|
||||
/* Author: aaroncsn <MapleSea Like, Incomplete>
|
||||
NPC Name: Athena Pierce
|
||||
Map(s): Altair Camp: Conference Hall(300000010)
|
||||
Description: Unknown
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Author: aaroncsn - MapleSea Like, Incomplete
|
||||
/* Author: aaroncsn <MapleSea Like, Incomplete>
|
||||
NPC Name: Euryth
|
||||
Map(s): Elin Forest:Altair Camp(300000000)
|
||||
Description: Unknown
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Author: aaroncsn - MapleSea Like, Incomplete
|
||||
/* Author: aaroncsn <MapleSea Like, Incomplete>
|
||||
NPC Name: Kanderun
|
||||
Map(s): Elin Forest:Entrance to Rocky Mountain(300010400)
|
||||
Description: Unknown
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
package client;
|
||||
|
||||
/**
|
||||
* @author PurpleMadness Patrick :O
|
||||
* @author PurpleMadness (Patrick) :O
|
||||
*/
|
||||
public class MapleMount {
|
||||
private int itemid;
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package constants;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author The Spookster
|
||||
* @author The Spookster (The Real Spookster)
|
||||
*/
|
||||
public enum EquipSlot {
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -31,7 +31,7 @@ import client.MapleClient;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Xotic & BubblesDev
|
||||
* @author Xotic (XoticStory) & BubblesDev
|
||||
*/
|
||||
|
||||
public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandler {
|
||||
|
||||
@@ -40,7 +40,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
|
||||
|
||||
|
||||
/**
|
||||
*@author Drago/Dragohe4rt
|
||||
*@author Drago (Dragohe4rt)
|
||||
*/
|
||||
|
||||
public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -31,7 +31,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author kevintjuh93 :3
|
||||
* @author kevintjuh93 - :3
|
||||
*/
|
||||
public class RemoteStoreHandler extends AbstractMaplePacketHandler {
|
||||
@Override
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -76,7 +76,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
|
||||
List<SummonAttackEntry> 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);
|
||||
|
||||
@@ -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())) {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author By Drago/Dragohe4rt
|
||||
* @author Drago (Dragohe4rt)
|
||||
*/
|
||||
public final class WeddingHandler extends AbstractMaplePacketHandler {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -911,9 +911,13 @@ 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<String, Integer> 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<Integer, List<RewardItem>> getItemReward(int itemId) {//Thanks Celino, used some stuffs :)
|
||||
public Pair<Integer, List<RewardItem>> getItemReward(int itemId) {//Thanks Celino - used some stuffs :)
|
||||
if (rewardCache.containsKey(itemId)) {
|
||||
return rewardCache.get(itemId);
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import tools.MaplePacketCreator;
|
||||
|
||||
/*
|
||||
* MapleTVEffect
|
||||
* @author MrXotic
|
||||
* @author MrXotic (XoticStory)
|
||||
* @author Ronan - made MapleTV mechanics synchronous
|
||||
*/
|
||||
public class MapleTVEffect {
|
||||
|
||||
@@ -14,7 +14,7 @@ import provider.MapleDataTool;
|
||||
import server.life.MobSkill;
|
||||
|
||||
/**
|
||||
*@author Drago/Dragohe4rt
|
||||
*@author Drago (Dragohe4rt)
|
||||
*/
|
||||
public class MapleCarnivalFactory {
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ import server.maps.MapleReactor;
|
||||
import tools.MaplePacketCreator;
|
||||
|
||||
/**
|
||||
* @author Drago/Dragohe4rt
|
||||
* @author Drago (Dragohe4rt)
|
||||
*/
|
||||
public class MonsterCarnival {
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -226,7 +226,7 @@ public class Main {
|
||||
ArrayList<Integer> 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%";
|
||||
|
||||
Reference in New Issue
Block a user