diff options
Diffstat (limited to 'npc/002-3')
| -rw-r--r-- | npc/002-3/_import.txt | 1 | ||||
| -rw-r--r-- | npc/002-3/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/002-3/doors.txt | 53 |
3 files changed, 46 insertions, 11 deletions
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt index 9a31365db..813d0c15e 100644 --- a/npc/002-3/_import.txt +++ b/npc/002-3/_import.txt @@ -1,6 +1,5 @@ // Map 002-3: First Deck // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/002-3/_warps.txt", "npc/002-3/billybons.txt", "npc/002-3/doors.txt", "npc/002-3/juliet.txt", diff --git a/npc/002-3/_warps.txt b/npc/002-3/_warps.txt deleted file mode 100644 index 939438c45..000000000 --- a/npc/002-3/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 002-3: First Deck warps -002-3,42,25,0 warp #002-3_42_25 0,0,002-1,72,29 diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt index eaf44f732..4bf062b16 100644 --- a/npc/002-3/doors.txt +++ b/npc/002-3/doors.txt @@ -35,10 +35,9 @@ OnTouch: close; } - // None of these checks will ever return positive + // 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; - if (.@nard > 0 && countitem(718) > 0) goto L_Key; setcamnpc "Julia"; mesn "Julia"; @@ -52,10 +51,6 @@ OnTouch: close; -L_Key: - warp "005-1", 42, 107; - close; - L_GotoNard: setcamnpc "Julia"; mesn "Julia"; @@ -76,6 +71,37 @@ L_End: restorecam; close; + + +OnInterIfInit: + + // Candor Instance (we do all tests for debugmes here) + .CANDOR_INSTID = instance_create("002-1@CandorInst", 0, IOT_NONE); + if (.CANDOR_INSTID < 0) debugmes "Error: No instance ID"; + else { + debugmes "created new instance id: " + str(.CANDOR_INSTID); + .CANDOR1$=instance_attachmap("002-1", .CANDOR_INSTID, 0, "002-1@Candor"); + if (.CANDOR1$ == "") debugmes "Error: Map 002-1 CANDY failed"; + + .CANDOR3$=instance_attachmap("002-3", .CANDOR_INSTID, 0, "002-3@Candor"); + if (.CANDOR3$ == "") debugmes "Error: Map 002-3 CANDY failed"; + + .CANDOR4$=instance_attachmap("002-4", .CANDOR_INSTID, 0, "002-4@Candor"); + if (.CANDOR4$ == "") debugmes "Error: Map 002-4 CANDY failed"; + + debugmes "Nard's Ship in Candor instance is set."; + instance_set_timeout(1000000, 1000000, .CANDOR_INSTID); + instance_init(.CANDOR_INSTID); + } + + // Tulim Instance + .TULIM_INSTID = instance_create("002-1@TulimInst", 0, IOT_NONE); + instance_attachmap("002-1", .TULIM_INSTID, 0, "002-1@Tulim"); + instance_attachmap("002-3", .TULIM_INSTID, 0, "002-3@Tulim"); + instance_attachmap("002-4", .TULIM_INSTID, 0, "002-4@Tulim"); + instance_set_timeout(1000000, 1000000, .TULIM_INSTID); + instance_init(.TULIM_INSTID); + end; } 002-3,44,28,0 script AreaNPC#doors5 NPC_HIDDEN,0,0,{ @@ -86,6 +112,19 @@ OnTouch: close; L_Warp: - warp "002-4", 20, 27; + if (LOCATION$ == "") + warp "002-4", 20, 27; + else + warp "002-4@"+LOCATION$, 20, 27; + close; +} + +002-3,42,25,0 script AreaNPC#002-3d NPC_HIDDEN,0,0,{ + +OnTouch: + if (LOCATION$ == "") + warp "002-1", 72, 29; + else + warp "002-1@"+LOCATION$, 72, 29; close; } |