Merge branch 'master' of https://github.com/alstroemeria-silentlove/ygopro-222DIY-cards

expansions/script/c1150042.lua

@@ -60,6 +60,7 @@ function c1150042.op2(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function c1150042.op3(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local e3_1=Effect.CreateEffect(c)
 	e3_1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e3_1:SetCode(EVENT_DAMAGE)

expansions/script/c12006001.lua

@@ -54,7 +54,6 @@ function c12006001.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006001.filter(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006001) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006004.lua

@@ -61,7 +61,6 @@ function c12006004.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006004.filter(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006004) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006006.lua

@@ -46,7 +46,6 @@ function c12006006.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006006.filter(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006006) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006008.lua

@@ -25,7 +25,6 @@ function c12006008.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006008.filter(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006008) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006009.lua

@@ -72,7 +72,6 @@ function c12006009.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006009.filter3(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006009) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006020.lua

@@ -87,7 +87,6 @@ function c12006020.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006020.filter1(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006020) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006021.lua

@@ -45,7 +45,6 @@ function c12006021.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006021.filter(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006021) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12006022.lua

@@ -63,7 +63,6 @@ function c12006022.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE)
 		or rp==1-tp and c:IsReason(REASON_DESTROY))
-		and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c12006022.filter1(c,e,tp)
 	return c:IsSetCard(0x8fbd) and not c:IsCode(12006022) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c12008030.lua

@@ -27,11 +27,12 @@ function c12008030.initial_effect(c)
 	c:RegisterEffect(e2)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(12008030,1))
+	e1:SetDescription(aux.Stringid(12008030,1))
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
-	e1:SetCondition(aux.exccon)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetCost(aux.exccon)
 	e1:SetCondition(c12008030.condition)
 	e1:SetTarget(c12008030.target)
 	e1:SetOperation(c12008030.operation)
@@ -75,7 +76,7 @@ function c12008030.spop1(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c12008030.spfilter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetLevel())
+	local g=Duel.SelectMatchingCard(tp,c12008030.spfilter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetAttribute())
 	local sc=g:GetFirst()
 	if sc then
 		local mg=tc:GetOverlayGroup()

expansions/script/c12010026.lua

@@ -113,7 +113,10 @@ function c12010026.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
 function c12010026.operation(e,tp,eg,ep,ev,re,r,rp)
-	  Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
+	end
 end
 
 

expansions/script/c12011000.lua

@@ -63,10 +63,10 @@ function c12011000.efop(e,tp,eg,ep,ev,re,r,rp)
 		rc:RegisterEffect(e2,true)
 	end
 end
-function c12011000.target(e,c)
+function c12011000.target(e,rc)
 	local g,te=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS,CHAININFO_TRIGGERING_EFFECT)
 	return not (te and te:IsHasProperty(EFFECT_FLAG_CARD_TARGET))
-		or not (g and g:IsContains(c))
+		or not (g and g:IsContains(rc))
 end
 function c12011000.efilter(e,te)
 	return te:GetOwnerPlayer()~=e:GetHandlerPlayer()