Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- help.txt Params lists: changed "/" to "|" to match the rest of the file.

Browse Source 
- Removed an extra 'packet_db_ver' comment from r15173.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16728 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-09-01 04:04:00 +00:00
parent 2adc9cdf28
commit c37e0bdd3f
4 changed files with 155 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
conf/help.txt
View File

@ -21,25 +21,25 @@ rates: "Displays the server's current rates."
uptime: "Displays how long the server has been online." uptime: "Displays how long the server has been online."
showdelay: "Shows/hides the \"There is a delay after this skill\" message." showdelay: "Shows/hides the \"There is a delay after this skill\" message."
exp: "Displays current levels and % progress." exp: "Displays current levels and % progress."
mobinfo: "Params: <monster ID>|<monster name>\n" "Shows monster info (stats, exp, drops etc)." mobinfo: "Params: <monster name|ID>\n" "Shows monster info (stats, exp, drops etc)."
iteminfo: "Params: <item ID>|<item name>\n" "Shows item info (type, price etc)." iteminfo: "Params: <item name|ID>\n" "Shows item info (type, price etc)."
whodrops: "Params: <item ID>|<item name>\n" "Shows who drops an item (monster with highest drop rates)." whodrops: "Params: <item name|ID>\n" "Shows who drops an item (monster with highest drop rates)."
version: "Displays SVN version of the server." version: "Displays SVN version of the server."
email: "Params: <current email> <new email>\n" "Changes your account e-mail address." email: "Params: <current email> <new email>\n" "Changes your account e-mail address."
where: "Params: <char name>\n" "Tells you the location of a character." where: "Params: <char name>\n" "Tells you the location of a character."
time: "Shows the date and time of the server." time: "Shows the date and time of the server."
showexp: "Displays/hides experience gained." showexp: "Displays/hides experience gained."
showzeny: "Displays/hides Zeny gained." showzeny: "Displays/hides Zeny gained."
mobsearch: "Params: <monster ID>|<monster name>\n" "Shows the location of a certain mob on the current map." mobsearch: "Params: <monster name|ID>\n" "Shows the location of a certain mob on the current map."
who: "Params: [<name>]\n" "Shows a list of online players and their party and guild." who: "Params: [<name>]\n" "Shows a list of online players and their party and guild."
who2: "Params: [<name>]\n" "Shows a list of online players and their job." who2: "Params: [<name>]\n" "Shows a list of online players and their job."
who3: "Params: [<name>]\n" "Shows a list of online players and their location." who3: "Params: [<name>]\n" "Shows a list of online players and their location."
whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map." whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map."
whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM." whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM."
guildspy: "Params: <guild_name/id> - You will receive all messages of the guild channel (Chat logging must be enabled)" guildspy: "Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)"
partyspy: "@partyspy <party_name/id> - You will receive all messages of the party channel (Chat logging must be enabled)" partyspy: "@partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)"
mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat)." mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat)."
go: "Params: <number/city_name>\n" "Warps you to a city.\n" go: "Params: <city name|number>\n" "Warps you to a city.\n"
" -3: (Memo point 2) 14: louyang 31: mora\n" " -3: (Memo point 2) 14: louyang 31: mora\n"
" -2: (Memo point 1) 15: start point 32: dewata\n" " -2: (Memo point 1) 15: start point 32: dewata\n"
" -1: (Memo point 0) 16: prison/jail 33: malangdo island\n" " -1: (Memo point 0) 16: prison/jail 33: malangdo island\n"
@ -58,9 +58,9 @@ go: "Params: <number/city_name>\n" "Warps you to a city.\n"
" 12: umbala 29: brasilis\n" " 12: umbala 29: brasilis\n"
" 13: niflheim 30: el dicastes" " 13: niflheim 30: el dicastes"
jumpto: "Params: <char name>\n" "Warps you to selected character." jumpto: "Params: <char name>\n" "Warps you to selected character."
follow: "Params: <char_name>\n" "Follow a player." follow: "Params: <char name>\n" "Follow a player."
mount: "Give/remove you a peco (Class is required, but not skill)" mount: "Give/remove you a peco (Class is required, but not skill)"
disguise: "Params: <monster_name_or_monster_ID>\n" "Change your appearence to other players to a mob." disguise: "Params: <monster name|ID>\n" "Change your appearence to other players to a mob."
undisguise: "Restore your normal appearance." undisguise: "Restore your normal appearance."
disguiseguild: "Disguises all online characters of a guild." disguiseguild: "Disguises all online characters of a guild."
undisguiseguild: "Restore the normal appearance of all characters of a guild." undisguiseguild: "Restore the normal appearance of all characters of a guild."
@ -73,7 +73,7 @@ save: "Sets respawn point to current spot."
load: "Warps you to your save point." load: "Warps you to your save point."
warp: "Params: <mapname> [<x> <y>]\n" "Warps you to the selected map and position." warp: "Params: <mapname> [<x> <y>]\n" "Warps you to the selected map and position."
jump: "Params: [<x> [<y>]]\n" "Randomly warps you like a flywing." jump: "Params: [<x> [<y>]]\n" "Randomly warps you like a flywing."
jobchange: "Params: <job ID>\n" "Changes your job.\n" jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
" 0: Novice 18: Alchemist 4015: Paladin\n" " 0: Novice 18: Alchemist 4015: Paladin\n"
" 1: Swordman 19: Bard 4016: Champion\n" " 1: Swordman 19: Bard 4016: Champion\n"
" 2: Mage 20: Dancer 4017: Professor\n" " 2: Mage 20: Dancer 4017: Professor\n"
@ -186,13 +186,13 @@ luk: "Params: <amount>\n" "Raises LUK by given amount."
allstats: "Params: <value>\n" "Adds value in all stats (maximum if no value)." allstats: "Params: <value>\n" "Adds value in all stats (maximum if no value)."
addwarp: "Params: <map name> <x coord> <y coord>\n" addwarp: "Params: <map name> <x coord> <y coord>\n"
killmonster2: "Kills all monsters of your map (without drops)." killmonster2: "Kills all monsters of your map (without drops)."
monster: "Params: <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]\n" monster: "Params: <monster name|ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]\n"
"@monster2 <desired_monster_name> <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]\n" "@monster2 <desired_monster_name> <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
"@spawn/@monster/@summon/@monster2 \"desired monster name\" <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]\n" "@spawn/@monster/@summon/@monster2 \"desired monster name\" <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
"@spawn/@monster/@summon/@monster2 <monster_name_or_monster_ID> \"desired monster name\" [<number to spawn> [<x coord> [<y coord>]]]\n" "@spawn/@monster/@summon/@monster2 <monster name|ID> \"desired monster name\" [<number to spawn> [<x coord> [<y coord>]]]\n"
" Spawns the desired monster with any desired name." " Spawns the desired monster with any desired name."
monstersmall: "Params: <monster_name_or_monster_ID>\n" "Spawns a smaller version of a monster." monstersmall: "Params: <monster name|ID>\n" "Spawns a smaller version of a monster."
monsterbig: "Params: <monster_name_or_monster_ID>\n" "Spawns a larger version of a monster." monsterbig: "Params: <monster name|ID>\n" "Spawns a larger version of a monster."
killmonster: "Params: <map>\n" "Kill all monsters of the map (they drop)" killmonster: "Params: <map>\n" "Kill all monsters of the map (they drop)"
autoloot: "Params: <on|off|#>\n" "Makes items go straight into your inventory." autoloot: "Params: <on|off|#>\n" "Makes items go straight into your inventory."
autotrade: "Allows you to vend while you are offline." autotrade: "Allows you to vend while you are offline."
@ -230,8 +230,8 @@ agitend: "End War of Emperium"
party: "Params: <party_name>\n" "Create a party." party: "Params: <party_name>\n" "Create a party."
guild: "Params: <guild_name>\n" "Create a guild." guild: "Params: <guild_name>\n" "Create a guild."
glvl: "Params: <# of levels>\n" "Raise Guild by desired number of levels" glvl: "Params: <# of levels>\n" "Raise Guild by desired number of levels"
guildrecall: "Params: <guild_name/id>\n" "Warps all online characters of a guild to you." guildrecall: "Params: <guild name|ID>\n" "Warps all online characters of a guild to you."
partyrecall: "Params: <party_name/id>\n" "Warps all online characters of a party to you." partyrecall: "Params: <party name|ID>\n" "Warps all online characters of a party to you."
petrename: "Re-enable pet rename" petrename: "Re-enable pet rename"
pettalk: "Params: <message>\n" "Makes your pet say a message." pettalk: "Params: <message>\n" "Makes your pet say a message."
petfriendly: "Params: <#>\n" "Set pet friendly amount (0-1000) 1000 = Max" petfriendly: "Params: <#>\n" "Set pet friendly amount (0-1000) 1000 = Max"
@ -281,4 +281,3 @@ reloadscript: "Reload all scripts."
gat: "For debugging (you inspect around gat)" gat: "For debugging (you inspect around gat)"
send: "For debugging (packet variety)" send: "For debugging (packet variety)"
nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them." nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them."

3
db/packet_db.txt
View File

@ -36,7 +36,6 @@
//packet_db_ver: 25 //packet_db_ver: 25
packet_db_ver: default packet_db_ver: default
//packet_db_ver: 23
packet_ver: 5 packet_ver: 5
0x0064,55 0x0064,55
0x0065,17 0x0065,17
@ -1759,4 +1758,4 @@ packet_ver: 30
0x0977,14 //Monster HP Bar 0x0977,14 //Monster HP Bar
//Add new packets here //Add new packets here
//packet_ver: 31 //packet_ver: 31

2
npc/scripts_custom.conf
View File

@ -101,4 +101,4 @@
//npc: npc/custom/battleground/bg_flavius_02.txt //npc: npc/custom/battleground/bg_flavius_02.txt
//npc: npc/custom/battleground/bg_kvm01.txt //npc: npc/custom/battleground/bg_kvm01.txt
//npc: npc/custom/battleground/bg_kvm02.txt //npc: npc/custom/battleground/bg_kvm02.txt
//npc: npc/custom/battleground/bg_kvm03.txt //npc: npc/custom/battleground/bg_kvm03.txt

271
src/map/atcommand.c
View File

@ -215,8 +215,8 @@ ACMD_FUNC(send)
|| sscanf(message, "%x", &type)==1) ) || sscanf(message, "%x", &type)==1) )
{ {
int i; int i;
for (i = 0; i < 4; ++i) for (i = 900; i <= 903; ++i)
clif_displaymessage(fd, msg_txt(900 + i)); clif_displaymessage(fd, msg_txt(i));
return -1; return -1;
} }
@ -997,135 +997,135 @@ ACMD_FUNC(jobchange)
{ {
int i, found = 0; int i, found = 0;
const struct { char name[24]; int id; } jobs[] = { const struct { char name[24]; int id; } jobs[] = {
{ "novice", 0 }, { "novice", 0 },
{ "swordman", 1 }, { "swordman", 1 },
{ "swordsman", 1 }, { "swordsman", 1 },
{ "magician", 2 }, { "magician", 2 },
{ "mage", 2 }, { "mage", 2 },
{ "archer", 3 }, { "archer", 3 },
{ "acolyte", 4 }, { "acolyte", 4 },
{ "merchant", 5 }, { "merchant", 5 },
{ "thief", 6 }, { "thief", 6 },
{ "knight", 7 }, { "knight", 7 },
{ "priest", 8 }, { "priest", 8 },
{ "priestess", 8 }, { "priestess", 8 },
{ "wizard", 9 }, { "wizard", 9 },
{ "blacksmith", 10 }, { "blacksmith", 10 },
{ "hunter", 11 }, { "hunter", 11 },
{ "assassin", 12 }, { "assassin", 12 },
{ "crusader", 14 }, { "crusader", 14 },
{ "monk", 15 }, { "monk", 15 },
{ "sage", 16 }, { "sage", 16 },
{ "rogue", 17 }, { "rogue", 17 },
{ "alchemist", 18 }, { "alchemist", 18 },
{ "bard", 19 }, { "bard", 19 },
{ "dancer", 20 }, { "dancer", 20 },
{ "super novice", 23 }, { "super novice", 23 },
{ "supernovice", 23 }, { "supernovice", 23 },
{ "gunslinger", 24 }, { "gunslinger", 24 },
{ "gunner", 24 }, { "gunner", 24 },
{ "ninja", 25 }, { "ninja", 25 },
{ "novice high", 4001 }, { "novice high", 4001 },
{ "high novice", 4001 }, { "high novice", 4001 },
{ "swordman high", 4002 }, { "swordman high", 4002 },
{ "swordsman high", 4002 }, { "swordsman high", 4002 },
{ "magician high", 4003 }, { "magician high", 4003 },
{ "mage high", 4003 }, { "mage high", 4003 },
{ "archer high", 4004 }, { "archer high", 4004 },
{ "acolyte high", 4005 }, { "acolyte high", 4005 },
{ "merchant high", 4006 }, { "merchant high", 4006 },
{ "thief high", 4007 }, { "thief high", 4007 },
{ "lord knight", 4008 }, { "lord knight", 4008 },
{ "high priest", 4009 }, { "high priest", 4009 },
{ "high priestess", 4009 }, { "high priestess", 4009 },
{ "high wizard", 4010 }, { "high wizard", 4010 },
{ "whitesmith", 4011 }, { "whitesmith", 4011 },
{ "sniper", 4012 }, { "sniper", 4012 },
{ "assassin cross", 4013 }, { "assassin cross", 4013 },
{ "paladin", 4015 }, { "paladin", 4015 },
{ "champion", 4016 }, { "champion", 4016 },
{ "professor", 4017 }, { "professor", 4017 },
{ "stalker", 4018 }, { "stalker", 4018 },
{ "creator", 4019 }, { "creator", 4019 },
{ "clown", 4020 }, { "clown", 4020 },
{ "gypsy", 4021 }, { "gypsy", 4021 },
{ "baby novice", 4023 }, { "baby novice", 4023 },
{ "baby swordman", 4024 }, { "baby swordman", 4024 },
{ "baby swordsman", 4024 }, { "baby swordsman", 4024 },
{ "baby magician", 4025 }, { "baby magician", 4025 },
{ "baby mage", 4025 }, { "baby mage", 4025 },
{ "baby archer", 4026 }, { "baby archer", 4026 },
{ "baby acolyte", 4027 }, { "baby acolyte", 4027 },
{ "baby merchant", 4028 }, { "baby merchant", 4028 },
{ "baby thief", 4029 }, { "baby thief", 4029 },
{ "baby knight", 4030 }, { "baby knight", 4030 },
{ "baby priest", 4031 }, { "baby priest", 4031 },
{ "baby priestess", 4031 }, { "baby priestess", 4031 },
{ "baby wizard", 4032 }, { "baby wizard", 4032 },
{ "baby blacksmith",4033 }, { "baby blacksmith",4033 },
{ "baby hunter", 4034 }, { "baby hunter", 4034 },
{ "baby assassin", 4035 }, { "baby assassin", 4035 },
{ "baby crusader", 4037 }, { "baby crusader", 4037 },
{ "baby monk", 4038 }, { "baby monk", 4038 },
{ "baby sage", 4039 }, { "baby sage", 4039 },
{ "baby rogue", 4040 }, { "baby rogue", 4040 },
{ "baby alchemist", 4041 }, { "baby alchemist", 4041 },
{ "baby bard", 4042 }, { "baby bard", 4042 },
{ "baby dancer", 4043 }, { "baby dancer", 4043 },
{ "super baby", 4045 }, { "super baby", 4045 },
{ "taekwon", 4046 }, { "taekwon", 4046 },
{ "taekwon boy", 4046 }, { "taekwon boy", 4046 },
{ "taekwon girl", 4046 }, { "taekwon girl", 4046 },
{ "star gladiator", 4047 }, { "star gladiator", 4047 },
{ "soul linker", 4049 }, { "soul linker", 4049 },
{ "gangsi", 4050 }, { "gangsi", 4050 },
{ "bongun", 4050 }, { "bongun", 4050 },
{ "munak", 4050 }, { "munak", 4050 },
{ "death knight", 4051 }, { "death knight", 4051 },
{ "dark collector", 4052 }, { "dark collector", 4052 },
{ "rune knight", 4054 }, { "rune knight", 4054 },
{ "warlock", 4055 }, { "warlock", 4055 },
{ "ranger", 4056 }, { "ranger", 4056 },
{ "arch bishop", 4057 }, { "arch bishop", 4057 },
{ "mechanic", 4058 }, { "mechanic", 4058 },
{ "guillotine", 4059 }, { "guillotine", 4059 },
{ "rune knight2", 4060 }, { "rune knight2", 4060 },
{ "warlock2", 4061 }, { "warlock2", 4061 },
{ "ranger2", 4062 }, { "ranger2", 4062 },
{ "arch bishop2", 4063 }, { "arch bishop2", 4063 },
{ "mechanic2", 4064 }, { "mechanic2", 4064 },
{ "guillotine2", 4065 }, { "guillotine2", 4065 },
{ "royal guard", 4066 }, { "royal guard", 4066 },
{ "sorcerer", 4067 }, { "sorcerer", 4067 },
{ "minstrel", 4068 }, { "minstrel", 4068 },
{ "wanderer", 4069 }, { "wanderer", 4069 },
{ "sura", 4070 }, { "sura", 4070 },
{ "genetic", 4071 }, { "genetic", 4071 },
{ "shadow chaser", 4072 }, { "shadow chaser", 4072 },
{ "royal guard2", 4073 }, { "royal guard2", 4073 },
{ "sorcerer2", 4074 }, { "sorcerer2", 4074 },
{ "minstrel2", 4075 }, { "minstrel2", 4075 },
{ "wanderer2", 4076 }, { "wanderer2", 4076 },
{ "sura2", 4077 }, { "sura2", 4077 },
{ "genetic2", 4078 }, { "genetic2", 4078 },
{ "shadow chaser2", 4079 }, { "shadow chaser2", 4079 },
{ "baby rune", 4096 }, { "baby rune", 4096 },
{ "baby warlock", 4097 }, { "baby warlock", 4097 },
{ "baby ranger", 4098 }, { "baby ranger", 4098 },
{ "baby bishop", 4099 }, { "baby bishop", 4099 },
{ "baby mechanic", 4100 }, { "baby mechanic", 4100 },
{ "baby cross", 4101 }, { "baby cross", 4101 },
{ "baby guard", 4102 }, { "baby guard", 4102 },
{ "baby sorcerer", 4103 }, { "baby sorcerer", 4103 },
{ "baby minstrel", 4104 }, { "baby minstrel", 4104 },
{ "baby wanderer", 4105 }, { "baby wanderer", 4105 },
{ "baby sura", 4106 }, { "baby sura", 4106 },
{ "baby genetic", 4107 }, { "baby genetic", 4107 },
{ "baby chaser", 4108 }, { "baby chaser", 4108 },
{ "super novice e", 4190 }, { "super novice e", 4190 },
{ "super baby e", 4191 }, { "super baby e", 4191 },
{ "kagerou", 4211 }, { "kagerou", 4211 },
{ "oboro", 4212 }, { "oboro", 4212 },
}; };
for (i=0; i < ARRAYLENGTH(jobs); i++) { for (i=0; i < ARRAYLENGTH(jobs); i++) {
@ -1140,8 +1140,8 @@ ACMD_FUNC(jobchange)
// TODO: convert this to use atcommand_help_string() // TODO: convert this to use atcommand_help_string()
if (!found) { if (!found) {
int i; int i;
for (i = 0; i < 45; ++i) for (i = 922; i <= 966; ++i)
clif_displaymessage(fd, msg_txt(922 + i)); clif_displaymessage(fd, msg_txt(i));
clif_displaymessage(fd, msg_txt(967)); // ---- Modes And Others ---- clif_displaymessage(fd, msg_txt(967)); // ---- Modes And Others ----
clif_displaymessage(fd, msg_txt(968)); // 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union) clif_displaymessage(fd, msg_txt(968)); // 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)
return -1; return -1;
@ -1165,8 +1165,8 @@ ACMD_FUNC(jobchange)
} else { } else {
// TODO: convert this to use atcommand_help_string() // TODO: convert this to use atcommand_help_string()
int i; int i;
for (i = 0; i < 45; ++i) for (i = 922; i <= 966; ++i)
clif_displaymessage(fd, msg_txt(922 + i)); clif_displaymessage(fd, msg_txt(i));
clif_displaymessage(fd, msg_txt(967)); // ---- Modes And Others ---- clif_displaymessage(fd, msg_txt(967)); // ---- Modes And Others ----
clif_displaymessage(fd, msg_txt(968)); // 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union) clif_displaymessage(fd, msg_txt(968)); // 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)
return -1; return -1;
@ -1944,8 +1944,7 @@ ACMD_FUNC(go)
// attempt to find the text help string // attempt to find the text help string
text = atcommand_help_string( command ); text = atcommand_help_string( command );
// Invalid location number, or name. clif_displaymessage(fd, msg_txt(38)); // Invalid location number, or name.
clif_displaymessage(fd, msg_txt(38));
if( text ) if( text )
{// send the text to the client {// send the text to the client