Update c24100.lua

script/c24100.lua

@@ -8,16 +8,17 @@ function c24100.initial_effect(c)
 	e1:SetDescription(aux.Stringid(24100,1))
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetRange(LOCATION_EXTRA)
 	e1:SetCondition(c24100.sprcon)
+	e1:SetTarget(c24100.sprtg)
 	e1:SetOperation(c24100.sprop)
 	c:RegisterEffect(e1)
 	--sp
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(24100,2))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CAN_FORBIDDEN)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(c24100.spcon)
@@ -26,10 +27,9 @@ function c24100.initial_effect(c)
 	c:RegisterEffect(e2)
 	--direct attack
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_TOGRAVE)
 	e3:SetDescription(aux.Stringid(24100,3))
 	e3:SetType(EFFECT_TYPE_IGNITION)
-	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CAN_FORBIDDEN)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c24100.dcon)
@@ -41,43 +41,33 @@ function c24100.initial_effect(c)
 	e4:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
 	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	c:RegisterEffect(e4)
-	--inactivatable
-	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_SINGLE)
-	e5:SetCode(EFFECT_CANNOT_DISABLE)
-	e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_RANGE)
-	e5:SetValue(1)
-	c:RegisterEffect(e5)
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_FIELD)
-	e6:SetCode(EFFECT_CANNOT_INACTIVATE)
-	e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_RANGE)
-	e6:SetValue(c24100.effectfilter)
-	c:RegisterEffect(e6)
+end
+function c24100.fselect(g,tp,sc)
+	return g:GetCount()==2 and Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
 end
 function c24100.sprfilter(c)
-	return c:IsSetCard(0x514a) and c:IsFaceup()
+	return c:IsSetCard(0x514a) and c:IsFaceup() and c:IsAbleToGraveAsCost()
 end
 function c24100.sprcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.GetLocationCount(tp,LOCATION_MZONE)>-2
-		and Duel.IsExistingMatchingCard(c24100.sprfilter,tp,LOCATION_MZONE,LOCATION_MZONE,2,nil,tp)
-		and not (Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 and not Duel.IsExistingMatchingCard(c24100.sprfilter,tp,LOCATION_MZONE,0,1,nil,tp))
+	local rg=Duel.GetMatchingGroup(c24100.sprfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+	return rg:CheckSubGroup(c24100.fselect,2,2,tp,c)
+end
+function c24100.sprtg(e,tp,eg,ep,ev,re,r,rp,chk,c)
+	local rg=Duel.GetMatchingGroup(c24100.sprfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
+	local sg=rg:SelectSubGroup(tp,c24100.fselect,true,2,2,tp,c)
+	if sg then
+		sg:KeepAlive()
+		e:SetLabelObject(sg)
+		return true
+	else return false end
 end
 function c24100.sprop(e,tp,eg,ep,ev,re,r,rp,c)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local g1=Duel.SelectMatchingCard(tp,c24100.sprfilter,tp,LOCATION_MZONE,0,1,1,nil)
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local g2=Duel.SelectMatchingCard(tp,c24100.sprfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
-		g1:Merge(g2)
-		Duel.SendtoGrave(g1,REASON_COST)
-	else
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local g=Duel.SelectMatchingCard(tp,c24100.sprfilter,tp,LOCATION_MZONE,LOCATION_MZONE,2,2,nil)
-		Duel.SendtoGrave(g,REASON_COST)
-	end
+	local g=e:GetLabelObject()
+    Duel.SendtoGrave(g,REASON_SPSUMMON)
+	g:DeleteGroup()
 end
 function c24100.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO 
@@ -128,7 +118,3 @@ end
 function c24100.aclimit(e,re,tp)
 	return re:IsActiveType(TYPE_MONSTER)
 end
\ No newline at end of file
-function c24100.effectfilter(e,ct)
-	local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)
-	return e:GetHandler()==te:GetHandler()
-end
\ No newline at end of file