diff options
-rw-r--r-- | npc/000-0-0/q'onan.txt | 2 | ||||
-rw-r--r-- | npc/000-0-0/sailors.txt | 4 | ||||
-rw-r--r-- | npc/000-2-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/q'onan.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/savepoint.txt | 8 | ||||
-rw-r--r-- | npc/000-2-3/_warps.txt | 2 | ||||
-rw-r--r-- | npc/000-2-3/hammock.txt | 2 | ||||
-rw-r--r-- | npc/001-2-0/_warps.txt | 4 | ||||
-rw-r--r-- | npc/001-2-2/_warps.txt | 4 | ||||
-rw-r--r-- | npc/001-2-4/_warps.txt | 4 | ||||
-rw-r--r-- | npc/001-2-5/_warps.txt | 2 | ||||
-rw-r--r-- | npc/001-2-6/_warps.txt | 2 | ||||
-rw-r--r-- | npc/001-2-7/_warps.txt | 6 | ||||
-rw-r--r-- | npc/001-2-8/_warps.txt | 2 | ||||
-rw-r--r-- | npc/001-2-9/_warps.txt | 2 |
15 files changed, 24 insertions, 24 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt index f033c11d..dc124c4d 100644 --- a/npc/000-0-0/q'onan.txt +++ b/npc/000-0-0/q'onan.txt @@ -6,7 +6,7 @@ // Sleeping and snoring NPC. // Gender = 1 -000-0-0,29,28,0 script Q'Onan 402,{ +000-0-0,29,28,0 script Q'Onan#000-0-0 402,{ callfunc "Asleep"; } diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index 8521c13b..7c32c68c 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -7,7 +7,7 @@ // Elmo will handle dialogs between both NPCs. // Gender = 1 -000-0-0,26,23,0 script Elmo 409,{ +000-0-0,26,23,0 script Elmo#sailors 409,{ OnTalk: setcamnpc; @@ -79,6 +79,6 @@ OnTalk: // Gender = 1 000-0-0,25,23,0 script Magic Arpan#sailors 407,{ - doevent "Elmo::OnTalk"; + doevent "Elmo#sailors::OnTalk"; close; } diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt index db8d25b2..db00884c 100644 --- a/npc/000-2-1/_warps.txt +++ b/npc/000-2-1/_warps.txt @@ -1,2 +1,2 @@ // Map 000-2-1: La Johanne, Second Deck -000-2-1,72,30,0 warp ToLevel0 0,0,000-2-0,31,26 +000-2-1,72,30,0 warp ToLevel0#000-2-1 0,0,000-2-0,31,26 diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index b89ae52d..debf5aec 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -7,7 +7,7 @@ // Size = 2 // Gender = 1 -000-2-1,53,38,0 script Q'Onan 402,{ +000-2-1,53,38,0 script Q'Onan#000-2-1 402,{ callfunc "Asleep"; } diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt index 15b5e5d2..25930a9a 100644 --- a/npc/000-2-1/savepoint.txt +++ b/npc/000-2-1/savepoint.txt @@ -6,28 +6,28 @@ // Size = 2 // Gender = 2 -000-2-1,40,37,0 script #name 901,{ +000-2-1,40,37,0 script #name1 901,{ callfunc "SavePoint", "000-2-1.gat", 40, 37; close; } // Size = 2 // Gender = 2 -000-2-1,46,37,0 script #name 901,{ +000-2-1,46,37,0 script #name2 901,{ callfunc "SavePoint", "000-2-1.gat", 46, 37; close; } // Size = 2 // Gender = 2 -000-2-1,50,38,0 script #name 901,{ +000-2-1,50,38,0 script #name3 901,{ callfunc "SavePoint", "000-2-1.gat", 50, 38; close; } // Size = 2 // Gender = 2 -000-2-1,55,40,0 script #name 901,{ +000-2-1,55,40,0 script #name4 901,{ callfunc "SavePoint", "000-2-1.gat", 55, 40; close; } diff --git a/npc/000-2-3/_warps.txt b/npc/000-2-3/_warps.txt index bce94fc5..e8557250 100644 --- a/npc/000-2-3/_warps.txt +++ b/npc/000-2-3/_warps.txt @@ -1,2 +1,2 @@ // Map 000-2-3: La Johanne, Nard's Room -000-2-3,19,27,0 warp ToLevel0 0,0,000-2-0,32,28 +000-2-3,19,27,0 warp ToLevel0#000-2-3 0,0,000-2-0,32,28 diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt index 60c2d31b..1d94ffd5 100644 --- a/npc/000-2-3/hammock.txt +++ b/npc/000-2-3/hammock.txt @@ -5,7 +5,7 @@ // Animated hammock at the top level of the ship. // Gender = 2 -000-2-3,28,24,0 script #name 904,1,0,{ +000-2-3,28,24,0 script #name5 904,1,0,{ OnTouchFirst: setnpcdir 4; diff --git a/npc/001-2-0/_warps.txt b/npc/001-2-0/_warps.txt index ecaae5e7..61e6956f 100644 --- a/npc/001-2-0/_warps.txt +++ b/npc/001-2-0/_warps.txt @@ -1,4 +1,4 @@ // 001-2-0 Light Armor Shop -001-2-0,30,35,0 warp To Artis North 0,0,001-1,51,66 -001-2-0,37,46,0 warp To Artis South 0,0,001-1,55,72 +001-2-0,30,35,0 warp To Artis North#001-2-0 0,0,001-1,51,66 +001-2-0,37,46,0 warp To Artis South#001-2-0 0,0,001-1,55,72 diff --git a/npc/001-2-2/_warps.txt b/npc/001-2-2/_warps.txt index dcfa185e..1aa60e6b 100644 --- a/npc/001-2-2/_warps.txt +++ b/npc/001-2-2/_warps.txt @@ -1,5 +1,5 @@ // 001-2-2 warps -001-2-2,38,39,0 warp To Artis 0,0,001-1,69,78 -001-2-2,27,30,0 warp To Second Level 1,0,001-2-3,27,30 +001-2-2,38,39,0 warp To Artis#001-2-2 0,0,001-1,69,78 +001-2-2,27,30,0 warp To Sec. Level#001-2-2 1,0,001-2-3,27,30 diff --git a/npc/001-2-4/_warps.txt b/npc/001-2-4/_warps.txt index c3e9480d..4ab55113 100644 --- a/npc/001-2-4/_warps.txt +++ b/npc/001-2-4/_warps.txt @@ -1,4 +1,4 @@ // 001-2-4 warps -001-2-4,48,41,0 warp To Artis 1,0,001-1,51,81 -001-2-4,57,27,0 warp To Library Second Floor 2,0,001-2-6,57,25 +001-2-4,48,41,0 warp To Artis#001-2-4 1,0,001-1,51,81 +001-2-4,57,27,0 warp To Lib. Second#001-2-4 2,0,001-2-6,57,25 diff --git a/npc/001-2-5/_warps.txt b/npc/001-2-5/_warps.txt index 71a4cf08..018cae38 100644 --- a/npc/001-2-5/_warps.txt +++ b/npc/001-2-5/_warps.txt @@ -1,3 +1,3 @@ // 001-2-5 warps -001-2-5,32,38,0 warp To Library First Floor 0,0,001-2-4,52,28 +001-2-5,32,38,0 warp To Library First#001-2-5 0,0,001-2-4,52,28 diff --git a/npc/001-2-6/_warps.txt b/npc/001-2-6/_warps.txt index a73ff98d..ded2e035 100644 --- a/npc/001-2-6/_warps.txt +++ b/npc/001-2-6/_warps.txt @@ -1,3 +1,3 @@ // 001-2-6 warps -001-2-6,57,28,0 warp To Library First Floor 2,0,001-2-4,57,29 +001-2-6,57,28,0 warp To Library First#001-2-6 2,0,001-2-4,57,29 diff --git a/npc/001-2-7/_warps.txt b/npc/001-2-7/_warps.txt index a5f792e2..ce1d4311 100644 --- a/npc/001-2-7/_warps.txt +++ b/npc/001-2-7/_warps.txt @@ -1,5 +1,5 @@ // 001-2-7 -001-2-7,26,30,0 warp To Left Room 0,0,001-2-8,45,31 -001-2-7,46,30,0 warp To Right Room 0,0,001-2-9,28,31 -001-2-7,36,44,0 warp To Artis 0,0,001-1,89,67 +001-2-7,26,30,0 warp To Left Room#001-2-7 0,0,001-2-8,45,31 +001-2-7,46,30,0 warp To Right Room#001-2-7 0,0,001-2-9,28,31 +001-2-7,36,44,0 warp To Artis#001-2-7 0,0,001-1,89,67 diff --git a/npc/001-2-8/_warps.txt b/npc/001-2-8/_warps.txt index 6b4d3b71..748cca0c 100644 --- a/npc/001-2-8/_warps.txt +++ b/npc/001-2-8/_warps.txt @@ -1,3 +1,3 @@ // 001-2-8 -001-2-8,46,31,0 warp To Main Hall 0,0,001-2-7,27,30 +001-2-8,46,31,0 warp To Main Hall#001-2-8 0,0,001-2-7,27,30 diff --git a/npc/001-2-9/_warps.txt b/npc/001-2-9/_warps.txt index 688c327a..a9a7b0ab 100644 --- a/npc/001-2-9/_warps.txt +++ b/npc/001-2-9/_warps.txt @@ -1,3 +1,3 @@ // 001-2-9 -001-2-9,27,31,0 warp To Main Hall 0,0,001-2-7,45,30 +001-2-9,27,31,0 warp To Main Hall#001-2-9 0,0,001-2-7,45,30 |