summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/jobs/2-1/blacksmith.txt9
-rw-r--r--npc/jobs/2-1/hunter.txt7
-rw-r--r--npc/sample/npc_test_npctimer2.txt16
4 files changed, 28 insertions, 7 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a8f61beae..586cc52b8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,9 @@ Other Ppl
Date Added
======
+01/10
+ * Fixed some typos and exploits in the Blacksmith and Hunter job quest,
+ thanks to Riotblade and nonox
01/09/05
* Modified guild war scripts to fix a bug for duplicate guild storages. [Codemaster & Ajarn]
8/1
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 0f1b71eb4..100bbc4da 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -7,7 +7,7 @@
//= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena 0.5.2 +
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= names and labels. Edited some text.[kobra_k88]
//= Removed "if(JobLevel > 48) goto higher". It was a left over line.
//= Thx to "Decker".[kobra_k88]
+//= Fixed some typos, thanks to Riotblade [celest]
==============================================================
@@ -461,7 +462,7 @@ L_result:
mes "Good!";
next;
mes "[Geshupenschte]";
- mes "Lets see....your score is ^5533FF"+@score+"."^000000;
+ mes "Lets see....your score is ^5533FF"+@score+".^000000";
if (@score == 100) goto L_perfect;
mes ".............";
next;
@@ -485,7 +486,7 @@ L_result2:
mes "Great!";
next;
mes "[Geshupenschte]";
- mes "Lets see....your score is ^5533FF"+@score+"."^000000;
+ mes "Lets see....your score is ^5533FF"+@score+".^000000";
if (@score > 80) goto L_pass;
mes ".............";
next;
@@ -1160,7 +1161,7 @@ comodo.gat,158,342,4 script Bismarck 118,{
if (BSMITH_Q == 3) goto L_Start;
mes "[Bismarck]";
- mes "......Ughï....";
+ mes "......Ugh?...";
mes ".....When's that delivery coming......";
next;
mes "[Bismarck]";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index b65b78720..bd8f830a5 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -6,7 +6,7 @@
//= Converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= v1.5 Fixed items quest fork bug [Lupus]
//= v1.6 Fixed items quest bug: added extra condition [Lupus]
//= v1.7 Fixed skillpoints check bug [Lupus]
+//= v1.8 Fixed an exploit, thanks to nonox [celest]
//============================================================
@@ -721,8 +722,7 @@ OnMyMobDead1:
stopnpctimer "TimerHnt";
killmonsterall "job_hunte.gat";
enablenpc "SwitchHnt";
- areaannounce "job_hunte.gat", 50, 64, 123, 143, "[Test Guide]: Great job! Go use the switch now!",8;
- set HNTR_Q2, 2;
+ areaannounce "job_hunte.gat", 50, 64, 123, 143, "[Test Guide]: Great job! Go use the switch now!",8;
end;
}
@@ -843,6 +843,7 @@ job_hunte.gat,93,101,1 script SwitchHnt 723,{
job_hunte.gat,89,139,1 script ExitHnt 45,2,2,{
deltimer "TimerHnt::OnTimer196000";
+ set HNTR_Q2, 2;
warp "payon_in02.gat", 16, 26;
killmonsterall "job_hunte.gat";
donpcevent "HntTG::OnStart";
diff --git a/npc/sample/npc_test_npctimer2.txt b/npc/sample/npc_test_npctimer2.txt
new file mode 100644
index 000000000..de9895f3c
--- /dev/null
+++ b/npc/sample/npc_test_npctimer2.txt
@@ -0,0 +1,16 @@
+prontera.gat,156,183,0 script NPCtimerƒeƒXƒg::npctimerX0000 116,{
+L_INIT:
+ mes "What would you like to know?";
+ menu "Tell me my level",L_WAIT;
+
+L_WAIT:
+ mes "I need time to think...";
+ initnpctimer;
+ attachnpctimer;
+ close;
+
+OnTimer5000:
+ mes "Ah, your level is " + readparam(11);
+ detachnpctimer;
+ close;
+} \ No newline at end of file