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

expansions/script/c13257305.lua

@@ -184,7 +184,7 @@ function c13257305.discon(e,tp,eg,ep,ev,re,r,rp)
 	if not g or g:GetCount()==0 then return false end
 	local tg=g:GetFirst()
 	local c=e:GetHandler()
-	return tg~=c and tg:IsFaceup() and tg:IsSetCard(0x351) and tg:IsType(TYPE_MONSTER)
+	return tg:IsFaceup() and tg:IsSetCard(0x351) and tg:IsType(TYPE_MONSTER)
 end
 function c13257305.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c13257328.lua

@@ -21,7 +21,7 @@ function c13257328.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_EQUIP)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
-	e1:SetValue(500)
+	e1:SetValue(200)
 	c:RegisterEffect(e1)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(13257328,0))

expansions/script/c13257330.lua

@@ -53,7 +53,7 @@ function c13257330.leftfilter(c,seq)
 	return c:GetSequence()>4-seq and c:GetSequence()<=5
 end
 function c13257330.rightfilter(c,seq)
-	return c:GetSequence()<4-seq or c:GetSequence()==5
+	return c:GetSequence()<4-seq
 end
 function c13257330.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ec=e:GetHandler():GetEquipTarget()

expansions/script/c22230123.lua

@@ -55,7 +55,7 @@ function c22230123.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c22230123.negop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.ChangePosition(e:GetHandler(),POS_FACEDOWN_DEFENSE)>0 then
-		if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
+		if Duel.NegateActivation(ev) then
 			Duel.SendtoHand(eg,nil,REASON_EFFECT)
 		end
 	end
@@ -75,6 +75,10 @@ end
 function c22230123.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and tc:IsFacedown() then
+		local og=tc:GetOverlayGroup()
+		if og:GetCount()>0 then
+			Duel.SendtoGrave(og,REASON_RULE)
+		end
 		Duel.Overlay(e:GetHandler(),tc)
 		if e:GetLabel()==1 and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_EFFECT) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(22230123,2)) then
 			e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_EFFECT)
@@ -84,8 +88,4 @@ function c22230123.tdop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c22230123.flipop(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterFlagEffect(22230123,0,0,0)
-end
-
+end
\ No newline at end of file
-
-
-

expansions/script/c33700067.lua

@@ -102,6 +102,7 @@ function c33700067.con(e)
 			e:GetHandler():RegisterFlagEffect(33700067,0x1fe1000,0,1)
 			Duel.Hint(11,0,aux.Stringid(33700067,0))
 		end
+		return true
 	else
 		return false
 	end