diff options
| -rw-r--r-- | db/skill_db.txt | 2 | ||||
| -rw-r--r-- | doc/script_commands.txt | 6 | ||||
| -rw-r--r-- | src/common/strlib.c | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 1 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/db/skill_db.txt b/db/skill_db.txt index 4eddf7404..21149b547 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -5,7 +5,7 @@ // 03 hit (8- repeated hitting, 6- single-hit) // 04 inf (0- passive, 1- enemy, 2- place, 4- self, 16- friend, 32- trap) // 05 pl attributes (0- neutral, 1- water, 2- earth, 3- fire, 4- wind, -// 5- poison, 6- saint, 7- darkness, 8- sense, 9- immortality) +// 5- poison, 6- holy, 7- dark, 8- ghost, 9- undead, -1- use weapon element) // 06 nk (skill damage properties): // 0x01 - No damage skill // 0x02 - Has splash area diff --git a/doc/script_commands.txt b/doc/script_commands.txt index f6c9c4162..38e5800af 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -69,6 +69,8 @@ //= Added info on OnTimerQuit label to npctimer section. [Skotlex] //= 3.04.20070317 //= Removed all .gat refferences from the examples [Lupus] +//= 3.04.20070330 +//= Adjusted the 'itemskill' description due to recent change [ultramage] //===== Compatible With =================================== //= LOL, can be used by anyone hopefully //===== Description ======================================= @@ -3821,7 +3823,7 @@ effect is still in effect). --------------------------------------- -*itemskill <skill id>,<skill level>,"<skill name to show>"; +*itemskill <skill id>,<skill level>; This is a command meant for item scripts to replicate single-use skills. It will not work properly in NPC scripts a lot of the time because casting a skill is @@ -3831,7 +3833,7 @@ just fine and even show a targeting pointer if this is a targeting skill. // When you use Anodyne, you will cast Endure(8) level 1, // and "Endure" will appear above your head as you use it. -605,Anodyne,Anodyne,11,2000,0,100,,,,,10477567,2,,,,,{ itemskill 8,1,"Endure"; },{} +605,Anodyne,Anodyne,11,2000,0,100,,,,,10477567,2,,,,,{ itemskill 8,1; },{} --------------------------------------- diff --git a/src/common/strlib.c b/src/common/strlib.c index dd10d655e..9d79e2745 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -7,7 +7,8 @@ #include <ctype.h> #include "strlib.h" -#include "utils.h" +#include "../common/cbasetypes.h" +#include "../common/utils.h" #include "../common/malloc.h" //----------------------------------------------- diff --git a/src/map/clif.c b/src/map/clif.c index 5d4bcc457..a9214a137 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8478,7 +8478,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) { //Possible bot? Thanks to veider and qspirit //FIXME: Still isn't perfected as clients keep asking for this on legitimate situations. unsigned char gm_msg[256]; - sprintf(gm_msg, "Hack on NameRequest: character '%s' (account: %d) requests name of invisible chars.", sd->status.name, sd->status.account_id); + sprintf(gm_msg, "Hack on NameRequest: character '%s' (account: %d) requested the name of an invisible target.", sd->status.name, sd->status.account_id); ShowWarning(gm_msg); // information is sended to all online GM intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, gm_msg); diff --git a/src/map/npc.c b/src/map/npc.c index 0a6277894..9cb53327a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -31,7 +31,6 @@ #include "skill.h" #include "unit.h" -#ifdef _WIN32 struct npc_src_list { struct npc_src_list * next; diff --git a/src/map/status.c b/src/map/status.c index 58d6190b7..8d4084f28 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5009,7 +5009,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val skill_enchant_elemental_end(bl,type); break; case SC_ELEMENTALCHANGE: - //Val1 is elemental change level, val2 is eleemnt to use. + //Val1 is elemental change level, val2 is element to use. if (!val2) //Val 3 holds the element, when not given, a random one is picked. val2 = rand()%ELE_MAX; //Elemental Lv is always a random value between 1 and 4. |