summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-07-09 12:07:36 -0300
committerJesusaves <cpntb1@ymail.com>2018-07-09 12:07:36 -0300
commit32298da90daf4762883185cc2c233ba10fd1fa56 (patch)
tree9ca3c95ac480229eef6580dff5bbdcc0291c80cb
parent7746323daa14ca0441acb9f858c985e519068f7c (diff)
downloadserverdata-32298da90daf4762883185cc2c233ba10fd1fa56.tar.gz
serverdata-32298da90daf4762883185cc2c233ba10fd1fa56.tar.bz2
serverdata-32298da90daf4762883185cc2c233ba10fd1fa56.tar.xz
serverdata-32298da90daf4762883185cc2c233ba10fd1fa56.zip
Arkim fix, and preparative for teleporter
-rw-r--r--npc/015-3/_import.txt2
-rw-r--r--npc/015-3/arkim.txt (renamed from npc/015-3/hermit.txt)6
-rw-r--r--npc/items/teleporter.txt37
-rw-r--r--npc/scripts.conf1
4 files changed, 44 insertions, 2 deletions
diff --git a/npc/015-3/_import.txt b/npc/015-3/_import.txt
index 2df65ff8f..0b521a5d0 100644
--- a/npc/015-3/_import.txt
+++ b/npc/015-3/_import.txt
@@ -2,4 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/015-3/_mobs.txt",
"npc/015-3/_warps.txt",
-"npc/015-3/hermit.txt",
+"npc/015-3/arkim.txt",
diff --git a/npc/015-3/hermit.txt b/npc/015-3/arkim.txt
index 506f7198b..7ec10fba6 100644
--- a/npc/015-3/hermit.txt
+++ b/npc/015-3/arkim.txt
@@ -26,7 +26,11 @@ L_Loop:
mesq l("I am doing a great research with Bats, and thus far I collected @@ Bat Wings and Teeths.", $ARKIM_ST);
next;
if (.@q3 > $@ARKIM_TIMER) goto L_Timer;
- if (.@q3 < $@ARKIM_TIMER-(60*60*24)) setq3 HurnscaldQuest_Arkim, $@ARKIM_TIMER-(60*60*24); // Globally-bound timed quest
+ // Globally-bound timed quest
+ if (.@q3 < $@ARKIM_TIMER-(60*60*24)) {
+ setq2 HurnscaldQuest_Arkim, 0;
+ setq3 HurnscaldQuest_Arkim, $@ARKIM_TIMER-(60*60*24);
+ }
if (.@q2 >= (BaseLevel-17)/3) goto L_Timer;
select
rif(countitem(BatWing) >= 1, l("Donate a Bat Wing")),
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
new file mode 100644
index 000000000..5d4ad5497
--- /dev/null
+++ b/npc/items/teleporter.txt
@@ -0,0 +1,37 @@
+// TMW2 scripts.
+// Authors:
+// Pyndragon
+// Jesusalva
+// Description:
+// Hand Teleporter (also saves coordinates - @memo)
+
+- script LoF Teleporter NPC_HIDDEN,{
+ close;
+
+L_Cooldown:
+ mesn;
+ mesc l("This teleporter is currently recharging.");
+ mesc l("You can use it again in @@.", FuzzyTime(TELEPORTER_TIME));
+ close;
+
+OnUse:
+ if (TELEPORTER_TIME > gettimetick(2))
+ goto L_Cooldown;
+
+ mesn;
+ mesc l("Do you want to cut this @@?", getitemlink(Croconut));
+ next;
+
+ menu
+ l("Yes."), L_Weapon,
+ l("No."), -;
+
+ getitem Croconut, 1;
+ close;
+
+L_Weapon:
+ mesc l("You perfectly cut your @@ into two edible parts.", getitemlink(Croconut));
+
+ getitem HalfCroconut, 2;
+ close;
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index bd3111f0b..8d7312b7d 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -54,6 +54,7 @@
"npc/items/books.txt",
"npc/items/croconut.txt",
"npc/items/shovel.txt",
+"npc/items/teleporter.txt",
// custom atcommands
"npc/commands/music.txt",