summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWombat <hpwombat@yahoo.com>2010-08-29 04:24:10 -0400
committerWombat <hpwombat@yahoo.com>2010-08-29 04:24:10 -0400
commitd857a51dfb5891b6be429d82ad4209fb0059d719 (patch)
tree47fdbbe434fc4098cc53b2f3df56f50fe7160e42
parent82244e430cb91cccc1b4046eb29cced1986c95b7 (diff)
parent3eced1bf67c6bd8337486d8e1766d514268f036f (diff)
downloadserverdata-d857a51dfb5891b6be429d82ad4209fb0059d719.tar.gz
serverdata-d857a51dfb5891b6be429d82ad4209fb0059d719.tar.bz2
serverdata-d857a51dfb5891b6be429d82ad4209fb0059d719.tar.xz
serverdata-d857a51dfb5891b6be429d82ad4209fb0059d719.zip
Merge branch 'master' of git://gitorious.org/tmw-eathena-data/mainline
-rw-r--r--db/item_db.txt4
-rw-r--r--npc/011-3_Hermits_cave/hermit.txt51
-rw-r--r--npc/020-1_Nivalis/mapflags.txt9
3 files changed, 58 insertions, 6 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 1c895454..bc4e2dfd 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -252,8 +252,8 @@
750, SlowPoisonPotion, Slow Poison Potion, 0, 500, 200, 10, , , , , , 2, , , 0, , { itemheal 5, 0; sc_start sc_slowpoison, 180000, 180; }, {}
751, PinkieHat, Pinkie Hat, 5, 5000, 1000, 5, , 1, , 1, 0, 2, 256, , 0, 0, {}, {}
752, FluffyHat, Fluffy Hat, 5, 7000, 2000, 10, , 2, , -5, 0, 2, 256, , 0, 0, {}, {}
-753, BatWing, Bat Wing, 3, 500, 50, 3, , , , , , , , , , , {}, {}
-754, BatTeeth, Bat Teeth, 3, 600, 75, 2, , , , , , , , , , , {}, {}
+753, BatWing, Bat Wing, 3, 500, 10, 3, , , , , , , , , , , {}, {}
+754, BatTeeth, Bat Teeth, 3, 600, 12, 2, , , , , , , , , , , {}, {}
755, AssassinShirt, Assassin Shirt, 5, 10000, 3000, 15, , 10, , -5, 0, 2, 512, , 0, 0, {}, { callfunc "UnreleasedItem"; bonus bAgi,10; }
756, AssassinGloves, Assassin Gloves, 5, 7000, 2000, 9, , 5, , -3, 0, 2, 4, , 0, 0, {}, { callfunc "UnreleasedItem"; bonus bAgi,5; }
757, AssassinBoots, Assassin Boots, 5, 7000, 2000, 10, , 5, , -3, 0, 2, 64, , 0, 0, {}, { callfunc "UnreleasedItem"; bonus bAgi,5; }
diff --git a/npc/011-3_Hermits_cave/hermit.txt b/npc/011-3_Hermits_cave/hermit.txt
index f732f83a..6dccccf4 100644
--- a/npc/011-3_Hermits_cave/hermit.txt
+++ b/npc/011-3_Hermits_cave/hermit.txt
@@ -3,13 +3,60 @@
011-3.gat,30,30,0 script Arkim 116,{
mes "[Arkim the Hermit]";
mes "\"Do you want to go back outside?\"";
- next;
menu
"Yes please", L_Sure,
- "Not yet", -;
+ "Not yet", -,
+ "Actually... Why do you live here?", L_Interested;
close;
L_Sure:
warp "011-1.gat", 60, 95;
close;
+
+L_Interested:
+ mes "[Arkim the Hermit]";
+ mes "\"Oh my, never really thought about it\"";
+ next;
+ mes "[Arkim the Hermit]";
+ mes "\"I guess mostly I enjoy experimenting with bats here\"";
+
+ menu
+ "I see", -,
+ "What type of experimenting?", L_Experiment;
+ close;
+
+L_Experiment:
+ mes "[Arkim the Hermit]";
+ mes "\"Never really thought about it...\"";
+
+ next;
+
+ mes "*You watch as his old, lazy eyes open wide. And the old man comes alive with engery*";
+
+ next;
+
+ mes "[Arkim the Hermit]";
+ mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!! HAHAHA!\"";
+
+ menu
+ "YOU'RE CRAZY!", -,
+ "Right... me too. Can I help?", L_Quest;
+ close;
+
+L_Quest:
+ set @dq_level, 20;
+ set @dq_cost, 4;
+ set @dq_count, 3;
+ set @dq_name$, "BatWing";
+ set @dq_friendly_name$, "bat wings";
+ set @dq_money, 600;
+ set @dq_exp, 100;
+
+ callfunc "DailyQuest";
+
+ next;
+
+ mes "[Arkim the Hermit]";
+ mes "\"And remember never lend your tooth brush to a slime!\"";
+ close;
}
diff --git a/npc/020-1_Nivalis/mapflags.txt b/npc/020-1_Nivalis/mapflags.txt
index 203cf649..b96ea2f6 100644
--- a/npc/020-1_Nivalis/mapflags.txt
+++ b/npc/020-1_Nivalis/mapflags.txt
@@ -1,2 +1,7 @@
-020-1.gat mapflag no_player_drops
-020-1.gat mapflag town
+//
+
+019-1.gat mapflag nosave 009-1,54,39;
+020-1.gat mapflag nosave 009-1,54,39;
+020-2.gat mapflag nosave 009-1,54,39;
+020-3.gat mapflag nosave 009-1,54,39;
+020-4.gat mapflag nosave 009-1,54,39;