Correct receptacle animationSub

LandSandBoat · May 17, 2024 · 2447680 · 2447680
1 parent f39281f
commit 2447680
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/scripts/globals/promyvion.lua b/scripts/globals/promyvion.lua
@@ -140,7 +140,7 @@ local function spawnStray(mob, strayId)
     mob:setLocalVar('[Stray]Id', strayId)
 
     -- 1: Raise Receptacle.
-    mob:setAnimationSub(1)
+    mob:setAnimationSub(5)
 
     -- 2: Pop Stray.
     mob:timer(875, function(mobArg)
@@ -152,7 +152,12 @@ local function spawnStray(mob, strayId)
 
     -- 3: Lower Receptacle.
     mob:timer(1750, function(mobArg)
-        mobArg:setAnimationSub(2)
+        mobArg:setAnimationSub(6)
+    end)
+
+    -- 4: Reset Receptacle (Makes it SLIGHTLY brighter).
+    mob:timer(3000, function(mobArg)
+        mobArg:setAnimationSub(4)
     end)
 end
 
@@ -325,6 +330,11 @@ xi.promyvion.receptacleOnMobDespawn = function(mob)
         newPortal:setLocalVar('[Portal]Chosen', 1) -- Mark new portal.
     end
 
+    -- Handle receptacle: Reset animationSub.
+    if mob:getAnimationSub() ~= 4 then
+        mob:setAnimationSub(4)
+    end
+
     -- Handle decoration: Reset.
     local decoration = GetNPCByID(mobId - 1)
 

diff --git a/sql/mob_pools.sql b/sql/mob_pools.sql
@@ -2667,7 +2667,7 @@ INSERT INTO `mob_pools` VALUES (2610,'Megamaw_Mikey','Megamaw_Mikey',258,0x0000A
 INSERT INTO `mob_pools` VALUES (2611,'Megantereon','Megantereon',242,0x0000340100000000000000000000000000000000,1,1,6,240,100,0,0,0,0,2,0,0,0,0,0,0,0,0,0,822,242);
 INSERT INTO `mob_pools` VALUES (2612,'Megapod_Megalops','Megapod_Megalops',77,0x0000640100000000000000000000000000000000,7,7,4,240,100,0,1,0,0,2,0,0,0,133,0,0,0,0,0,77,77);
 INSERT INTO `mob_pools` VALUES (2613,'Melo_Melo','Melo_Melo',251,0x0000510500000000000000000000000000000000,1,1,6,240,100,0,1,1,0,2,0,0,0,133,4,0,0,0,0,989,251);
-INSERT INTO `mob_pools` VALUES (2614,'Memory_Receptacle_PH','Memory_Receptacle',181,0x00004E0400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,18,0,0,6,131,0,0,0,0,0,181,181);
+INSERT INTO `mob_pools` VALUES (2614,'Memory_Receptacle_PH','Memory_Receptacle',181,0x00004E0400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,18,0,0,6,131,4,0,0,0,0,181,181);
 -- 2615: free
 INSERT INTO `mob_pools` VALUES (2616,'Mercurial_Makara','Mercurial_Makara',197,0x00005C0100000000000000000000000000000000,1,1,7,240,100,0,1,0,0,4,0,0,0,3,0,0,0,0,0,197,197);
 INSERT INTO `mob_pools` VALUES (2617,'Merrow_Bladedancer','Merrow_Bladedancer',182,0x0600870600000000000000000000000000000000,5,5,4,240,100,0,1,0,1,0,0,0,26,517,12,0,3,0,0,182,182);
@@ -6685,9 +6685,9 @@ INSERT INTO `mob_pools` VALUES (6641,'Ealdnarche_Apoc_Nigh','Ealdnarche',351,0x0
 INSERT INTO `mob_pools` VALUES (6642,'Atori-Tutori_qm','Atori-Tutori_???',153,0x0100020500101120003000400050F261F2710000,2,0,1,480,110,0,1,0,0,18,0,32,7,155,0,0,0,0,0,1145,153);
 INSERT INTO `mob_pools` VALUES (6643,'Craver_PV','Craver',78,0x00006E0400000000000000000000000000000000,1,1,8,240,100,0,1,1,1,0,0,0,712,133,13,0,0,0,0,78,78);
 INSERT INTO `mob_pools` VALUES (6644,'Gorger_PV','Gorger',138,0x00006B0400000000000000000000000000000000,8,8,3,240,100,0,1,1,1,0,0,0,238,133,13,0,5,0,0,137,138);
-INSERT INTO `mob_pools` VALUES (6645,'Memory_Receptacle_PD','Memory_Receptacle',181,0x00004F0400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,0,0,0,0,0,181,181);
-INSERT INTO `mob_pools` VALUES (6646,'Memory_Receptacle_PM','Memory_Receptacle',181,0x0000500400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,0,0,0,0,0,181,181);
-INSERT INTO `mob_pools` VALUES (6647,'Memory_Receptacle_PV','Memory_Receptacle',181,0x0000510400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,0,0,0,0,0,181,181);
+INSERT INTO `mob_pools` VALUES (6645,'Memory_Receptacle_PD','Memory_Receptacle',181,0x00004F0400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,4,0,0,0,0,181,181);
+INSERT INTO `mob_pools` VALUES (6646,'Memory_Receptacle_PM','Memory_Receptacle',181,0x0000500400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,4,0,0,0,0,181,181);
+INSERT INTO `mob_pools` VALUES (6647,'Memory_Receptacle_PV','Memory_Receptacle',181,0x0000510400000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,0,6,131,4,0,0,0,0,181,181);
 INSERT INTO `mob_pools` VALUES (6648,'Seether_PV','Seether',220,0x0000610400000000000000000000000000000000,1,1,7,240,100,0,1,1,1,0,0,0,138,133,5,0,0,0,0,220,220);
 INSERT INTO `mob_pools` VALUES (6649,'Thinker_PV','Thinker',241,0x0000670400000000000000000000000000000000,1,1,7,240,100,0,1,1,1,0,0,0,6,133,13,0,0,0,0,241,241);
 INSERT INTO `mob_pools` VALUES (6650,'Stray_PV','Stray',499,0x0000530400000000000000000000000000000000,1,1,7,240,100,0,1,1,0,2,0,0,1062,131,13,0,0,0,0,255,499);