summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/script_commands.txt14
-rw-r--r--npc/custom/jobs/jobmaster.txt4
-rw-r--r--npc/kafras/dts_warper.txt4
-rw-r--r--npc/quests/skills/assassin_skills.txt2
-rw-r--r--src/common/ers.c4
-rw-r--r--src/common/mapindex.c4
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/npc_chat.c2
-rw-r--r--src/map/script.c4
9 files changed, 22 insertions, 18 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 9a41db7ee..1599058c8 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2048,7 +2048,7 @@ Lets say the ID of a party was saved as a global variable:
---------------------------------------
-*getpartymember <party id>,{<type>};
+*getpartymember <party id>{,<type>};
Thank you to HappyDenn for all this information.
@@ -2112,7 +2112,7 @@ Example:
---------------------------------------
-*getpartyleader(<party id>,{<type>});
+*getpartyleader(<party id>{,<type>});
This function returns some information about the given party-id's leader.
When type is ommitted, the default information retrieved is the leader's name.
@@ -3856,7 +3856,7 @@ Example:
getnameditem "Apple","Aaron";
//Self-explanatory (I hope).
- if (getnameitem("Apple,"Aaron")) {
+ if (getnameitem("Apple","Aaron")) {
mes "You now have a Aaron's Apple!";
}
@@ -5939,10 +5939,14 @@ to query the server log tables.
---------------------------------------
-*setitemscript(<ItemID>,<"{ new item script }">);
+*setitemscript(<item id>,<"{ new item script }">{,<type>});
Set a new script bonus to the Item. Very useful for game events.
-You can remove an item's itemscript by leaving empty the itemscript argument.
+You can remove an item's itemscript by leaving the itemscript argument empty.
+Type can optionally be used indicates which script to set (default is 0):
+ 0 - Script
+ 1 - OnEquip_Script
+ 2 - OnUnequip_Script
Example:
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index d3bf6f59b..3886ccf60 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -187,7 +187,7 @@ prontera,153,193,6 script Job Master 123,{
close;
}
}
- mes "Looks like something has gone wrong. Please report to the eAthena Development Team about this error.";
+ mes "I'm sorry, there are no further classes for your job.";
close;
L_GivePlat:
@@ -266,4 +266,4 @@ OnInit:
set $@JC_Plat, 1; //Give Platinum skills on Jobchange (Default : 1-yes)
set $@JC_SupNovM, 45; //Base Level to change into Super Novice (Default : 45)
end;
-} \ No newline at end of file
+}
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index bd23f807a..5140fb541 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -86,10 +86,10 @@ lighthalzen,154,60,6 script Cool Event Voting Staff::CoolEventVotingStaff02 874,
callfunc "F_DTS_Warp",0,0;
}
//Prontera
-prontera,147,125,4 script Cool Event Voting Staff::CoolEventVotingStaff03 874,{
+prontera,147,125,6 script Cool Event Voting Staff::CoolEventVotingStaff03 874,{
callfunc "F_DTS_Warp",0,0;
}
-prontera,164,125,6 script Kafra Voting Staff#02 115,{
+prontera,164,125,4 script Kafra Voting Staff#02 115,{
callfunc "F_DTS_Warp",1,3;
}
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 8a0664345..f9666da05 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -486,7 +486,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{
mes "[Esmille]";
mes "That jewel is yours";
mes "to keep. In truth, I don't";
- mes "really need any treasure, just^FFFFFF ^000000 some proof your of qualification.";
+ mes "really need any treasure, just^FFFFFF ^000000 some proof of your qualification.";
mes "It looks like you're ready for me^FFFFFF ^000000 to teach you Sonic Acceleration.";
set ASSN_SK,6;
next;
diff --git a/src/common/ers.c b/src/common/ers.c
index 06bad92a4..db7cb149d 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -311,14 +311,14 @@ static void ers_obj_destroy(ERS self)
}
}
if (count) { // missing entries
- ShowWarning("ers::destroy : %u entries missing (possible double free), continuing destruction (entry size=%u).",
+ ShowWarning("ers::destroy : %u entries missing (possible double free), continuing destruction (entry size=%u).\n",
count, obj->size);
} else if (reuse) { // extra entries
while (reuse && count != UINT32_MAX) {
count++;
reuse = reuse->next;
}
- ShowWarning("ers::destroy : %u extra entries found, continuing destruction (entry size=%u).",
+ ShowWarning("ers::destroy : %u extra entries found, continuing destruction (entry size=%u).\n",
count, obj->size);
}
// destroy the entry manager
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 4aef69574..72db1af6d 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -30,7 +30,7 @@ const char* mapindex_getmapname(const char* string, char* output)
size_t len = strnlen(string, MAP_NAME_LENGTH_EXT);
if (len == MAP_NAME_LENGTH_EXT) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!", 2*MAP_NAME_LENGTH_EXT, string);
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH_EXT, string);
len--;
}
if (len >= 4 && stricmp(&string[len-4], ".gat") == 0)
@@ -52,7 +52,7 @@ const char* mapindex_getmapname_ext(const char* string, char* output)
size_t len = safestrnlen(string, MAP_NAME_LENGTH);
if (len == MAP_NAME_LENGTH) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!", 2*MAP_NAME_LENGTH, string);
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH, string);
len--;
}
diff --git a/src/map/clif.c b/src/map/clif.c
index 3baba439e..7ced02555 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12496,7 +12496,7 @@ void clif_bossmapinfo(int fd, struct mob_data *md, short flag)
unsigned int seconds;
int hours, minutes;
- seconds = DIFF_TICK(timer_data->tick, gettick()) / 1000;
+ seconds = DIFF_TICK(timer_data->tick, gettick()) / 1000 + 60;
hours = seconds / (60 * 60);
seconds = seconds - (60 * 60 * hours);
minutes = seconds / 60;
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 4278c33f5..99fa40a20 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -389,7 +389,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
lst = nd->u.scr.label_list;
ARR_FIND(0, nd->u.scr.label_list_num, i, strncmp(lst[i].name, e->label, sizeof(lst[i].name)) == 0);
if (i == nd->u.scr.label_list_num) {
- ShowWarning("Unable to find label: %s", e->label);
+ ShowWarning("Unable to find label: %s\n", e->label);
return 0;
}
diff --git a/src/map/script.c b/src/map/script.c
index cfb909370..0aa92003a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6040,7 +6040,7 @@ BUILDIN_FUNC(strcharinfo)
script_pushconststr(st,"");
break;
default:
- ShowWarning("buildin_strcharinfo: unknown parameter.");
+ ShowWarning("buildin_strcharinfo: unknown parameter.\n");
script_pushconststr(st,"");
break;
}
@@ -10851,7 +10851,7 @@ BUILDIN_FUNC(charcommand)
}
if (*cmd != charcommand_symbol) {
- ShowWarning("script: buildin_charcommand: No '#' symbol!");
+ ShowWarning("script: buildin_charcommand: No '#' symbol!\n");
script_reportsrc(st);
return 1;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 07:25:23 +0000