From 07d4122a9da62bc05b555369040cae4730ca6035 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Fri, 23 Feb 2018 19:45:26 -0300 Subject: Instance Nard's ship. This may have crazy side-effects with savepoints --- npc/002-1/_import.txt | 2 +- npc/002-1/_warps.txt | 3 --- npc/002-2/doors.txt | 5 ++++- npc/002-3/_import.txt | 1 - npc/002-3/_warps.txt | 3 --- npc/002-3/doors.txt | 53 ++++++++++++++++++++++++++++++++++++++++++++------- npc/002-4/_import.txt | 2 +- npc/002-4/_warps.txt | 3 --- npc/003-1/ship.txt | 2 +- npc/005-1/ship.txt | 2 +- npc/005-2/_import.txt | 2 +- npc/005-2/_mobs.txt | 2 +- npc/005-2/_warps.txt | 2 +- npc/005-3/_import.txt | 2 +- npc/005-3/_mobs.txt | 2 +- npc/005-3/_warps.txt | 2 +- npc/005-4/_import.txt | 2 +- npc/005-4/_warps.txt | 2 +- 18 files changed, 62 insertions(+), 30 deletions(-) delete mode 100644 npc/002-1/_warps.txt delete mode 100644 npc/002-3/_warps.txt delete mode 100644 npc/002-4/_warps.txt diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt index fc6ddd14e..56410529a 100644 --- a/npc/002-1/_import.txt +++ b/npc/002-1/_import.txt @@ -2,13 +2,13 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/002-1/_mobs.txt", "npc/002-1/_savepoints.txt", -"npc/002-1/_warps.txt", "npc/002-1/alige.txt", "npc/002-1/arpan.txt", "npc/002-1/chefgado.txt", "npc/002-1/chest.txt", "npc/002-1/dan.txt", "npc/002-1/devis.txt", +"npc/002-1/doors.txt", "npc/002-1/hammock.txt", "npc/002-1/knife.txt", "npc/002-1/mapflags.txt", diff --git a/npc/002-1/_warps.txt b/npc/002-1/_warps.txt deleted file mode 100644 index a3d236338..000000000 --- a/npc/002-1/_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-1: Second Deck warps -002-1,72,30,0 warp #002-1_72_30 0,0,002-3,42,26 diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt index 09317360d..d22e02669 100644 --- a/npc/002-2/doors.txt +++ b/npc/002-2/doors.txt @@ -30,7 +30,10 @@ L_Warn: close; L_Warp: - warp "002-1", 72, 36; + if (LOCATION$ == "") + warp "002-1", 72, 36; + else + warp "002-1@"+LOCATION$, 72, 36; closeclientdialog; close; } 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; } diff --git a/npc/002-4/_import.txt b/npc/002-4/_import.txt index 52297249f..5def6f5d9 100644 --- a/npc/002-4/_import.txt +++ b/npc/002-4/_import.txt @@ -1,5 +1,5 @@ // Map 002-4: Nard's Room // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/002-4/_warps.txt", +"npc/002-4/doors.txt", "npc/002-4/elmo.txt", "npc/002-4/nard.txt", diff --git a/npc/002-4/_warps.txt b/npc/002-4/_warps.txt deleted file mode 100644 index d3af640aa..000000000 --- a/npc/002-4/_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-4: Nard's Room warps -002-4,19,27,0 warp #002-4_19_27 0,0,002-3,43,28 diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt index 327db573f..5dd5b9479 100644 --- a/npc/003-1/ship.txt +++ b/npc/003-1/ship.txt @@ -11,7 +11,7 @@ OnTouch: goto L_Warp; L_Warp: - warp "002-3", 31, 28; + warp "002-3@"+LOCATION$, 31, 28; closedialog; close; } diff --git a/npc/005-1/ship.txt b/npc/005-1/ship.txt index 95394abaf..929d5a73c 100644 --- a/npc/005-1/ship.txt +++ b/npc/005-1/ship.txt @@ -11,7 +11,7 @@ OnTouch: goto L_Warp; L_Warp: - warp "002-3", 31, 28; + warp "002-3@"+LOCATION$, 31, 28; closedialog; close; } diff --git a/npc/005-2/_import.txt b/npc/005-2/_import.txt index 2ec41cb54..d5850de36 100644 --- a/npc/005-2/_import.txt +++ b/npc/005-2/_import.txt @@ -1,4 +1,4 @@ -// Map 005-2: Merchant Guild +// Map 005-2: Saxso's House // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-2/_mobs.txt", "npc/005-2/_warps.txt", diff --git a/npc/005-2/_mobs.txt b/npc/005-2/_mobs.txt index 2986f2952..56667f482 100644 --- a/npc/005-2/_mobs.txt +++ b/npc/005-2/_mobs.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 005-2: Merchant Guild mobs +// Map 005-2: Saxso's House mobs 005-2,43,40,0,0 monster Saxso Ghost 1076,1,35000,300000 diff --git a/npc/005-2/_warps.txt b/npc/005-2/_warps.txt index 137c98af4..430abf8e4 100644 --- a/npc/005-2/_warps.txt +++ b/npc/005-2/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 005-2: Merchant Guild warps +// Map 005-2: Saxso's House warps 005-2,33,43,0 warp #005-2_33_43 0,0,005-1,31,80 diff --git a/npc/005-3/_import.txt b/npc/005-3/_import.txt index 5465ca016..e47ad86f9 100644 --- a/npc/005-3/_import.txt +++ b/npc/005-3/_import.txt @@ -1,4 +1,4 @@ -// Map 005-3: Merchant Guild +// Map 005-3: Storage House // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-3/_mobs.txt", "npc/005-3/_warps.txt", diff --git a/npc/005-3/_mobs.txt b/npc/005-3/_mobs.txt index 8e2a8474b..5b8cc1a28 100644 --- a/npc/005-3/_mobs.txt +++ b/npc/005-3/_mobs.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 005-3: Merchant Guild mobs +// Map 005-3: Storage House mobs 005-3,34,37,10,3 monster Cave Maggot 1027,8,35000,300000 diff --git a/npc/005-3/_warps.txt b/npc/005-3/_warps.txt index d32c88bb9..6fb61c763 100644 --- a/npc/005-3/_warps.txt +++ b/npc/005-3/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 005-3: Merchant Guild warps +// Map 005-3: Storage House warps 005-3,25,43,0 warp #005-3_25_43 0,0,005-1,34,75 diff --git a/npc/005-4/_import.txt b/npc/005-4/_import.txt index 000bb26f5..e93dfbbcf 100644 --- a/npc/005-4/_import.txt +++ b/npc/005-4/_import.txt @@ -1,4 +1,4 @@ -// Map 005-4: Merchant Guild +// Map 005-4: Armor Shop // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-4/_warps.txt", "npc/005-4/rosen.txt", diff --git a/npc/005-4/_warps.txt b/npc/005-4/_warps.txt index 97c3f55a7..78e6d570c 100644 --- a/npc/005-4/_warps.txt +++ b/npc/005-4/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 005-4: Merchant Guild warps +// Map 005-4: Armor Shop warps 005-4,25,43,0 warp #005-4_25_43 0,0,005-1,48,71 -- cgit v1.2.3-60-g2f50