From 43fcfa1f9aaaefd46adf36f4b1888c3ca74e475f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 7 May 2022 21:16:46 -0300 Subject: Tie loosely the new maps --- db/constants.conf | 1 + maps/re/032-2.mcache | Bin 2522 -> 2549 bytes maps/re/032-4.mcache | Bin 303 -> 306 bytes npc/020-4/henry.txt | 2 +- npc/032-1/_import.txt | 2 ++ npc/032-1/_mobs.txt | 9 +++++ npc/032-1/_warps.txt | 6 +--- npc/032-1/episode.txt | 25 +++++++++++++ npc/032-2/_import.txt | 1 + npc/032-2/_warps.txt | 84 ++++++++++++++++++++++++++++++++++++++++++++ npc/032-3/_import.txt | 1 + npc/032-3/_warps.txt | 3 ++ npc/items/lofteleporter.txt | 1 + 13 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 npc/032-1/_mobs.txt create mode 100644 npc/032-1/episode.txt create mode 100644 npc/032-2/_warps.txt create mode 100644 npc/032-3/_warps.txt diff --git a/db/constants.conf b/db/constants.conf index 24e72a6a4..48bbf9b49 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -1854,6 +1854,7 @@ constants_db: { NPC_TRAP_B: 274 NPC_TRAP_ONLINE_B: 275 NPC_HENRY: 276 + NPC_ELLI: 277 // TMW-BR Non Animated NPCs NPC_SHOPPAKEP: 301 diff --git a/maps/re/032-2.mcache b/maps/re/032-2.mcache index 39ba0dc60..0475be947 100644 Binary files a/maps/re/032-2.mcache and b/maps/re/032-2.mcache differ diff --git a/maps/re/032-4.mcache b/maps/re/032-4.mcache index 24c6526e6..95465d6ac 100644 Binary files a/maps/re/032-4.mcache and b/maps/re/032-4.mcache differ diff --git a/npc/020-4/henry.txt b/npc/020-4/henry.txt index c0854189d..2d2390833 100644 --- a/npc/020-4/henry.txt +++ b/npc/020-4/henry.txt @@ -72,7 +72,7 @@ mesc l("You start feeling dizzy."); mesn; mesq l("%s? You don't look so well. You should see a doctor immediately!", strcharinfo(0)); - setq LoFQuest_EPISODE, 13; + setq LoFQuest_EPISODE, 13, 0, 0; SC_Bonus(86400, SC_POISON, 1); close; } diff --git a/npc/032-1/_import.txt b/npc/032-1/_import.txt index 8f31af36b..35ba4a691 100644 --- a/npc/032-1/_import.txt +++ b/npc/032-1/_import.txt @@ -1,3 +1,5 @@ // Map 032-1: Past Tulimshar // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/032-1/_mobs.txt", "npc/032-1/_warps.txt", +"npc/032-1/episode.txt", diff --git a/npc/032-1/_mobs.txt b/npc/032-1/_mobs.txt new file mode 100644 index 000000000..944a68886 --- /dev/null +++ b/npc/032-1/_mobs.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 032-1: Past Tulimshar mobs +032-1,107,88,69,78 monster Duck 1029,12,30000,20000 +032-1,84,52,19,37 monster Croc 1006,5,35000,90000 +032-1,44,171,2,4 monster Crocotree 1010,2,5000,150000 +032-1,104,119,22,41 monster Little Blub 1007,7,35000,150000 +032-1,0,0,0,0 monster Maggot 1030,65,35000,450000 +032-1,104,200,63,36 monster Giant Maggot 1031,4,30000,20000 +032-1,143,214,37,29 monster Red Scorpion 1072,11,35000,120000 diff --git a/npc/032-1/_warps.txt b/npc/032-1/_warps.txt index 7cf10cedc..cc98a5d82 100644 --- a/npc/032-1/_warps.txt +++ b/npc/032-1/_warps.txt @@ -1,10 +1,6 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 032-1: Past Tulimshar warps -032-1,59,126,0 script #032-1_59_126 NPC_HIDDEN,0,0,{ - end; -OnTouch: - slide 52,127; end; -} +032-1,53,108,0 warp #032-1_53_108 0,0,032-2,103,112 032-1,53,126,0 script #032-1_53_126 NPC_HIDDEN,1,0,{ end; OnTouch: diff --git a/npc/032-1/episode.txt b/npc/032-1/episode.txt new file mode 100644 index 000000000..9fa353b7d --- /dev/null +++ b/npc/032-1/episode.txt @@ -0,0 +1,25 @@ +// TMW2 scripts. +// Authors: +// Jesusalva +// Description: +// Part of the Doctor's Quest. + +032-1,58,129,0 script Elli NPC_ELLI,{ + npctalk3 l("Hi."); + end; + +OnInit: + .distance=5; + end; +} + +032-1,59,126,0 script #InnerEP NPC_HIDDEN,0,0,{ + end; +OnTouch: + if (is_master()) + slide 52, 127; + else + dispbottom l("This door is locked."); + end; +} + diff --git a/npc/032-2/_import.txt b/npc/032-2/_import.txt index f2f8746c3..789ca6cb3 100644 --- a/npc/032-2/_import.txt +++ b/npc/032-2/_import.txt @@ -1,2 +1,3 @@ // Map 032-2: Tree Maze // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/032-2/_warps.txt", diff --git a/npc/032-2/_warps.txt b/npc/032-2/_warps.txt new file mode 100644 index 000000000..25abd4cd0 --- /dev/null +++ b/npc/032-2/_warps.txt @@ -0,0 +1,84 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 032-2: Tree Maze warps +032-2,25,178,0 script #032-2_25_178 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 41,136; end; +} +032-2,41,135,0 script #032-2_41_135 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 36,109; end; +} +032-2,36,108,0 script #032-2_36_108 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 34,71; end; +} +032-2,34,70,0 script #032-2_34_70 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 75,28; end; +} +032-2,75,27,0 warp #032-2_75_27 0,0,032-3,121,101 +032-2,133,28,0 script #032-2_133_28 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 177,39; end; +} +032-2,177,38,0 script #032-2_177_38 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 147,66; end; +} +032-2,147,67,0 script #032-2_147_67 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 130,72; end; +} +032-2,130,71,0 script #032-2_130_71 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 165,79; end; +} +032-2,165,78,0 script #032-2_165_78 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 178,88; end; +} +032-2,178,89,0 script #032-2_178_89 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 170,107; end; +} +032-2,170,106,0 script #032-2_170_106 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 168,150; end; +} +032-2,168,149,0 script #032-2_168_149 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 146,153; end; +} +032-2,146,152,0 script #032-2_146_152 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 119,154; end; +} +032-2,119,153,0 script #032-2_119_153 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 87,174; end; +} +032-2,87,173,0 script #032-2_87_173 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 47,167; end; +} +032-2,47,166,0 script #032-2_47_166 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 25,179; end; +} +032-2,40,19,0 warp #032-2_40_19 0,0,032-1,53,109 diff --git a/npc/032-3/_import.txt b/npc/032-3/_import.txt index c9c6ea84f..68dfe2eae 100644 --- a/npc/032-3/_import.txt +++ b/npc/032-3/_import.txt @@ -1,2 +1,3 @@ // Map 032-3: Beasts Dungeon // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/032-3/_warps.txt", diff --git a/npc/032-3/_warps.txt b/npc/032-3/_warps.txt new file mode 100644 index 000000000..2f7461a63 --- /dev/null +++ b/npc/032-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 032-3: Beasts Dungeon warps +032-3,121,102,0 warp #032-3_121_102 0,0,032-2,133,29 diff --git a/npc/items/lofteleporter.txt b/npc/items/lofteleporter.txt index 05d6d028f..533d793a9 100644 --- a/npc/items/lofteleporter.txt +++ b/npc/items/lofteleporter.txt @@ -108,6 +108,7 @@ OnUse: break; case 8: atcommand("@block "+strcharinfo(0)); + setq2 LoFQuest_EPISODE, 0; warp "032-1", 23, 25; TELEPORTER_TIME=loftel_time(360, .@x*2); @timer_navio_running=0; -- cgit v1.2.3-60-g2f50