summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/re/001-3-1.mcachebin351 -> 372 bytes
-rw-r--r--maps/re/001-3.mcachebin737 -> 737 bytes
-rw-r--r--npc/001-3-1/_warps.txt4
-rw-r--r--npc/001-3/_import.txt1
-rw-r--r--npc/001-3/_warps.txt7
-rw-r--r--npc/001-3/ctrl.txt13
-rw-r--r--npc/004-2/bug.txt17
7 files changed, 39 insertions, 3 deletions
diff --git a/maps/re/001-3-1.mcache b/maps/re/001-3-1.mcache
index 0876134bc..0ac55e428 100644
--- a/maps/re/001-3-1.mcache
+++ b/maps/re/001-3-1.mcache
Binary files differ
diff --git a/maps/re/001-3.mcache b/maps/re/001-3.mcache
index e2e3bfe20..946bbf09e 100644
--- a/maps/re/001-3.mcache
+++ b/maps/re/001-3.mcache
Binary files differ
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
index 462db80d7..ba603fe06 100644
--- a/npc/001-3-1/_warps.txt
+++ b/npc/001-3-1/_warps.txt
@@ -1,9 +1,11 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-3-1: Saulc's Palace warps
-001-3-1,24,62,0 warp #001-3-1_24_62 0,0,001-3,127,65
+001-3-1,24,62,0 warp #001-3-1_24_62 0,0,001-3,80,124
001-3-1,117,62,0 warp #001-3-1_117_62 0,0,001-3,127,125
001-3-1,45,127,0 warp #001-3-1_45_127 3,0,001-3,104,81
001-3-1,45,83,0 warp #001-3-1_45_83 3,0,001-3-1,106,116
001-3-1,107,117,0 warp #001-3-1_107_117 3,0,001-3-1,44,84
001-3-1,116,127,0 warp #001-3-1_116_127 2,0,001-3,106,66
001-3-1,97,127,0 warp #001-3-1_97_127 2,0,001-3,101,66
+001-3-1,24,31,0 warp #001-3-1_24_31 0,0,001-3,72,104
+001-3-1,117,31,0 warp #001-3-1_117_31 0,0,001-3,135,104
diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt
index a49e27bc7..3a2cb29dd 100644
--- a/npc/001-3/_import.txt
+++ b/npc/001-3/_import.txt
@@ -1,3 +1,4 @@
// Map 001-3: Saulc's Home
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/001-3/_warps.txt",
+"npc/001-3/ctrl.txt",
diff --git a/npc/001-3/_warps.txt b/npc/001-3/_warps.txt
index e80597123..90ce9c580 100644
--- a/npc/001-3/_warps.txt
+++ b/npc/001-3/_warps.txt
@@ -1,8 +1,11 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-3: Saulc's Home warps
-001-3,80,123,0 warp #001-3_80_123 0,0,001-1,0,0
+001-3,80,123,0 warp #001-3_80_123 0,0,001-3-1,24,61
001-3,127,124,0 warp #001-3_127_124 0,0,001-3-1,117,61
001-3,104,80,0 warp #001-3_104_80 3,0,001-3-1,45,126
001-3,106,65,0 warp #001-3_106_65 0,0,001-3-1,116,126
-001-3,127,64,0 warp #001-3_127_64 0,0,001-3-1,24,61
001-3,101,65,0 warp #001-3_101_65 0,0,001-3-1,97,126
+001-3,117,138,0 warp #001-3_117_138 0,0,000-1,22,22
+001-3,72,103,0 warp #001-3_72_103 0,0,001-3-1,0,0
+001-3,135,103,0 warp #001-3_135_103 0,0,001-3-1,117,30
+001-3,66,121,0 warp #001-3_66_121 0,2,004-2,50,61
diff --git a/npc/001-3/ctrl.txt b/npc/001-3/ctrl.txt
new file mode 100644
index 000000000..cbe473276
--- /dev/null
+++ b/npc/001-3/ctrl.txt
@@ -0,0 +1,13 @@
+// TMW2 Script.
+// Author:
+// Jesusalva
+// Description:
+// None
+
+001-3,127,64,0 script #PatreonTower NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ if (is_sponsor()) warp "003-0-2", 35, 42;
+ end;
+}
+
diff --git a/npc/004-2/bug.txt b/npc/004-2/bug.txt
index 4c100bf87..479fa948d 100644
--- a/npc/004-2/bug.txt
+++ b/npc/004-2/bug.txt
@@ -9,6 +9,23 @@
mesc "→ "+l("Canyon - Safe Route");
mesc "↓ "+l("Canyon - Dangerous Route");
close;
+
+OnInit:
+ .sex = G_OTHER;
+ .distance = 3;
+ end;
+}
+
+004-2,81,23,0 script Sign#TempBugfix NPC_SWORDS_SIGN,{
+ if (countitem(DesertTablet)) goto L_Tablet;
+ mesc l("Impossible to read.");
+ close;
+
+L_Tablet:
+ mes l("The %s shines with a strange light...", getitemlink(DesertTablet));
+ next;
+ closeclientdialog;
+ cwarp "001-3", 117, 135;
close;
OnInit: