diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-09 05:05:11 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-09 05:05:11 -0300 |
| commit | a821a9eb3f53f288055bad4fd4036476a2f808a5 (patch) | |
| tree | 0520e50f937368da257109fdc169d81f58f22c8d | |
| parent | 3842b99fda4de51bf6c3faeb4744a28e4760c22b (diff) | |
| download | serverdata-a821a9eb3f53f288055bad4fd4036476a2f808a5.tar.gz serverdata-a821a9eb3f53f288055bad4fd4036476a2f808a5.tar.bz2 serverdata-a821a9eb3f53f288055bad4fd4036476a2f808a5.tar.xz serverdata-a821a9eb3f53f288055bad4fd4036476a2f808a5.zip | |
Mostly fixes and polishments so it is test-server ready
| -rw-r--r-- | npc/001-2-43/core.txt | 3 | ||||
| -rw-r--r-- | npc/001-2-8/doors.txt | 7 | ||||
| -rw-r--r-- | npc/001-3-0/gates.txt | 14 | ||||
| -rw-r--r-- | npc/commands/debug-quest.txt | 3 |
4 files changed, 23 insertions, 4 deletions
diff --git a/npc/001-2-43/core.txt b/npc/001-2-43/core.txt index 0ab81895..9f541b54 100644 --- a/npc/001-2-43/core.txt +++ b/npc/001-2-43/core.txt @@ -95,7 +95,8 @@ OnInit: 001-2-43,39,24,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_32768 NPC_NO_SPRITE 001-2-43,49,24,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_65536 NPC_NO_SPRITE // Fail-safe; Henry's record should not be here -001-2-43,29,31,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_131072 NPC_NO_SPRITE +001-2-43,34,24,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_131072 NPC_NO_SPRITE +//001-2-43,29,31,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_131072 NPC_NO_SPRITE //001-2-43,24,26,0 duplicate(#ArtisThiefBook_1) #ArtisThiefBook_262144 NPC_NO_SPRITE diff --git a/npc/001-2-8/doors.txt b/npc/001-2-8/doors.txt index e1f47ef8..7b34c4da 100644 --- a/npc/001-2-8/doors.txt +++ b/npc/001-2-8/doors.txt @@ -26,7 +26,12 @@ function breakIn { next; // Better to not use only a pine! if (LockPicking(2, 3, false)) { - // TODO: Begin the catch timer (addtimer) + // Delete previous timers. + deltimer("#ArtisThiefBook_0::OnBust1"); + deltimer("#ArtisThiefBook_0::OnBust2"); + deltimer("#ArtisThiefBook_0::OnBust3"); + deltimer("#ArtisThiefBook_0::OnBust4"); + // Begin the catch timer (addtimer) addtimer 30000, "#ArtisThiefBook_0::OnBust1"; warp "001-2-43", 27, 34; } else { diff --git a/npc/001-3-0/gates.txt b/npc/001-3-0/gates.txt index 62bec61d..ceae982f 100644 --- a/npc/001-3-0/gates.txt +++ b/npc/001-3-0/gates.txt @@ -142,7 +142,19 @@ OnInit: end; OnTouch: - // FIXME: No enter except when q1 and q2 matches + // No enter except when q1 and q2 matches + .@q=getq(ThiefQuests_Artis); + .@q2=getq2(ThiefQuests_Artis); + if (.@q != 1 || .@q2 != 2) + end; + + // Delete previous timers. Makes easier to cheat but more reliable (FIXME) + deltimer("#ArtisThiefBook_0::OnBust1"); + deltimer("#ArtisThiefBook_0::OnBust2"); + deltimer("#ArtisThiefBook_0::OnBust3"); + deltimer("#ArtisThiefBook_0::OnBust4"); + + // Archives: Begin addtimer 30000, "#ArtisThiefBook_0::OnBust1"; warp "001-2-43", 51, 34; end; diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt index 34bdf63b..868b807c 100644 --- a/npc/commands/debug-quest.txt +++ b/npc/commands/debug-quest.txt @@ -81,7 +81,8 @@ function script GlobalQuestDebug { "Lloyd", ArtisQuests_Lloyd, l("Mona's dad"), ArtisQuests_MonaDad, l("Artis legion progress"), Artis_Legion_Progress, - l("Legion training"), ArtisQuests_TrainingLegion; + l("Legion training"), ArtisQuests_TrainingLegion, + "Henry", ThiefQuests_Artis; switch (@menuret) { |