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

expansions/script/c12037020.lua

@@ -14,13 +14,13 @@ function c12037020.initial_effect(c)
 end
 --
 function c12037020.tfilter1_1(c,e,tp)
-	local rk=c:GetRank()
-	return rk>0 and c:IsFaceup()
+	return c:IsType(TYPE_XYZ) and c:IsFaceup()
 		and Duel.IsExistingMatchingCard(c12037020.tfilter1_2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c)
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function c12037020.tfilter1_2(c,e,tp,mc)
 	return (c:IsRace(RACE_WINDBEAST) or c:IsSetCard(0x2fb5))
+		and c:IsType(TYPE_XYZ)
 		and mc:IsCanBeXyzMaterial(c)
 		and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
@@ -33,6 +33,7 @@ function c12037020.tfilter1_3(c,e,tp)
 end
 function c12037020.tfilter1_4(c,e,tp,mc)
 	return c:IsSetCard(0x2fb5)
+		and c:IsType(TYPE_XYZ)
 		and mc:IsCanBeXyzMaterial(c)
 		and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)

expansions/script/c47530149.lua

@@ -25,17 +25,18 @@ function c47530149.initial_effect(c)
     c:RegisterEffect(e2)
     Duel.AddCustomActivityCounter(47530149,ACTIVITY_SPSUMMON,c47530149.counterfilter) 
     --luncher
-    local e2=Effect.CreateEffect(c)
-    e2:SetDescription(aux.Stringid(47530149,1))
-    e2:SetCategory(CATEGORY_DISABLE)
-    e2:SetType(EFFECT_TYPE_QUICK_O)
-    e2:SetCode(EVENT_FREE_CHAIN)
-    e2:SetRange(LOCATION_MZONE)
-    e2:SetCondition(c47530149.discon)
-    e2:SetCost(c47530149.discost)
-    e2:SetTarget(c47530149.distg)
-    e2:SetOperation(c47530149.disop)
-    c:RegisterEffect(e2)
+    local e3=Effect.CreateEffect(c)
+    e3:SetDescription(aux.Stringid(47530149,1))
+    e3:SetCategory(CATEGORY_DISABLE)
+    e3:SetType(EFFECT_TYPE_QUICK_O)
+    e3:SetCode(EVENT_FREE_CHAIN)
+    e3:SetRange(LOCATION_MZONE)
+    e3:SetCountLimit(1,47530149)
+    e3:SetCondition(c47530149.discon)
+    e3:SetCost(c47530149.discost)
+    e3:SetTarget(c47530149.distg)
+    e3:SetOperation(c47530149.disop)
+    c:RegisterEffect(e3)
 end
 function c47530149.counterfilter(c)
     return c:IsRace(RACE_MACHINE)

expansions/script/c47530157.lua

@@ -60,7 +60,7 @@ function c47530157.efop(e,tp,eg,ep,ev,re,r,rp)
     local e1=Effect.CreateEffect(c)
     e1:SetDescription(aux.Stringid(47530157,1))
     e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
     e1:SetCode(EFFECT_CANNOT_ACTIVATE)
     e1:SetRange(LOCATION_MZONE)
     e1:SetTargetRange(0,1)
@@ -71,7 +71,7 @@ function c47530157.efop(e,tp,eg,ep,ev,re,r,rp)
     local e2=Effect.CreateEffect(c)
     e2:SetDescription(aux.Stringid(47530157,2))
     e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-    e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+    e2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
     e2:SetCode(EVENT_BATTLE_DESTROYING)
     e2:SetCondition(aux.bdocon)
     e2:SetOperation(c47530157.caop)

expansions/script/c82224035.lua

@@ -16,7 +16,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)  
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)  
 	e2:SetRange(LOCATION_MZONE)  
-	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)  
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_SET_AVAILABLE)  
 	e2:SetTargetRange(LOCATION_MZONE,0)  
 	e2:SetValue(aux.tgoval)  
 	c:RegisterEffect(e2)