From c3d8c4bf61fbecdbce7b7e0e83002d98a3875ffe Mon Sep 17 00:00:00 2001
From: MowFord <131182600+MowFord@users.noreply.github.com>
Date: Sat, 4 May 2024 17:05:16 -0500
Subject: [PATCH] Correct isValidEntry logic to trade for registration

---
 scripts/battlefields/Apollyon/central_apollyon.lua | 6 +-----
 scripts/battlefields/Apollyon/cs_apollyon.lua      | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/battlefields/Apollyon/central_apollyon.lua b/scripts/battlefields/Apollyon/central_apollyon.lua
index 17aa7ec510d..695435f10c9 100644
--- a/scripts/battlefields/Apollyon/central_apollyon.lua
+++ b/scripts/battlefields/Apollyon/central_apollyon.lua
@@ -19,16 +19,12 @@ local content = Limbus:new({
     timeLimit        = utils.minutes(30),
     index            = 4,
     area             = 5,
-    entryNpc         = '_12i',
+    entryNpcs        = { '_12i', '_127' },
     requiredKeyItems = { xi.ki.COSMO_CLEANSE, { xi.ki.RED_CARD, xi.ki.BLACK_CARD }, message = ID.text.YOU_INSERT_THE_CARD_POLISHED },
     requiredItems    = { xi.item.SMALT_CHIP, xi.item.SMOKY_CHIP, xi.item.CHARCOAL_CHIP, xi.item.MAGENTA_CHIP },
     name             = 'CENTRAL_APOLLYON',
 })
 
-function content:isValidEntry(player, npc)
-    return self.entryNpc == '_12i' or self.entryNpc == '_127'
-end
-
 function content:onEntryEventUpdate(player, csid, option, npc)
     if Battlefield.onEntryEventUpdate(self, player, csid, option, npc) then
         if npc:getName() == '_12i' then
diff --git a/scripts/battlefields/Apollyon/cs_apollyon.lua b/scripts/battlefields/Apollyon/cs_apollyon.lua
index 3dc38f53560..8e02e7fbd64 100644
--- a/scripts/battlefields/Apollyon/cs_apollyon.lua
+++ b/scripts/battlefields/Apollyon/cs_apollyon.lua
@@ -16,17 +16,13 @@ local content = Limbus:new({
     timeLimit        = utils.minutes(20),
     index            = 5,
     area             = 6,
-    entryNpc         = '_12i',
+    entryNpcs        = { '_12i', '_127' },
     requiredKeyItems = { xi.ki.COSMO_CLEANSE, { xi.ki.RED_CARD, xi.ki.BLACK_CARD }, message = ID.text.YOU_INSERT_THE_CARD_POLISHED },
     requiredItems    = { xi.item.METAL_CHIP },
     name             = 'CS_APOLLYON',
     timeExtension    = 5,
 })
 
-function content:isValidEntry(player, npc)
-    return self.entryNpc == '_12i' or self.entryNpc == '_127'
-end
-
 function content:onEntryEventUpdate(player, csid, option, npc)
     if Battlefield.onEntryEventUpdate(self, player, csid, option, npc) then
         if npc:getName() == '_12i' then