summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-25 06:15:46 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-25 06:15:46 +0000
commit3f599dbc85b01da7552abf61bf6dfd6776bc3a8b (patch)
tree6bc4f70fe7a9c196dc0dc9974062ec3f3b431900 /npc
parent45c0e17a5c1040d2294e330c8eb28a9e1a13a0e1 (diff)
downloadhercules-3f599dbc85b01da7552abf61bf6dfd6776bc3a8b.tar.gz
hercules-3f599dbc85b01da7552abf61bf6dfd6776bc3a8b.tar.bz2
hercules-3f599dbc85b01da7552abf61bf6dfd6776bc3a8b.tar.xz
hercules-3f599dbc85b01da7552abf61bf6dfd6776bc3a8b.zip
- Applied the rest of Rayce's suggestions and fixes (http://www.eathena.ws/board/index.php?showtopic=129185)
- warn_cmd_no_comma, warn_func_no_comma, warn_cmd_mismatch_paramnum are now warn_func_mismatch_paramnum and it only prevents showing the error, as it was probably intended in the first place. (correct me if i'm wrong) - Merged the parsing of function calls in the script engine, removing the parse_cmd hackery, and made "heal (.@val+rand(0xff))&0xff,0;" valid again. - Fixed a bug in eye_of_hellion.txt and a bug in hunter.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9569 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/jobs/2-1/hunter.txt5
-rw-r--r--npc/quests/eye_of_hellion.txt5
3 files changed, 8 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a97eed75b..a82da86cc 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,8 @@ KarLaeda
Date Added
======
+2006/12/25
+ * Fixed a bug in eye_of_hellion.txt and a bug in hunter.txt. [FlavioJS]
2006/12/22
* Corrected scripts to use the new format of agitcheck
* Simplified the global function "getJobName" [Skotlex]
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 4f6c14c55..6ff6ea367 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -5,7 +5,7 @@
//= Converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.4a
+//= 2.5
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -32,6 +32,7 @@
//= 2.2a Fixed Sharon resetting the test2 item set [Lupus]
//= 2.3a 7 official sets of Demon Hunter,thx to Dr.Evil [Lupus]
//= 2.4a Added missing next;, missing NPC names [Lupus]
+//= 2.5 "strcharinfo" -> "strcharinfo(0)" [FlavioJS]
//============================================================
//<====================================== Job Changer ========================================>\\
@@ -554,7 +555,7 @@ L_Other:
L_Hnt:
mes "[Guild Master]";
- mes "Ah, it's you again, "+strcharinfo+"! Good to see you're well. Me? I'm still busy as usual.";
+ mes "Ah, it's you again, "+strcharinfo(0)+"! Good to see you're well. Me? I'm still busy as usual.";
next;
mes "[Guild Master]";
mes "Well I've gota get back to work. Stay safe.";
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index f90cf3714..1db58facb 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -12,6 +12,7 @@
//=
//===== Additional Comments: =================================
//= 1.0 First version [MasterOfMuppets]
+//= 1.1 a ',' that should be ';' [FlavioJS]
//============================================================
geffen.gat,110,200,3 script Sage Welshyun 754,2,2,{
@@ -228,7 +229,7 @@ s_Switches:
mes "were too simple...";
set HELLIONQ,24;
delitem 717,1; //Blue gemstone
- getitem 7336,1, //Geffen Tablet
+ getitem 7336,1; //Geffen Tablet
next;
mes "[Welshyun]";
mes "Please send my regards";