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

expansions/script/c13257301.lua

@@ -31,6 +31,7 @@ function c13257301.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257301.bgmop)
 	c:RegisterEffect(e11)
+	c13257301[c]=e2
 end
 function c13257301.eqfilter(c,ec)
 	return c:IsSetCard(0x352) and c:IsType(TYPE_MONSTER) and c:CheckEquipTarget(ec)

expansions/script/c13257303.lua

@@ -31,6 +31,7 @@ function c13257303.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257303.bgmop)
 	c:RegisterEffect(e11)
+	c13257303[c]=e3
 	
 end
 function c13257303.eqfilter(c,ec)

expansions/script/c13257304.lua

@@ -32,6 +32,7 @@ function c13257304.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257304.bgmop)
 	c:RegisterEffect(e11)
+	c13257304[c]=e2
 	
 end
 function c13257304.spcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c13257305.lua

@@ -37,6 +37,7 @@ function c13257305.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257305.bgmop)
 	c:RegisterEffect(e11)
+	c13257305[c]=e2
 	
 end
 function c13257305.necon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c13257306.lua

@@ -33,6 +33,7 @@ function c13257306.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257306.bgmop)
 	c:RegisterEffect(e11)
+	c13257306[c]=e2
 	
 end
 function c13257306.spcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c13257314.lua

@@ -34,6 +34,7 @@ function c13257314.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257314.bgmop)
 	c:RegisterEffect(e11)
+	c13257314[c]=e3
 	
 end
 function c13257314.feqfilter(c,ec)

expansions/script/c13257317.lua

@@ -33,6 +33,7 @@ function c13257317.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257317.bgmop)
 	c:RegisterEffect(e11)
+	c13257317[c]=e2
 	
 end
 function c13257317.spcon(e,c)

expansions/script/c13257318.lua

@@ -46,6 +46,7 @@ function c13257318.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257318.bgmop)
 	c:RegisterEffect(e11)
+	c13257318[c]=e4
 	
 end
 function c13257318.eqtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c13257319.lua

@@ -39,6 +39,7 @@ function c13257319.initial_effect(c)
 	e4:SetTarget(c13257319.pctg)
 	e4:SetOperation(c13257319.pcop)
 	c:RegisterEffect(e4)
+	c13257319[c]=e4
 	
 end
 function c13257319.cfilter(c,tp)

expansions/script/c13257320.lua

@@ -34,6 +34,7 @@ function c13257320.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257320.bgmop)
 	c:RegisterEffect(e11)
+	c13257320[c]=e2
 	
 end
 function c13257320.spcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c13257321.lua

@@ -35,6 +35,7 @@ function c13257321.initial_effect(c)
 	e11:SetCode(EVENT_SUMMON_SUCCESS)
 	e11:SetOperation(c13257321.bgmop)
 	c:RegisterEffect(e11)
+	c13257321[c]=e2
 	
 end
 function c13257321.eqfilter(c,ec)
@@ -124,8 +125,14 @@ end
 function c13257321.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()
 end
+function c13257321.acfilter(c)
+	return c:IsFaceup() and (c:GetAttack()>0 or c:GetDefense()>0)
+end
+function c13257321.desfilter(c)
+	return c:IsFaceup() and (c:GetAttack()==0 or c:GetDefense()==0)
+end
 function c13257321.bombop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
+	local g=Duel.GetMatchingGroup(c13257321.acfilter,tp,0,LOCATION_MZONE,nil)
 	if g:GetCount()>0 then
 		local sc=g:GetFirst()
 		while sc do
@@ -140,6 +147,11 @@ function c13257321.bombop(e,tp,eg,ep,ev,re,r,rp)
 			sc:RegisterEffect(e2)
 			sc=g:GetNext()
 		end
+		g=Duel.GetMatchingGroup(c13257324.desfilter,tp,0,LOCATION_MZONE,nil)
+		if g:GetCount()>0 then
+			Duel.BreakEffect()
+			Duel.Destroy(g,REASON_EFFECT)
+		end
 	end
 end
 function c13257321.bgmop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c13257325.lua

@@ -20,7 +20,7 @@ function c13257325.initial_effect(c)
 	--atkup
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e3:SetRange(LOCATION_MZONE)
+	e3:SetRange(LOCATION_SZONE)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c13257325.atkcon)
@@ -30,8 +30,14 @@ function c13257325.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e4:SetCode(EVENT_BATTLED)
+	e4:SetRange(LOCATION_SZONE)
 	e4:SetOperation(c13257325.retop)
 	c:RegisterEffect(e4)
+	--Pierce
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_EQUIP)
+	e5:SetCode(EFFECT_PIERCE)
+	c:RegisterEffect(e5)
 	
 end
 function c13257325.eqlimit(e,c)

expansions/script/c66612323.lua

@@ -70,17 +70,17 @@ end
 function c66612323.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c66612323.afilter,1,nil,tp)
 end
-function c66612323.cfilter(c,tp)
+function c66612323.cfilter(c,e,tp)
 	return c:IsFaceup() and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x666) and c:IsType(TYPE_TUNER) and c:IsAbleToGraveAsCost() and Duel.IsExistingMatchingCard(c66612323.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp,Group.FromCards(c))
 end
 function c66612323.bfilter(c)
 	return c:IsAbleToGraveAsCost()
 end
 function c66612323.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c66612323.cfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if chk==0 then return Duel.IsExistingMatchingCard(c66612323.cfilter,tp,LOCATION_MZONE,0,1,nil,e,tp)
 		and Duel.IsExistingMatchingCard(c66612323.bfilter,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g1=Duel.SelectMatchingCard(tp,c66612323.cfilter,tp,LOCATION_MZONE,0,1,1,nil,tp)
+	local g1=Duel.SelectMatchingCard(tp,c66612323.cfilter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g2=Duel.SelectMatchingCard(tp,c66612323.bfilter,tp,LOCATION_HAND,0,1,1,nil)
 	g1:Merge(g2)