diff options
| -rw-r--r-- | world/map/npc/annuals/2022.txt | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt index 858d47b0..282f9ef1 100644 --- a/world/map/npc/annuals/2022.txt +++ b/world/map/npc/annuals/2022.txt @@ -94,12 +94,54 @@ function|script|P22Login L_FixMask: mapmask 1 | 2; + sendcollision "003-1", 1, 50, 53, 52, 55; // Ishi Tables + sendcollision "003-1", 1, 26, 50, 31, 50; // Gift Rows + sendcollision "003-1", 1, 26, 52, 31, 52; + sendcollision "003-1", 1, 26, 54, 31, 54; + sendcollision "003-1", 1, 26, 56, 31, 56; + sendcollision "003-1", 1, 33, 51, 38, 51; + sendcollision "003-1", 1, 33, 53, 38, 53; + sendcollision "003-1", 1, 33, 55, 38, 55; + sendcollision "003-1", 1, 39, 34, 48, 35; // Main Table + sendcollision "003-1", 1, 53, 26, 55, 28; // Right Side Tables + sendcollision "003-1", 1, 53, 31, 55, 33; + sendcollision "003-1", 1, 53, 36, 55, 38; + sendcollision "003-1", 1, 58, 26, 60, 28; + sendcollision "003-1", 1, 58, 31, 60, 33; + sendcollision "003-1", 1, 58, 36, 60, 38; + sendcollision "003-1", 1, 26, 26, 28, 28; // Left Side Tables + sendcollision "003-1", 1, 26, 31, 28, 33; + sendcollision "003-1", 1, 26, 36, 28, 38; + sendcollision "003-1", 1, 31, 26, 33, 28; + sendcollision "003-1", 1, 31, 31, 33, 33; + sendcollision "003-1", 1, 31, 36, 33, 38; return; L_Warp: set #X21, #X21 | 2; warp "003-1", 45, 24; mapmask 1 | 2; + sendcollision "003-1", 1, 50, 53, 52, 55; // Ishi Tables + sendcollision "003-1", 1, 26, 50, 31, 50; // Gift Rows + sendcollision "003-1", 1, 26, 52, 31, 52; + sendcollision "003-1", 1, 26, 54, 31, 54; + sendcollision "003-1", 1, 26, 56, 31, 56; + sendcollision "003-1", 1, 33, 51, 38, 51; + sendcollision "003-1", 1, 33, 53, 38, 53; + sendcollision "003-1", 1, 33, 55, 38, 55; + sendcollision "003-1", 1, 39, 34, 48, 35; // Main Table + sendcollision "003-1", 1, 53, 26, 55, 28; // Right Side Tables + sendcollision "003-1", 1, 53, 31, 55, 33; + sendcollision "003-1", 1, 53, 36, 55, 38; + sendcollision "003-1", 1, 58, 26, 60, 28; + sendcollision "003-1", 1, 58, 31, 60, 33; + sendcollision "003-1", 1, 58, 36, 60, 38; + sendcollision "003-1", 1, 26, 26, 28, 28; // Left Side Tables + sendcollision "003-1", 1, 26, 31, 28, 33; + sendcollision "003-1", 1, 26, 36, 28, 38; + sendcollision "003-1", 1, 31, 26, 33, 28; + sendcollision "003-1", 1, 31, 31, 33, 33; + sendcollision "003-1", 1, 31, 36, 33, 38; if (strcharinfo(0) == "Prsm") goto L_Prsm; return; @@ -234,7 +276,7 @@ L_Close: //////////////////////////////////////////////// -// FIXME: Elli sprite, she'll collect +// Elli will come back in Olympics. Collects // Present Boxes for Prsm, and give players // their commemorative hat for attending. // If the player has none, they can use Tybalt's storage @@ -242,7 +284,7 @@ L_Close: // The far corner where the scammer is. // $PARTY_GIFTS track how many gifts were given // NOTE: Elli is Hocus' protegee. -003-1,28,47,0|script|Elli#P22|393 +003-1,28,47,0|script|Elli#P22|441 { if (strcharinfo(0) == "Prsm") goto L_Done; if (#X21 & 4) goto L_Done; |