Merge branch 'master' of github.com:purerosefallen/ygopro-222DIY-cards

expansions/script/c1000417.lua

@@ -41,11 +41,9 @@ function c1000417.filter1(c)
 	return c:IsType(TYPE_CONTINUOUS) and c:IsFaceup() and c:IsAbleToGrave() and not c:IsCode(1000417)
 end
 function c1000417.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c1000417.filter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
-	local g=Duel.GetMatchingGroup(c1000417.filter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
-	local g=Duel.GetMatchingGroup(c1000417.filter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
-	Duel.SendtoGrave(g,REASON_EFFECT)
+	if chk==0 then return Duel.IsExistingMatchingCard(c1000417.filter1,tp,LOCATION_SZONE,LOCATION_SZONE,1,nil,e,tp) end
+	local g=Duel.GetMatchingGroup(c1000417.filter1,tp,LOCATION_SZONE,LOCATION_SZONE,nil)
+	Duel.SendtoGrave(g,REASON_COST)
 end
 function c1000417.activate(e,tp,eg,ep,ev,re,r,rp)
 	--destroy

expansions/script/c26807032.lua

@@ -153,7 +153,11 @@ function c26807032.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c26807032.cfilter,tp,LOCATION_ONFIELD,0,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,c26807032.cfilter,tp,LOCATION_ONFIELD,0,1,1,nil,tp)
+	if Duel.IsPlayerAffectedByEffect(tp,26807041) then
+		Duel.Remove(g,POS_FACEDOWN,REASON_COST)
+	else
 		Duel.Remove(g,POS_FACEUP,REASON_COST)
+	end
 end
 function c26807032.spfilter(c,e,tp)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c81012029.lua

@@ -51,11 +51,11 @@ function c81012029.drcon(e,tp,eg,ep,ev,re,r,rp)
 	local des=eg:GetFirst()
 	if des:IsReason(REASON_BATTLE) then
 		local rc=des:GetReasonCard()
-		return rc and rc:IsType(TYPE_RITUAL) and re:IsType(TYPE_PENDULUM) and rc:IsControler(tp) and rc:IsRelateToBattle()
+		return rc and rc:IsType(TYPE_RITUAL) and rc:IsType(TYPE_PENDULUM) and rc:IsControler(tp) and rc:IsRelateToBattle()
 	elseif re then
 		local rc=re:GetHandler()
 		return eg:IsExists(c81012029.cfilter,1,nil,tp)
-			and rc and rc:IsType(TYPE_RITUAL) and re:IsType(TYPE_PENDULUM) and rc:IsControler(tp) and re:IsActiveType(TYPE_MONSTER)
+			and rc and rc:IsType(TYPE_RITUAL) and rc:IsType(TYPE_PENDULUM) and rc:IsControler(tp) and re:IsActiveType(TYPE_MONSTER)
 	end
 	return false
 end

expansions/script/c9980237.lua

@@ -41,7 +41,7 @@ function c9980237.initial_effect(c)
 	e4:SetDescription(aux.Stringid(9980237,0))
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_LEAVE_FIELD)
-	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
+	e4:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetCondition(c9980237.spcon)

expansions/script/c9980512.lua

@@ -16,7 +16,7 @@ function c9980513.cfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcbcc)
 end
 function c9980512.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() andDuel.IsExistingMatchingCard(c9980513.cfilter,tp,LOCATION_PZONE+LOCATION_MZONE,0,1,nil)
+	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() and Duel.IsExistingMatchingCard(c9980513.cfilter,tp,LOCATION_PZONE+LOCATION_MZONE,0,1,nil)
 end
 function c9980512.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0x5bcc)

expansions/script/c9980590.lua

@@ -79,7 +79,7 @@ function c9980590.op(e,tp,eg,ep,ev,re,r,rp)
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_UPDATE_DEFENSE)
 	Duel.RegisterEffect(e2,tp)
-	Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
+	Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 end
 function c9980590.filter1(e,c)
 	return c:IsSetCard(0x6bca)