summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-0/berserk.txt2
-rw-r--r--npc/009-1/guards.txt7
-rw-r--r--npc/011-3/_import.txt5
-rw-r--r--npc/011-3/_mobs.txt20
-rw-r--r--npc/011-3/_warps.txt4
-rw-r--r--npc/011-3/flood.txt10
-rw-r--r--npc/014-2/_import.txt1
-rw-r--r--npc/014-2/guards.txt17
-rw-r--r--npc/021-4/main.txt5
-rw-r--r--npc/_import.txt1
10 files changed, 66 insertions, 6 deletions
diff --git a/npc/003-0/berserk.txt b/npc/003-0/berserk.txt
index 4f2b893a7..9c572aa16 100644
--- a/npc/003-0/berserk.txt
+++ b/npc/003-0/berserk.txt
@@ -75,7 +75,7 @@ L_Member:
countitem(RubyPowder) < (getskilllv(SM_BASH)+1)*2 ||
countitem(StrengthPotion) < (getskilllv(SM_BASH)+1)*2) goto L_Missing;
- delitem PiberriesInfusion, (getskilllv(SM_BASH)+1)*15;
+ delitem ManaPiouFeathers, (getskilllv(SM_BASH)+1)*15;
delitem CaveSnakeSkin, (getskilllv(SM_BASH)+1)*3;
delitem RubyPowder, (getskilllv(SM_BASH)+1)*2;
delitem StrengthPotion, (getskilllv(SM_BASH)+1)*2;
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index bfa5942f5..7574fd07f 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -8,13 +8,14 @@
// The Monster King guild have a special menu
if (strcharinfo(2) == "Monster King") goto L_MKControl;
mesn;
- mesq l("Sorry! The monsters are gone, but this gate stays closed.");
+ mesq l("Halt! Beyond this gate, is the Great River and the Eternal Swamps.");
next;
mesn;
- mesq l("Past this way is the Great River and the Eternal Swamps. But the river flooded.");
+ mesq l("Was not it only flooded constantly, the graveyard is not too far. If you stray away from the path, you'll get lost.");
next;
mesn;
- mesq l("Various people already went missing. We are not allowing anyone to pass, not even GMs!");
+ mesq l("Various people already went missing, including GMs. This is why if you plan to cross, @@.", b(l("You won't be allowed to walk sideways, except to avoid a monster or two.")));
+ mesc l("If you try to walk west or east too much, you'll hit an \"invisible wall\" to prevent you from getting lost.");
if (GHQUEST)
GHQ_Assign(Snake, "Halinarzo");
end;
diff --git a/npc/011-3/_import.txt b/npc/011-3/_import.txt
new file mode 100644
index 000000000..b931fb109
--- /dev/null
+++ b/npc/011-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 011-3: Eternal Swamps - Landbridge
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/011-3/_mobs.txt",
+"npc/011-3/_warps.txt",
+"npc/011-3/flood.txt",
diff --git a/npc/011-3/_mobs.txt b/npc/011-3/_mobs.txt
new file mode 100644
index 000000000..2b7eb0b88
--- /dev/null
+++ b/npc/011-3/_mobs.txt
@@ -0,0 +1,20 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-3: Eternal Swamps - Landbridge mobs
+011-3,39,205,19,14 monster Angry Red Scorpion 1130,20,100000,30000
+011-3,40,206,19,14 monster Fire Goblin 1067,20,100000,30000
+011-3,38,207,19,14 monster Old Snake 1199,5,100000,30000
+011-3,38,173,18,13 monster Sarracenus 1125,10,100000,30000
+011-3,37,175,18,13 monster Black Scorpion 1074,5,100000,30000
+011-3,39,174,18,13 monster Snake 1122,15,100000,30000
+011-3,39,144,19,11 monster Snake 1122,5,100000,30000
+011-3,38,144,19,11 monster Sarracenus 1125,5,100000,30000
+011-3,38,145,19,11 monster Desert Bandit 1124,5,100000,30000
+011-3,40,100,36,26 monster Fire Fairy 1183,15,100000,30000
+011-3,38,99,36,26 monster Bandit 1124,15,100000,30000
+011-3,36,102,36,26 monster Robin Bandit 1153,8,100000,30000
+011-3,37,56,24,14 monster Sea Slime 1093,5,100000,30000
+011-3,39,55,24,14 monster Red Mushroom 1042,5,100000,30000
+011-3,38,54,24,14 monster Grass Snake 1169,5,100000,30000
+011-3,38,32,19,7 monster Sea Slime 1093,5,100000,30000
+011-3,39,31,19,7 monster Tipiou 1016,3,900000,300000
+011-3,38,31,19,7 monster Vicious Squirrel 1187,5,100000,30000
diff --git a/npc/011-3/_warps.txt b/npc/011-3/_warps.txt
new file mode 100644
index 000000000..22caef9e6
--- /dev/null
+++ b/npc/011-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-3: Eternal Swamps - Landbridge warps
+011-3,37,20,0 warp #011-3_37_20 2,0,014-2,56,102
+011-3,37,221,0 warp #011-3_37_221 4,0,009-1,71,25
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
new file mode 100644
index 000000000..2880e3504
--- /dev/null
+++ b/npc/011-3/flood.txt
@@ -0,0 +1,10 @@
+// TMW2 scripts.
+// Authors:
+// Jesusalva
+// Description:
+// Controls Eternal Swamps.
+// Contains functions to flood the map (hide the bridges - mask 1024)
+// Flood happens at random and causes BluePar to be spawn. Runs every 10 minutes.
+// At the 6th minute of an hour (6, 16, 26, 36, 46, 56)
+
+
diff --git a/npc/014-2/_import.txt b/npc/014-2/_import.txt
index 06d0056e7..9efb6ced4 100644
--- a/npc/014-2/_import.txt
+++ b/npc/014-2/_import.txt
@@ -2,5 +2,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/014-2/_mobs.txt",
"npc/014-2/_warps.txt",
+"npc/014-2/guards.txt",
"npc/014-2/mouboo.txt",
"npc/014-2/woodywife.txt",
diff --git a/npc/014-2/guards.txt b/npc/014-2/guards.txt
new file mode 100644
index 000000000..6216de67c
--- /dev/null
+++ b/npc/014-2/guards.txt
@@ -0,0 +1,17 @@
+// TMW2 scripts.
+// Authors:
+// Jesusalva
+// Description:
+// Access to Eternal Swamps
+
+014-2,41,56,0 script Guard Jennifer NPC_GUARD2,{
+ mesn;
+ mesc l("Beyond this bridge are the Eternal Swamps!");
+ close;
+
+OnInit:
+ .sex = G_OTHER;
+ .distance = 5;
+ end;
+}
+
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index c6021f1e0..b543fef99 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -174,12 +174,13 @@ OnTimer2500:
.@y=mobcount("021-4", "Cindy#Outside::OnPetDeath");
if (.@y == 0 && .canfinish) {
$@CINDY_STATE=gettimetick(2)+60*rand(55,65)*rand(4,36); // It is way too random to I say how long it takes (220min ~ 39 hours)
- announce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc;
+ mapannounce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc;
areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward";
goto L_CleanUp;
}
.wtime+=5;
- if (.wtime >= rand(90,120)+(.lifetime*rand(11,12))) {
+ .@bonus=(.lifetime/10)*10; // After the 10th round, it starts to spawn slower
+ if (.wtime >= rand(90,120)+.@bonus+(.lifetime*rand(11,12))) {
.wtime=0;
.lifetime+=1;
.@pl = getmapusers("021-4")+1;
diff --git a/npc/_import.txt b/npc/_import.txt
index 712af135a..e31047c40 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -65,6 +65,7 @@
@include "npc/010-2/_import.txt"
@include "npc/011-1/_import.txt"
@include "npc/011-2/_import.txt"
+@include "npc/011-3/_import.txt"
@include "npc/012-1/_import.txt"
@include "npc/012-2/_import.txt"
@include "npc/012-3/_import.txt"