From 95c3832b02b027a8be296f618ff3585a288389ad Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 6 Feb 2018 23:21:20 +0100 Subject: add 002-2 map --- conf/map/maps.conf | 1 + db/map_index.txt | 67 ++++++++++++++++++++++++----------------------- db/re/map_cache.dat | Bin 21834 -> 21975 bytes npc/002-1/peter.txt | 26 +++++++++---------- npc/002-2/_import.txt | 5 ++++ npc/002-2/doors.txt | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ npc/002-2/mapflags.txt | 1 + npc/002-2/ratto.txt | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ npc/_import.txt | 1 + 9 files changed, 192 insertions(+), 46 deletions(-) create mode 100644 npc/002-2/_import.txt create mode 100644 npc/002-2/doors.txt create mode 100644 npc/002-2/mapflags.txt create mode 100644 npc/002-2/ratto.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 4c86c6b2c..42f634dfb 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -61,6 +61,7 @@ map_list: ( "001-3-0", "001-3-1", "002-1", + "002-2", "003-1", "003-2-0", "003-2-1", diff --git a/db/map_index.txt b/db/map_index.txt index c27324385..6f6266865 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -58,36 +58,37 @@ 001-3-0 58 001-3-1 59 002-1 60 -003-1 61 -003-2-0 62 -003-2-1 63 -003-2-2 64 -003-2 65 -003-3 66 -003-5 67 -003-7 68 -003-8 69 -005-1 70 -005-2 71 -005-3 72 -005-4 73 -005-5 74 -005-6 75 -008-1 76 -008-2-0 77 -008-2-1 78 -008-2-10 79 -008-2-11 80 -008-2-12 81 -008-2-13 82 -008-2-14 83 -008-2-2 84 -008-2-3 85 -008-2-4 86 -008-2-5 87 -008-2-6 88 -008-2-7 89 -008-2-8 90 -008-2-9 91 -test 92 -testbg 93 +002-2 61 +003-1 62 +003-2-0 63 +003-2-1 64 +003-2-2 65 +003-2 66 +003-3 67 +003-5 68 +003-7 69 +003-8 70 +005-1 71 +005-2 72 +005-3 73 +005-4 74 +005-5 75 +005-6 76 +008-1 77 +008-2-0 78 +008-2-1 79 +008-2-10 80 +008-2-11 81 +008-2-12 82 +008-2-13 83 +008-2-14 84 +008-2-2 85 +008-2-3 86 +008-2-4 87 +008-2-5 88 +008-2-6 89 +008-2-7 90 +008-2-8 91 +008-2-9 92 +test 93 +testbg 94 diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat index 1a5c9482d..66e98e2b9 100755 Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt index fc91e943e..24ee6917b 100644 --- a/npc/002-1/peter.txt +++ b/npc/002-1/peter.txt @@ -181,7 +181,7 @@ OnReturnWin: L_BonusTask: mes ""; mesn; - mesq l("What if I give you 1000 Esperin for that job, is it ok?"); + mesq l("What if I give you 1000 GP for that job, is it ok?"); next; menu @@ -211,7 +211,7 @@ OnStartOutside: $@RAT_SAILOR_HELPER$ = strcharinfo(0); $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER; initnpctimer; - warp "000-2-2", 48, 28; + warp "002-2", 48, 28; doevent "RattosControl::OnSpawn"; goto L_Quit; @@ -222,7 +222,7 @@ OnTimer2000: if ($@RAT_SAILOR_CONTROL[9] > 100) goto L_Timeout; if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto L_Dead; if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto L_Done; - if (getmapusers("000-2-2") == 0) goto L_CleaningEnd; + if (getmapusers("002-2") == 0) goto L_CleaningEnd; goto L_CheckRattos; end; @@ -253,7 +253,7 @@ OnDontneedHelp: L_Timeout: mesn; mesq l("Hey! Be careful. You can't stay in this basement for so long, you're going to get sick. Come outside and take a break, maybe you can try again later."); - warp "000-2-1", 72, 36; + warp "002-1", 72, 36; goto L_CleaningClose; @@ -271,7 +271,7 @@ L_Done: if($@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet; .@peter = getq(ShipQuests_Peter); if (.@peter == 2 || .@peter == 4) goto L_Reward; - warp "000-2-1", 72, 36; + warp "002-1", 72, 36; goto L_Thanks; @@ -280,10 +280,10 @@ L_CleaningEnd: $@RAT_SAILOR_HELPER$ = ""; $@RAT_SAILOR_DEATHS = 0; cleararray $@RAT_SAILOR_CONTROL, 0, 11; - killmonster "000-2-2", "RattosControl::OnRatto1Death"; - killmonster "000-2-2", "RattosControl::OnRatto2Death"; - killmonster "000-2-2", "RattosControl::OnRatto3Death"; - killmonster "000-2-2", "RattosControl::OnRatto4Death"; + killmonster "002-2", "RattosControl::OnRatto1Death"; + killmonster "002-2", "RattosControl::OnRatto2Death"; + killmonster "002-2", "RattosControl::OnRatto3Death"; + killmonster "002-2", "RattosControl::OnRatto4Death"; end; @@ -293,10 +293,10 @@ L_CleaningClose: $@RAT_SAILOR_HELPER$ = ""; $@RAT_SAILOR_DEATHS = 0; cleararray $@RAT_SAILOR_CONTROL, 0, 11; - killmonster "000-2-2", "RattosControl::OnRatto1Death"; - killmonster "000-2-2", "RattosControl::OnRatto2Death"; - killmonster "000-2-2", "RattosControl::OnRatto3Death"; - killmonster "000-2-2", "RattosControl::OnRatto4Death"; + killmonster "002-2", "RattosControl::OnRatto1Death"; + killmonster "002-2", "RattosControl::OnRatto2Death"; + killmonster "002-2", "RattosControl::OnRatto3Death"; + killmonster "002-2", "RattosControl::OnRatto4Death"; $@RAT_SAILOR_COUNTDOWN = gettimetick(2); close; diff --git a/npc/002-2/_import.txt b/npc/002-2/_import.txt new file mode 100644 index 000000000..5b662cf60 --- /dev/null +++ b/npc/002-2/_import.txt @@ -0,0 +1,5 @@ +// Map 002-2: Hold +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/002-2/doors.txt", +"npc/002-2/mapflags.txt", +"npc/002-2/ratto.txt", diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt new file mode 100644 index 000000000..035c2e7ec --- /dev/null +++ b/npc/002-2/doors.txt @@ -0,0 +1,69 @@ +// Evol scripts. +// Authors: +// Ablu +// Alastrim +// Reid +// Description: +// Doors NPCs. + +002-2,48,29,0 script DoorUpwards NPC_HIDDEN,0,0,{ + +OnTouch: + if (mobcount("002-2","all") > 0) goto L_Warn; + + goto L_Warp; + +L_Warn: + .@q = getq(ShipQuests_Peter); + if (.@q == 5) goto L_Warp; + + mesn "Narrator"; + mes col(l("There are still some rattos left! Do you want to abort the quest?"), 9); + next; + + menu + l("Yes."), L_Warp, + l("No."), -; + + warp "002-2", 48, 28; + closedialog; + close; + +L_Warp: + warp "002-1", 72, 36; + closedialog; + close; +} + +002-2,24,31,0 script LeftDoor NPC_HIDDEN,0,0,{ + +OnTouch: + mesn "Narrator"; + mes col(l("It seems that you need a key to open this door."), 9); + next; + mes col(l("What do you want to do?"), 9); + next; + + menu + rif(countitem(718) > 0, l("Use the key.")), L_Warp, + l("Break the door."), L_Break, + l("Go away."), -; + + closedialog; + close; + +L_Break: + + mes ""; + mesn "Narrator"; + mes col(l("You hear a loud scream. It must be the creaking of the wooden door..."), 9); + + close; + +L_Warp: + mes ""; + mesn "Narrator"; + mes col(l("Wait, it seems someone is blocking the door from the other side!"), 9); + + close; +} diff --git a/npc/002-2/mapflags.txt b/npc/002-2/mapflags.txt new file mode 100644 index 000000000..207a4557c --- /dev/null +++ b/npc/002-2/mapflags.txt @@ -0,0 +1 @@ +000-2-2 mapflag nosave 002-1,55,40 diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt new file mode 100644 index 000000000..39827420a --- /dev/null +++ b/npc/002-2/ratto.txt @@ -0,0 +1,68 @@ +// Evol scripts. +// Authors: +// Ablu +// Alastrim +// Reid +// Description: +// Ratto killer. + +// $@RAT_SAILOR_CONTROL array explanation: +// [1] = Shows status of ratto number 1 (1 is dead and 0 is alive). +// [2] = Shows status of ratto number 2 (1 is dead and 0 is alive). +// [3] = Shows status of ratto number 3 (1 is dead and 0 is alive). +// [4] = Shows status of ratto number 4 (1 is dead and 0 is alive). +// [5] = Shows how many seconds passed since ratto number 1 died. +// [6] = Shows how many seconds passed since ratto number 2 died. +// [7] = Shows how many seconds passed since ratto number 3 died. +// [8] = Shows how many seconds passed since ratto number 4 died. +// [9] = Shows how many seconds passed since the player started the quest. + +000-2,47,30,0 script RattosControl NPC_HIDDEN,{ + +OnSpawn: + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + close; + +OnRatto1Respawn: + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; + $@RAT_SAILOR_CONTROL[1] = 0; + $@RAT_SAILOR_CONTROL[5] = 0; + end; + +OnRatto2Respawn: + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; + $@RAT_SAILOR_CONTROL[2] = 0; + $@RAT_SAILOR_CONTROL[6] = 0; + end; + +OnRatto3Respawn: + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; + $@RAT_SAILOR_CONTROL[3] = 0; + $@RAT_SAILOR_CONTROL[7] = 0; + end; + +OnRatto4Respawn: + areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + $@RAT_SAILOR_CONTROL[4] = 0; + $@RAT_SAILOR_CONTROL[8] = 0; + end; + +OnRatto1Death: + $@RAT_SAILOR_CONTROL[1] = 1; + end; + +OnRatto2Death: + $@RAT_SAILOR_CONTROL[2] = 1; + end; + +OnRatto3Death: + $@RAT_SAILOR_CONTROL[3] = 1; + end; + +OnRatto4Death: + $@RAT_SAILOR_CONTROL[4] = 1; + end; +} diff --git a/npc/_import.txt b/npc/_import.txt index f742937af..4671e0836 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -60,6 +60,7 @@ @include "npc/001-3-0/_import.txt" @include "npc/001-3-1/_import.txt" @include "npc/002-1/_import.txt" +@include "npc/002-2/_import.txt" @include "npc/003-1/_import.txt" @include "npc/003-2-0/_import.txt" @include "npc/003-2-1/_import.txt" -- cgit v1.2.3-60-g2f50