summaryrefslogtreecommitdiff
path: root/src/map/atcommand.c
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-17 00:17:15 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-17 00:17:15 +0000
commit069d63bc755e5a9335946eb70ba610956c307386 (patch)
treefee4369a71d481a44244289cd8c2e5d36eaad86b /src/map/atcommand.c
parent1e3c956244764b331c8bf1fd89ada37eb4d505da (diff)
downloadhercules-069d63bc755e5a9335946eb70ba610956c307386.tar.gz
hercules-069d63bc755e5a9335946eb70ba610956c307386.tar.bz2
hercules-069d63bc755e5a9335946eb70ba610956c307386.tar.xz
hercules-069d63bc755e5a9335946eb70ba610956c307386.zip
Massive at+charcommand cleanup, big thanks to HiddenDragon
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10272 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
-rw-r--r--src/map/atcommand.c2425
1 files changed, 894 insertions, 1531 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 3f2c8ffea..b6fe0e20c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -64,7 +64,6 @@ ACMD_FUNC(whozeny); // [Valaris]
ACMD_FUNC(save);
ACMD_FUNC(load);
ACMD_FUNC(speed);
-ACMD_FUNC(charspeed);
ACMD_FUNC(storage);
ACMD_FUNC(guildstorage);
ACMD_FUNC(option);
@@ -99,7 +98,7 @@ ACMD_FUNC(refine);
ACMD_FUNC(produce);
ACMD_FUNC(memo);
ACMD_FUNC(gat);
-ACMD_FUNC(packet);
+ACMD_FUNC(displaystatus);
ACMD_FUNC(statuspoint);
ACMD_FUNC(skillpoint);
ACMD_FUNC(zeny);
@@ -112,7 +111,6 @@ ACMD_FUNC(pethungry);
ACMD_FUNC(petrename);
ACMD_FUNC(recall);
ACMD_FUNC(recallall);
-ACMD_FUNC(revive);
ACMD_FUNC(night);
ACMD_FUNC(day);
ACMD_FUNC(doom);
@@ -151,7 +149,6 @@ ACMD_FUNC(char_ban); // by Yor
ACMD_FUNC(char_unblock); // by Yor
ACMD_FUNC(char_unban); // by Yor
ACMD_FUNC(mount_peco); // by Valaris
-ACMD_FUNC(char_mount_peco); // by Yor
ACMD_FUNC(guildspy); // [Syrus22]
ACMD_FUNC(partyspy); // [Syrus22]
ACMD_FUNC(repairall); // [Valaris]
@@ -163,19 +160,14 @@ ACMD_FUNC(hidenpc);
ACMD_FUNC(loadnpc);
ACMD_FUNC(unloadnpc);
ACMD_FUNC(servertime); // by Yor
-ACMD_FUNC(chardelitem); // by Yor
ACMD_FUNC(jail); // by Yor
ACMD_FUNC(unjail); // by Yor
ACMD_FUNC(jailfor); // Alias Meruru
ACMD_FUNC(jailtime); // Coltaro
-ACMD_FUNC(charjailtime); // Coltaro
ACMD_FUNC(disguise); // [Valaris]
ACMD_FUNC(undisguise); // by Yor
-ACMD_FUNC(chardisguise); // Kalaspuff
-ACMD_FUNC(charundisguise); // Kalaspuff
ACMD_FUNC(email); // by Yor
ACMD_FUNC(effect);//by Apple
-ACMD_FUNC(character_cart_list); // by Yor
ACMD_FUNC(addwarp); // by MouseJstr
ACMD_FUNC(follow); // by MouseJstr
ACMD_FUNC(skillon); // by MouseJstr
@@ -183,14 +175,11 @@ ACMD_FUNC(skilloff); // by MouseJstr
ACMD_FUNC(killer); // by MouseJstr
ACMD_FUNC(npcmove); // by MouseJstr
ACMD_FUNC(killable); // by MouseJstr
-ACMD_FUNC(charkillable); // by MouseJstr
ACMD_FUNC(dropall); // by MouseJstr
-ACMD_FUNC(chardropall); // by MouseJstr
ACMD_FUNC(storeall); // by MouseJstr
-ACMD_FUNC(charstoreall); // by MouseJstr
ACMD_FUNC(skillid); // by MouseJstr
ACMD_FUNC(useskill); // by MouseJstr
-ACMD_FUNC(displayskill); // by MouseJstr
+ACMD_FUNC(displayskill); //[Skotlex]
ACMD_FUNC(summon);
ACMD_FUNC(rain);
ACMD_FUNC(snow);
@@ -222,43 +211,14 @@ ACMD_FUNC(pettalk);
ACMD_FUNC(users);
ACMD_FUNC(reset);
ACMD_FUNC(autoloot); // Improved version imported from Freya.
-
-#ifndef TXT_ONLY
-ACMD_FUNC(checkmail); // [Valaris]
-ACMD_FUNC(listmail); // [Valaris]
-ACMD_FUNC(listnewmail); // [Valaris]
-ACMD_FUNC(readmail); // [Valaris]
-ACMD_FUNC(sendmail); // [Valaris]
-ACMD_FUNC(sendprioritymail); // [Valaris]
-ACMD_FUNC(deletemail); // [Valaris]
-ACMD_FUNC(refreshonline); // [Valaris]
-#endif /* TXT_ONLY */
-
ACMD_FUNC(skilltree); // by MouseJstr
-
ACMD_FUNC(marry); // by MouseJstr
ACMD_FUNC(divorce); // by MouseJstr
-
-ACMD_FUNC(grind); // by MouseJstr
-ACMD_FUNC(grind2); // by MouseJstr
-
-#ifdef DMALLOC
-ACMD_FUNC(dmstart); // by MouseJstr
-ACMD_FUNC(dmtick); // by MouseJstr
-#endif
-
-ACMD_FUNC(jumptoid); // by Dino9021
ACMD_FUNC(jumptoid2); // by Dino9021
-ACMD_FUNC(recallid); // by Dino9021
ACMD_FUNC(recallid2); // by Dino9021
-ACMD_FUNC(kickid); // by Dino9021
ACMD_FUNC(kickid2); // by Dino9021
-ACMD_FUNC(reviveid); // by Dino9021
ACMD_FUNC(reviveid2); // by Dino9021
-ACMD_FUNC(killid); // by Dino9021
ACMD_FUNC(killid2); // by Dino9021
-ACMD_FUNC(charkillableid); // by Dino9021
-ACMD_FUNC(charkillableid2); // by Dino9021
ACMD_FUNC(sound);
ACMD_FUNC(undisguiseall);
ACMD_FUNC(disguiseall);
@@ -266,12 +226,9 @@ ACMD_FUNC(changelook);
ACMD_FUNC(mobinfo); //by Lupus
ACMD_FUNC(exp); // by Skotlex
ACMD_FUNC(adopt); // by Veider
-
ACMD_FUNC(version); // by Ancyker
-
ACMD_FUNC(mutearea); // by MouseJstr
ACMD_FUNC(rates); // by MouseJstr
-
ACMD_FUNC(iteminfo); // Lupus
ACMD_FUNC(whodrops); //Skotlex
ACMD_FUNC(mapflag); // Lupus
@@ -286,23 +243,19 @@ ACMD_FUNC(autotrade);// durf
ACMD_FUNC(changeleader);// [Skotlex]
ACMD_FUNC(partyoption);// [Skotlex]
ACMD_FUNC(changegm);// durf
-
// Duel [LuzZza]
ACMD_FUNC(invite);
ACMD_FUNC(duel);
ACMD_FUNC(leave);
ACMD_FUNC(accept);
ACMD_FUNC(reject);
-
ACMD_FUNC(away); // LuzZza
ACMD_FUNC(main); // LuzZza
-
ACMD_FUNC(clone); // [Valaris]
ACMD_FUNC(tonpc); // LuzZza
ACMD_FUNC(commands); // [Skotlex]
ACMD_FUNC(noask); //LuzZza
ACMD_FUNC(request); //[Skotlex]
-
ACMD_FUNC(homlevel); //[orn]
ACMD_FUNC(homevolution); //[orn]
ACMD_FUNC(makehomun); //[orn]
@@ -313,6 +266,21 @@ ACMD_FUNC(hominfo); //[Toms]
ACMD_FUNC(homstats); //[Skotlex]
ACMD_FUNC(homshuffle); //[Skotlex]
ACMD_FUNC(showmobs); //KarLaeda
+ACMD_FUNC(feelreset); //[HiddenDragon]
+#ifndef TXT_ONLY
+ACMD_FUNC(checkmail); // [Valaris]
+ACMD_FUNC(listmail); // [Valaris]
+ACMD_FUNC(listnewmail); // [Valaris]
+ACMD_FUNC(readmail); // [Valaris]
+ACMD_FUNC(sendmail); // [Valaris]
+ACMD_FUNC(sendprioritymail); // [Valaris]
+ACMD_FUNC(deletemail); // [Valaris]
+ACMD_FUNC(refreshonline); // [Valaris]
+#endif
+#ifdef DMALLOC
+ACMD_FUNC(dmstart); // by MouseJstr
+ACMD_FUNC(dmtick); // by MouseJstr
+#endif
/*==========================================
*AtCommandInfo atcommand_info[] structure definition
@@ -322,327 +290,302 @@ ACMD_FUNC(showmobs); //KarLaeda
// First char of commands is configured in atcommand_athena.conf. Leave @ in this list for default value.
// to set default level, read atcommand_athena.conf first please.
static AtCommandInfo atcommand_info[] = {
- { AtCommand_Rura, "@rura", 40, atcommand_rura },
- { AtCommand_Warp, "@warp", 40, atcommand_rura },
- { AtCommand_MapMove, "@mapmove", 40, atcommand_rura }, // /mm command
- { AtCommand_Where, "@where", 1, atcommand_where },
- { AtCommand_JumpTo, "@jumpto", 20, atcommand_jumpto }, // + /shift
- { AtCommand_JumpTo, "@warpto", 20, atcommand_jumpto },
- { AtCommand_JumpTo, "@goto", 20, atcommand_jumpto },
- { AtCommand_Jump, "@jump", 40, atcommand_jump },
- { AtCommand_Who, "@who", 20, atcommand_who },
- { AtCommand_Who, "@whois", 20, atcommand_who },
- { AtCommand_Who2, "@who2", 20, atcommand_who2 },
- { AtCommand_Who3, "@who3", 20, atcommand_who3 },
- { AtCommand_WhoMap, "@whomap", 20, atcommand_whomap },
- { AtCommand_WhoMap2, "@whomap2", 20, atcommand_whomap2 },
- { AtCommand_WhoMap3, "@whomap3", 20, atcommand_whomap3 },
- { AtCommand_WhoGM, "@whogm", 20, atcommand_whogm }, // by Yor
- { AtCommand_Save, "@save", 40, atcommand_save },
- { AtCommand_Load, "@return", 40, atcommand_load },
- { AtCommand_Load, "@load", 40, atcommand_load },
- { AtCommand_Speed, "@speed", 40, atcommand_speed },
- { AtCommand_CharSpeed, "@charspeed", 40, atcommand_charspeed },
- { AtCommand_Storage, "@storage", 1, atcommand_storage },
- { AtCommand_GuildStorage, "@gstorage", 50, atcommand_guildstorage },
- { AtCommand_Option, "@option", 40, atcommand_option },
- { AtCommand_Hide, "@hide", 40, atcommand_hide }, // + /hide
- { AtCommand_JobChange, "@jobchange", 40, atcommand_jobchange },
- { AtCommand_JobChange, "@job", 40, atcommand_jobchange },
- { AtCommand_Die, "@die", 1, atcommand_die },
- { AtCommand_Kill, "@kill", 60, atcommand_kill },
- { AtCommand_Alive, "@alive", 60, atcommand_alive },
- { AtCommand_Kami, "@kami", 40, atcommand_kami },
- { AtCommand_KamiB, "@kamib", 40, atcommand_kami },
- { AtCommand_KamiC, "@kamic", 40, atcommand_kami }, //[LuzZza]
- { AtCommand_Heal, "@heal", 40, atcommand_heal },
- { AtCommand_Item, "@item", 60, atcommand_item },
- { AtCommand_Item2, "@item2", 60, atcommand_item2 },
- { AtCommand_ItemReset, "@itemreset", 40, atcommand_itemreset },
- { AtCommand_BaseLevelUp, "@lvup", 60, atcommand_baselevelup },
- { AtCommand_BaseLevelUp, "@blevel", 60, atcommand_baselevelup },
- { AtCommand_BaseLevelUp, "@baselvlup", 60, atcommand_baselevelup },
- { AtCommand_JobLevelUp, "@jlevel", 60, atcommand_joblevelup },
- { AtCommand_JobLevelUp, "@joblvup", 60, atcommand_joblevelup },
- { AtCommand_JobLevelUp, "@joblvlup", 60, atcommand_joblevelup },
- { AtCommand_H, "@h", 20, atcommand_help },
- { AtCommand_Help, "@help", 20, atcommand_help },
- { AtCommand_H2, "@h2", 20, atcommand_help2 },
- { AtCommand_Help2, "@help2", 20, atcommand_help2 },
- { AtCommand_GM, "@gm", 100, atcommand_gm },
- { AtCommand_PvPOff, "@pvpoff", 40, atcommand_pvpoff },
- { AtCommand_PvPOn, "@pvpon", 40, atcommand_pvpon },
- { AtCommand_GvGOff, "@gvgoff", 40, atcommand_gvgoff },
- { AtCommand_GvGOff, "@gpvpoff", 40, atcommand_gvgoff },
- { AtCommand_GvGOn, "@gvgon", 40, atcommand_gvgon },
- { AtCommand_GvGOn, "@gpvpon", 40, atcommand_gvgon },
- { AtCommand_Model, "@model", 20, atcommand_model },
- { AtCommand_Go, "@go", 10, atcommand_go },
- { AtCommand_Spawn, "@monster", 50, atcommand_monster },
- { AtCommand_Spawn, "@spawn", 50, atcommand_monster },
- { AtCommand_MonsterSmall, "@monstersmall", 50, atcommand_monstersmall },
- { AtCommand_MonsterBig, "@monsterbig", 50, atcommand_monsterbig },
- { AtCommand_KillMonster, "@killmonster", 60, atcommand_killmonster },
- { AtCommand_KillMonster2, "@killmonster2", 40, atcommand_killmonster2 },
- { AtCommand_Refine, "@refine", 60, atcommand_refine },
- { AtCommand_Produce, "@produce", 60, atcommand_produce },
- { AtCommand_Memo, "@memo", 40, atcommand_memo },
- { AtCommand_GAT, "@gat", 99, atcommand_gat }, // debug function
- { AtCommand_Packet, "@packet", 99, atcommand_packet }, // debug function
- { AtCommand_Packet, "@packetmode", 99, atcommand_packet }, // debug function
- { AtCommand_StatusPoint, "@stpoint", 60, atcommand_statuspoint },
- { AtCommand_SkillPoint, "@skpoint", 60, atcommand_skillpoint },
- { AtCommand_Zeny, "@zeny", 60, atcommand_zeny },
- { AtCommand_Strength, "@str", 60, atcommand_param },
- { AtCommand_Agility, "@agi", 60, atcommand_param },
- { AtCommand_Vitality, "@vit", 60, atcommand_param },
- { AtCommand_Intelligence, "@int", 60, atcommand_param },
- { AtCommand_Dexterity, "@dex", 60, atcommand_param },
- { AtCommand_Luck, "@luk", 60, atcommand_param },
- { AtCommand_GuildLevelUp, "@guildlvup", 60, atcommand_guildlevelup },
- { AtCommand_GuildLevelUp, "@guildlvlup", 60, atcommand_guildlevelup },
- { AtCommand_MakeEgg, "@makeegg", 60, atcommand_makeegg },
- { AtCommand_Hatch, "@hatch", 60, atcommand_hatch },
- { AtCommand_PetFriendly, "@petfriendly", 40, atcommand_petfriendly },
- { AtCommand_PetHungry, "@pethungry", 40, atcommand_pethungry },
- { AtCommand_PetRename, "@petrename", 1, atcommand_petrename },
- { AtCommand_Recall, "@recall", 60, atcommand_recall }, // + /recall
- { AtCommand_Revive, "@revive", 60, atcommand_revive },
- { AtCommand_Night, "@night", 80, atcommand_night },
- { AtCommand_Day, "@day", 80, atcommand_day },
- { AtCommand_Doom, "@doom", 80, atcommand_doom },
- { AtCommand_DoomMap, "@doommap", 80, atcommand_doommap },
- { AtCommand_Raise, "@raise", 80, atcommand_raise },
- { AtCommand_RaiseMap, "@raisemap", 80, atcommand_raisemap },
- { AtCommand_Kick, "@kick", 20, atcommand_kick }, // + right click menu for GM "(name) force to quit"
- { AtCommand_KickAll, "@kickall", 99, atcommand_kickall },
- { AtCommand_AllSkill, "@allskill", 60, atcommand_allskill },
- { AtCommand_AllSkill, "@allskills", 60, atcommand_allskill },
- { AtCommand_AllSkill, "@skillall", 60, atcommand_allskill },
- { AtCommand_AllSkill, "@skillsall", 60, atcommand_allskill },
- { AtCommand_QuestSkill, "@questskill", 40, atcommand_questskill },
- { AtCommand_LostSkill, "@lostskill", 40, atcommand_lostskill },
- { AtCommand_SpiritBall, "@spiritball", 40, atcommand_spiritball },
- { AtCommand_Party, "@party", 1, atcommand_party },
- { AtCommand_Guild, "@guild", 50, atcommand_guild },
- { AtCommand_AgitStart, "@agitstart", 60, atcommand_agitstart },
- { AtCommand_AgitEnd, "@agitend", 60, atcommand_agitend },
- { AtCommand_MapExit, "@mapexit", 99, atcommand_mapexit },
- { AtCommand_IDSearch, "@idsearch", 60, atcommand_idsearch },
- { AtCommand_Broadcast, "@broadcast", 40, atcommand_broadcast }, // /b and /nb command
- { AtCommand_LocalBroadcast, "@localbroadcast", 40, atcommand_localbroadcast }, // /lb and /nlb command
- { AtCommand_RecallAll, "@recallall", 80, atcommand_recallall },
- { AtCommand_ReloadItemDB, "@reloaditemdb", 99, atcommand_reloaditemdb }, // admin command
- { AtCommand_ReloadMobDB, "@reloadmobdb", 99, atcommand_reloadmobdb }, // admin command
- { AtCommand_ReloadSkillDB, "@reloadskilldb", 99, atcommand_reloadskilldb }, // admin command
- { AtCommand_ReloadScript, "@reloadscript", 99, atcommand_reloadscript }, // admin command
- { AtCommand_ReloadGMDB, "@reloadgmdb", 99, atcommand_reloadgmdb }, // admin command
- { AtCommand_ReloadAtcommand, "@reloadatcommand", 99, atcommand_reloadatcommand },
- { AtCommand_ReloadBattleConf, "@reloadbattleconf",99, atcommand_reloadbattleconf },
- { AtCommand_ReloadStatusDB, "@reloadstatusdb", 99, atcommand_reloadstatusdb },
- { AtCommand_ReloadPcDB, "@reloadpcdb", 99, atcommand_reloadpcdb },
- { AtCommand_ReloadMOTD, "@reloadmotd", 99, atcommand_reloadmotd }, // [Valaris]
- { AtCommand_MapInfo, "@mapinfo", 99, atcommand_mapinfo },
- { AtCommand_Dye, "@dye", 40, atcommand_dye }, // by fritz
- { AtCommand_Dye, "@ccolor", 40, atcommand_dye }, // by fritz
- { AtCommand_Hstyle, "@hairstyle", 40, atcommand_hair_style }, // by fritz
- { AtCommand_Hstyle, "@hstyle", 40, atcommand_hair_style }, // by fritz
- { AtCommand_Hcolor, "@haircolor", 40, atcommand_hair_color }, // by fritz
- { AtCommand_Hcolor, "@hcolor", 40, atcommand_hair_color }, // by fritz
- { AtCommand_StatAll, "@statall", 60, atcommand_stat_all }, // by fritz
- { AtCommand_StatAll, "@statsall", 60, atcommand_stat_all },
- { AtCommand_StatAll, "@allstats", 60, atcommand_stat_all }, // by fritz
- { AtCommand_StatAll, "@allstat", 60, atcommand_stat_all }, // by fritz
- { AtCommand_CharBlock, "@block", 60, atcommand_char_block }, // by Yor
- { AtCommand_CharBlock, "@charblock", 60, atcommand_char_block }, // by Yor
- { AtCommand_CharBan, "@ban", 60, atcommand_char_ban }, // by Yor
- { AtCommand_CharBan, "@banish", 60, atcommand_char_ban }, // by Yor
- { AtCommand_CharBan, "@charban", 60, atcommand_char_ban }, // by Yor
- { AtCommand_CharBan, "@charbanish", 60, atcommand_char_ban }, // by Yor
- { AtCommand_CharUnBlock, "@unblock", 60, atcommand_char_unblock }, // by Yor
- { AtCommand_CharUnBlock, "@charunblock", 60, atcommand_char_unblock }, // by Yor
- { AtCommand_CharUnBan, "@unban", 60, atcommand_char_unban }, // by Yor
- { AtCommand_CharUnBan, "@unbanish", 60, atcommand_char_unban }, // by Yor
- { AtCommand_CharUnBan, "@charunban", 60, atcommand_char_unban }, // by Yor
- { AtCommand_CharUnBan, "@charunbanish", 60, atcommand_char_unban }, // by Yor
- { AtCommand_MountPeco, "@mountpeco", 20, atcommand_mount_peco }, // by Valaris
- { AtCommand_CharMountPeco, "@charmountpeco", 50, atcommand_char_mount_peco }, // by Yor
- { AtCommand_GuildSpy, "@guildspy", 60, atcommand_guildspy }, // [Syrus22]
- { AtCommand_PartySpy, "@partyspy", 60, atcommand_partyspy }, // [Syrus22]
- { AtCommand_RepairAll, "@repairall", 60, atcommand_repairall }, // [Valaris]
- { AtCommand_GuildRecall, "@guildrecall", 60, atcommand_guildrecall }, // by Yor
- { AtCommand_PartyRecall, "@partyrecall", 60, atcommand_partyrecall }, // by Yor
- { AtCommand_Nuke, "@nuke", 60, atcommand_nuke }, // [Valaris]
- { AtCommand_Shownpc, "@shownpc", 80, atcommand_shownpc }, // []
- { AtCommand_Hidenpc, "@hidenpc", 80, atcommand_hidenpc }, // []
- { AtCommand_Loadnpc, "@loadnpc", 80, atcommand_loadnpc }, // []
- { AtCommand_Unloadnpc, "@unloadnpc", 80, atcommand_unloadnpc }, // []
- { AtCommand_ServerTime, "@time", 1, atcommand_servertime }, // by Yor
- { AtCommand_ServerTime, "@date", 1, atcommand_servertime }, // by Yor
- { AtCommand_ServerTime, "@serverdate", 1, atcommand_servertime }, // by Yor
- { AtCommand_ServerTime, "@servertime", 1, atcommand_servertime }, // by Yor
- { AtCommand_CharDelItem, "@chardelitem", 60, atcommand_chardelitem }, // by Yor
- { AtCommand_Jail, "@jail", 60, atcommand_jail }, // by Yor
- { AtCommand_UnJail, "@unjail", 60, atcommand_unjail }, // by Yor
- { AtCommand_UnJail, "@discharge", 60, atcommand_unjail }, // by Yor
- { AtCommand_JailFor, "@jailfor", 60, atcommand_jailfor }, //Meruru
- { AtCommand_JailTime, "@jailtime", 1, atcommand_jailtime },
- { AtCommand_CharJailTime, "@charjailtime", 60, atcommand_charjailtime },
- { AtCommand_Disguise, "@disguise", 20, atcommand_disguise }, // [Valaris]
- { AtCommand_UnDisguise, "@undisguise", 20, atcommand_undisguise }, // by Yor
- { AtCommand_CharDisguise, "@chardisguise", 60, atcommand_chardisguise }, // Kalaspuff
- { AtCommand_CharUnDisguise, "@charundisguise", 60, atcommand_charundisguise }, // Kalaspuff
- { AtCommand_EMail, "@email", 1, atcommand_email }, // by Yor
- { AtCommand_Effect, "@effect", 40, atcommand_effect }, // by Apple
- { AtCommand_Char_Cart_List, "@charcartlist", 40, atcommand_character_cart_list }, // by Yor
- { AtCommand_Follow, "@follow", 20, atcommand_follow }, // by MouseJstr
- { AtCommand_AddWarp, "@addwarp", 60, atcommand_addwarp }, // by MouseJstr
- { AtCommand_SkillOn, "@skillon", 80, atcommand_skillon }, // by MouseJstr
- { AtCommand_SkillOff, "@skilloff", 80, atcommand_skilloff }, // by MouseJstr
- { AtCommand_Killer, "@killer", 60, atcommand_killer }, // by MouseJstr
- { AtCommand_NpcMove, "@npcmove", 80, atcommand_npcmove }, // by MouseJstr
- { AtCommand_Killable, "@killable", 40, atcommand_killable }, // by MouseJstr
- { AtCommand_CharKillable, "@charkillable", 40, atcommand_charkillable }, // by MouseJstr
- { AtCommand_Dropall, "@dropall", 40, atcommand_dropall }, // MouseJstr
- { AtCommand_Chardropall, "@chardropall", 60, atcommand_chardropall }, // MouseJstr
- { AtCommand_Storeall, "@storeall", 40, atcommand_storeall }, // MouseJstr
- { AtCommand_Charstoreall, "@charstoreall", 60, atcommand_charstoreall }, // MouseJstr
- { AtCommand_Skillid, "@skillid", 40, atcommand_skillid }, // MouseJstr
- { AtCommand_Useskill, "@useskill", 40, atcommand_useskill }, // MouseJstr
- { AtCommand_DisplaySkill, "@displayskill", 99, atcommand_displayskill }, // MouseJstr
-// { AtCommand_Rain, "@rain", 99, atcommand_rain }, //Client no longer supports rain!
- { AtCommand_Snow, "@snow", 99, atcommand_snow },
- { AtCommand_Sakura, "@sakura", 99, atcommand_sakura },
- { AtCommand_Clouds, "@clouds", 99, atcommand_clouds },
- { AtCommand_Clouds2, "@clouds2", 99, atcommand_clouds2 },
- { AtCommand_Fog, "@fog", 99, atcommand_fog },
- { AtCommand_Fireworks, "@fireworks", 99, atcommand_fireworks },
- { AtCommand_Leaves, "@leaves", 99, atcommand_leaves },
- { AtCommand_Summon, "@summon", 60, atcommand_summon },
- { AtCommand_AdjGmLvl, "@adjgmlvl", 99, atcommand_adjgmlvl },
- { AtCommand_AdjCmdLvl, "@adjcmdlvl", 99, atcommand_adjcmdlvl },
- { AtCommand_Trade, "@trade", 60, atcommand_trade },
- { AtCommand_Send, "@send", 99, atcommand_send },
- { AtCommand_SetBattleFlag, "@setbattleflag", 99, atcommand_setbattleflag },
- { AtCommand_UnMute, "@unmute", 80, atcommand_unmute }, // [Valaris]
- { AtCommand_Clearweather, "@clearweather", 99, atcommand_clearweather }, // Dexity
- { AtCommand_UpTime, "@uptime", 1, atcommand_uptime }, // by MC Cameri
- { AtCommand_ChangeSex, "@changesex", 60, atcommand_changesex }, // by MC Cameri
- { AtCommand_Mute, "@mute", 80, atcommand_mute }, // [celest]
- { AtCommand_WhoZeny, "@whozeny", 20, atcommand_whozeny }, // [Valaris]
- { AtCommand_Refresh, "@refresh", 1, atcommand_refresh }, // by MC Cameri
- { AtCommand_PetId, "@petid", 40, atcommand_petid }, // by MC Cameri
- { AtCommand_Identify, "@identify", 40, atcommand_identify }, // by MC Cameri
- { AtCommand_Gmotd, "@gmotd", 20, atcommand_gmotd }, // Added by MC Cameri, created by davidsiaw
- { AtCommand_MiscEffect, "@misceffect", 50, atcommand_misceffect }, // by MC Cameri
- { AtCommand_MobSearch, "@mobsearch", 10, atcommand_mobsearch },
- { AtCommand_CleanMap, "@cleanmap", 40, atcommand_cleanmap },
- { AtCommand_NpcTalk, "@npctalk", 20, atcommand_npctalk },
- { AtCommand_PetTalk, "@pettalk", 10, atcommand_pettalk },
- { AtCommand_Users, "@users", 40, atcommand_users },
- { AtCommand_ResetState, "@reset", 40, atcommand_reset },
-
+ { AtCommand_Rura, "@rura", 40, atcommand_rura },
+ { AtCommand_Warp, "@warp", 40, atcommand_rura },
+ { AtCommand_MapMove, "@mapmove", 40, atcommand_rura }, // /mm command
+ { AtCommand_Where, "@where", 1, atcommand_where },
+ { AtCommand_JumpTo, "@jumpto", 20, atcommand_jumpto }, // + /shift
+ { AtCommand_JumpTo, "@warpto", 20, atcommand_jumpto },
+ { AtCommand_JumpTo, "@goto", 20, atcommand_jumpto },
+ { AtCommand_Jump, "@jump", 40, atcommand_jump },
+ { AtCommand_Who, "@who", 20, atcommand_who },
+ { AtCommand_Who, "@whois", 20, atcommand_who },
+ { AtCommand_Who2, "@who2", 20, atcommand_who2 },
+ { AtCommand_Who3, "@who3", 20, atcommand_who3 },
+ { AtCommand_WhoMap, "@whomap", 20, atcommand_whomap },
+ { AtCommand_WhoMap2, "@whomap2", 20, atcommand_whomap2 },
+ { AtCommand_WhoMap3, "@whomap3", 20, atcommand_whomap3 },
+ { AtCommand_WhoGM, "@whogm", 20, atcommand_whogm }, // by Yor
+ { AtCommand_Save, "@save", 40, atcommand_save },
+ { AtCommand_Load, "@return", 40, atcommand_load },
+ { AtCommand_Load, "@load", 40, atcommand_load },
+ { AtCommand_Speed, "@speed", 40, atcommand_speed },
+ { AtCommand_Storage, "@storage", 1, atcommand_storage },
+ { AtCommand_GuildStorage, "@gstorage", 50, atcommand_guildstorage },
+ { AtCommand_Option, "@option", 40, atcommand_option },
+ { AtCommand_Hide, "@hide", 40, atcommand_hide }, // + /hide
+ { AtCommand_JobChange, "@jobchange", 40, atcommand_jobchange },
+ { AtCommand_JobChange, "@job", 40, atcommand_jobchange },
+ { AtCommand_Die, "@die", 1, atcommand_die },
+ { AtCommand_Kill, "@kill", 60, atcommand_kill },
+ { AtCommand_Alive, "@alive", 60, atcommand_alive },
+ { AtCommand_Kami, "@kami", 40, atcommand_kami },
+ { AtCommand_KamiB, "@kamib", 40, atcommand_kami },
+ { AtCommand_KamiC, "@kamic", 40, atcommand_kami }, //[LuzZza]
+ { AtCommand_Heal, "@heal", 40, atcommand_heal },
+ { AtCommand_Item, "@item", 60, atcommand_item },
+ { AtCommand_Item2, "@item2", 60, atcommand_item2 },
+ { AtCommand_ItemReset, "@itemreset", 40, atcommand_itemreset },
+ { AtCommand_BaseLevelUp, "@baselvl", 60, atcommand_baselevelup },
+ { AtCommand_BaseLevelUp, "@baselevel", 60, atcommand_baselevelup },
+ { AtCommand_BaseLevelUp, "@blevel", 60, atcommand_baselevelup },
+ { AtCommand_BaseLevelUp, "@blvl", 60, atcommand_baselevelup },
+ { AtCommand_JobLevelUp, "@jlvl", 60, atcommand_joblevelup },
+ { AtCommand_JobLevelUp, "@jlevel", 60, atcommand_joblevelup },
+ { AtCommand_JobLevelUp, "@joblvl", 60, atcommand_joblevelup },
+ { AtCommand_JobLevelUp, "@joblevel", 60, atcommand_joblevelup },
+ { AtCommand_H, "@h", 20, atcommand_help },
+ { AtCommand_Help, "@help", 20, atcommand_help },
+ { AtCommand_H2, "@h2", 20, atcommand_help2 },
+ { AtCommand_Help2, "@help2", 20, atcommand_help2 },
+ { AtCommand_GM, "@gm", 100,atcommand_gm },
+ { AtCommand_PvPOff, "@pvpoff", 40, atcommand_pvpoff },
+ { AtCommand_PvPOn, "@pvpon", 40, atcommand_pvpon },
+ { AtCommand_GvGOff, "@gvgoff", 40, atcommand_gvgoff },
+ { AtCommand_GvGOff, "@gpvpoff", 40, atcommand_gvgoff },
+ { AtCommand_GvGOn, "@gvgon", 40, atcommand_gvgon },
+ { AtCommand_GvGOn, "@gpvpon", 40, atcommand_gvgon },
+ { AtCommand_Model, "@model", 20, atcommand_model },
+ { AtCommand_Go, "@go", 10, atcommand_go },
+ { AtCommand_Spawn, "@monster", 50, atcommand_monster },
+ { AtCommand_Spawn, "@spawn", 50, atcommand_monster },
+ { AtCommand_MonsterSmall, "@monstersmall", 50, atcommand_monstersmall },
+ { AtCommand_MonsterBig, "@monsterbig", 50, atcommand_monsterbig },
+ { AtCommand_KillMonster, "@killmonster", 60, atcommand_killmonster },
+ { AtCommand_KillMonster2, "@killmonster2", 40, atcommand_killmonster2 },
+ { AtCommand_Refine, "@refine", 60, atcommand_refine },
+ { AtCommand_Produce, "@produce", 60, atcommand_produce },
+ { AtCommand_Memo, "@memo", 40, atcommand_memo },
+ { AtCommand_GAT, "@gat", 99, atcommand_gat },
+ { AtCommand_DisplayStatus, "@displaystatus", 99, atcommand_displaystatus },
+ { AtCommand_StatusPoint, "@stpoint", 60, atcommand_statuspoint },
+ { AtCommand_SkillPoint, "@skpoint", 60, atcommand_skillpoint },
+ { AtCommand_Zeny, "@zeny", 60, atcommand_zeny },
+ { AtCommand_Strength, "@str", 60, atcommand_param },
+ { AtCommand_Agility, "@agi", 60, atcommand_param },
+ { AtCommand_Vitality, "@vit", 60, atcommand_param },
+ { AtCommand_Intelligence, "@int", 60, atcommand_param },
+ { AtCommand_Dexterity, "@dex", 60, atcommand_param },
+ { AtCommand_Luck, "@luk", 60, atcommand_param },
+ { AtCommand_GuildLevelUp, "@glvl", 60, atcommand_guildlevelup },
+ { AtCommand_GuildLevelUp, "@glevel", 60, atcommand_guildlevelup },
+ { AtCommand_GuildLevelUp, "@guildlvl", 60, atcommand_guildlevelup },
+ { AtCommand_GuildLevelUp, "@guildlevel", 60, atcommand_guildlevelup },
+ { AtCommand_MakeEgg, "@makeegg", 60, atcommand_makeegg },
+ { AtCommand_Hatch, "@hatch", 60, atcommand_hatch },
+ { AtCommand_PetFriendly, "@petfriendly", 40, atcommand_petfriendly },
+ { AtCommand_PetHungry, "@pethungry", 40, atcommand_pethungry },
+ { AtCommand_PetRename, "@petrename", 1, atcommand_petrename },
+ { AtCommand_Recall, "@recall", 60, atcommand_recall }, // + /recall
+ { AtCommand_Night, "@night", 80, atcommand_night },
+ { AtCommand_Day, "@day", 80, atcommand_day },
+ { AtCommand_Doom, "@doom", 80, atcommand_doom },
+ { AtCommand_DoomMap, "@doommap", 80, atcommand_doommap },
+ { AtCommand_Raise, "@raise", 80, atcommand_raise },
+ { AtCommand_RaiseMap, "@raisemap", 80, atcommand_raisemap },
+ { AtCommand_Kick, "@kick", 20, atcommand_kick }, // + right click menu for GM "(name) force to quit"
+ { AtCommand_KickAll, "@kickall", 99, atcommand_kickall },
+ { AtCommand_AllSkill, "@allskill", 60, atcommand_allskill },
+ { AtCommand_AllSkill, "@allskills", 60, atcommand_allskill },
+ { AtCommand_AllSkill, "@skillall", 60, atcommand_allskill },
+ { AtCommand_AllSkill, "@skillsall", 60, atcommand_allskill },
+ { AtCommand_QuestSkill, "@questskill", 40, atcommand_questskill },
+ { AtCommand_LostSkill, "@lostskill", 40, atcommand_lostskill },
+ { AtCommand_SpiritBall, "@spiritball", 40, atcommand_spiritball },
+ { AtCommand_Party, "@party", 1, atcommand_party },
+ { AtCommand_Guild, "@guild", 50, atcommand_guild },
+ { AtCommand_AgitStart, "@agitstart", 60, atcommand_agitstart },
+ { AtCommand_AgitEnd, "@agitend", 60, atcommand_agitend },
+ { AtCommand_MapExit, "@mapexit", 99, atcommand_mapexit },
+ { AtCommand_IDSearch, "@idsearch", 60, atcommand_idsearch },
+ { AtCommand_Broadcast, "@broadcast", 40, atcommand_broadcast }, // /b and /nb command
+ { AtCommand_LocalBroadcast, "@localbroadcast", 40, atcommand_localbroadcast }, // /lb and /nlb command
+ { AtCommand_RecallAll, "@recallall", 80, atcommand_recallall },
+ { AtCommand_ReloadItemDB, "@reloaditemdb", 99, atcommand_reloaditemdb }, // admin command
+ { AtCommand_ReloadMobDB, "@reloadmobdb", 99, atcommand_reloadmobdb }, // admin command
+ { AtCommand_ReloadSkillDB, "@reloadskilldb", 99, atcommand_reloadskilldb }, // admin command
+ { AtCommand_ReloadScript, "@reloadscript", 99, atcommand_reloadscript }, // admin command
+ { AtCommand_ReloadGMDB, "@reloadgmdb", 99, atcommand_reloadgmdb }, // admin command
+ { AtCommand_ReloadAtcommand, "@reloadatcommand", 99, atcommand_reloadatcommand },
+ { AtCommand_ReloadBattleConf, "@reloadbattleconf",99, atcommand_reloadbattleconf },
+ { AtCommand_ReloadStatusDB, "@reloadstatusdb", 99, atcommand_reloadstatusdb },
+ { AtCommand_ReloadPcDB, "@reloadpcdb", 99, atcommand_reloadpcdb },
+ { AtCommand_ReloadMOTD, "@reloadmotd", 99, atcommand_reloadmotd }, // [Valaris]
+ { AtCommand_MapInfo, "@mapinfo", 99, atcommand_mapinfo },
+ { AtCommand_Dye, "@dye", 40, atcommand_dye }, // by fritz
+ { AtCommand_Dye, "@ccolor", 40, atcommand_dye }, // by fritz
+ { AtCommand_Hstyle, "@hairstyle", 40, atcommand_hair_style }, // by fritz
+ { AtCommand_Hstyle, "@hstyle", 40, atcommand_hair_style }, // by fritz
+ { AtCommand_Hcolor, "@haircolor", 40, atcommand_hair_color }, // by fritz
+ { AtCommand_Hcolor, "@hcolor", 40, atcommand_hair_color }, // by fritz
+ { AtCommand_StatAll, "@statall", 60, atcommand_stat_all }, // by fritz
+ { AtCommand_StatAll, "@statsall", 60, atcommand_stat_all },
+ { AtCommand_StatAll, "@allstats", 60, atcommand_stat_all }, // by fritz
+ { AtCommand_StatAll, "@allstat", 60, atcommand_stat_all }, // by fritz
+ { AtCommand_CharBlock, "@block", 60, atcommand_char_block }, // by Yor
+ { AtCommand_CharBlock, "@charblock", 60, atcommand_char_block }, // by Yor
+ { AtCommand_CharBan, "@ban", 60, atcommand_char_ban }, // by Yor
+ { AtCommand_CharBan, "@banish", 60, atcommand_char_ban }, // by Yor
+ { AtCommand_CharBan, "@charban", 60, atcommand_char_ban }, // by Yor
+ { AtCommand_CharBan, "@charbanish", 60, atcommand_char_ban }, // by Yor
+ { AtCommand_CharUnBlock, "@unblock", 60, atcommand_char_unblock }, // by Yor
+ { AtCommand_CharUnBlock, "@charunblock", 60, atcommand_char_unblock }, // by Yor
+ { AtCommand_CharUnBan, "@unban", 60, atcommand_char_unban }, // by Yor
+ { AtCommand_CharUnBan, "@unbanish", 60, atcommand_char_unban }, // by Yor
+ { AtCommand_CharUnBan, "@charunban", 60, atcommand_char_unban }, // by Yor
+ { AtCommand_CharUnBan, "@charunbanish", 60, atcommand_char_unban }, // by Yor
+ { AtCommand_MountPeco, "@mount", 20, atcommand_mount_peco }, // by Valaris
+ { AtCommand_MountPeco, "@mountpeco", 20, atcommand_mount_peco }, // by Valaris
+ { AtCommand_GuildSpy, "@guildspy", 60, atcommand_guildspy }, // [Syrus22]
+ { AtCommand_PartySpy, "@partyspy", 60, atcommand_partyspy }, // [Syrus22]
+ { AtCommand_RepairAll, "@repairall", 60, atcommand_repairall }, // [Valaris]
+ { AtCommand_GuildRecall, "@guildrecall", 60, atcommand_guildrecall }, // by Yor
+ { AtCommand_PartyRecall, "@partyrecall", 60, atcommand_partyrecall }, // by Yor
+ { AtCommand_Nuke, "@nuke", 60, atcommand_nuke }, // [Valaris]
+ { AtCommand_Shownpc, "@shownpc", 80, atcommand_shownpc }, // []
+ { AtCommand_Hidenpc, "@hidenpc", 80, atcommand_hidenpc }, // []
+ { AtCommand_Loadnpc, "@loadnpc", 80, atcommand_loadnpc }, // []
+ { AtCommand_Unloadnpc, "@unloadnpc", 80, atcommand_unloadnpc }, // []
+ { AtCommand_ServerTime, "@time", 1, atcommand_servertime }, // by Yor
+ { AtCommand_ServerTime, "@date", 1, atcommand_servertime }, // by Yor
+ { AtCommand_ServerTime, "@serverdate", 1, atcommand_servertime }, // by Yor
+ { AtCommand_ServerTime, "@servertime", 1, atcommand_servertime }, // by Yor
+ { AtCommand_Jail, "@jail", 60, atcommand_jail }, // by Yor
+ { AtCommand_UnJail, "@unjail", 60, atcommand_unjail }, // by Yor
+ { AtCommand_UnJail, "@discharge", 60, atcommand_unjail }, // by Yor
+ { AtCommand_JailFor, "@jailfor", 60, atcommand_jailfor }, //Meruru
+ { AtCommand_JailTime, "@jailtime", 1, atcommand_jailtime }, //Change this to 0 in atcommand_conf.txt if you want it accessible to players (you most likely will ;))
+ { AtCommand_Disguise, "@disguise", 20, atcommand_disguise }, // [Valaris]
+ { AtCommand_UnDisguise, "@undisguise", 20, atcommand_undisguise }, // by Yor
+ { AtCommand_EMail, "@email", 1, atcommand_email }, // by Yor
+ { AtCommand_Effect, "@effect", 40, atcommand_effect }, // by Apple
+ { AtCommand_Follow, "@follow", 20, atcommand_follow }, // by MouseJstr
+ { AtCommand_AddWarp, "@addwarp", 60, atcommand_addwarp }, // by MouseJstr
+ { AtCommand_SkillOn, "@skillon", 80, atcommand_skillon }, // by MouseJstr
+ { AtCommand_SkillOff, "@skilloff", 80, atcommand_skilloff }, // by MouseJstr
+ { AtCommand_Killer, "@killer", 60, atcommand_killer }, // by MouseJstr
+ { AtCommand_NpcMove, "@npcmove", 80, atcommand_npcmove }, // by MouseJstr
+ { AtCommand_Killable, "@killable", 40, atcommand_killable }, // by MouseJstr
+ { AtCommand_Dropall, "@dropall", 40, atcommand_dropall }, // MouseJstr
+ { AtCommand_Storeall, "@storeall", 40, atcommand_storeall }, // MouseJstr
+ { AtCommand_Skillid, "@skillid", 40, atcommand_skillid }, // MouseJstr
+ { AtCommand_Useskill, "@useskill", 40, atcommand_useskill }, // MouseJstr
+ { AtCommand_Snow, "@snow", 99, atcommand_snow },
+ { AtCommand_Sakura, "@sakura", 99, atcommand_sakura },
+ { AtCommand_Clouds, "@clouds", 99, atcommand_clouds },
+ { AtCommand_Clouds2, "@clouds2", 99, atcommand_clouds2 },
+ { AtCommand_Fog, "@fog", 99, atcommand_fog },
+ { AtCommand_Fireworks, "@fireworks", 99, atcommand_fireworks },
+ { AtCommand_Leaves, "@leaves", 99, atcommand_leaves },
+ { AtCommand_Summon, "@summon", 60, atcommand_summon },
+ { AtCommand_AdjGmLvl, "@adjgmlvl", 99, atcommand_adjgmlvl },
+ { AtCommand_AdjCmdLvl, "@adjcmdlvl", 99, atcommand_adjcmdlvl },
+ { AtCommand_Trade, "@trade", 60, atcommand_trade },
+ { AtCommand_Send, "@send", 99, atcommand_send },
+ { AtCommand_SetBattleFlag, "@setbattleflag", 99, atcommand_setbattleflag },
+ { AtCommand_UnMute, "@unmute", 80, atcommand_unmute }, // [Valaris]
+ { AtCommand_Clearweather, "@clearweather", 99, atcommand_clearweather }, // Dexity
+ { AtCommand_UpTime, "@uptime", 1, atcommand_uptime }, // by MC Cameri
+ { AtCommand_ChangeSex, "@changesex", 60, atcommand_changesex }, // by MC Cameri <- do we still need this? [Foruken] <- why not? [Skotlex]
+ { AtCommand_Mute, "@mute", 80, atcommand_mute }, // [celest]
+ { AtCommand_WhoZeny, "@whozeny", 20, atcommand_whozeny }, // [Valaris]
+ { AtCommand_Refresh, "@refresh", 1, atcommand_refresh }, // by MC Cameri
+ { AtCommand_PetId, "@petid", 40, atcommand_petid }, // by MC Cameri
+ { AtCommand_Identify, "@identify", 40, atcommand_identify }, // by MC Cameri
+ { AtCommand_Gmotd, "@gmotd", 20, atcommand_gmotd }, // Added by MC Cameri, created by davidsiaw
+ { AtCommand_MiscEffect, "@misceffect", 50, atcommand_misceffect }, // by MC Cameri
+ { AtCommand_MobSearch, "@mobsearch", 10, atcommand_mobsearch },
+ { AtCommand_CleanMap, "@cleanmap", 40, atcommand_cleanmap },
+ { AtCommand_NpcTalk, "@npctalk", 20, atcommand_npctalk },
+ { AtCommand_PetTalk, "@pettalk", 10, atcommand_pettalk },
+ { AtCommand_Users, "@users", 40, atcommand_users },
+ { AtCommand_ResetState, "@reset", 40, atcommand_reset },
+ { AtCommand_SkillTree, "@skilltree", 40, atcommand_skilltree }, // [MouseJstr]
+ { AtCommand_Marry, "@marry", 40, atcommand_marry }, // [MouseJstr]
+ { AtCommand_Divorce, "@divorce", 40, atcommand_divorce }, // [MouseJstr]
+ { AtCommand_JumpToId2, "@jumptoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
+ { AtCommand_JumpToId2, "@warptoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
+ { AtCommand_JumpToId2, "@gotoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
+ { AtCommand_RecallId2, "@recallid2", 60, atcommand_recallid2 }, // [Dino9021]
+ { AtCommand_KickId2, "@kickid2", 99, atcommand_kickid2 }, // [Dino9021]
+ { AtCommand_ReviveId2, "@reviveid2", 60, atcommand_reviveid2 }, // [Dino9021]
+ { AtCommand_KillId2, "@killid2", 60, atcommand_killid2 }, // [Dino9021]
+ { AtCommand_Sound, "@sound", 40, atcommand_sound },
+ { AtCommand_UndisguiseAll, "@undisguiseall", 99, atcommand_undisguiseall },
+ { AtCommand_DisguiseAll, "@disguiseall", 99, atcommand_disguiseall },
+ { AtCommand_ChangeLook, "@changelook", 60, atcommand_changelook },
+ { AtCommand_AutoLoot, "@autoloot", 10, atcommand_autoloot }, // Upa-Kun
+ { AtCommand_MobInfo, "@mobinfo", 1, atcommand_mobinfo }, // [Lupus]
+ { AtCommand_MobInfo, "@monsterinfo", 1, atcommand_mobinfo }, // [Lupus]
+ { AtCommand_MobInfo, "@mi", 1, atcommand_mobinfo }, // [Lupus]
+ { AtCommand_Exp, "@exp", 1, atcommand_exp }, // [Skotlex]
+ { AtCommand_Adopt, "@adopt", 40, atcommand_adopt }, // [Veider]
+ { AtCommand_Version, "@version", 1, atcommand_version },
+ { AtCommand_MuteArea, "@mutearea", 99, atcommand_mutearea }, // MouseJstr
+ { AtCommand_MuteArea, "@stfu", 99, atcommand_mutearea }, // MouseJstr
+ { AtCommand_Rates, "@rates", 1, atcommand_rates }, // MouseJstr
+ { AtCommand_ItemInfo, "@iteminfo", 1, atcommand_iteminfo }, // [Lupus]
+ { AtCommand_ItemInfo, "@ii", 1, atcommand_iteminfo }, // [Lupus]
+ { AtCommand_WhoDrops, "@whodrops", 1, atcommand_whodrops }, // [Skotlex]
+ { AtCommand_MapFlag, "@mapflag", 99, atcommand_mapflag }, // [Lupus]
+ { AtCommand_Me, "@me", 20, atcommand_me }, //added by massdriller, code by lordalfa
+ { AtCommand_MonsterIgnore, "@monsterignore", 99, atcommand_monsterignore }, // [Valaris]
+ { AtCommand_MonsterIgnore, "@battleignore", 99, atcommand_monsterignore },
+ { AtCommand_FakeName, "@fakename", 20, atcommand_fakename }, // [Valaris]
+ { AtCommand_Size, "@size", 20, atcommand_size },
+ { AtCommand_ShowExp, "@showexp", 10, atcommand_showexp},
+ { AtCommand_ShowZeny, "@showzeny", 10, atcommand_showzeny},
+ { AtCommand_ShowDelay, "@showdelay", 1, atcommand_showdelay},
+ { AtCommand_AutoTrade, "@autotrade", 10, atcommand_autotrade }, // durf
+ { AtCommand_AutoTrade, "@at", 10, atcommand_autotrade },
+ { AtCommand_ChangeGM, "@changegm", 10, atcommand_changegm }, // durf
+ { AtCommand_ChangeLeader, "@changeleader", 10, atcommand_changeleader }, // durf
+ { AtCommand_PartyOption, "@partyoption", 10, atcommand_partyoption}, // durf
+ { AtCommand_Invite, "@invite", 1, atcommand_invite }, // By LuzZza
+ { AtCommand_Duel, "@duel", 1, atcommand_duel }, // By LuzZza
+ { AtCommand_Leave, "@leave", 1, atcommand_leave }, // By LuzZza
+ { AtCommand_Accept, "@accept", 1, atcommand_accept }, // By LuzZza
+ { AtCommand_Reject, "@reject", 1, atcommand_reject }, // By LuzZza
+ { AtCommand_Away, "@away", 1, atcommand_away }, // [LuzZza]
+ { AtCommand_Away, "@aw", 1, atcommand_away }, // [LuzZza]
+ { AtCommand_Main, "@main", 1, atcommand_main }, // [LuzZza]
+ { AtCommand_Clone, "@clone", 50, atcommand_clone },
+ { AtCommand_Clone, "@slaveclone", 50, atcommand_clone },
+ { AtCommand_Clone, "@evilclone", 50, atcommand_clone }, // [Valaris]
+ { AtCommand_ToNPC, "@tonpc", 40, atcommand_tonpc }, // LuzZza
+ { AtCommand_Commands, "@commands", 1, atcommand_commands }, // [Skotlex]
+ { AtCommand_NoAsk, "@noask", 1, atcommand_noask }, // [LuzZza]
+ { AtCommand_Request, "@request", 20, atcommand_request }, // [Skotlex]
+ { AtCommand_HomLevel, "@hlvl", 60, atcommand_homlevel },
+ { AtCommand_HomLevel, "@hlevel", 60, atcommand_homlevel },
+ { AtCommand_HomLevel, "@homlvl", 60, atcommand_homlevel },
+ { AtCommand_HomLevel, "@homlevel", 60, atcommand_homlevel },
+ { AtCommand_HomEvolution, "@homevolution", 60, atcommand_homevolution },
+ { AtCommand_MakeHomun, "@makehomun", 60, atcommand_makehomun },
+ { AtCommand_HomFriendly, "@homfriendly", 60, atcommand_homfriendly },
+ { AtCommand_HomHungry, "@homhungry", 60, atcommand_homhungry },
+ { AtCommand_HomTalk, "@homtalk", 10, atcommand_homtalk },
+ { AtCommand_HomInfo, "@hominfo", 1, atcommand_hominfo },
+ { AtCommand_HomStats, "@homstats", 1, atcommand_homstats },
+ { AtCommand_HomShuffle, "@homshuffle", 60, atcommand_homshuffle },
+ { AtCommand_ShowMobs, "@showmobs", 10, atcommand_showmobs }, //KarLaeda
+ { AtCommand_FeelReset, "@feelreset", 10, atcommand_feelreset }, //[HiddenDragon]
#ifndef TXT_ONLY // sql-only commands
- { AtCommand_CheckMail, "@checkmail", 1, atcommand_listmail }, // [Valaris]
- { AtCommand_ListMail, "@listmail", 1, atcommand_listmail }, // [Valaris]
- { AtCommand_ListNewMail, "@listnewmail", 1, atcommand_listmail }, // [Valaris]
- { AtCommand_ReadMail, "@readmail", 1, atcommand_readmail }, // [Valaris]
- { AtCommand_DeleteMail, "@deletemail", 1, atcommand_readmail }, // [Valaris]
- { AtCommand_SendMail, "@sendmail", 1, atcommand_sendmail }, // [Valaris]
- { AtCommand_SendPriorityMail, "@sendprioritymail",80, atcommand_sendmail }, // [Valaris]
- { AtCommand_RefreshOnline, "@refreshonline", 99, atcommand_refreshonline }, // [Valaris]
-
-#endif /* TXT_ONLY */
- { AtCommand_SkillTree, "@skilltree", 40, atcommand_skilltree }, // [MouseJstr]
- { AtCommand_Marry, "@marry", 40, atcommand_marry }, // [MouseJstr]
- { AtCommand_Divorce, "@divorce", 40, atcommand_divorce }, // [MouseJstr]
- { AtCommand_Grind, "@grind", 99, atcommand_grind }, // [MouseJstr]
- { AtCommand_Grind2, "@grind2", 99, atcommand_grind2 }, // [MouseJstr]
-
+ { AtCommand_CheckMail, "@checkmail", 1, atcommand_listmail }, // [Valaris]
+ { AtCommand_ListMail, "@listmail", 1, atcommand_listmail }, // [Valaris]
+ { AtCommand_ListNewMail, "@listnewmail", 1, atcommand_listmail }, // [Valaris]
+ { AtCommand_ReadMail, "@readmail", 1, atcommand_readmail }, // [Valaris]
+ { AtCommand_DeleteMail, "@deletemail", 1, atcommand_readmail }, // [Valaris]
+ { AtCommand_SendMail, "@sendmail", 1, atcommand_sendmail }, // [Valaris]
+ { AtCommand_SendPriorityMail, "@sendprioritymail",80, atcommand_sendmail }, // [Valaris]
+ { AtCommand_RefreshOnline, "@refreshonline", 99, atcommand_refreshonline }, // [Valaris]
+#endif
#ifdef DMALLOC
- { AtCommand_DMStart, "@dmstart", 99, atcommand_dmstart }, // [MouseJstr]
- { AtCommand_DMTick, "@dmtick", 99, atcommand_dmtick }, // [MouseJstr]
+ { AtCommand_DMStart, "@dmstart", 99, atcommand_dmstart }, // [MouseJstr]
+ { AtCommand_DMTick, "@dmtick", 99, atcommand_dmtick }, // [MouseJstr]
#endif
-
- { AtCommand_JumpToId, "@jumptoid", 20, atcommand_jumptoid }, // [Dino9021]
- { AtCommand_JumpToId, "@warptoid", 20, atcommand_jumptoid }, // [Dino9021]
- { AtCommand_JumpToId, "@gotoid", 20, atcommand_jumptoid }, // [Dino9021]
- { AtCommand_JumpToId2, "@jumptoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
- { AtCommand_JumpToId2, "@warptoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
- { AtCommand_JumpToId2, "@gotoid2", 20, atcommand_jumptoid2 }, // [Dino9021]
- { AtCommand_RecallId, "@recallid", 60, atcommand_recallid }, // [Dino9021]
- { AtCommand_RecallId2, "@recallid2", 60, atcommand_recallid2 }, // [Dino9021]
- { AtCommand_KickId, "@kickid", 99, atcommand_kickid }, // [Dino9021]
- { AtCommand_KickId2, "@kickid2", 99, atcommand_kickid2 }, // [Dino9021]
- { AtCommand_ReviveId, "@reviveid", 60, atcommand_reviveid }, // [Dino9021]
- { AtCommand_ReviveId2, "@reviveid2", 60, atcommand_reviveid2 }, // [Dino9021]
- { AtCommand_KillId, "@killid", 60, atcommand_killid }, // [Dino9021]
- { AtCommand_KillId2, "@killid2", 60, atcommand_killid2 }, // [Dino9021]
- { AtCommand_CharKillableId, "@charkillableid", 40, atcommand_charkillableid }, // [Dino9021]
- { AtCommand_CharKillableId2, "@charkillableid2", 40, atcommand_charkillableid2 }, // [Dino9021]
-
- { AtCommand_Sound, "@sound", 40, atcommand_sound },
- { AtCommand_UndisguiseAll, "@undisguiseall", 99, atcommand_undisguiseall },
- { AtCommand_DisguiseAll, "@disguiseall", 99, atcommand_disguiseall },
- { AtCommand_ChangeLook, "@changelook", 60, atcommand_changelook },
- { AtCommand_AutoLoot, "@autoloot", 10, atcommand_autoloot }, // Upa-Kun
- { AtCommand_MobInfo, "@mobinfo", 1, atcommand_mobinfo }, // [Lupus]
- { AtCommand_MobInfo, "@monsterinfo", 1, atcommand_mobinfo }, // [Lupus]
- { AtCommand_MobInfo, "@mi", 1, atcommand_mobinfo }, // [Lupus]
- { AtCommand_Exp, "@exp", 1, atcommand_exp }, // [Skotlex]
- { AtCommand_Adopt, "@adopt", 40, atcommand_adopt }, // [Veider]
- { AtCommand_Version, "@version", 1, atcommand_version },
-
- { AtCommand_MuteArea, "@mutearea", 99, atcommand_mutearea }, // MouseJstr
- { AtCommand_MuteArea, "@stfu", 99, atcommand_mutearea }, // MouseJstr
- { AtCommand_Rates, "@rates", 1, atcommand_rates }, // MouseJstr
-
- { AtCommand_ItemInfo, "@iteminfo", 1, atcommand_iteminfo }, // [Lupus]
- { AtCommand_ItemInfo, "@ii", 1, atcommand_iteminfo }, // [Lupus]
- { AtCommand_WhoDrops, "@whodrops", 1, atcommand_whodrops }, // [Skotlex]
- { AtCommand_MapFlag, "@mapflag", 99, atcommand_mapflag }, // [Lupus]
-
- { AtCommand_Me, "@me", 20, atcommand_me }, //added by massdriller, code by lordalfa
- { AtCommand_MonsterIgnore, "@monsterignore", 99, atcommand_monsterignore }, // [Valaris]
- { AtCommand_MonsterIgnore, "@battleignore", 99, atcommand_monsterignore },
- { AtCommand_FakeName, "@fakename", 20, atcommand_fakename }, // [Valaris]
- { AtCommand_Size, "@size", 20, atcommand_size },
- { AtCommand_ShowExp, "@showexp", 10, atcommand_showexp},
- { AtCommand_ShowZeny, "@showzeny", 10, atcommand_showzeny},
- { AtCommand_ShowDelay, "@showdelay", 1, atcommand_showdelay},
- { AtCommand_AutoTrade, "@autotrade", 10, atcommand_autotrade }, // durf
- { AtCommand_AutoTrade, "@at", 10, atcommand_autotrade },
- { AtCommand_ChangeGM, "@changegm", 10, atcommand_changegm }, // durf
- { AtCommand_ChangeLeader, "@changeleader", 10, atcommand_changeleader }, // durf
- { AtCommand_PartyOption, "@partyoption", 10, atcommand_partyoption}, // durf
- { AtCommand_Invite, "@invite", 1, atcommand_invite }, // By LuzZza
- { AtCommand_Duel, "@duel", 1, atcommand_duel }, // By LuzZza
- { AtCommand_Leave, "@leave", 1, atcommand_leave }, // By LuzZza
- { AtCommand_Accept, "@accept", 1, atcommand_accept }, // By LuzZza
- { AtCommand_Reject, "@reject", 1, atcommand_reject }, // By LuzZza
- { AtCommand_Away, "@away", 1, atcommand_away }, // [LuzZza]
- { AtCommand_Away, "@aw", 1, atcommand_away }, // [LuzZza]
- { AtCommand_Main, "@main", 1, atcommand_main }, // [LuzZza]
- { AtCommand_Clone, "@clone", 50, atcommand_clone },
- { AtCommand_Clone, "@slaveclone", 50, atcommand_clone },
- { AtCommand_Clone, "@evilclone", 50, atcommand_clone }, // [Valaris]
- { AtCommand_ToNPC, "@tonpc", 40, atcommand_tonpc }, // LuzZza
- { AtCommand_Commands, "@commands", 1, atcommand_commands }, // [Skotlex]
- { AtCommand_NoAsk, "@noask", 1, atcommand_noask }, // [LuzZza]
- { AtCommand_Request, "@request", 20, atcommand_request }, // [Skotlex]
-
- { AtCommand_HomLevel, "@homlvup", 60, atcommand_homlevel },
- { AtCommand_HomEvolution, "@homevolution", 60, atcommand_homevolution },
- { AtCommand_MakeHomun, "@makehomun", 60, atcommand_makehomun },
- { AtCommand_HomFriendly, "@homfriendly", 60, atcommand_homfriendly },
- { AtCommand_HomHungry, "@homhungry", 60, atcommand_homhungry },
- { AtCommand_HomTalk, "@homtalk", 10, atcommand_homtalk },
- { AtCommand_HomInfo, "@hominfo", 1, atcommand_hominfo },
- { AtCommand_HomStats, "@homstats", 1, atcommand_homstats },
- { AtCommand_HomShuffle, "@homshuffle", 60, atcommand_homshuffle },
- { AtCommand_ShowMobs, "@showmobs", 10, atcommand_showmobs }, //KarLaeda
// add new commands before this line
- { AtCommand_Unknown, NULL, 1, NULL }
+ { AtCommand_Unknown, NULL, 1, NULL }
};
/*=========================================
@@ -650,7 +593,7 @@ static AtCommandInfo atcommand_info[] = {
*-----------------------------------------
*/
char atcmd_output[200];
-char atcmd_player_name[100];
+char atcmd_player_name[NAME_LENGTH];
char atcmd_temp[100];
/*==========================================
@@ -670,13 +613,13 @@ char *estr_lower(char *str)
// compare function for sorting high to lowest
int hightolow_compare (const void * a, const void * b)
{
- return ( *(int*)b - *(int*)a );
+ return ( *(int*)b - *(int*)a );
}
// compare function for sorting lowest to highest
int lowtohigh_compare (const void * a, const void * b)
{
- return ( *(int*)a - *(int*)b );
+ return ( *(int*)a - *(int*)b );
}
//-----------------------------------------------------------
@@ -1046,9 +989,9 @@ int atcommand_send(const int fd, struct map_session_data* sd, const char* comman
|| sscanf(message, "%x", &type)==1) )
{
clif_displaymessage(fd, "Usage:");
- clif_displaymessage(fd, " @send len <packet hex number>");
- clif_displaymessage(fd, " @send <packet hex number> {<value>}*");
- clif_displaymessage(fd, " Value: <type=B(default),W,L><number> or S<length>\"<string>\"");
+ clif_displaymessage(fd, " @send len <packet hex number>");
+ clif_displaymessage(fd, " @send <packet hex number> {<value>}*");
+ clif_displaymessage(fd, " Value: <type=B(default),W,L><number> or S<length>\"<string>\"");
return -1;
}
@@ -1311,13 +1254,12 @@ int atcommand_rura( const int fd, struct map_session_data* sd, const char* comma
clif_displaymessage(fd, msg_txt(248));
return -1;
}
- if (pc_setpos(sd, mapindex, x, y, 3) == 0)
- clif_displaymessage(fd, msg_txt(0)); // Warped.
- else {
+ if (pc_setpos(sd, mapindex, x, y, 3) != 0) {
clif_displaymessage(fd, msg_txt(1)); // Map not found.
return -1;
}
+ clif_displaymessage(fd, msg_txt(0)); // Warped.
return 0;
}
@@ -1328,7 +1270,6 @@ int atcommand_rura( const int fd, struct map_session_data* sd, const char* comma
int atcommand_where(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
struct map_session_data *pl_sd = NULL;
- int GM_level, pl_GM_level;
nullpo_retr(-1, sd);
memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
@@ -1337,20 +1278,23 @@ int atcommand_where(const int fd, struct map_session_data* sd, const char* comma
clif_displaymessage(fd, "Please, enter a player name (usage: @where <char name>).");
return -1;
}
- pl_sd = map_nick2sd(atcmd_player_name);
-
- if (pl_sd == NULL)
+
+ if ((pl_sd = map_nick2sd(atcmd_player_name)) == NULL)
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
+ }
if(strncmp(pl_sd->status.name,atcmd_player_name,NAME_LENGTH)!=0)
+ {
+ clif_displaymessage(fd, "You already know where you are...");
return -1;
+ }
- GM_level = pc_isGM(sd);//also hide gms depending on settings in battle_athena.conf, show if they are aid [Kevin]
- pl_GM_level = pc_isGM(pl_sd);
-
if (battle_config.hide_GM_session) {
- if(GM_level < pl_GM_level) {
- if (!(battle_config.who_display_aid && GM_level >= battle_config.who_display_aid)) {
+ if(pc_isGM(sd) < pc_isGM(pl_sd)) {
+ if (!(battle_config.who_display_aid && pc_isGM(sd) >= battle_config.who_display_aid)) {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
}
@@ -1373,30 +1317,38 @@ int atcommand_jumpto(const int fd, struct map_session_data* sd, const char* comm
nullpo_retr(-1, sd);
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @jumpto/@warpto/@goto <char name>).");
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @jumpto/@warpto/@goto <player name/id>).");
return -1;
}
- if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0) //Yourself mate? Tsk tsk tsk.
- return -1;
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(247));
- return -1;
- }
- if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(248));
- return -1;
- }
- pc_setpos(sd, pl_sd->mapindex, pl_sd->bl.x, pl_sd->bl.y, 3);
- sprintf(atcmd_output, msg_txt(4), atcmd_player_name); // Jump to %s
- clif_displaymessage(fd, atcmd_output);
- } else {
+ if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ {
clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+
+ if (pl_sd == sd)
+ {
+ clif_displaymessage(fd, "But you are already where you are...");
+ return -1;
+ }
+
+ if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd))
+ {
+ clif_displaymessage(fd, msg_txt(247)); // You are not authorized to warp to this map.
+ return -1;
+ }
+
+ if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd))
+ {
+ clif_displaymessage(fd, msg_txt(248)); // You are not authorized to warp from your current map.
+ return -1;
+ }
+
+ pc_setpos(sd, pl_sd->mapindex, pl_sd->bl.x, pl_sd->bl.y, 3);
+ sprintf(atcmd_output, msg_txt(4), atcmd_player_name); // Jumped to %s
+ clif_displaymessage(fd, atcmd_output);
return 0;
}
@@ -1420,11 +1372,11 @@ int atcommand_jump(const int fd, struct map_session_data* sd, const char* comman
if (y <= 0)
y = -1;
if (sd->bl.m >= 0 && (map[sd->bl.m].flag.nowarp || map[sd->bl.m].flag.nowarpto) && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(248));
+ clif_displaymessage(fd, msg_txt(248)); // You are not authorized to warp from your current map.
return -1;
}
pc_setpos(sd, sd->mapindex, x, y, 3);
- sprintf(atcmd_output, msg_txt(5), sd->bl.x, sd->bl.y); // Jump to %d %d
+ sprintf(atcmd_output, msg_txt(5), sd->bl.x, sd->bl.y); // Jumped to %d %d
clif_displaymessage(fd, atcmd_output);
return 0;
}
@@ -2023,11 +1975,11 @@ int atcommand_load(const int fd, struct map_session_data* sd, const char* comman
m = map_mapindex2mapid(sd->status.save_point.map);
if (m >= 0 && map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(249));
+ clif_displaymessage(fd, msg_txt(249)); // You are not authorized to warp to your save map.
return -1;
}
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(248));
+ clif_displaymessage(fd, msg_txt(248)); // You are not authorized to warp from your current map.
return -1;
}
@@ -2056,61 +2008,18 @@ int atcommand_speed(const int fd, struct map_session_data* sd, const char* comma
}
speed = atoi(message);
- if (speed >= MIN_WALK_SPEED && speed <= MAX_WALK_SPEED) {
- sd->base_status.speed = speed;
- status_calc_bl(&sd->bl, SCB_SPEED);
- clif_displaymessage(fd, msg_txt(8)); // Speed changed.
- } else {
- sprintf(atcmd_output, "Please, enter a valid speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED);
- clif_displaymessage(fd, atcmd_output);
- return -1;
- }
-
- return 0;
-}
-
-/*==========================================
- *
- *------------------------------------------
- */
-int atcommand_charspeed(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd;
- int speed;
-
- nullpo_retr(-1, sd);
-
- memset(atcmd_output, '\0', sizeof(atcmd_output));
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
-
- if (!message || !*message || sscanf(message, "%d %23[^\n]", &speed, atcmd_player_name) < 2) {
- sprintf(atcmd_output, "Please, enter a speed and a player name (usage: @charspeed <speed <%d-%d>> <char name>).", MIN_WALK_SPEED, MAX_WALK_SPEED);
- clif_displaymessage(fd, atcmd_output);
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) == NULL) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd))
- { //GM level check
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
+ if (speed < MIN_WALK_SPEED)
+ {
+ speed = MIN_WALK_SPEED;
}
-
- if (speed >= MIN_WALK_SPEED && speed <= MAX_WALK_SPEED) {
- pl_sd->base_status.speed = speed;
- status_calc_bl(&pl_sd->bl, SCB_SPEED);
- clif_displaymessage(fd, msg_txt(8)); // Speed changed.
- if(pl_sd->fd)
- clif_displaymessage(pl_sd->fd, msg_txt(8)); // Speed changed.
- } else {
- sprintf(atcmd_output, "Please, enter a valid speed value (usage: @speed <%d-%d>).", MIN_WALK_SPEED, MAX_WALK_SPEED);
- clif_displaymessage(fd, atcmd_output);
- return -1;
+ else if (speed > MAX_WALK_SPEED)
+ {
+ speed = MAX_WALK_SPEED;
}
+
+ sd->base_status.speed = speed;
+ status_calc_bl(&sd->bl, SCB_SPEED);
+ clif_displaymessage(fd, msg_txt(8)); // Speed changed.
return 0;
}
@@ -2126,10 +2035,13 @@ int atcommand_storage(const int fd, struct map_session_data* sd, const char* com
return -1;
if (storage_storageopen(sd) == 1)
- { //Already open.
+ { //Already open.
clif_displaymessage(fd, msg_txt(250));
return -1;
}
+
+ clif_displaymessage(fd, "Storage opened.");
+
return 0;
}
@@ -2161,6 +2073,7 @@ int atcommand_guildstorage(const int fd, struct map_session_data* sd, const char
return -1;
}
storage_guild_storageopen(sd);
+ clif_displaymessage(fd, "Guild storage opened.");
return 0;
}
@@ -2310,7 +2223,29 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c
}
if (!found) {
- clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange <job ID>).");
+ clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange <job name/ID>).");
+ clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 Peco Crusader");
+ clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A");
+ clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice");
+ clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger");
+ clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja");
+ clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A");
+ clif_displaymessage(fd, " 6 Thief 13 Peco Knight 20 Dancer");
+ clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 Peco Paladin");
+ clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion");
+ clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor");
+ clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker");
+ clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator");
+ clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown");
+ clif_displaymessage(fd, "4007 Thief High 4014 Peco Lord Knight 4021 Gypsy");
+ clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 Baby Peco Crusader");
+ clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby");
+ clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid");
+ clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A");
+ clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker");
+ clif_displaymessage(fd, "4029 Baby Thief 4036 Baby Peco-Knight 4043 Baby Dancer");
+ clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job.");
return -1;
}
}
@@ -2333,7 +2268,29 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c
return -1;
}
} else {
- clif_displaymessage(fd, "Please, enter a valid job ID (usage: @job/@jobchange <job ID>).");
+ clif_displaymessage(fd, "Please, enter a valid job ID (usage: @job/@jobchange <job name/ID>).");
+ clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 Peco Crusader");
+ clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A");
+ clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice");
+ clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger");
+ clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja");
+ clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A");
+ clif_displaymessage(fd, " 6 Thief 13 Peco Knight 20 Dancer");
+ clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 Peco Paladin");
+ clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion");
+ clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor");
+ clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker");
+ clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator");
+ clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown");
+ clif_displaymessage(fd, "4007 Thief High 4014 Peco Lord Knight 4021 Gypsy");
+ clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 Baby Peco Crusader");
+ clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby");
+ clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid");
+ clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A");
+ clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker");
+ clif_displaymessage(fd, "4029 Baby Thief 4036 Baby Peco-Knight 4043 Baby Dancer");
+ clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job.");
return -1;
}
@@ -2365,23 +2322,27 @@ int atcommand_kill(const int fd, struct map_session_data* sd, const char* comman
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @kill <char name>).");
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @kill <player name/id>).");
return -1;
}
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level
- status_kill(&pl_sd->bl);
- clif_displaymessage(fd, msg_txt(14)); // Character killed.
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
+ if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ {
clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+
+ if (pc_isGM(sd) < pc_isGM(pl_sd))
+ { // you can kill only lower or same level
+ clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+ return -1;
+ }
+
+ status_kill(&pl_sd->bl);
+ clif_displaymessage(pl_sd->fd, msg_txt(13)); // A pity! You've died.
+ if (fd != pl_sd->fd)
+ clif_displaymessage(fd, msg_txt(14)); // Character killed.
return 0;
}
@@ -2394,7 +2355,10 @@ int atcommand_alive(const int fd, struct map_session_data* sd, const char* comma
{
nullpo_retr(-1, sd);
if (!status_revive(&sd->bl, 100, 100))
+ {
+ clif_displaymessage(fd, "You're not dead.");
return -1;
+ }
clif_skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1);
clif_displaymessage(fd, msg_txt(16)); // You've been revived! It's a miracle!
return 0;
@@ -2911,10 +2875,10 @@ int atcommand_pvpoff(const int fd, struct map_session_data* sd, const char* comm
{
nullpo_retr(-1, sd);
- if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris]
- clif_displaymessage(fd, msg_txt(52)); // This option cannot be used in PK Mode.
- return -1;
- }
+ //if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris]
+ // clif_displaymessage(fd, msg_txt(52)); // This option cannot be used in PK Mode.
+ // return -1;
+ //}
if (!map[sd->bl.m].flag.pvp) {
clif_displaymessage(fd, msg_txt(160)); // PvP is already Off.
@@ -2922,7 +2886,9 @@ int atcommand_pvpoff(const int fd, struct map_session_data* sd, const char* comm
}
map[sd->bl.m].flag.pvp = 0;
- clif_send0199(sd->bl.m, 0);
+
+ if (!battle_config.pk_mode)
+ clif_send0199(sd->bl.m, 0);
map_foreachinmap(atcommand_pvpoff_sub,sd->bl.m, BL_PC);
map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0);
clif_displaymessage(fd, msg_txt(31)); // PvP: Off.
@@ -2939,23 +2905,26 @@ int atcommand_pvpon(const int fd, struct map_session_data* sd, const char* comma
int i, users;
nullpo_retr(-1, sd);
- if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris]
- clif_displaymessage(fd, msg_txt(52)); // This option cannot be used in PK Mode.
- return -1;
- }
+ //if (battle_config.pk_mode) { //disable command if server is in PK mode [Valaris]
+ // clif_displaymessage(fd, msg_txt(52)); // This option cannot be used in PK Mode.
+ // return -1;
+ //}
if (!map[sd->bl.m].flag.pvp) {
map[sd->bl.m].flag.pvp = 1;
- clif_send0199(sd->bl.m, 1);
- pl_allsd = map_getallusers(&users);
- for (i = 0; i < users; i++) {
- if ((pl_sd = pl_allsd[i]) && sd->bl.m == pl_sd->bl.m && pl_sd->pvp_timer == -1) {
- pl_sd->pvp_timer = add_timer(gettick() + 200, pc_calc_pvprank_timer, pl_sd->bl.id, 0);
- pl_sd->pvp_rank = 0;
- pl_sd->pvp_lastusers = 0;
- pl_sd->pvp_point = 5;
- pl_sd->pvp_won = 0;
- pl_sd->pvp_lost = 0;
+ if (!battle_config.pk_mode)
+ {
+ clif_send0199(sd->bl.m, 1);
+ pl_allsd = map_getallusers(&users);
+ for (i = 0; i < users; i++) {
+ if ((pl_sd = pl_allsd[i]) && sd->bl.m == pl_sd->bl.m && pl_sd->pvp_timer == -1) {
+ pl_sd->pvp_timer = add_timer(gettick() + 200, pc_calc_pvprank_timer, pl_sd->bl.id, 0);
+ pl_sd->pvp_rank = 0;
+ pl_sd->pvp_lastusers = 0;
+ pl_sd->pvp_point = 5;
+ pl_sd->pvp_won = 0;
+ pl_sd->pvp_lost = 0;
+ }
}
}
clif_displaymessage(fd, msg_txt(32)); // PvP: On.
@@ -3456,7 +3425,7 @@ int atcommand_monstersmall(const int fd, struct map_session_data* sd, const char
}
if (mob_id == MOBID_EMPERIUM) {
- clif_displaymessage(fd, msg_txt(83));
+ clif_displaymessage(fd, msg_txt(83)); // Cannot spawn emperium
return -1;
}
@@ -3532,7 +3501,7 @@ int atcommand_monsterbig(const int fd, struct map_session_data* sd, const char*
}
if (mob_id == MOBID_EMPERIUM) {
- clif_displaymessage(fd, msg_txt(83));
+ clif_displaymessage(fd, msg_txt(83)); // Cannot spawn emperium
return -1;
}
@@ -3653,6 +3622,26 @@ int atcommand_refine(const int fd, struct map_session_data* sd, const char* comm
if (!message || !*message || sscanf(message, "%d %d", &position, &refine) < 2) {
clif_displaymessage(fd, "Please, enter a position and a amount (usage: @refine <equip position> <+/- amount>).");
+ sprintf(atcmd_output, "%d: Left Accessory", EQI_ACC_L);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Right Accessory", EQI_ACC_R);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Shoes", EQI_SHOES);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Garment", EQI_GARMENT);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Lower Headgear", EQI_HEAD_LOW);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Mid Headgear", EQI_HEAD_MID);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Top Headgear", EQI_HEAD_TOP);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Body Armor", EQI_ARMOR);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Left Hand", EQI_HAND_L);
+ clif_displaymessage(fd, atcmd_output);
+ sprintf(atcmd_output, "%d: Right Hand", EQI_HAND_R);
+ clif_displaymessage(fd, atcmd_output);
return -1;
}
@@ -3863,47 +3852,18 @@ int atcommand_gat(const int fd, struct map_session_data* sd, const char* command
*
*------------------------------------------
*/
-int atcommand_packet(const int fd, struct map_session_data* sd, const char* command, const char* message)
+int atcommand_displaystatus(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
- static int packet_mode = 0;
- int i, x = 0, y = 0;
+ int i, type, flag;
nullpo_retr(-1, sd);
-
- if (strstr(command, "packetmode")) {
- packet_mode = atoi(message);
- clif_displaymessage(fd, "Packet mode changed.");
- return 0;
- }
- if (!message || !*message || (i = sscanf(message, "%d %d", &x, &y)) < 1) {
- clif_displaymessage(fd, "Please, enter a status type/flag (usage: @packet <status type> <flag>).");
+ if (!message || !*message || (i = sscanf(message, "%d %d", &type, &flag)) < 1) {
+ clif_displaymessage(fd, "Please, enter a status type/flag (usage: @displaystatus <status type> <flag>).");
return -1;
}
- if (i == 1) y = 1;
+ if (i == 1) flag = 1;
- switch (packet_mode)
- {
- case 0:
- clif_status_change(&sd->bl, x, y);
- break;
- case 1:
- sd->status.skill[sd->cloneskill_id].id=0;
- sd->status.skill[sd->cloneskill_id].lv=0;
- sd->status.skill[sd->cloneskill_id].flag=0;
- sd->cloneskill_id = x;
- sd->status.skill[x].id = x;
- sd->status.skill[x].lv = skill_get_max(x);
- sd->status.skill[x].flag = 13;//cloneskill flag
- clif_skillinfoblock(sd);
- break;
- case 2:
- clif_skill_nodamage(&sd->bl,&sd->bl,x,y,1);
- case 3:
- clif_skill_poseffect(&sd->bl,x,y,sd->bl.x,sd->bl.y,gettick());
- default:
- break;
- //added later
- }
+ clif_status_change(&sd->bl, type, flag);
return 0;
}
@@ -4029,7 +3989,7 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma
memset(atcmd_output, '\0', sizeof(atcmd_output));
if (!message || !*message || sscanf(message, "%d", &value) < 1 || value == 0) {
- sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>).");
+ sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustment>).");
clif_displaymessage(fd, atcmd_output);
return -1;
}
@@ -4039,7 +3999,7 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma
break;
if (param[i] == NULL || i > MAX_STATUS_TYPE) { // normally impossible...
- sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>).");
+ sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustment>).");
clif_displaymessage(fd, atcmd_output);
return -1;
}
@@ -4051,7 +4011,7 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma
status[4] = &sd->status.dex;
status[5] = &sd->status.luk;
- max = pc_maxparameter(sd);
+ max = SHRT_MAX;
new_value = cap_value(*status[i] + value, 1, max);
if (new_value != (int)*status[i]) {
@@ -4093,7 +4053,7 @@ int atcommand_stat_all(const int fd, struct map_session_data* sd, const char* co
value = pc_maxparameter(sd);
count = 0;
- max = pc_maxparameter(sd);
+ max = SHRT_MAX;
for (index = 0; index < (int)(sizeof(status) / sizeof(status[0])); index++) {
if (value > 0 && *status[index] > max - value)
@@ -4145,10 +4105,10 @@ int atcommand_guildlevelup(const int fd, struct map_session_data* sd, const char
clif_displaymessage(fd, msg_txt(43)); // You're not in a guild.
return -1;
}
- if (strcmp(sd->status.name, guild_info->master) != 0) {
- clif_displaymessage(fd, msg_txt(44)); // You're not the master of your guild.
- return -1;
- }
+ //if (strcmp(sd->status.name, guild_info->master) != 0) {
+ // clif_displaymessage(fd, msg_txt(44)); // You're not the master of your guild.
+ // return -1;
+ //}
added_level = (short)level;
if (level > 0 && (level > MAX_GUILDLEVEL || added_level > ((short)MAX_GUILDLEVEL - guild_info->guild_lv))) // fix positiv overflow
@@ -4331,67 +4291,41 @@ int atcommand_recall(const int fd, struct map_session_data* sd, const char* comm
nullpo_retr(-1, sd);
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @recall <char name>).");
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @recall <player name/id>).");
return -1;
}
- if(strncmp(sd->status.name,atcmd_player_name,NAME_LENGTH)==0)
- return -1;
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can recall only lower or same level
- if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, "You are not authorised to warp somenone to your actual map.");
- return -1;
- }
- if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
- clif_displaymessage(fd, "You are not authorized to warp this player from its actual map.");
- return -1;
- }
- pc_setpos(pl_sd, sd->mapindex, sd->bl.x, sd->bl.y, 2);
- sprintf(atcmd_output, msg_txt(46), atcmd_player_name); // %s recalled!
- clif_displaymessage(fd, atcmd_output);
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
+ if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ {
clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+
+ if (pl_sd == sd)
+ {
+ clif_displaymessage(fd, "You are already where you are...");
+ return -1;
+ }
- return 0;
-}
-
-/*==========================================
- *
- *------------------------------------------
- */
-int atcommand_revive(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
-
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @revive <char name>).");
+ if ( pc_isGM(sd) < pc_isGM(pl_sd) )
+ {
+ clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
return -1;
}
- pl_sd = map_nick2sd(atcmd_player_name);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
+ clif_displaymessage(fd, "You are not authorised to warp somenone to your actual map.");
return -1;
}
-
- if (!status_revive(&pl_sd->bl, 100, 0))
+ if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
+ clif_displaymessage(fd, "You are not authorized to warp this player from its actual map.");
return -1;
-
- clif_skill_nodamage(&sd->bl,&pl_sd->bl,ALL_RESURRECTION,4,1);
- clif_displaymessage(fd, msg_txt(51)); // Character revived.
+ }
+ pc_setpos(pl_sd, sd->mapindex, sd->bl.x, sd->bl.y, 2);
+ sprintf(atcmd_output, msg_txt(46), pl_sd->status.name); // %s recalled!
+ clif_displaymessage(fd, atcmd_output);
+
return 0;
}
@@ -4451,7 +4385,7 @@ int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* co
memset(atcmd_output, '\0', sizeof(atcmd_output));
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message || sscanf(message, "%199s %99[^\n]", atcmd_output, atcmd_player_name) < 2) {
+ if (!message || !*message || sscanf(message, "%s %23[^\n]", atcmd_output, atcmd_player_name) < 2) {
clif_displaymessage(fd, "Please, enter ban time and a player name (usage: @charban/@ban/@banish/@charbanish <time> <name>).");
return -1;
}
@@ -4522,7 +4456,7 @@ int atcommand_char_unblock(const int fd, struct map_session_data* sd, const char
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charunblock <player_name>).");
return -1;
}
@@ -4553,7 +4487,7 @@ int atcommand_char_unban(const int fd, struct map_session_data* sd, const char*
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message || sscanf(message, "%99[^\n]", atcmd_player_name) < 1) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charunban <player_name>).");
return -1;
}
@@ -4726,23 +4660,25 @@ int atcommand_kick(const int fd, struct map_session_data* sd, const char* comman
memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @kick <charname>).");
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @kick <player name/id>).");
return -1;
}
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) // you can kick only lower or same gm level
- clif_GM_kick(sd, pl_sd, 1);
- else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
+ if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
+ {
clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+ if ( pc_isGM(sd) < pc_isGM(pl_sd) )
+ {
+ clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+ return -1;
+ }
+
+ clif_GM_kick(sd, pl_sd, 1);
+
return 0;
}
@@ -5598,13 +5534,20 @@ int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char*
nullpo_retr(-1, sd);
if (!pc_isriding(sd)) { // if actually no peco
- if (pc_checkskill(sd, KN_RIDING)) {
- pc_setoption(sd, sd->sc.option | OPTION_RIDING);
- clif_displaymessage(fd, msg_txt(102)); // Mounted Peco.
- } else {
+ if (!pc_checkskill(sd, KN_RIDING))
+ {
clif_displaymessage(fd, msg_txt(213)); // You can not mount a peco with your job.
return -1;
}
+
+ if (sd->disguise)
+ {
+ clif_displaymessage(fd, msg_txt(212)); // Cannot mount a Peco while in disguise.
+ return -1;
+ }
+
+ pc_setoption(sd, sd->sc.option | OPTION_RIDING);
+ clif_displaymessage(fd, msg_txt(102)); // Mounted Peco.
} else { //Dismount
pc_setoption(sd, sd->sc.option & ~OPTION_RIDING);
clif_displaymessage(fd, msg_txt(214)); // Unmounted Peco.
@@ -5614,44 +5557,6 @@ int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char*
}
/*==========================================
- *
- *------------------------------------------
- */
-int atcommand_char_mount_peco(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
-
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @charmountpeco <char_name>).");
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
-
- if (!pc_isriding(pl_sd)) { // if actually no peco
- if (pc_checkskill(pl_sd, KN_RIDING)) {
- pc_setoption(pl_sd, pl_sd->sc.option | OPTION_RIDING);
- clif_displaymessage(fd, msg_txt(216)); // Mounted Peco.
- } else {
- clif_displaymessage(fd, msg_txt(217)); // You can not mount a peco with your job.
- return -1;
- }
- } else { //Dismount
- pc_setoption(pl_sd, pl_sd->sc.option & ~OPTION_RIDING);
- clif_displaymessage(fd, msg_txt(218)); // Unmounted Peco.
- }
- } else {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- return 0;
-}
-
-/*==========================================
*Spy Commands by Syrus22
*------------------------------------------
*/
@@ -5872,14 +5777,13 @@ int atcommand_hidenpc(const int fd, struct map_session_data* sd, const char* com
return -1;
}
- if (npc_name2id(NPCname) != NULL) {
- npc_enable(NPCname, 0);
- clif_displaymessage(fd, msg_txt(112)); // Npc Disabled.
- } else {
+ if (npc_name2id(NPCname) == NULL) {
clif_displaymessage(fd, msg_txt(111)); // This NPC doesn't exist.
return -1;
}
+ npc_enable(NPCname, 0);
+ clif_displaymessage(fd, msg_txt(112)); // Npc Disabled.
return 0;
}
@@ -5922,15 +5826,14 @@ int atcommand_unloadnpc(const int fd, struct map_session_data* sd, const char* c
return -1;
}
- if ((nd = npc_name2id(NPCname)) != NULL) {
- npc_unload_duplicates(nd);
- npc_unload(nd);
- clif_displaymessage(fd, msg_txt(112)); // Npc Disabled.
- } else {
+ if ((nd = npc_name2id(NPCname)) == NULL) {
clif_displaymessage(fd, msg_txt(111)); // This NPC doesn't exist.
return -1;
}
+ npc_unload_duplicates(nd);
+ npc_unload(nd);
+ clif_displaymessage(fd, msg_txt(112)); // Npc Disabled.
return 0;
}
@@ -5975,7 +5878,7 @@ char * txt_time(unsigned int duration)
}
/*==========================================
- * @time/@date/@server_date/@serverdate/@server_time/@servertime: Display the date/time of the server (by [Yor]
+ * @time/@date/@serverdate/@servertime: Display the date/time of the server (by [Yor]
* Calculation management of GM modification (@day/@night GM commands) is done
*------------------------------------------
*/
@@ -6048,81 +5951,6 @@ int atcommand_servertime(const int fd, struct map_session_data* sd, const char*
return 0;
}
-/*==========================================
- * @chardelitem <item_name_or_ID> <quantity> <player> (by [Yor]
- * removes <quantity> item from a character
- * item can be equiped or not.
- * Inspired from a old command created by RoVeRT
- *------------------------------------------
- */
-int atcommand_chardelitem(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd;
- char item_name[100];
- int i, number = 0, item_id, item_position, count;
- struct item_data *item_data;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- memset(item_name, '\0', sizeof(item_name));
- memset(atcmd_output, '\0', sizeof(atcmd_output));
-
- if (!message || !*message || (
- sscanf(message, "\"%99[^\"]\" %d %99[^\n]", item_name, &number, atcmd_player_name) < 3 &&
- sscanf(message, "%99s %d %99[^\n]", item_name, &number, atcmd_player_name) < 3
- ) || number < 1) {
- clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: @chardelitem <item_name_or_ID> <quantity> <player>).");
- return -1;
- }
-
- item_id = 0;
- if ((item_data = itemdb_searchname(item_name)) != NULL ||
- (item_data = itemdb_exists(atoi(item_name))) != NULL)
- item_id = item_data->nameid;
-
- if (item_id > 500) {
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level
- item_position = pc_search_inventory(pl_sd, item_id);
- if (item_position >= 0) {
- count = 0;
- for(i = 0; i < number && item_position >= 0; i++) {
-
- //Logs (A)dmins items [Lupus]
- if(log_config.enable_logs&0x400)
- log_pick_pc(pl_sd, "A", pl_sd->status.inventory[item_position].nameid, -1, &pl_sd->status.inventory[item_position]);
-
- pc_delitem(pl_sd, item_position, 1, 0);
- count++;
- item_position = pc_search_inventory(pl_sd, item_id); // for next loop
- }
- sprintf(atcmd_output, msg_txt(113), count); // %d item(s) removed by a GM.
- clif_displaymessage(pl_sd->fd, atcmd_output);
- if (number == count)
- sprintf(atcmd_output, msg_txt(114), count); // %d item(s) removed from the player.
- else
- sprintf(atcmd_output, msg_txt(115), count, count, number); // %d item(s) removed. Player had only %d on %d items.
- clif_displaymessage(fd, atcmd_output);
- } else {
- clif_displaymessage(fd, msg_txt(116)); // Character does not have the item.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(19)); // Invalid item ID or name.
- return -1;
- }
-
- return 0;
-}
-
//Added by Coltaro
//We're using this function here instead of using time_t so that it only counts player's jail time when he/she's online (and since the idea is to reduce the amount of minutes one by one in status_change_timer...).
//Well, using time_t could still work but for some reason that looks like more coding x_x
@@ -6256,8 +6084,8 @@ int atcommand_jailfor(const int fd, struct map_session_data* sd, const char* com
short m_index = 0;
nullpo_retr(-1, sd);
- if (!message || !*message || sscanf(message, "%199s %99[^\n]",atcmd_output,atcmd_player_name) < 2) {
- clif_displaymessage(fd, msg_txt(400)); //Usage: @jailfor <time> <character name>
+ if (!message || !*message || sscanf(message, "%s %23[^\n]",atcmd_output,atcmd_player_name) < 2) {
+ clif_displaymessage(fd, msg_txt(400)); //Usage: @jailfor <time> <character name>
return -1;
}
@@ -6387,47 +6215,6 @@ int atcommand_jailtime(const int fd, struct map_session_data* sd, const char* co
return 0;
}
-//By Coltaro
-int atcommand_charjailtime(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data* pl_sd;
- int year, month, day, hour, minute;
-
- nullpo_retr(-1, sd);
-
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @charjailtime <character name>).");
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) == NULL) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
- if (pc_isGM(pl_sd) >= pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
- return -1;
- }
- if (!pl_sd->sc.count || pl_sd->sc.data[SC_JAILED].timer == -1 ) {
- clif_displaymessage(fd, "This player is not in jail."); // You are not in jail.
- return -1;
- }
- if (pl_sd->sc.data[SC_JAILED].val2) {
- clif_displaymessage(fd, "This player has been jailed indefinitely.");
- return 0;
- }
-
- if (pl_sd->sc.data[SC_JAILED].val1 <= 0) { // Was not jailed with @jailfor (maybe @jail?)
- clif_displaymessage(fd, "This player has been jailed for an unknown amount of time.");
- return -1;
- }
- //Get remaining jail time
- get_jail_time(pl_sd->sc.data[SC_JAILED].val1,&year,&month,&day,&hour,&minute);
- sprintf(atcmd_output,msg_txt(402),"This player will remain",year,month,day,hour,minute);
- clif_displaymessage(fd, atcmd_output);
- return 0;
-}
-
/*==========================================
* @disguise <mob_id> by [Valaris] (simplified by [Yor])
*------------------------------------------
@@ -6456,8 +6243,14 @@ int atcommand_disguise(const int fd, struct map_session_data* sd, const char* co
}
if (id == 0)
- { // Monster/NPC name/id hasn't been found.
- clif_displaymessage(fd, msg_txt(123));
+ {
+ clif_displaymessage(fd, msg_txt(123)); // Monster/NPC name/id hasn't been found.
+ return -1;
+ }
+
+ if(pc_isriding(sd))
+ {
+ clif_displaymessage(fd, msg_txt(227)); // Character cannot wear disguise while riding a PecoPeco.
return -1;
}
@@ -6478,24 +6271,25 @@ int atcommand_disguiseall(const int fd, struct map_session_data* sd, const char*
nullpo_retr(-1, sd);
if (!message || !*message) {
- clif_displaymessage(fd, "Please, enter a Monster/NPC name/id (usage: @disguiseall <monster_name_or_monster_ID>).");
+ clif_displaymessage(fd, "Please, enter a Monster/NPC name/id (usage: @disguiseall <monster name or monster ID>).");
return -1;
}
if ((mob_id = mobdb_searchname(message)) == 0) // check name first (to avoid possible name begining by a number)
mob_id = atoi(message);
- if (mobdb_checkid(mob_id) || npcdb_checkid(mob_id)) { //if mob or npc...
- pl_allsd = map_getallusers(&users);
- for(i=0; i < users; i++) {
- if((pl_sd = pl_allsd[i]))
- pc_disguise(pl_sd, mob_id);
- }
- clif_displaymessage(fd, msg_txt(122)); // Disguise applied.
- } else {
+ if (!mobdb_checkid(mob_id) && !npcdb_checkid(mob_id)) { //if mob or npc...
+ clif_displaymessage(fd, msg_txt(123)); // Monster/NPC name/id not found.
return -1;
}
+ pl_allsd = map_getallusers(&users);
+ for(i=0; i < users; i++)
+ {
+ if((pl_sd = pl_allsd[i]))
+ pc_disguise(pl_sd, mob_id);
+ }
+ clif_displaymessage(fd, msg_txt(122)); // Disguise applied.
return 0;
}
@@ -6578,7 +6372,7 @@ int atcommand_broadcast(const int fd, struct map_session_data* sd, const char* c
return -1;
}
- sprintf(atcmd_output, "%s : %s", sd->status.name, message);
+ sprintf(atcmd_output, "%s: %s", sd->status.name, message);
intif_GMmessage(atcmd_output, strlen(atcmd_output) + 1, 0);
return 0;
@@ -6599,7 +6393,7 @@ int atcommand_localbroadcast(const int fd, struct map_session_data* sd, const ch
return -1;
}
- sprintf(atcmd_output, "%s : %s", sd->status.name, message);
+ sprintf(atcmd_output, "%s: %s", sd->status.name, message);
clif_GMmessage(&sd->bl, atcmd_output, strlen(atcmd_output) + 1, 1); // 1: ALL_SAMEMAP
@@ -6607,96 +6401,6 @@ int atcommand_localbroadcast(const int fd, struct map_session_data* sd, const ch
}
/*==========================================
- * @chardisguise <mob_id> <character> by Kalaspuff (based off Valaris' and Yor's work)
- *------------------------------------------
- */
-int atcommand_chardisguise(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int mob_id;
- char mob_name[NAME_LENGTH];
- struct map_session_data* pl_sd;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- memset(mob_name, '\0', sizeof(mob_name));
-
- if (!message || !*message || sscanf(message, "%23s %23[^\n]", mob_name, atcmd_player_name) < 2) {
- clif_displaymessage(fd, "Please, enter a Monster/NPC name/id and a player name (usage: @chardisguise <monster_name_or_monster_ID> <char name>).");
- return -1;
- }
-
- if ((mob_id = atoi(mob_name)) > 0)
- { //Acquired an ID
- if (!mobdb_checkid(mob_id) && !npcdb_checkid(mob_id))
- mob_id = 0; //Invalid id for either mobs or npcs.
- } else { //Acquired a Name
- if ((mob_id = mobdb_searchname(mob_name)) == 0)
- {
- struct npc_data* nd = npc_name2id(mob_name);
- if (nd != NULL)
- mob_id = nd->n;
- }
- }
-
- if (mob_id == 0)
- {
- clif_displaymessage(fd, msg_txt(123)); // Monster/NPC name/id hasn't been found.
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can disguise only lower or same level
- pc_disguise(pl_sd, mob_id);
- clif_displaymessage(fd, msg_txt(140)); // Character's disguise applied.
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- return 0;
-}
-
-/*==========================================
- * @charundisguise <character> by Kalaspuff (based off Yor's work)
- *------------------------------------------
- */
-int atcommand_charundisguise(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data* pl_sd;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
-
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @charundisguise <char name>).");
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can undisguise only lower or same level
- if (pl_sd->disguise)
- pc_disguise(pl_sd, 0);
- else {
- clif_displaymessage(fd, msg_txt(142)); // Character is not disguised.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- return 0;
-}
-
-/*==========================================
* @email <actual@email> <new@email> by [Yor]
*------------------------------------------
*/
@@ -6726,11 +6430,10 @@ int atcommand_email(const int fd, struct map_session_data* sd, const char* comma
} else if (strcmpi(actual_email, new_email) == 0) {
clif_displaymessage(fd, msg_txt(147)); // New email must be different of the actual e-mail.
return -1;
- } else {
- chrif_changeemail(sd->status.account_id, actual_email, new_email);
- clif_displaymessage(fd, msg_txt(148)); // Information sended to login-server via char-server.
}
+ chrif_changeemail(sd->status.account_id, actual_email, new_email);
+ clif_displaymessage(fd, msg_txt(148)); // Information sended to login-server via char-server.
return 0;
}
@@ -6743,90 +6446,13 @@ int atcommand_effect(const int fd, struct map_session_data* sd, const char* comm
int type = 0, flag = 0;
nullpo_retr(-1, sd);
- if (!message || !*message || sscanf(message, "%d %d", &type,&flag) < 2) {
- clif_displaymessage(fd, "Please, enter a type and a send flag (usage: @effect <type> <flag>).");
+ if (!message || !*message || sscanf(message, "%d", &type) < 1) {
+ clif_displaymessage(fd, "Please, enter an effect number (usage: @effect <effect number>).");
return -1;
}
clif_specialeffect(&sd->bl, type, flag);
clif_displaymessage(fd, msg_txt(229)); // Your effect has changed.
-
- return 0;
-}
-
-/*==========================================
- * @charcartlist <character>: Displays the items list of a player's cart.
- *------------------------------------------
- */
-int atcommand_character_cart_list(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- char outputtmp[200];
- struct map_session_data *pl_sd;
- struct item_data *item_data, *item_temp;
- int i, j, count, counter, counter2;
- nullpo_retr(-1, sd);
-
- memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
- memset(atcmd_output, '\0', sizeof(atcmd_output));
- memset(outputtmp, '\0', sizeof(outputtmp));
-
- if (!message || !*message || sscanf(message, "%23[^\n]", atcmd_player_name) < 1) {
- clif_displaymessage(fd, "Please, enter a player name (usage: @cartlist <char name>).");
- return -1;
- }
-
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can look items only lower or same level
- counter = 0;
- count = 0;
- for (i = 0; i < MAX_CART; i++) {
- if (pl_sd->status.cart[i].nameid > 0 && (item_data = itemdb_search(pl_sd->status.cart[i].nameid)) != NULL) {
- counter = counter + pl_sd->status.cart[i].amount;
- count++;
- if (count == 1) {
- sprintf(atcmd_output, "------ Cart items list of '%s' ------", pl_sd->status.name);
- clif_displaymessage(fd, atcmd_output);
- }
- if (pl_sd->status.cart[i].refine)
- sprintf(atcmd_output, "%d %s %+d (%s %+d, id: %d)", pl_sd->status.cart[i].amount, item_data->name, pl_sd->status.cart[i].refine, item_data->jname, pl_sd->status.cart[i].refine, pl_sd->status.cart[i].nameid);
- else
- sprintf(atcmd_output, "%d %s (%s, id: %d)", pl_sd->status.cart[i].amount, item_data->name, item_data->jname, pl_sd->status.cart[i].nameid);
- clif_displaymessage(fd, atcmd_output);
- memset(atcmd_output, '\0', sizeof(atcmd_output));
- counter2 = 0;
- for (j = 0; j < item_data->slot; j++) {
- if (pl_sd->status.cart[i].card[j]) {
- if ( (item_temp = itemdb_search(pl_sd->status.cart[i].card[j])) != NULL) {
- if (atcmd_output[0] == '\0')
- sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
- else
- sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
- strcat(atcmd_output, outputtmp);
- }
- }
- }
- if (atcmd_output[0] != '\0') {
- atcmd_output[strlen(atcmd_output) - 2] = ')';
- atcmd_output[strlen(atcmd_output) - 1] = '\0';
- clif_displaymessage(fd, atcmd_output);
- }
- }
- }
- if (count == 0)
- clif_displaymessage(fd, "No item found in the cart of this player.");
- else {
- sprintf(atcmd_output, "%d item(s) found in %d kind(s) of items.", counter, count);
- clif_displaymessage(fd, atcmd_output);
- }
- } else {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
return 0;
}
@@ -6869,32 +6495,6 @@ int atcommand_killable(const int fd, struct map_session_data* sd, const char* co
}
/*==========================================
- * @charkillable by MouseJstr
- * enable another player to be killed
- *------------------------------------------
- */
-int atcommand_charkillable(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd = NULL;
- nullpo_retr(-1, sd);
-
- if (!message || !*message)
- return -1;
-
- if((pl_sd=map_nick2sd((char *) message)) == NULL)
- return -1;
-
- pl_sd->state.killable = !pl_sd->state.killable;
-
- if(pl_sd->state.killable)
- clif_displaymessage(fd, msg_txt(289));
- else
- clif_displaymessage(fd, msg_txt(290));
-
- return 0;
-}
-
-/*==========================================
* @skillon by MouseJstr
* turn skills on for the map
*------------------------------------------
@@ -6930,14 +6530,9 @@ int atcommand_npcmove(const int fd, struct map_session_data* sd, const char* com
int x = 0, y = 0, m;
struct npc_data *nd = 0;
nullpo_retr(-1, sd);
-
-
- if (!message || !*message)
- return -1;
-
memset(atcmd_player_name, '\0', sizeof atcmd_player_name);
- if (sscanf(message, "%d %d %23[^\n]", &x, &y, atcmd_player_name) < 3) {
+ if (!message || !*message || sscanf(message, "%d %d %23[^\n]", &x, &y, atcmd_player_name) < 3) {
clif_displaymessage(fd, "Usage: @npcmove <X> <Y> <npc_name>");
return -1;
}
@@ -6946,10 +6541,16 @@ int atcommand_npcmove(const int fd, struct map_session_data* sd, const char* com
// nullpo_retr(-1, (nd = npc_name2id(atcmd_player_name)));
if ((nd = npc_name2id(atcmd_player_name)) == NULL)
+ {
+ clif_displaymessage(fd, msg_txt(111)); // This NPC doesn't exist.
return -1;
+ }
if ((m=nd->bl.m) < 0 || nd->bl.prev == NULL)
+ {
+ clif_displaymessage(fd, "NPC is not on this map.");
return -1; //Not on a map.
+ }
if (x < 0) x = 0;
else if (x >= map[m].xs) x = map[m].xs-1;
@@ -6958,6 +6559,7 @@ int atcommand_npcmove(const int fd, struct map_session_data* sd, const char* com
map_foreachinrange(clif_outsight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
map_moveblock(&nd->bl, x, y, gettick());
map_foreachinrange(clif_insight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
+ clif_displaymessage(fd, "NPC moved.");
return 0;
}
@@ -6973,11 +6575,10 @@ int atcommand_addwarp(const int fd, struct map_session_data* sd, const char* com
int x,y,ret;
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
-
- if (sscanf(message, "%23s %d %d[^\n]", atcmd_player_name, &x, &y ) < 3)
+ if (!message || !*message || sscanf(message, "%23s %d %d[^\n]", atcmd_player_name, &x, &y) < 3) {
+ clif_displaymessage(fd, "usage: @addwarp <mapname (without .gat)> <X> <Y>.");
return -1;
+ }
sprintf(w1,"%s,%d,%d", mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y);
sprintf(w3,"%s%d%d%d%d", atcmd_player_name,sd->bl.x, sd->bl.y, x, y);
@@ -7010,21 +6611,22 @@ int atcommand_follow(const int fd, struct map_session_data* sd, const char* comm
clif_displaymessage(fd, "Follow mode OFF.");
return 0;
}
- if ((pl_sd = map_nick2sd((char *) message)) != NULL) {
- if (sd->followtarget == pl_sd->bl.id) {
- pc_stop_following (sd);
- clif_displaymessage(fd, "Follow mode OFF.");
- } else {
- pc_follow(sd, pl_sd->bl.id);
- clif_displaymessage(fd, "Follow mode ON.");
- }
- return 0;
- } else {
- clif_displaymessage(fd, "Character not found.");
+
+ if ( (pl_sd = map_nick2sd((char *)message)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+
+ if (sd->followtarget == pl_sd->bl.id) {
+ pc_stop_following (sd);
+ clif_displaymessage(fd, "Follow mode OFF.");
+ } else {
+ pc_follow(sd, pl_sd->bl.id);
+ clif_displaymessage(fd, "Follow mode ON.");
+ }
- return 1;
+ return 0;
}
@@ -7048,34 +6650,6 @@ int atcommand_dropall(const int fd, struct map_session_data* sd, const char* com
}
/*==========================================
- * @chardropall by [MouseJstr]
- * Drop all of the target's possessions on the ground
- *------------------------------------------
- */
-int atcommand_chardropall(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int i;
- struct map_session_data *pl_sd = NULL;
- nullpo_retr(-1, sd);
-
- if (!message || !*message)
- return -1;
- if((pl_sd=map_nick2sd((char *) message)) == NULL)
- return -1;
- for (i = 0; i < MAX_INVENTORY; i++) {
- if (pl_sd->status.inventory[i].amount) {
- if(pl_sd->status.inventory[i].equip != 0)
- pc_unequipitem(pl_sd, i, 3);
- pc_dropitem(pl_sd, i, pl_sd->status.inventory[i].amount);
- }
- }
-
- clif_displaymessage(pl_sd->fd, "Ever play 52 card pickup?");
- clif_displaymessage(fd, "It is done");
-
- return 0;
-}
-/*==========================================
* @storeall by [MouseJstr]
* Put everything into storage
*------------------------------------------
@@ -7108,52 +6682,7 @@ int atcommand_storeall(const int fd, struct map_session_data* sd, const char* co
clif_displaymessage(fd, "It is done");
return 0;
}
-/*==========================================
- * @charstoreall by [MouseJstr]
- * A way to screw with players who piss you off
- *------------------------------------------
- */
-int atcommand_charstoreall(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int i;
- struct map_session_data *pl_sd = NULL;
- nullpo_retr(-1, sd);
-
- if (!message || !*message)
- return -1;
- if((pl_sd=map_nick2sd((char *) message)) == NULL)
- return -1;
- if (pl_sd->state.storage_flag != 1)
- { //Open storage.
- switch (storage_storageopen(pl_sd)) {
- case 2: //Try again
- clif_displaymessage(fd, "Had to open the characters storage window...");
- clif_displaymessage(fd, "run this command again..");
- return 0;
- case 1: //Failure
- clif_displaymessage(fd, "The character currently can't use the storage.");
- return 1;
- }
- }
-
- for (i = 0; i < MAX_INVENTORY; i++) {
- if (pl_sd->status.inventory[i].amount) {
- if(pl_sd->status.inventory[i].equip != 0)
- pc_unequipitem(pl_sd, i, 3);
- storage_storageadd(pl_sd, i, sd->status.inventory[i].amount);
- }
- }
- storage_storageclose(pl_sd);
-
- clif_displaymessage(pl_sd->fd, "Everything you own has been put away for safe keeping.");
- clif_displaymessage(pl_sd->fd, "go to the nearest kafka to retrieve it..");
- clif_displaymessage(pl_sd->fd, " -- the management");
-
- clif_displaymessage(fd, "It is done");
-
- return 0;
-}
/*==========================================
* @skillid by [MouseJstr]
* lookup a skill by name
@@ -7165,7 +6694,11 @@ int atcommand_skillid(const int fd, struct map_session_data* sd, const char* com
nullpo_retr(-1, sd);
if (!message || !*message)
+ {
+ clif_displaymessage(fd, "Please enter a skill name to look up (usage: @skillid <skill name>).");
return -1;
+ }
+
skillen = strlen(message);
for (idx = 0; idx < MAX_SKILL_DB; idx++) {
@@ -7194,13 +6727,20 @@ int atcommand_useskill(const int fd, struct map_session_data* sd, const char* co
char target[100];
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
- if(sscanf(message, "%d %d %99[^\n]", &skillnum, &skilllv, target) != 3) {
+ if(!message || !*message || sscanf(message, "%d %d %23[^\n]", &skillnum, &skilllv, target) != 3) {
clif_displaymessage(fd, "Usage: @useskill <skillnum> <skillv> <target>");
return -1;
}
- if((pl_sd=map_nick2sd(target)) == NULL) {
+
+ if ( (pl_sd = map_nick2sd(target)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ return -1;
+ }
+
+ if ( pc_isGM(sd) < pc_isGM(pl_sd) )
+ {
+ clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
return -1;
}
@@ -7232,8 +6772,7 @@ int atcommand_displayskill(const int fd, struct map_session_data* sd, const char
int skilllv = 1;
nullpo_retr(-1, sd);
- if (!message || !*message ||
- sscanf(message, "%d %d", &skillnum, &skilllv) < 1)
+ if (!message || !*message || sscanf(message, "%d %d", &skillnum, &skilllv) < 1)
{
clif_displaymessage(fd, "Usage: @displayskill <skillnum> {<skillv>}>");
return -1;
@@ -7261,15 +6800,16 @@ int atcommand_skilltree(const int fd, struct map_session_data* sd, const char* c
struct skill_tree_entry *ent;
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
-
- if(sscanf(message, "%d %23[^\r\n]", &skillnum, target) != 2) {
+ if(!message || !*message || sscanf(message, "%d %23[^\r\n]", &skillnum, target) != 2) {
clif_displaymessage(fd, "Usage: @skilltree <skillnum> <target>");
return -1;
}
- if((pl_sd=map_nick2sd(target)) == NULL)
+
+ if ( (pl_sd = map_nick2sd(target)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
+ }
c = pc_calc_skilltree_normalize_job(pl_sd);
c = pc_mapid2jobid(c, pl_sd->status.sex);
@@ -7380,7 +6920,9 @@ int atcommand_marry(const int fd, struct map_session_data* sd, const char* comma
getring (pl_sd2);
return 0;
}
- return -1;
+
+ clif_displaymessage(fd, "The two cannot wed because one of them is either a baby or is already married.");
+ return -1;
}
/*==========================================
@@ -7399,20 +6941,21 @@ int atcommand_divorce(const int fd, struct map_session_data* sd, const char* com
return -1;
}
- if((pl_sd=map_nick2sd((char *) atcmd_player_name)) != NULL) {
+ if ( (pl_sd = map_nick2sd(atcmd_player_name)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ return -1;
+ }
+
if (pc_divorce(pl_sd) != 0) {
sprintf(atcmd_output, "The divorce has failed.. Cannot find player '%s' or his(her) partner online.", atcmd_player_name);
clif_displaymessage(fd, atcmd_output);
return -1;
- } else {
- sprintf(atcmd_output, "'%s' and his(her) partner are now divorced.", atcmd_player_name);
- clif_displaymessage(fd, atcmd_output);
- return 0;
}
- }
- sprintf(atcmd_output, "Cannot find player '%s' online", atcmd_player_name);
- clif_displaymessage(fd, atcmd_output);
- return -1;
+
+ sprintf(atcmd_output, "'%s' and his(her) partner are now divorced.", atcmd_player_name);
+ clif_displaymessage(fd, atcmd_output);
+ return 0;
}
@@ -7438,61 +6981,6 @@ int atcommand_dmtick(const int fd, struct map_session_data* sd, const char* comm
#endif
/*==========================================
- * @grind by [MouseJstr]
- *------------------------------------------
- */
-int atcommand_grind(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd = NULL;
- int skillnum;
- int inf;
- char target[NAME_LENGTH];
- nullpo_retr(-1, sd);
-
- if (!message || !*message)
- return -1;
- if(sscanf(message, "%23s", target) != 1) {
- clif_displaymessage(fd, "Usage: @grind <target>");
- return -1;
- }
- if((pl_sd=map_nick2sd(target)) == NULL)
- return -1;
-
- for (skillnum = 1; skillnum < 500; skillnum++) {
- sd->status.sp = sd->status.max_sp;
- atcommand_alive(fd, sd, command, message);
-
- inf = skill_get_inf(skillnum);
-
- if (inf & INF_GROUND_SKILL)
- unit_skilluse_pos(&sd->bl, pl_sd->bl.x, pl_sd->bl.y, skillnum, 1);
- else if (!(inf & INF_SUPPORT_SKILL))
- unit_skilluse_id(&sd->bl, pl_sd->bl.id, skillnum, 1);
- }
-
- return 0;
-}
-
-/*==========================================
- * @grind2 by [MouseJstr]
- *------------------------------------------
- */
-int atcommand_grind2(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int i;
- short x, y;
-
- for (i = 1000; i < MAX_MOB_DB; i++) {
- if (!mobdb_checkid(i))
- continue;
- map_search_freecell(&sd->bl, 0, &x, &y, 5, 5, 0);
- mob_once_spawn(sd, "this", x, y, "--ja--", i, 1, "");
- }
-
- return 0;
-}
-
-/*==========================================
* @changelook by [Celest]
*------------------------------------------
*/
@@ -7898,15 +7386,13 @@ int atcommand_sound(const int fd, struct map_session_data *sd, const char *comma
{
char sound_file[100];
- if(!message || !*message || sscanf(message, "%99[^\n]", sound_file) < 1) {
+ memset(sound_file, '\0', sizeof(sound_file));
+
+ if(!message || !*message || sscanf(message, "%99[^\n]", sound_file) < 1) {
clif_displaymessage(fd, "Please, enter a sound filename. (usage: @sound <filename>)");
return -1;
}
- memset(sound_file, '\0', sizeof(sound_file));
- if(sscanf(message, "%99[^\n]", sound_file) < 1)
- return -1;
-
if(strstr(sound_file, ".wav") == NULL)
strcat(sound_file, ".wav");
@@ -7951,15 +7437,17 @@ int atcommand_mobsearch(const int fd, struct map_session_data* sd, const char* c
nullpo_retr(-1, sd);
- if (sscanf(message, "%99[^\n]", mob_name) < 0)
+ if (!message || !*message || sscanf(message, "%99[^\n]", mob_name) < 1) {
+ clif_displaymessage(fd, "Please, enter a monster name (usage: @mobsearch <monster name>).");
return -1;
+ }
if ((mob_id = atoi(mob_name)) == 0)
mob_id = mobdb_searchname(mob_name);
if(mob_id > 0 && mobdb_checkid(mob_id) == 0){
snprintf(atcmd_output, sizeof atcmd_output, "Invalid mob id %s!",mob_name);
clif_displaymessage(fd, atcmd_output);
- return 0;
+ return -1;
}
if(mob_id == atoi(mob_name) && mob_db(mob_id)->jname)
strcpy(mob_name,mob_db(mob_id)->jname); // --ja--
@@ -8008,13 +7496,23 @@ int atcommand_npctalk(const int fd, struct map_session_data* sd, const char* com
char name[NAME_LENGTH],mes[100],temp[100];
struct npc_data *nd;
- if (sscanf(message, "%23[^,],%99[^\n]", name, mes) < 2)
+ if (sd->sc.count && //no "chatting" while muted.
+ (sd->sc.data[SC_BERSERK].timer!=-1 ||
+ (sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOCHAT)))
+ return -1;
+
+ if (!message || !*message || sscanf(message, "%23[^,],%99[^\n]", name, mes) < 2) {
+ clif_displaymessage(fd, "Please, enter the correct info (usage: @npctalk <npc name> <message>).");
return -1;
+ }
if (!(nd = npc_name2id(name)))
+ {
+ clif_displaymessage(fd, msg_txt(111)); // This NPC doesn't exist
return -1;
+ }
- snprintf(temp, sizeof temp ,"%s : %s",name,mes);
+ snprintf(temp, sizeof temp ,"%s: %s",name,mes);
clif_message(&nd->bl, temp);
return 0;
@@ -8024,21 +7522,42 @@ int atcommand_pettalk(const int fd, struct map_session_data* sd, const char* com
{
char mes[100],temp[100];
struct pet_data *pd;
+ const char* emo[] = { "/!", "/?", "/ho", "/lv", "/swt", "/ic", "/an", "/ag", "/$", "/...",
+ "/scissors", "/rock", "/paper", "/korea", "/lv2", "/thx", "/wah", "/sry", "/heh", "/swt2",
+ "/hmm", "/no1", "/??", "/omg", "/O", "/X", "/hlp", "/go", "/sob", "/gg",
+ "/kis", "/kis2", "/pif", "/ok", "-?-", "-?-", "/bzz", "/rice", "/awsm", "/meh",
+ "/shy", "/pat", "/mp", "/slur", "/com", "/yawn", "/grat", "/hp", "/philippines", "/usa",
+ "/indonesia", "/brazil", "/fsh", "/spin", "/sigh", "/dum", "/crwd", "/desp", "/dice", NULL };
nullpo_retr(-1, sd);
if(!sd->status.pet_id || !(pd=sd->pd))
+ {
+ clif_displaymessage(fd, msg_txt(184));
return -1;
+ }
if (sd->sc.count && //no "chatting" while muted.
(sd->sc.data[SC_BERSERK].timer!=-1 ||
(sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOCHAT)))
return -1;
- if (sscanf(message, "%99[^\n]", mes) < 1)
+ if (!message || !*message || sscanf(message, "%99[^\n]", mes) < 1) {
+ clif_displaymessage(fd, "Please, enter a message (usage: @pettalk <message>");
return -1;
+ }
+
+ if (message[0] == '/') {
+ int i;
+ for (i = 0; emo[i] != NULL; i++) {
+ if (!stricmp(message, emo[i])) {
+ clif_emotion(&pd->bl, i);
+ return 0;
+ }
+ }
+ }
- snprintf(temp, sizeof temp ,"%s : %s",pd->pet.name,mes);
+ snprintf(temp, sizeof temp ,"%s: %s",pd->pet.name,mes);
clif_message(&pd->bl, temp);
return 0;
@@ -8064,7 +7583,7 @@ static int atcommand_users_sub2(DBKey key,void* val,va_list va)
{
char buf[256];
struct map_session_data* sd = va_arg(va,struct map_session_data*);
- sprintf(buf,"%s : %d (%d%%)",mapindex_id2name(key.i),(int)val,(int)val * 100 / users_all);
+ sprintf(buf,"%s: %d (%d%%)",mapindex_id2name(key.i),(int)val,(int)val * 100 / users_all);
clif_displaymessage(sd->fd,buf);
return 0;
}
@@ -8077,7 +7596,7 @@ int atcommand_users(const int fd, struct map_session_data* sd, const char* comma
users_db->clear(users_db, NULL);
clif_foreachclient(atcommand_users_sub1);
users_db->foreach(users_db,atcommand_users_sub2,sd);
- sprintf(buf,"all : %d",users_all);
+ sprintf(buf,"all: %d",users_all);
clif_displaymessage(fd,buf);
return 0;
}
@@ -8109,10 +7628,11 @@ int atcommand_summon(const int fd, struct map_session_data* sd, const char* comm
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
- if (sscanf(message, "%23s %d", name, &duration) < 1)
+ if (!message || !*message || sscanf(message, "%23s %d", name, &duration) < 1)
+ {
+ clif_displaymessage(fd, "Please, enter a monster name (usage: @summon <monster name> [duration]");
return -1;
+ }
if (duration < 1)
duration =1;
@@ -8122,20 +7642,25 @@ int atcommand_summon(const int fd, struct map_session_data* sd, const char* comm
if ((mob_id = atoi(name)) == 0)
mob_id = mobdb_searchname(name);
if(mob_id == 0 || mobdb_checkid(mob_id) == 0)
+ {
+ clif_displaymessage(fd, msg_txt(40)); // Invalid monster ID or name.
return -1;
+ }
md = mob_once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, "--ja--", mob_id, "");
- if(md){
- md->master_id=sd->bl.id;
- md->special_state.ai=1;
- md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,md->bl.id,0);
- clif_misceffect2(&md->bl,344);
- mob_spawn(md);
- sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
- clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);
- }
-
+ if(!md)
+ return -1;
+
+ md->master_id=sd->bl.id;
+ md->special_state.ai=1;
+ md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,md->bl.id,0);
+ clif_misceffect2(&md->bl,344);
+ mob_spawn(md);
+ sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
+ clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);
+ clif_displaymessage(fd, msg_txt(39)); // All monster summoned!
+
return 0;
}
@@ -8200,8 +7725,11 @@ int atcommand_adjgmlvl(const int fd, struct map_session_data* sd, const char* co
return -1;
}
- if((pl_sd=map_nick2sd((char *) user)) == NULL)
- return -1;
+ if ( (pl_sd = map_nick2sd(user)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ return -1;
+ }
pc_set_gm_level(pl_sd->status.account_id, newlev);
@@ -8218,13 +7746,19 @@ int atcommand_trade(const int fd, struct map_session_data* sd, const char* comma
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
- if((pl_sd=map_nick2sd((char *) message)) != NULL) {
- trade_traderequest(sd, pl_sd);
- return 0;
- }
- return -1;
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @trade <player>).");
+ return -1;
+ }
+
+ if ( (pl_sd = map_nick2sd((char *)message)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ return -1;
+ }
+
+ trade_traderequest(sd, pl_sd);
+ return 0;
}
/*==========================================
@@ -8242,9 +7776,12 @@ int atcommand_setbattleflag(const int fd, struct map_session_data* sd, const cha
}
if (battle_set_value(flag, value) == 0)
- clif_displaymessage(fd, "unknown battle_config flag");
- else
- clif_displaymessage(fd, "battle_config set as requested");
+ {
+ clif_displaymessage(fd, "unknown battle_config flag");
+ return -1;
+ }
+
+ clif_displaymessage(fd, "battle_config set as requested");
return 0;
}
@@ -8258,19 +7795,26 @@ int atcommand_unmute(const int fd, struct map_session_data* sd, const char* comm
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @unmute <player>).");
+ return -1;
+ }
- if((pl_sd=map_nick2sd((char *) message)) != NULL) {
- if(pl_sd->sc.data[SC_NOCHAT].timer!=-1) {
- pl_sd->status.manner = 0;
- status_change_end(&pl_sd->bl,SC_NOCHAT,-1);
- clif_displaymessage(sd->fd,"Player unmuted");
- }
- else
- clif_displaymessage(sd->fd,"Player is not muted");
+ if ( (pl_sd = map_nick2sd((char *)message)) == NULL )
+ {
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
+ return -1;
}
+ if(pl_sd->sc.data[SC_NOCHAT].timer == -1) {
+ clif_displaymessage(sd->fd,"Player is not muted");
+ return -1;
+ }
+
+ pl_sd->status.manner = 0;
+ status_change_end(&pl_sd->bl,SC_NOCHAT,-1);
+ clif_displaymessage(sd->fd,"Player unmuted");
+
return 0;
}
@@ -8325,21 +7869,23 @@ int atcommand_mute(const int fd, struct map_session_data* sd, const char* comman
return -1;
}
- if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
- if (pc_isGM(pl_sd) > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
- clif_GM_silence(sd, pl_sd, 0);
- pl_sd->status.manner -= manner;
- if(pl_sd->status.manner < 0)
- sc_start(&pl_sd->bl,SC_NOCHAT,100,0,0);
- }
- else {
+ if ( (pl_sd = map_nick2sd(atcmd_player_name)) == NULL )
+ {
clif_displaymessage(fd, msg_txt(3)); // Character not found.
return -1;
}
+ if ( pc_isGM(sd) < pc_isGM(pl_sd) )
+ {
+ clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+ return -1;
+ }
+
+ clif_GM_silence(sd, pl_sd, 0);
+ pl_sd->status.manner -= manner;
+ if(pl_sd->status.manner < 0)
+ sc_start(&pl_sd->bl,SC_NOCHAT,100,0,0);
+
return 0;
}
@@ -8368,10 +7914,12 @@ int atcommand_petid(const int fd, struct map_session_data* sd, const char* comma
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
- if (sscanf(message, "%99s", searchtext) < 1)
+ if (!message || !*message || sscanf(message, "%99s", searchtext) < 1)
+ {
+ clif_displaymessage(fd, "Please, enter a player name (usage: @petid <monster name>).");
return -1;
+ }
+
estr_lower(searchtext);
snprintf(temp0, sizeof(temp0), "Search results for: %s", searchtext);
clif_displaymessage(fd,temp0);
@@ -8435,6 +7983,8 @@ int atcommand_gmotd(const int fd, struct map_session_data* sd, const char* comma
if( (fp = fopen(motd_txt, "r"))!=NULL){
while (fgets(buf, 250, fp) != NULL){
int i;
+ if (buf[0] == '/' && buf[1] == '/')
+ continue;
for( i=0; buf[i]; i++){
if( buf[i]=='\r' || buf[i]=='\n'){
buf[i]=0;
@@ -8467,41 +8017,6 @@ int atcommand_misceffect(const int fd, struct map_session_data* sd, const char*
* Added in by nsstrunks
*------------------------------------------
*/
-int atcommand_jumptoid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int cid=0;
- struct map_session_data *pl_sd;
-
- memset(atcmd_output, '\0', sizeof(atcmd_output));
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID (usage: @jumptoid/@warptoid/@gotoid <char id>).");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(154)); // Character not found.
- return -1;
- }
- if (map[pl_sd->bl.m].flag.nowarpto &&
- battle_config.any_warp_GM_min_level > pc_isGM(sd))
- {
- clif_displaymessage(fd, msg_txt(247));
- return -1;
- }
- if (map[sd->bl.m].flag.nowarp &&
- battle_config.any_warp_GM_min_level > pc_isGM(sd))
- {
- clif_displaymessage(fd, msg_txt(248));
- return -1;
- }
-
- pc_setpos(sd, pl_sd->mapindex, pl_sd->bl.x, pl_sd->bl.y, 3);
- sprintf(atcmd_output, msg_txt(4), pl_sd->status.name); // Jump to %s
- clif_displaymessage(fd, atcmd_output);
- return 0;
-}
/*==========================================
* Jump to a player by PID number
@@ -8551,48 +8066,6 @@ int atcommand_jumptoid2(const int fd, struct map_session_data* sd, const char* c
* Added in by nsstrunks
*------------------------------------------
*/
-int atcommand_recallid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int cid=0;
- struct map_session_data *pl_sd;
-
- memset(atcmd_output, '\0', sizeof(atcmd_output));
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID (usage: @recallid <char id>).");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(154)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd)) { // you can recall only lower or same level
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
-
- if (map[pl_sd->bl.m].flag.nowarpto &&
- battle_config.any_warp_GM_min_level > pc_isGM(sd))
- {
- clif_displaymessage(fd, msg_txt(247));
- return -1;
- }
- if (map[sd->bl.m].flag.nowarp &&
- battle_config.any_warp_GM_min_level > pc_isGM(sd))
- {
- clif_displaymessage(fd, msg_txt(248));
- return -1;
- }
-
- pc_setpos(pl_sd, sd->mapindex, sd->bl.x, sd->bl.y, 2);
- sprintf(atcmd_output, msg_txt(46), pl_sd->status.name); // Jump to %s
- clif_displaymessage(fd, atcmd_output);
- return 0;
-}
/*==========================================
* Recall a player by PID number
@@ -8648,31 +8121,6 @@ int atcommand_recallid2(const int fd, struct map_session_data* sd, const char* c
* Added in by nsstrunks
*------------------------------------------
*/
-int atcommand_kickid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd;
- int cid=0;
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID (usage: @kickid <char id>).");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd))
- { // you can kick only lower or same gm level
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
-
- clif_GM_kick(sd, pl_sd, 1);
- return 0;
-}
/*==========================================
* Kick a player by PID number
@@ -8710,28 +8158,6 @@ int atcommand_kickid2(const int fd, struct map_session_data* sd, const char* com
* Added in by nsstrunks
*------------------------------------------
*/
-int atcommand_reviveid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int cid=0;
- struct map_session_data *pl_sd;
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID (usage: @reviveid <char id>).");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
- if(!status_revive(&pl_sd->bl, 100, 100))
- return -1;
-
- clif_skill_nodamage(&pl_sd->bl,&pl_sd->bl,ALL_RESURRECTION,4,1);
- clif_displaymessage(fd, msg_txt(51)); // Character revived.
- return 0;
-}
/*==========================================
* Revive a player by PID number
@@ -8770,33 +8196,6 @@ int atcommand_reviveid2(const int fd, struct map_session_data* sd, const char* c
* Added in by nsstrunks
*------------------------------------------
*/
-int atcommand_killid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- int cid=0;
- struct map_session_data *pl_sd;
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID (usage: @killid <char id>).");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd))
- { // you can kill only lower or same level
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
-
- status_kill(&pl_sd->bl);
- clif_displaymessage(fd, msg_txt(14)); // Character killed.
- return 0;
-}
/*==========================================
* Kill a player by PID number
@@ -8831,83 +8230,6 @@ int atcommand_killid2(const int fd, struct map_session_data* sd, const char* com
return 0;
}
-/*==========================================
- * Make a player killable, by PID
- * Original by Dino9021
- * Added in by nsstrunks
- *------------------------------------------
- */
-int atcommand_charkillableid(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd = NULL;
- int cid=0;
-
- if (!message || (cid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player CID.");
- return -1;
- }
-
- pl_sd = map_charid2sd(cid);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd))
- {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
-
- pl_sd->state.killable = !pl_sd->state.killable;
- if(pl_sd->state.killable)
- clif_displaymessage(fd, msg_txt(289));
- else
- clif_displaymessage(fd, msg_txt(290));
- return 0;
-}
-
-
-/*==========================================
- * Make a player killable, by PID
- * Original by Dino9021
- * Added in by nsstrunks
- *------------------------------------------
- */
-int atcommand_charkillableid2( const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
- struct map_session_data *pl_sd = NULL;
- int aid=0;
-
- if (!message || (aid = atoi(message)) == 0) {
- clif_displaymessage(fd, "Please, enter a player AID.");
- return -1;
- }
-
- pl_sd = map_id2sd(aid);
-
- if (!pl_sd) {
- clif_displaymessage(fd, msg_txt(3)); // Character not found.
- return -1;
- }
-
- if (pc_isGM(sd) < pc_isGM(pl_sd))
- {
- clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
- return -1;
- }
-
- pl_sd->state.killable = !pl_sd->state.killable;
-
- if(pl_sd->state.killable)
- clif_displaymessage(fd, msg_txt(289));
- else
- clif_displaymessage(fd, msg_txt(290));
-
- return 0;
-}
-
#ifndef TXT_ONLY /* Begin SQL-Only commands */
/*==========================================
@@ -9204,11 +8526,15 @@ int atcommand_homlevel(const int fd, struct map_session_data* sd, const char* co
nullpo_retr(-1, sd);
- if (!message || !*message)
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a level adjustment: (usage: @homlevel <+/- # of levels>.");
return -1;
+ }
- if ( !merc_is_hom_active(sd->hd) )
- return 1 ;
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
+ return -1;
+ }
level = atoi(message);
hd = sd->hd;
@@ -9231,11 +8557,19 @@ int atcommand_homevolution(const int fd, struct map_session_data* sd, const char
{
nullpo_retr(-1, sd);
- if (sd->hd && sd->hd->homunculusDB->evo_class)
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
+ return -1;
+ }
+
+ if (sd->hd->homunculusDB->evo_class)
{
merc_hom_evolution(sd->hd) ;
+ return 0;
}
- return 0;
+
+ clif_displaymessage(fd, "Your homunculus doesn't evove.");
+ return -1;
}
/*==========================================
@@ -9246,44 +8580,56 @@ int atcommand_makehomun(const int fd, struct map_session_data* sd, const char* c
{
int homunid;
nullpo_retr(-1, sd);
- if(sscanf(message, "%d", &homunid)<1)
+
+ if ( merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, msg_txt(450));
return -1;
- if( homunid < HM_CLASS_BASE || homunid > HM_CLASS_BASE + MAX_HOMUNCULUS_CLASS - 1 )
+ }
+
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a homunculus id: (usage: @makehomun <homunculus id>.");
return -1;
- if(sd->status.hom_id == 0)
- {
- merc_create_homunculus_request(sd,homunid);
}
- else
+
+ homunid = atoi(message);
+ if( homunid < HM_CLASS_BASE || homunid > HM_CLASS_BASE + MAX_HOMUNCULUS_CLASS - 1 )
{
- clif_displaymessage(fd,msg_txt(450));
+ clif_displaymessage(fd, "Invalid Homunculus id.");
+ return -1;
}
+
+ merc_create_homunculus_request(sd,homunid);
return 0;
}
/*==========================================
* modify homunculus intimacy [orn]
*------------------------------------------
- */
+ho */
int atcommand_homfriendly(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
int friendly = 0;
nullpo_retr(-1, sd);
- if (!message || !*message)
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
return -1;
+ }
- friendly = atoi(message);
- if (merc_is_hom_active(sd->hd)) {
- if (friendly > 0 && friendly <= 1000) {
- sd->hd->homunculus.intimacy = friendly * 100 ;
- clif_send_homdata(sd,SP_INTIMATE,friendly);
- } else {
- return -1;
- }
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a friendly value: (usage: @homfriendly <friendly value[0-1000]>.");
+ return -1;
}
+ friendly = atoi(message);
+ if (friendly < 0)
+ friendly = 0;
+ else if (friendly > 1000)
+ friendly = 1000;
+
+ sd->hd->homunculus.intimacy = friendly * 100 ;
+ clif_send_homdata(sd,SP_INTIMATE,friendly);
return 0;
}
@@ -9297,20 +8643,24 @@ int atcommand_homhungry(const int fd, struct map_session_data* sd, const char* c
nullpo_retr(-1, sd);
- if (!message || !*message)
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
return -1;
+ }
- hungry = atoi(message);
- if (sd->status.hom_id > 0 && sd->hd) {
- struct homun_data *hd = sd->hd;
- if (hungry >= 0 && hungry <= 100) {
- hd->homunculus.hunger = hungry;
- clif_send_homdata(sd,SP_HUNGRY,hd->homunculus.hunger);
- } else {
- return -1;
- }
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a hunger value: (usage: @homhungry <hunger value[0-100]>.");
+ return -1;
}
+ hungry = atoi(message);
+ if (hungry < 0)
+ hungry = 0;
+ else if (hungry > 100)
+ hungry = 100;
+
+ sd->hd->homunculus.hunger = hungry;
+ clif_send_homdata(sd,SP_HUNGRY,hungry);
return 0;
}
@@ -9324,13 +8674,22 @@ int atcommand_homtalk(const int fd, struct map_session_data* sd, const char* com
nullpo_retr(-1, sd);
- if(!merc_is_hom_active(sd->hd))
+ if (sd->sc.count && //no "chatting" while muted.
+ (sd->sc.data[SC_BERSERK].timer!=-1 ||
+ (sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOCHAT)))
+ return -1;
+
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
return -1;
+ }
- if (sscanf(message, "%99[^\n]", mes) < 1)
+ if (!message || !*message || sscanf(message, "%99[^\n]", mes) < 1) {
+ clif_displaymessage(fd, "Please, enter a message (usage: @homtalk <message>");
return -1;
+ }
- snprintf(temp, sizeof temp ,"%s : %s",sd->hd->homunculus.name,mes);
+ snprintf(temp, sizeof temp ,"%s: %s",sd->hd->homunculus.name,mes);
clif_message(&sd->hd->bl, temp);
return 0;
@@ -9346,8 +8705,11 @@ int atcommand_hominfo(const int fd, struct map_session_data* sd, const char* com
struct status_data *status;
nullpo_retr(-1, sd);
- if(!merc_is_hom_active(sd->hd))
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
return -1;
+ }
+
hd = sd->hd;
status = status_get_status_data(&hd->bl);
clif_displaymessage(fd, "Homunculus stats :");
@@ -9382,8 +8744,11 @@ int atcommand_homstats(const int fd, struct map_session_data* sd, const char* co
nullpo_retr(-1, sd);
- if(!merc_is_hom_active(sd->hd))
+ if ( !merc_is_hom_active(sd->hd) ) {
+ clif_displaymessage(fd, "You do not have a homunculus.");
return -1;
+ }
+
hd = sd->hd;
hom = &hd->homunculus;
@@ -9500,19 +8865,19 @@ int atcommand_iteminfo(const int fd, struct map_session_data* sd, const char* co
int i, count = 1;
if (!message || !*message) {
- clif_displaymessage(fd, "Please, enter Item name or its ID (usage: @iteminfo <item_name_or_ID>).");
+ clif_displaymessage(fd, "Please, enter Item name or its ID (usage: @ii/@iteminfo <item name or ID>).");
return -1;
}
if ((item_array[0] = itemdb_exists(atoi(message))) == NULL)
count = itemdb_searchname_array(item_array, MAX_SEARCH, message);
if (!count) {
- clif_displaymessage(fd, "Item not found.");
+ clif_displaymessage(fd, msg_txt(19)); // Invalid item ID or name.
return -1;
}
if (count > MAX_SEARCH) {
- sprintf(atcmd_output, msg_txt(269), MAX_SEARCH, count);
+ sprintf(atcmd_output, msg_txt(269), MAX_SEARCH, count); // Displaying first %d out of %d matches
clif_displaymessage(fd, atcmd_output);
count = MAX_SEARCH;
}
@@ -9550,19 +8915,19 @@ int atcommand_whodrops(const int fd, struct map_session_data* sd, const char* co
int i,j, count = 1;
if (!message || !*message) {
- clif_displaymessage(fd, "Please, enter Item name or its ID (usage: @whodrops <item_name_or_ID>).");
+ clif_displaymessage(fd, "Please, enter Item name or its ID (usage: @whodrops <item name or ID>).");
return -1;
}
if ((item_array[0] = itemdb_exists(atoi(message))) == NULL)
count = itemdb_searchname_array(item_array, MAX_SEARCH, message);
if (!count) {
- clif_displaymessage(fd, "Item not found.");
+ clif_displaymessage(fd, msg_txt(19)); // Invalid item ID or name.
return -1;
}
if (count > MAX_SEARCH) {
- sprintf(atcmd_output, msg_txt(269), MAX_SEARCH, count);
+ sprintf(atcmd_output, msg_txt(269), MAX_SEARCH, count); // Displaying first %d out of %d matches
clif_displaymessage(fd, atcmd_output);
count = MAX_SEARCH;
}
@@ -9604,13 +8969,10 @@ int atcommand_adopt(const int fd, struct map_session_data* sd, const char* comma
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
-
- if (sscanf(message, "%23[^,],%23[^,],%23[^\r\n]", player1, player2, player3) != 3) {
- clif_displaymessage(fd, "usage: @adopt <player1>,<player2>,<player3>.");
- return -1;
- }
+ if (!message || !*message || sscanf(message, "%23[^,],%23[^,],%23[^\r\n]", player1, player2, player3) < 3) {
+ clif_displaymessage(fd, "usage: @adopt <player1>,<player2>,<player3>.");
+ return -1;
+ }
if (battle_config.etc_log)
printf("Adopting: --%s--%s--%s--\n",player1,player2,player3);
@@ -9633,17 +8995,12 @@ int atcommand_adopt(const int fd, struct map_session_data* sd, const char* comma
return -1;
}
- if((pl_sd1->status.base_level < 70) || (pl_sd2->status.base_level < 70)){
- clif_displaymessage(fd, "They are too young to be parents!");
- return -1;
- }
-
- if (pc_adoption(pl_sd1, pl_sd2, pl_sd3) == 0) {
- clif_displaymessage(fd, "They are family.. wish them luck");
- return 0;
- }
- else
- return -1;
+ if (pc_adoption(pl_sd1, pl_sd2, pl_sd3) == 0) {
+ clif_displaymessage(fd, "They are family.. wish them luck");
+ return 0;
+ }
+ else
+ return -1;
}
int atcommand_version(const int fd, struct map_session_data* sd, const char* command, const char* message)
@@ -9689,9 +9046,13 @@ int atcommand_mutearea(const int fd, struct map_session_data* sd, const char* co
int time;
nullpo_retr(0, sd);
+ if (!message || !*message) {
+ clif_displaymessage(fd, "Please, enter a time in minutes (usage: @mutearea/@stfu <time in minutes>.");
+ return -1;
+ }
+
time = atoi(message);
- if (!time)
- time = 15; // 15 minutes default
+
map_foreachinarea(atcommand_mutearea_sub,sd->bl.m,
sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE,
sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_PC, sd->bl.id, time);
@@ -9723,7 +9084,7 @@ int atcommand_me(const int fd, struct map_session_data* sd, const char* command,
{
char tempmes[200];
nullpo_retr(-1, sd);
-
+
memset(tempmes, '\0', sizeof(tempmes));
memset(atcmd_output, '\0', sizeof(atcmd_output));
@@ -9732,15 +9093,14 @@ int atcommand_me(const int fd, struct map_session_data* sd, const char* command,
(sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOCHAT)))
return -1;
- if (!message || !*message) {
+ if (!message || !*message || sscanf(message, "%199[^\n]", tempmes) < 0) {
clif_displaymessage(fd, "Please, enter a message (usage: @me <message>).");
return -1;
}
- sscanf(message, "%199[^\n]", tempmes);
- sprintf(atcmd_output, msg_txt(270), sd->status.name, tempmes);
- clif_disp_overhead(sd, atcmd_output);
-
+ sprintf(atcmd_output, msg_txt(270), sd->status.name, tempmes); // *%s %s*
+ clif_disp_overhead(sd, atcmd_output);
+
return 0;
}
@@ -9756,12 +9116,7 @@ int atcommand_size(const int fd, struct map_session_data* sd, const char* comman
nullpo_retr(-1, sd);
- if (!message || !*message)
- return -1;
-
- if (sscanf(message,"%d", &size) < 1)
- return -1;
-
+ size = atoi(message);
if(sd->state.size) {
sd->state.size=0;
pc_setpos(sd, sd->mapindex, sd->bl.x, sd->bl.y, 3);
@@ -9814,19 +9169,14 @@ int atcommand_fakename(const int fd, struct map_session_data* sd, const char* co
return 0;
}
- if (!message || !*message) {
+ if (!message || !*message || sscanf(message, "%23[^\n]", name) < 1) {
clif_displaymessage(sd->fd,"You must enter a name.");
- return 0;
+ return -1;
}
-
- if (sscanf(message, "%23[^\n]", name) < 1) {
- return 0;
- }
-
if(strlen(name) < 2) {
clif_displaymessage(sd->fd,"Fake name must be at least two characters.");
- return 0;
+ return -1;
}
memcpy(sd->fakename,name,NAME_LENGTH);
@@ -10095,12 +9445,12 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma
}
if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL) {
- clif_displaymessage(fd, msg_txt(3));
+ clif_displaymessage(fd, msg_txt(3)); // Character not found.
return 0;
}
if(pc_isGM(pl_sd) > pc_isGM(sd)) {
- clif_displaymessage(fd, msg_txt(126));
+ clif_displaymessage(fd, msg_txt(126)); // Cannot clone a player of higher GM level than yourself.
return 0;
}
@@ -10111,7 +9461,7 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma
master = sd->bl.id;
if (battle_config.atc_slave_clone_limit
&& mob_countslave(&sd->bl) >= battle_config.atc_slave_clone_limit) {
- clif_displaymessage(fd, msg_txt(127));
+ clif_displaymessage(fd, msg_txt(127)); // You've reached your slave clones limit.
return 0;
}
}
@@ -10127,10 +9477,10 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma
}
if((x = mob_clone_spawn(pl_sd, sd->bl.m, x, y, "", master, 0, flag?1:0, 0)) > 0) {
- clif_displaymessage(fd, msg_txt(128+flag*2));
+ clif_displaymessage(fd, msg_txt(128+flag*2)); // Evil Clone spawned. Clone spawned. Slave clone spawned.
return 0;
}
- clif_displaymessage(fd, msg_txt(129+flag*2));
+ clif_displaymessage(fd, msg_txt(129+flag*2)); // Unable to spawn evil clone. Unable to spawn clone. Unable to spawn slave clone.
return 0;
}
@@ -10211,17 +9561,30 @@ int atcommand_noask(const int fd, struct map_session_data* sd, const char* comma
int atcommand_request(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
if (!message || !*message) {
- clif_displaymessage(sd->fd,msg_txt(277));
+ clif_displaymessage(sd->fd,msg_txt(277)); // Usage: @request <petition/message to online GMs>.
return -1;
}
- sprintf(atcmd_output, msg_txt(278), message);
+ sprintf(atcmd_output, msg_txt(278), message); // (@request): %s
intif_wis_message_to_gm(sd->status.name, lowest_gm_level, atcmd_output);
clif_disp_onlyself(sd, atcmd_output, strlen(atcmd_output));
- clif_displaymessage(sd->fd,msg_txt(279));
+ clif_displaymessage(sd->fd,msg_txt(279)); // @request sent.
return 0;
}
+/*==========================================
+ * Feel (SG save map) Reset [HiddenDragon]
+ *------------------------------------------
+ */
+int atcommand_feelreset(
+ const int fd, struct map_session_data* sd,
+ const char* command, const char* message)
+{
+ pc_resetfeel(sd);
+ clif_displaymessage(fd, "Reset 'Feeling' maps.");
+
+ return 0;
+}
void do_init_atcommand()
{