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

expansions/script/c33401005.lua

@@ -29,7 +29,7 @@ function cm.repfilter(c,tp)
 		and c:IsOnField() and c:IsControler(tp) and c:IsReason(REASON_EFFECT+REASON_BATTLE) and not c:IsReason(REASON_REPLACE)
 end
 function cm.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToRemove() and eg:IsExists(cm.repfilter,1,c:IsCode(m),tp) end
+	if chk==0 then return e:GetHandler():IsAbleToRemove() and eg:IsExists(cm.repfilter,1,e:GetHandler():IsCode(m),tp) end
 	return Duel.SelectEffectYesNo(tp,e:GetHandler(),96)
 end
 function cm.repval(e,c)

expansions/script/c33500201.lua

@@ -30,8 +30,11 @@ end
 function cm.tezhao(c,e,tp)
 	return c:IsDiscardable() and not c:IsCode(m)
 end
+function cm.spfilter1(c,e,tp)
+	return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end
 function cm.diuka(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 and Duel.IsExistingMatchingCard(cm.tezhao,tp,LOCATION_HAND,0,1,nil) end
+	if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 and Duel.IsExistingMatchingCard(cm.tezhao,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil,e,tp) end
 	Duel.DiscardHand(tp,cm.tezhao,1,1,REASON_COST+REASON_DISCARD)
 end
 function cm.tezhao1(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c53703005.lua

@@ -167,6 +167,7 @@ function c53703005.top(e,tp,eg,ep,ev,re,r,rp)
 		e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 		e5:SetCode(EVENT_BATTLE_DESTROYING)
 		e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e5:SetCountLimit(1)
 		e5:SetOperation(c53703005.bdop)
 		e:GetHandler():RegisterEffect(e5)
 		e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(53703005,2))

expansions/script/c53703009.lua

@@ -55,7 +55,7 @@ function c53703009.lcheck(g)
 	return g:IsExists(c53703009.sfilter,1,nil)
 end
 function c53703009.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function c53703009.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
@@ -84,12 +84,12 @@ function c53703009.penfilter(c,e,tp)
 	return c:IsSetCard(0x533) and c:IsType(TYPE_PENDULUM) and not c:IsForbidden()
 end
 function c53703009.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local b1=Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)
 	local b2=Duel.IsExistingMatchingCard(c53703009.penfilter,tp,LOCATION_HAND,0,1,nil) and Duel.GetTurnPlayer()~=tp
 	local b3=Duel.IsExistingMatchingCard(c53703009.penfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) and Duel.GetTurnPlayer()==tp
-	if chk==0 then return (b1 and (b2 or b3)) end
+	if chk==0 then return b2 or b3 end
 end
 function c53703009.spop(e,tp,eg,ep,ev,re,r,rp)
+	if not Duel.GetFieldCard(tp,LOCATION_PZONE,0) and not Duel.GetFieldCard(tp,LOCATION_PZONE,1) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	if Duel.GetTurnPlayer()~=tp then
 		local g=Duel.SelectMatchingCard(tp,c53703009.penfilter,tp,LOCATION_HAND,0,1,1,nil)

expansions/script/c60152702.lua

@@ -73,18 +73,16 @@ function c60152702.e3op(e,tp,eg,ep,ev,re,r,rp)
     if cg:GetCount()==0 then return end
     Duel.ConfirmCards(1-tp,cg)
 	local tc=cg:GetFirst()
-	if tc:IsRelateToEffect(e) then
-        local e1=Effect.CreateEffect(e:GetHandler())
-        e1:SetType(EFFECT_TYPE_SINGLE)
-        e1:SetCode(EFFECT_CHANGE_RACE)
-        e1:SetValue(RACE_MACHINE)
-        e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-        tc:RegisterEffect(e1)
-		local e2=Effect.CreateEffect(e:GetHandler())
-        e2:SetType(EFFECT_TYPE_SINGLE)
-        e2:SetCode(EFFECT_CHANGE_RANK)
-        e2:SetValue(8)
-        e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-        tc:RegisterEffect(e2)
-    end
+	local e1=Effect.CreateEffect(e:GetHandler())
+    e1:SetType(EFFECT_TYPE_SINGLE)
+    e1:SetCode(EFFECT_CHANGE_RACE)
+    e1:SetValue(RACE_MACHINE)
+    e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+    tc:RegisterEffect(e1)
+	local e2=Effect.CreateEffect(e:GetHandler())
+    e2:SetType(EFFECT_TYPE_SINGLE)
+    e2:SetCode(EFFECT_CHANGE_RANK)
+    e2:SetValue(8)
+    e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+    tc:RegisterEffect(e2)
 end
\ No newline at end of file

expansions/script/c66915031.lua

@@ -158,6 +158,7 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
     local rc=re:GetHandler()
     if Duel.NegateEffect(ev) and c:IsRelateToEffect(e) and c:IsType(TYPE_XYZ) then
+        rc:CancelToGrave()
         Duel.Overlay(c,Group.FromCards(rc))
     end
 end