Updated some card scripts to use the new "Cost.AND" function

Author: pyrQ

official/c11441009.lua

@@ -14,7 +14,7 @@ function s.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,id)
-	e1:SetCost(s.drcost)
+	e1:SetCost(Cost.AND(Cost.PayLP(600),Cost.Detach(1)))
 	e1:SetTarget(s.drtg)
 	e1:SetOperation(s.drop)
 	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
@@ -44,13 +44,6 @@ function s.xyzop(e,tp,chk)
 	Duel.RegisterFlagEffect(tp,id,RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1)
 	return true
 end
-function s.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local pay=aux.PayLPCost(600)
-	local detach=aux.dxmcostgen(1,1)
-	if chk==0 then return pay(e,tp,eg,ep,ev,re,r,rp,chk) and detach(e,tp,eg,ep,ev,re,r,rp,chk) end
-	pay(e,tp,eg,ep,ev,re,r,rp,chk)
-	detach(e,tp,eg,ep,ev,re,r,rp,chk)
-end
 function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)

official/c78693036.lua

@@ -32,7 +32,7 @@ function s.initial_effect(c)
 	e2:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E)
 	e2:SetCountLimit(1,id)
 	e2:SetCondition(function(e,tp) return Duel.IsTurnPlayer(1-tp) end)
-	e2:SetCost(s.descost)
+	e2:SetCost(Cost.AND(Cost.PayLP(1500),Cost.SelfTribute))
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
 	c:RegisterEffect(e2)
@@ -43,12 +43,6 @@ function s.lpop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Recover(tp,300,REASON_EFFECT)
 	end
 end
-function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return Duel.CheckLPCost(tp,1500) and c:IsReleasable() end
-	Duel.PayLPCost(tp,1500)
-	Duel.Release(c,REASON_COST)
-end
 function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g1=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
 	local g2=Duel.GetMatchingGroup(aux.FaceupFilter(Card.IsSpellTrap),tp,0,LOCATION_ONFIELD,nil)
@@ -65,11 +59,13 @@ end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local op=e:GetLabel()
 	if op==1 then
+		--Destroy all face-up monsters your opponent controls
 		local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
 		if #g>0 then
 			Duel.Destroy(g,REASON_EFFECT)
 		end
 	elseif op==2 then
+		--Destroy all face-up Spells/Traps your opponent controls
 		local g=Duel.GetMatchingGroup(aux.FaceupFilter(Card.IsSpellTrap),tp,0,LOCATION_ONFIELD,nil)
 		if #g>0 then
 			Duel.Destroy(g,REASON_EFFECT)

official/c97476032.lua

@@ -10,7 +10,7 @@ function s.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,id)
-	e1:SetCost(s.spcost)
+	e1:SetCost(Cost.AND(s.wateronlycost,Cost.Discard(aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER),true)))
 	e1:SetTarget(s.sptg)
 	e1:SetOperation(s.spop)
 	c:RegisterEffect(e1)
@@ -54,12 +54,6 @@ function s.wateronlycost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetReset(RESET_PHASE|PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local discard=aux.DiscardCost(function(c) return c:IsAttribute(ATTRIBUTE_WATER) end,true)
-	if chk==0 then return discard(e,tp,eg,ep,ev,re,r,rp,chk) and s.wateronlycost(e,tp,eg,ep,ev,re,r,rp,chk) end
-	discard(e,tp,eg,ep,ev,re,r,rp,chk)
-	s.wateronlycost(e,tp,eg,ep,ev,re,r,rp,chk)
-end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0