Update "Slimey Disposition"

Script clean-up

Author: TheRazgriz

skill/c300307016.lua

@@ -4,55 +4,46 @@ local s,id=GetID()
 function s.initial_effect(c)
 	aux.AddSkillProcedure(c,1,false,s.flipcon,s.flipop)
 end
-s.listed_names={46821314,73216412,5600127}
+s.listed_names={46821314,73216412,5600127} --"Humanoid Slime","Worm Drake", "Humanoid Worm Drake"
 function s.flipcon(e,tp,eg,ep,ev,re,r,rp)
-	--condition for the first effect:
-	local b1=Duel.GetFlagEffect(tp,id)==0
-		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
-	--condition for the second effect:
-	local params={fusfilter=s.fusmonfilter,
-					matfilter=Fusion.OnFieldMat,
-					extrafil=s.extrafusmat,
-					extratg=s.extratarget}
-	local b2=Duel.GetFlagEffect(tp,id+100)==0 and Fusion.SummonEffTG(params)(e,tp,eg,ep,ev,re,r,rp,0)
+	--Special Summon from GY condition:
+	local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) and not Duel.HasFlagEffect(tp,id)
+	--Fusion Summon condition:
+	local params={fusfilter=aux.FilterBoolFunction(Card.IsCode,5600127),
+			matfilter=Fusion.OnFieldMat,
+			extrafil=s.extrafusmat,
+			extratg=s.extratarget}
+	local b2=Fusion.SummonEffTG(params)(e,tp,eg,ep,ev,re,r,rp,0) and not Duel.HasFlagEffect(tp,id+100)
 	return aux.CanActivateSkill(tp) and (b1 or b2)
 end
 --Special Summon Function
 function s.spfilter(c,e,tp)
 	return c:IsCode(46821314,73216412) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK)
 end
 --Fusion Summon functions
-function s.fusmonfilter(c)
-	return c:IsCode(5600127)
+function s.extrafusmat(e,tp,mg)
+	return Duel.GetMatchingGroup(Card.IsAbleToGrave,tp,LOCATION_DECK,0,nil),s.specialcheck
 end
 function s.specialcheck(tp,sg,fc)
 	return sg:GetClassCount(Card.GetLocation,nil)==#sg
 end
-function s.extrafusmat(e,tp,mg)
-	return Duel.GetMatchingGroup(Card.IsAbleToGrave,tp,LOCATION_DECK,0,nil),s.specialcheck
-end
 function s.extratarget(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
-	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
+	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST|REASON_DISCARD)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,0,tp,LOCATION_DECK)
 end
 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)
 	--For the Special Summon
-	local b1=Duel.GetFlagEffect(tp,id)==0
-		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
+	local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) and not Duel.HasFlagEffect(tp,id)
 	--For the Fusion Summon
-	local params={fusfilter=s.fusmonfilter,
-					matfilter=Fusion.OnFieldMat,
-					extrafil=s.extrafusmat,
-					extratg=s.extratarget}
-	local b2=Duel.GetFlagEffect(tp,id+100)==0 and Fusion.SummonEffTG(params)(e,tp,eg,ep,ev,re,r,rp,0)
-	local op=Duel.SelectEffect(tp,
-			{b1,aux.Stringid(id,0)},
-			{b2,aux.Stringid(id,1)})
+	local params={fusfilter=aux.FilterBoolFunction(Card.IsCode,5600127),
+			matfilter=Fusion.OnFieldMat,
+			extrafil=s.extrafusmat,
+			extratg=s.extratarget}
+	local b2=Fusion.SummonEffTG(params)(e,tp,eg,ep,ev,re,r,rp,0) and not Duel.HasFlagEffect(tp,id+100)
+	local op=Duel.SelectEffect(tp,{b1,aux.Stringid(id,0)},{b2,aux.Stringid(id,1)})
 	if op==1 then
 		--OPT Register (Special Summon from GY)
 		Duel.RegisterFlagEffect(tp,id,RESET_PHASE|PHASE_END,0,1)
@@ -75,10 +66,10 @@ function s.flipop(e,tp,eg,ep,ev,re,r,rp)
 			sc:RegisterEffect(e2)
 		end
 	else
-		--Fusion Summon "Humanoid Worm Drake"
-		Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1)
 		--OPT Register (Fusion Summon)
+		Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1)
+		--Fusion Summon "Humanoid Worm Drake"
 		Fusion.SummonEffTG(params)(e,tp,eg,ep,ev,re,r,rp,1)
 		Fusion.SummonEffOP(params)(e,tp,eg,ep,ev,re,r,rp,1)
 	end
-end
+end