summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/mapflag/nomemo.txt1
-rw-r--r--db/map_index.txt2
-rw-r--r--db/mob_skill_db.txt6
-rw-r--r--doc/script_commands.txt20
-rw-r--r--npc/other/Global_Functions.txt2
5 files changed, 15 insertions, 16 deletions
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 960b790c4..e895a1dee 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -1,5 +1,4 @@
//===== eAthena Script =======================================
-//===== eAthena Script =======================================
//= Map flags that disable warp portal memory
//===== By: ==================================================
//= eAthena Dev Team
diff --git a/db/map_index.txt b/db/map_index.txt
index 5d4ca6422..51d1e62b9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -599,7 +599,7 @@ job_hunter
job_knight
job_priest
job_wizard
-ve_in02 // missing map
+ve_in02
rachel
ra_in01
ra_fild01
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index c711e0bfb..436b7e7a4 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -5673,9 +5673,9 @@
2022,Nidhoggr's Shadow@NPC_EARTHQUAKE,attack,653,3,10000,8000,30000,no,self,myhpltmaxrate,40,,,,,,,
2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,chase,662,5,10000,5000,180000,no,self,myhpltmaxrate,50,,,,,,,
2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,attack,662,5,10000,5000,180000,no,self,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@@TF_HIDING,idle,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@@TF_HIDING,chase,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@@TF_HIDING,attack,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
+2022,Nidhoggr's Shadow@TF_HIDING,idle,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
+2022,Nidhoggr's Shadow@TF_HIDING,chase,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
+2022,Nidhoggr's Shadow@TF_HIDING,attack,353,1,3000,500,30000,yes,self,myhpltmaxrate,50,,,,,,,
2022,Nidhoggr's Shadow@NPC_ALLHEAL,idle,687,1,5000,120000,30000,yes,self,myhpltmaxrate,60,,,,,,,
2022,Nidhoggr's Shadow@NPC_ALLHEAL,chase,687,1,5000,120000,30000,yes,self,myhpltmaxrate,60,,,,,,,
2022,Nidhoggr's Shadow@NPC_SLOWCAST,chase,672,3,1000,3000,60000,no,self,myhpltmaxrate,70,,,,,,,
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 06a5a7121..f235d7563 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -5094,14 +5094,14 @@ invoked by the RID that was active in the script that issued a 'doevent'.
place,100,100,1%TAB%script%TAB%NPC%TAB%53,{
mes "This is what you will see when you click me";
close;
- Label:
+ OnLabel:
mes "This is what you will see if the doevent is activated";
close;
}
....
- doevent "NPC::Label";
+ doevent "NPC::OnLabel";
---------------------------------------
@@ -5126,20 +5126,20 @@ something.
place,100,100,1%TAB%script%TAB%NPC%TAB%53,{
mes "Hey NPC2 copy what I do";
close2;
- set @emo, rand(1,30);
- donpcevent "NPC2::Emo";
- Emo:
- emotion @emo;
+ set .@emote, rand(1,30);
+ donpcevent "NPC2::OnEmote";
+ OnEmote:
+ emotion .@emote;
end;
}
place,102,100,1%TAB%script%TAB%NPC2%TAB%53,{
mes "Hey NPC copy what I do";
close2;
- set @emo, rand(1,30);
- donpcevent "NPC::Emo";
- Emo:
- emotion @emo;
+ set .@emote, rand(1,30);
+ donpcevent "NPC::OnEmote";
+ OnEmote:
+ emotion .@emote;
end;
}
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 18c384771..eea78ef5a 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -38,7 +38,7 @@
//= 2.13 Added more unused vars to F_ClearGarbage [Lupus]
//= 2.14 Added old novice variables to F_ClearGarbage. [L0ne_W0lf]
//= 2.15 Added no unused DTS variables to F_ClearGarbage. [L0ne_W0lf]
-//= 2.6 Added F_GetWeaponType, and F_GetArmorType. [L0ne_W0lf]
+//= 2.16 Added F_GetWeaponType, and F_GetArmorType. [L0ne_W0lf]
//============================================================