"Straight out of Neo Space!" script updates

Author: pyrQ

skill/c300308001.lua

@@ -3,14 +3,13 @@
 local s,id=GetID()
 function s.initial_effect(c)
 	aux.AddSkillProcedure(c,2,false,nil,nil)
-	--Flip this card over at the start of the Duel
+	--At the start of the Duel, flip this card over
 	local e1=Effect.CreateEffect(c)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
 	e1:SetCode(EVENT_STARTUP)
 	e1:SetCountLimit(1)
 	e1:SetRange(0x5f)
-	e1:SetLabel(0)
 	e1:SetOperation(s.flipop)
 	c:RegisterEffect(e1)
 end
@@ -20,82 +19,60 @@ function s.flipop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SKILL_FLIP,tp,id|(1<<32))
 	Duel.Hint(HINT_CARD,tp,id)
 	local c=e:GetHandler()
-	--Special Summon 1 "Elemental HERO Neos" from your hand
+	--If only your opponent controls a monster, you can Special Summon 1 "Elemental HERO Neos" from your hand, also for the rest of this turn, you cannot Special Summon, except "Elemental HERO" or "Neo-Spacian" monsters
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetRange(0x5f)
-	e1:SetCondition(s.spcon1)
-	e1:SetOperation(s.spop1)
+	e1:SetCountLimit(1,{id,0},EFFECT_COUNT_CODE_DUEL)
+	e1:SetCondition(s.handspcon)
+	e1:SetOperation(s.handspop)
 	Duel.RegisterEffect(e1,tp)
-	--Special Summon 1 "Elemental HERO Neos" from your Deck
+	--During your End Phase, if a Fusion Monster you control is returned to your Extra Deck, you can Special Summon 1 "Elemental HERO Neos" from your Deck
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_PHASE+PHASE_END)
-	e2:SetRange(0x5f)
-	e2:SetCondition(s.spcon2)
-	e2:SetOperation(s.spop2)
+	e2:SetCode(EVENT_TO_DECK)
+	e2:SetCountLimit(1,{id,1},EFFECT_COUNT_CODE_DUEL)
+	e2:SetCondition(s.deckspcon)
+	e2:SetOperation(s.deckspop)
 	Duel.RegisterEffect(e2,tp)
-	--Check for Fusion Monsters returning to the Extra Deck
-	aux.GlobalCheck(s,function()
-		local ge1=Effect.CreateEffect(e:GetHandler())
-		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_TO_DECK)
-		ge1:SetCondition(function(_,tp) return Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_END end)
-		ge1:SetOperation(s.checkop)
-		Duel.RegisterEffect(ge1,0)
-		local ge2=Effect.CreateEffect(e:GetHandler())
-		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge2:SetCode(EVENT_SPSUMMON_SUCCESS)
-		ge2:SetCondition(s.resetflagcon)
-		ge2:SetOperation(function(_,tp) Duel.ResetFlagEffect(tp,id) end)
-		Duel.RegisterEffect(ge2,0)
-	end)
 end
---Checks for Fusion Monsters to be returned to the Extra Deck
-function s.checkop(e,tp,eg,ep,ev,re,r,rp)
-	if eg:IsExists(Card.IsType,1,nil,TYPE_FUSION) and #eg==1 and eg:GetFirst():IsLocation(LOCATION_EXTRA) then
-		Duel.RegisterFlagEffect(tp,id,RESET_PHASE|PHASE_END,0,1)
-	end
-end
---Checks for "Elemental HERO Neos" Special Summoned by this Skill
-function s.resetflagcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:GetFirst():IsOriginalCode(CARD_NEOS) and re and re:GetHandler():IsCode(id)
-end
---"Elemental HERO Neos" Special Summon filter
 function s.spfilter(c,e,tp)
 	return c:IsCode(CARD_NEOS) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
---Special Summon from hand functions
-function s.spcon1(e,tp,eg,ep,ev,re,r,rp)
-	return aux.CanActivateSkill(tp) and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 and Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
+function s.handspcon(e,tp,eg,ep,ev,re,r,rp)
+	return aux.CanActivateSkill(tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
+		and Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0
+		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
 end
-function s.spop1(e,tp,eg,ep,ev,re,r,rp)
+function s.handspop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.SelectYesNo(tp,aux.Stringid(id,0)) then return end
-	--Special Summon 1 "Elemental HERO Neos" from your hand
+	Duel.Hint(HINT_CARD,0,id)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 	if #g>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
-	--Cannot Special Summon, except "Elemental HERO" and "Neo-Spacian" monsters, until the End Phase
+	--For the rest of this turn, you cannot Special Summon, except "Elemental HERO" or "Neo-Spacian" monsters
 	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetDescription(aux.Stringid(id,2))
+	e1:SetDescription(aux.Stringid(id,1))
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e1:SetTargetRange(1,0)
-	e1:SetTarget(function(_,c) return not (c:IsSetCard(SET_ELEMENTAL_HERO) or c:IsSetCard(SET_NEO_SPACIAN)) end)
+	e1:SetTarget(function(e,c) return not c:IsSetCard({SET_ELEMENTAL_HERO,SET_NEO_SPACIAN}) end)
 	e1:SetReset(RESET_PHASE|PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
---Special Summon from Deck functions
-function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,id)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
+function s.deckspconfilter(c,tp)
+	return c:IsFusionMonster() and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) and c:IsControler(tp)
+end
+function s.deckspcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsEndPhase(tp) and eg:IsExists(s.deckspconfilter,1,nil,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
 end
-function s.spop2(e,tp,eg,ep,ev,re,r,rp)
-	if not Duel.SelectYesNo(tp,aux.Stringid(id,1)) then return end
-	--Special Summon 1 "Elemental HERO Neos" from your Deck
+function s.deckspop(e,tp,eg,ep,ev,re,r,rp)
+	if not Duel.SelectYesNo(tp,aux.Stringid(id,2)) then return end
+	Duel.Hint(HINT_CARD,0,id)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 	if #g>0 then