From 71ca63db4d154e34a2124c047e53ece1e8cc1dcd Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 17 Apr 2020 00:59:32 -0300 Subject: Updates to Abandoned Island --- db/constants.conf | 7 ++++--- maps/re/006-4-1.mcache | Bin 356 -> 362 bytes maps/re/006-4.mcache | Bin 1887 -> 1894 bytes npc/006-4-1/_import.txt | 1 + npc/006-4-1/_warps.txt | 2 +- npc/006-4-1/painting.txt | 32 ++++++++++++++++++++++++++++++++ npc/006-4/_mobs.txt | 9 +++++++-- 7 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 npc/006-4-1/painting.txt diff --git a/db/constants.conf b/db/constants.conf index 44d689d98..76b2b9e95 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4221,9 +4221,10 @@ constants_db: { EE_NONE: 0 EE_SAXSO: 1 EE_DEMURE: 2 - EE_PRSM: 4 - EE_MAGICSCHOOL: 8 - EE_THEATER: 16 + EE_PRSM: 4 + EE_MAGICSCHOOL: 8 + EE_THEATER: 16 + EE_JAK1: 32 comment__: "Teleporter enum" TP_NONE: 0 diff --git a/maps/re/006-4-1.mcache b/maps/re/006-4-1.mcache index 51552736d..65c595936 100644 Binary files a/maps/re/006-4-1.mcache and b/maps/re/006-4-1.mcache differ diff --git a/maps/re/006-4.mcache b/maps/re/006-4.mcache index 98dfbfe1a..b8add6fa1 100644 Binary files a/maps/re/006-4.mcache and b/maps/re/006-4.mcache differ diff --git a/npc/006-4-1/_import.txt b/npc/006-4-1/_import.txt index e218adf14..bdd19d693 100644 --- a/npc/006-4-1/_import.txt +++ b/npc/006-4-1/_import.txt @@ -2,3 +2,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-4-1/_mobs.txt", "npc/006-4-1/_warps.txt", +"npc/006-4-1/painting.txt", diff --git a/npc/006-4-1/_warps.txt b/npc/006-4-1/_warps.txt index 24ae1b116..c248eefbe 100644 --- a/npc/006-4-1/_warps.txt +++ b/npc/006-4-1/_warps.txt @@ -15,7 +15,7 @@ OnTouch: OnTouch: slide 85,103; end; } -006-4-1,58,61,0 warp #006-4-1_58_61 6,0,006-4,95,99 +006-4-1,58,61,0 warp #006-4-1_58_61 6,0,006-4,95,100 006-4-1,88,53,0 script #006-4-1_88_53 NPC_HIDDEN,0,1,{ end; OnTouch: diff --git a/npc/006-4-1/painting.txt b/npc/006-4-1/painting.txt new file mode 100644 index 000000000..8a3cfb1d5 --- /dev/null +++ b/npc/006-4-1/painting.txt @@ -0,0 +1,32 @@ +// TMW2 Script +// Author: +// Jesusalva + +006-4-1,59,29,0 script #jakPortrait1 NPC_NO_SPRITE,{ + .@q=getq(General_EasterEggs); + + if (!(.@q & EE_JAK1)) { + setq General_EasterEggs, .@q|EE_JAK1; + dispbottom l("For finding an Easter Egg, you got Strange Coins!"); + getitem StrangeCoin, 1; + } + mesc ".:: " + l("Researcher Jak's Residence") + " ::."; + mes ""; + mesc l("And his sister,"); + mes ""; + mesc ".:: " + l("Researcher Alyta's Residence") + " ::."; + close; + +OnInit: + .distance=2; + end; +} + +006-4-1,24,53,0 script #jakWestWind NPC_HIDDEN,0,0,{ + end; + +OnTouch: + dispbottom l("This passage is still sealed."); + end; +} + diff --git a/npc/006-4/_mobs.txt b/npc/006-4/_mobs.txt index 023a4b4db..9de2d82d6 100644 --- a/npc/006-4/_mobs.txt +++ b/npc/006-4/_mobs.txt @@ -1,5 +1,10 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-4: Abandoned Island mobs -006-4,107,83,6,0 monster Mana Ghost 1068,5,75000,25000 +006-4,57,82,10,24 monster Mana Ghost 1068,5,75000,25000 006-4,78,101,2,0 monster Mana Ghost 1068,8,75000,25000 -006-4,132,66,6,4 monster Mana Ghost 1068,9,75000,250000 +006-4,59,192,16,19 monster Mana Ghost 1068,9,75000,250000 +006-4,94,179,17,15 monster Mana Ghost 1068,9,75000,250000 +006-4,128,183,14,19 monster Mana Ghost 1068,9,75000,250000 +006-4,102,202,20,8 monster Mana Ghost 1068,9,75000,250000 +006-4,101,153,21,10 monster Mana Ghost 1068,9,75000,250000 +006-4,95,66,39,11 monster Green Dragon 1195,6,75000,105000 -- cgit v1.2.3-60-g2f50