summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-04-18 15:49:32 -0300
committerJesusaves <cpntb1@ymail.com>2021-04-18 15:49:32 -0300
commit6521897eeec144f47a65c5855829544b892368e2 (patch)
treea70036aa9710c661657d2d4f722495725c5cfcdc /npc
parent054bbf6de228285faee69f24e8b68da1ac8f51c5 (diff)
downloadserverdata-6521897eeec144f47a65c5855829544b892368e2.tar.gz
serverdata-6521897eeec144f47a65c5855829544b892368e2.tar.bz2
serverdata-6521897eeec144f47a65c5855829544b892368e2.tar.xz
serverdata-6521897eeec144f47a65c5855829544b892368e2.zip
Update all mapflags - Remove weird nosaves, add Event and MMO zones.
Permanent rain to 070-1 close #11
Diffstat (limited to 'npc')
-rw-r--r--npc/000-1/exit.txt1
-rw-r--r--npc/001-3/mapflags.txt2
-rw-r--r--npc/009-5/mapflags.txt1
-rw-r--r--npc/009-6/mapflags.txt1
-rw-r--r--npc/013-1/sagatha.txt2
-rw-r--r--npc/015-3/mapflags.txt1
-rw-r--r--npc/025-4/mapflags.txt2
-rw-r--r--npc/027-6/mapflags.txt2
-rw-r--r--npc/027-7/mapflags.txt2
-rw-r--r--npc/027-8/mapflags.txt2
-rw-r--r--npc/028-1/mapflags.txt2
-rw-r--r--npc/028-3/mapflags.txt2
-rw-r--r--npc/029-2/mapflags.txt2
-rw-r--r--npc/029-3/mapflags.txt2
-rw-r--r--npc/030-4/mapflags.txt2
-rw-r--r--npc/031-4/mapflags.txt2
-rw-r--r--npc/051-1/mapflags.txt2
-rw-r--r--npc/051-3/mapflags.txt2
-rw-r--r--npc/052-1/mapflags.txt2
-rw-r--r--npc/052-2/mapflags.txt2
-rw-r--r--npc/070-1/_import.txt1
-rw-r--r--npc/070-1/mapflags.txt1
-rw-r--r--npc/099-5/_import.txt1
-rw-r--r--npc/099-5/mapflag.txt2
-rw-r--r--npc/botcheck/mapflags.txt3
-rw-r--r--npc/items/warpTowels.txt14
26 files changed, 36 insertions, 22 deletions
diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt
index 4c8f167e..d4a6821a 100644
--- a/npc/000-1/exit.txt
+++ b/npc/000-1/exit.txt
@@ -15,6 +15,7 @@ OnTalkNearby:
warp "029-2", 22, 24;
end;
L_ToLoc:
+ // Possibly could warp to "Save" as well?
ReturnTown();
end;
}
diff --git a/npc/001-3/mapflags.txt b/npc/001-3/mapflags.txt
index 04479442..d86f50e1 100644
--- a/npc/001-3/mapflags.txt
+++ b/npc/001-3/mapflags.txt
@@ -1,2 +1,2 @@
001-3 mapflag nosave 002-2,74,59
-//001-3 mapflag resave 002-2,74,59
+001-3 mapflag zone MMO
diff --git a/npc/009-5/mapflags.txt b/npc/009-5/mapflags.txt
index c27c167e..a1d35c0d 100644
--- a/npc/009-5/mapflags.txt
+++ b/npc/009-5/mapflags.txt
@@ -1 +1,2 @@
009-5 mapflag nosave 009-3,162,82
+009-5 mapflag zone MMO
diff --git a/npc/009-6/mapflags.txt b/npc/009-6/mapflags.txt
index 9b247c8c..c6a65e72 100644
--- a/npc/009-6/mapflags.txt
+++ b/npc/009-6/mapflags.txt
@@ -1 +1,2 @@
009-6 mapflag nosave 009-3,162,82
+009-6 mapflag zone MMO
diff --git a/npc/013-1/sagatha.txt b/npc/013-1/sagatha.txt
index a2f5ce7d..01171c14 100644
--- a/npc/013-1/sagatha.txt
+++ b/npc/013-1/sagatha.txt
@@ -217,7 +217,7 @@ L_Teach_N14:
if (@mexp < 125 || getskilllv(SKILL_MAGIC) < 1)
goto L_Teach_noexp;
mesn .@n$;
- mes "\"Some forest creatures sometimes overgrow their fur or hide. That makes them uncomfortable.\"";
+ mesq l("Some forest creatures sometimes overgrow their fur or hide. That makes them uncomfortable.");
next;
mesn .@n$;
mesq l("You can help them with shearing magic. Press your hands together and say '%s'. Then touch them with your hands, and brush off any excess.", b("Chipchip"));
diff --git a/npc/015-3/mapflags.txt b/npc/015-3/mapflags.txt
index 049e6274..8d10f78e 100644
--- a/npc/015-3/mapflags.txt
+++ b/npc/015-3/mapflags.txt
@@ -1,2 +1,3 @@
015-3 mapflag nosave 015-1,59,32
//015-3 mapflag resave 010-1,27,97
+015-3 mapflag zone MMO
diff --git a/npc/025-4/mapflags.txt b/npc/025-4/mapflags.txt
index a5a1cf62..8183383c 100644
--- a/npc/025-4/mapflags.txt
+++ b/npc/025-4/mapflags.txt
@@ -1,2 +1,2 @@
025-4 mapflag nosave 025-1,33,50
-//025-4 mapflag resave 025-1,33,50
+025-4 mapflag zone MMO
diff --git a/npc/027-6/mapflags.txt b/npc/027-6/mapflags.txt
index 1f2249a1..71b31051 100644
--- a/npc/027-6/mapflags.txt
+++ b/npc/027-6/mapflags.txt
@@ -1,2 +1,2 @@
027-6 mapflag nosave 027-3,82,90
-//027-6 mapflag resave 027-3,82,90
+027-6 mapflag zone MMO
diff --git a/npc/027-7/mapflags.txt b/npc/027-7/mapflags.txt
index 808ab063..5a798c1c 100644
--- a/npc/027-7/mapflags.txt
+++ b/npc/027-7/mapflags.txt
@@ -1,2 +1,2 @@
027-7 mapflag nosave 027-4,73,78
-//027-7 mapflag resave 027-4,73,78
+027-7 mapflag zone MMO
diff --git a/npc/027-8/mapflags.txt b/npc/027-8/mapflags.txt
index 180a25be..f19c8671 100644
--- a/npc/027-8/mapflags.txt
+++ b/npc/027-8/mapflags.txt
@@ -1,2 +1,2 @@
027-8 mapflag nosave 027-5,70,27
-//027-8 mapflag resave 027-5,70,27
+027-8 mapflag zone MMO
diff --git a/npc/028-1/mapflags.txt b/npc/028-1/mapflags.txt
index f0c74e5d..cadc40e9 100644
--- a/npc/028-1/mapflags.txt
+++ b/npc/028-1/mapflags.txt
@@ -1 +1 @@
-028-1 mapflag nosave 009-1,53,40
+028-1 mapflag zone Event
diff --git a/npc/028-3/mapflags.txt b/npc/028-3/mapflags.txt
index 62771987..7e4c34b6 100644
--- a/npc/028-3/mapflags.txt
+++ b/npc/028-3/mapflags.txt
@@ -1 +1 @@
-028-3 mapflag nosave 009-1,53,40
+028-3 mapflag zone Event
diff --git a/npc/029-2/mapflags.txt b/npc/029-2/mapflags.txt
index bfe50c0c..481d8ee5 100644
--- a/npc/029-2/mapflags.txt
+++ b/npc/029-2/mapflags.txt
@@ -1,3 +1,3 @@
-029-2 mapflag nosave 029-2,22,24
+//029-2 mapflag nosave 029-2,22,24
//029-2 mapflag resave 029-2,22,24
029-2 mapflag mask 1
diff --git a/npc/029-3/mapflags.txt b/npc/029-3/mapflags.txt
index a161e111..f64a309a 100644
--- a/npc/029-3/mapflags.txt
+++ b/npc/029-3/mapflags.txt
@@ -1,2 +1,2 @@
029-3 mapflag nosave 029-1,39,102
-//029-3 mapflag resave 029-1,39,102
+029-3 mapflag zone MMO
diff --git a/npc/030-4/mapflags.txt b/npc/030-4/mapflags.txt
index e9283539..72984c63 100644
--- a/npc/030-4/mapflags.txt
+++ b/npc/030-4/mapflags.txt
@@ -1,2 +1,2 @@
030-4 mapflag nosave 030-2,151,25
-//030-4 mapflag resave 030-2,151,25
+030-4 mapflag zone MMO
diff --git a/npc/031-4/mapflags.txt b/npc/031-4/mapflags.txt
index 06a10489..7ce6a307 100644
--- a/npc/031-4/mapflags.txt
+++ b/npc/031-4/mapflags.txt
@@ -1,2 +1,2 @@
031-4 mapflag nosave 031-3,46,26
-//031-4 mapflag resave 031-3,46,26
+031-4 mapflag zone MMO
diff --git a/npc/051-1/mapflags.txt b/npc/051-1/mapflags.txt
index 5ac6d06e..620a8d3c 100644
--- a/npc/051-1/mapflags.txt
+++ b/npc/051-1/mapflags.txt
@@ -1,2 +1,2 @@
051-1 mapflag nosave 007-2,36,23
-//051-1 mapflag resave 007-2,36,23
+051-1 mapflag zone MMO
diff --git a/npc/051-3/mapflags.txt b/npc/051-3/mapflags.txt
index a3b3c49b..3a343f5a 100644
--- a/npc/051-3/mapflags.txt
+++ b/npc/051-3/mapflags.txt
@@ -1,2 +1,2 @@
051-3 mapflag nosave 007-2,36,23
-//051-3 mapflag resave 007-2,36,23
+051-3 mapflag zone MMO
diff --git a/npc/052-1/mapflags.txt b/npc/052-1/mapflags.txt
index 0e8e3295..045801f7 100644
--- a/npc/052-1/mapflags.txt
+++ b/npc/052-1/mapflags.txt
@@ -1,2 +1,2 @@
052-1 mapflag nosave 007-2,36,23
-//052-1 mapflag resave 007-2,36,23
+052-1 mapflag zone MMO
diff --git a/npc/052-2/mapflags.txt b/npc/052-2/mapflags.txt
index d4ce9d64..082d21b1 100644
--- a/npc/052-2/mapflags.txt
+++ b/npc/052-2/mapflags.txt
@@ -1,2 +1,2 @@
052-2 mapflag nosave 007-2,36,23
-//052-2 mapflag resave 007-2,36,23
+052-2 mapflag zone MMO
diff --git a/npc/070-1/_import.txt b/npc/070-1/_import.txt
index 5dbdaa98..2a44f7d7 100644
--- a/npc/070-1/_import.txt
+++ b/npc/070-1/_import.txt
@@ -1,2 +1,3 @@
// Map 070-1: Underworld
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/070-1/mapflags.txt",
diff --git a/npc/070-1/mapflags.txt b/npc/070-1/mapflags.txt
new file mode 100644
index 00000000..fb393c84
--- /dev/null
+++ b/npc/070-1/mapflags.txt
@@ -0,0 +1 @@
+070-1 mapflag mask 17
diff --git a/npc/099-5/_import.txt b/npc/099-5/_import.txt
index 7d086628..9276a379 100644
--- a/npc/099-5/_import.txt
+++ b/npc/099-5/_import.txt
@@ -1,2 +1,3 @@
// Map 099-5: ?????
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/099-5/mapflag.txt",
diff --git a/npc/099-5/mapflag.txt b/npc/099-5/mapflag.txt
new file mode 100644
index 00000000..df97cc7c
--- /dev/null
+++ b/npc/099-5/mapflag.txt
@@ -0,0 +1,2 @@
+099-5 mapflag zone MMO
+099-6 mapflag zone MMO
diff --git a/npc/botcheck/mapflags.txt b/npc/botcheck/mapflags.txt
index 754c247c..6d36e10c 100644
--- a/npc/botcheck/mapflags.txt
+++ b/npc/botcheck/mapflags.txt
@@ -1,2 +1,3 @@
//botcheck mapflag resave botcheck,37,37
-botcheck mapflag nosave botcheck,37,37
+//botcheck mapflag nosave botcheck,37,37
+botcheck mapflag zone Jail
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index 35c7d55b..d90e5639 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -1,10 +1,14 @@
function script WarpTowel {
@seconds = TowelLastUsed - (gettimetick(2) - 1200);
- if (@seconds > 0 && GM < 1)
+ if (@seconds > 0 && !is_trusted())
goto L_DontPanic;
- if (isin("botcheck",25,27,51,47))
+ .@zone = getmapinfo(MAPINFO_ZONE);
+ if (.@zone == "Jail")
goto L_Prison;
- if (getmapflag(getmapname(), mf_nosave) || getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
+ // Zone will never be MMO, though
+ if (.@zone == "MMO" || .@zone == "Event")
+ goto L_Forbid;
+ if (getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
goto L_Forbid;
if (@warpTowelName$ == "HitchhikersTowel")
@@ -115,7 +119,7 @@ L_WarpPlayer:
goto L_BreakChance;
L_BreakChance:
- if (rand(15))
+ if (rand2(12))
goto L_Keep;
getitem "HitchhikersTowel", 1;
goto L_End;
@@ -125,7 +129,7 @@ L_Forbid:
goto L_Keep;
L_Prison:
- message strcharinfo(0), "Towel : You must be warped by a GM to leave the botcheck area.";
+ message strcharinfo(0), "Towel : You must be warped by a GM to leave this area.";
goto L_Keep;
L_DontPanic: