diff options
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 15 | ||||
| -rw-r--r-- | maps/re/016-1.mcache | bin | 106 -> 101 bytes | |||
| -rw-r--r-- | maps/re/016-7.mcache | bin | 0 -> 125 bytes | |||
| -rw-r--r-- | npc/002-3/doors.txt | 35 | ||||
| -rw-r--r-- | npc/003-1/ship.txt | 14 | ||||
| -rw-r--r-- | npc/016-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/016-1/doors.txt | 24 | ||||
| -rw-r--r-- | npc/016-7/_import.txt | 3 | ||||
| -rw-r--r-- | npc/016-7/_mobs.txt | 3 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
11 files changed, 57 insertions, 40 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 15fe67797..e081bc3f6 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -64,6 +64,7 @@ map_list: ( "015-1", "016-1", "016-6", + "016-7", "boss", "botcheck", "sec_pri", diff --git a/db/map_index.txt b/db/map_index.txt index c83bcc686..d8635f325 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -61,10 +61,11 @@ 015-1 61 016-1 62 016-6 63 -boss 64 -botcheck 65 -sec_pri 66 -soren-2 67 -soren 68 -test 69 -testbg 70 +016-7 64 +boss 65 +botcheck 66 +sec_pri 67 +soren-2 68 +soren 69 +test 70 +testbg 71 diff --git a/maps/re/016-1.mcache b/maps/re/016-1.mcache Binary files differindex 1545b2200..304feb9a3 100644 --- a/maps/re/016-1.mcache +++ b/maps/re/016-1.mcache diff --git a/maps/re/016-7.mcache b/maps/re/016-7.mcache Binary files differnew file mode 100644 index 000000000..1b8001bf6 --- /dev/null +++ b/maps/re/016-7.mcache diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt index 5a8d4da62..371e25982 100644 --- a/npc/002-3/doors.txt +++ b/npc/002-3/doors.txt @@ -2,28 +2,20 @@ // Author: // Jesusalva // Description: -// Doors NPCs. +// Nard's ship Doors NPCs. 002-3,30,28,0 script AreaNPC#doors4 NPC_HIDDEN,0,0,{ OnTouch: - .@nard = getq(ShipQuests_Nard); - - if (LOCATION$ == "Candor") - { + if (LOCATION$ == "Candor") { warp "005-1", 42, 107; close; } - if (LOCATION$ == "Tulim") - { + if (LOCATION$ == "Tulim") { warp "003-1", 81, 68; close; } - // None of these checks will ever return positive, but were kept when delay is applied. - if (.@nard == 4) goto L_GotoNard; - if (.@nard == 5) goto L_End; - setcamnpc "Julia"; mesn "Julia"; mesq l("The captain has locked the door, you should go see him."); @@ -36,27 +28,6 @@ OnTouch: close; -L_GotoNard: - setcamnpc "Julia"; - mesn "Julia"; - mesq l("The captain is waiting for you! Hurry up."); - next; - restorecam; - - close; - -L_End: - mesn "Narrator"; - mesq col(l("This door is locked."), 9); - setcamnpc "Julia"; - next; - mesn "Julia"; - mesq l("We're soon leaving that island, please return to your cabine."); - next; - restorecam; - - close; - OnInterIfInit: diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt index 5dd5b9479..958a821e5 100644 --- a/npc/003-1/ship.txt +++ b/npc/003-1/ship.txt @@ -2,7 +2,7 @@ // Authors: // Jesusalva // Description: -// This script controls access to Nard's Ship, fixing variables. +// This script controls access to Ships, fixing variables. 003-1,82,68,0 script TulimShip NPC_HIDDEN,0,0,{ @@ -15,3 +15,15 @@ L_Warp: closedialog; close; } + +003-1,120,25,0 script TulimShip#M NPC_HIDDEN,0,0,{ + +OnTouch: + LOCATION$="Tulim"; + goto L_Warp; + +L_Warp: + warp "016-1@"+LOCATION$, 21, 26; + closedialog; + close; +} diff --git a/npc/016-1/_import.txt b/npc/016-1/_import.txt index a366f8e21..9dcb1e0ad 100644 --- a/npc/016-1/_import.txt +++ b/npc/016-1/_import.txt @@ -1,4 +1,5 @@ // Map 016-1: La Marine First Deck // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/016-1/_mobs.txt", +"npc/016-1/doors.txt", "npc/016-1/marine.txt", diff --git a/npc/016-1/doors.txt b/npc/016-1/doors.txt new file mode 100644 index 000000000..62759c83a --- /dev/null +++ b/npc/016-1/doors.txt @@ -0,0 +1,24 @@ +// TMW2 Scripts. +// Author: +// Jesusalva +// Description: +// La Marine ship Doors NPCs. + +016-1,21,25,0 script #MarineToOutside NPC_HIDDEN,0,0,{ + +OnTouch: + .@nard = getq(ShipQuests_Nard); + + if (LOCATION$ == "Hurns") { + warp "012-1", 141, 65; + close; + } + if (LOCATION$ == "Tulim") { + warp "003-1", 81, 68; + close; + } + mes col("Oh noes! The door is locked!! Quick! Call a GM!!!", 1); + close; +} + + diff --git a/npc/016-7/_import.txt b/npc/016-7/_import.txt new file mode 100644 index 000000000..7ca740e41 --- /dev/null +++ b/npc/016-7/_import.txt @@ -0,0 +1,3 @@ +// Map 016-7: Pirate Attack +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/016-7/_mobs.txt", diff --git a/npc/016-7/_mobs.txt b/npc/016-7/_mobs.txt new file mode 100644 index 000000000..b5b9691e9 --- /dev/null +++ b/npc/016-7/_mobs.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 016-7: Pirate Attack mobs +016-7,37,29,14,4 monster Ocean Croc 1133,6,36000,30000 diff --git a/npc/_import.txt b/npc/_import.txt index 1d9deba5b..f46f1ff09 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -63,6 +63,7 @@ @include "npc/015-1/_import.txt" @include "npc/016-1/_import.txt" @include "npc/016-6/_import.txt" +@include "npc/016-7/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/sec_pri/_import.txt" |