summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-01-13 03:58:49 -0300
committerJesusaves <cpntb1@ymail.com>2021-01-13 03:58:49 -0300
commit99f3f84befda9bd286a59b5bb9792b7948b2ae91 (patch)
tree87a6a4b0e8db56fb6d6751256f654ca23dedc48e
parent185f8fdf2cd8e3d07eeea2a22bd6904710e86e48 (diff)
downloadserverdata-99f3f84befda9bd286a59b5bb9792b7948b2ae91.tar.gz
serverdata-99f3f84befda9bd286a59b5bb9792b7948b2ae91.tar.bz2
serverdata-99f3f84befda9bd286a59b5bb9792b7948b2ae91.tar.xz
serverdata-99f3f84befda9bd286a59b5bb9792b7948b2ae91.zip
Move Phoenix Rebirth inside Fortress Town. Lockdown whole Fortress Island.
-rw-r--r--npc/017-10/airship.txt2
-rw-r--r--npc/025-1/_import.txt1
-rw-r--r--npc/025-1/phoenix.txt (renamed from npc/025-2/phoenix.txt)7
-rw-r--r--npc/025-2/_import.txt2
-rw-r--r--npc/025-2/guard.txt24
5 files changed, 33 insertions, 3 deletions
diff --git a/npc/017-10/airship.txt b/npc/017-10/airship.txt
index 751be8cea..57618a629 100644
--- a/npc/017-10/airship.txt
+++ b/npc/017-10/airship.txt
@@ -8,7 +8,7 @@
end;
OnTouch:
.@q=getq(General_Narrator);
- if (.@q < 19)
+ if (.@q < 20)
end;
mesc l(".:: Fortress Island ::."), 1;
diff --git a/npc/025-1/_import.txt b/npc/025-1/_import.txt
index 2d7aab78d..50631a93c 100644
--- a/npc/025-1/_import.txt
+++ b/npc/025-1/_import.txt
@@ -4,5 +4,6 @@
"npc/025-1/_mobs.txt",
"npc/025-1/ctrl.c",
"npc/025-1/ihclot.txt",
+"npc/025-1/phoenix.txt",
"npc/025-1/salohcin.txt",
"npc/025-1/xovilam.txt",
diff --git a/npc/025-2/phoenix.txt b/npc/025-1/phoenix.txt
index 6e1d64d19..b8e20a246 100644
--- a/npc/025-2/phoenix.txt
+++ b/npc/025-1/phoenix.txt
@@ -4,7 +4,7 @@
// Notes:
// Phoenix Rebirth
-025-2,108,23,0 script Phoenix Rebirth NPC_BRGUARD_SPEAR,{
+025-1,66,21,0 script Phoenix Rebirth NPC_BRGUARD_SPEAR,{
setpcblock(255, true);
mesn;
mesq l("Hello there. My name is %s.", .name$);
@@ -187,5 +187,10 @@
jobchange max(0, @menuret);
close;
+
+OnInit:
+ .sex = G_MALE;
+ .distance = 7;
+ end;
}
diff --git a/npc/025-2/_import.txt b/npc/025-2/_import.txt
index d195a69a1..f3af81005 100644
--- a/npc/025-2/_import.txt
+++ b/npc/025-2/_import.txt
@@ -2,5 +2,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/025-2/_mobs.txt",
"npc/025-2/_warps.txt",
+"npc/025-2/guard.txt",
"npc/025-2/main.txt",
-"npc/025-2/phoenix.txt",
diff --git a/npc/025-2/guard.txt b/npc/025-2/guard.txt
new file mode 100644
index 000000000..93839a2a3
--- /dev/null
+++ b/npc/025-2/guard.txt
@@ -0,0 +1,24 @@
+// TMW-2 Script.
+// Author:
+// Jesusalva
+// Notes:
+// Generic Guard from the Alliance
+
+025-2,108,23,0 script Alliance Guard NPC_BRGUARD_BOW,{
+ .@q=getq(General_Narrator);
+ if (.@q >= 21)
+ goto L_ShortSummary;
+ setpcblock(255, true);
+ mesn;
+ mesq l("Hey %s, I was informed about your arrival. You are here, good!");
+ setpcblock(255, false);
+ close;
+
+L_ShortSummary:
+ .@open$=l("We have set some stalls which should be useful if you plan into raiding the Impregnable Fortress.");
+ .@lock$=l("It is locked but %s should be able to coordinate a raid on it.", $MOST_HEROIC$);
+ mesn;
+ mesq l("Past this point is the Fortress Island. %s Even so, be careful, the town should not exist.", ($FORTRESS_STATE ? .@open$ : .@lock$));
+ close;
+}
+