summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWombat <hpwombat@yahoo.com>2010-12-07 13:21:55 -0500
committerWombat <hpwombat@yahoo.com>2010-12-07 13:21:55 -0500
commit0b3e81f870d5c23f71165dabd6781f2c4f4b9b9d (patch)
treee88d6ddc618f42cad93806da1b2f275089df6970
parentc8486b73d0a033293ab68b438e02301949f77376 (diff)
parent9b3da22d7210886081d3a1a4bc7da9fd8a35b7fd (diff)
downloadserverdata-0b3e81f870d5c23f71165dabd6781f2c4f4b9b9d.tar.gz
serverdata-0b3e81f870d5c23f71165dabd6781f2c4f4b9b9d.tar.bz2
serverdata-0b3e81f870d5c23f71165dabd6781f2c4f4b9b9d.tar.xz
serverdata-0b3e81f870d5c23f71165dabd6781f2c4f4b9b9d.zip
Merge remote branch 'master/master'
-rw-r--r--npc/018-1_Woodland_mining_camp/_import.txt1
-rw-r--r--npc/018-1_Woodland_mining_camp/mike.txt22
-rw-r--r--npc/functions/banker.txt6
3 files changed, 26 insertions, 3 deletions
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
index 06c8a307..f682ead9 100644
--- a/npc/018-1_Woodland_mining_camp/_import.txt
+++ b/npc/018-1_Woodland_mining_camp/_import.txt
@@ -1,5 +1,6 @@
map: 018-1.gat
npc: npc/018-1_Woodland_mining_camp/_mobs.txt
npc: npc/018-1_Woodland_mining_camp/_warps.txt
+npc: npc/018-1_Woodland_mining_camp/mike.txt
npc: npc/018-1_Woodland_mining_camp/miners.txt
npc: npc/018-1_Woodland_mining_camp/sword.txt
diff --git a/npc/018-1_Woodland_mining_camp/mike.txt b/npc/018-1_Woodland_mining_camp/mike.txt
new file mode 100644
index 00000000..7e0d296c
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/mike.txt
@@ -0,0 +1,22 @@
+018-1.gat,77,60,0 script Mike 113,{
+
+ mes "[Mike]";
+ mes "\"I need black stingers to make some medicine to cure my sister.\"";
+ next;
+
+ set @dq_level, 40;
+ set @dq_cost, 16;
+ set @dq_count, 4;
+ set @dq_name$, "BlackScorpionStinger";
+ set @dq_friendly_name$, "black stingers";
+ set @dq_money, 2500;
+ set @dq_exp, 500;
+
+ callfunc "DailyQuest";
+
+ next;
+
+ mes "\"Hopefully I'll have enough soon.\"";
+ close;
+
+}
diff --git a/npc/functions/banker.txt b/npc/functions/banker.txt
index 08b67229..2f738478 100644
--- a/npc/functions/banker.txt
+++ b/npc/functions/banker.txt
@@ -50,7 +50,7 @@ L_Dep_Input:
"Go back", L_Start,
"Try again", L_Dep_Input,
"Deposit all", L_Dep_All,
- "Quit", -;
+ "Nevermind", -;
goto L_Nev;
L_Dep_5k:
@@ -119,7 +119,7 @@ L_With:
"All of my money", L_With_All,
"I've changed my mind", L_Start,
"Quit", -;
- next;
+ return;
L_With_Input:
input @Amount;
@@ -130,7 +130,7 @@ L_With_Input:
"Go back", L_Start,
"Try again", L_With_Input,
"Withdraw all", L_With_All,
- "Quit", -;
+ "Nevermind", -;
goto L_Nev;
L_With_5k: