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

expansions/script/c33400402.lua

@@ -5,6 +5,7 @@ function c33400402.initial_effect(c)
 	e0:SetDescription(aux.Stringid(33400402,0))
 	e0:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e0:SetProperty(EFFECT_FLAG_DELAY)
 	e0:SetCode(EVENT_EQUIP)
 	e0:SetCountLimit(1,33400402)
 	e0:SetCondition(c33400402.spcon)
@@ -27,7 +28,7 @@ function c33400402.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(Card.IsSetCard,1,nil,0x6343) or eg:IsExists(Card.IsSetCard,1,nil,0x5343)
 end
 function c33400402.spfilter1(c,e,tp)
-	return  c:IsSetCard(0x341) or c:IsSetCard(0x5342) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return  c:IsSetCard(0x341) or c:IsSetCard(0x5342) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c33400402.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c33400471.lua

@@ -5,7 +5,7 @@ function c33400471.initial_effect(c)
 	e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_TO_GRAVE)
-	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetCountLimit(1,33400471)
 	e1:SetCondition(c33400471.thcon)
 	e1:SetTarget(c33400471.thtg)
@@ -25,7 +25,7 @@ function c33400471.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c33400471.cfilter2(c,tp,re)
-	return  c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)
+	return  c:IsType(TYPE_MONSTER) and  c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)
 		and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_ONFIELD) 
 		and re:GetOwner():IsSetCard(0x341)
 end

expansions/script/c33400472.lua

@@ -5,7 +5,7 @@ function c33400472.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_TO_GRAVE)
-	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetCountLimit(1,33400472+EFFECT_COUNT_CODE_OATH)
 	e1:SetCondition(c33400472.spcon)
 	e1:SetTarget(c33400472.sptg)
@@ -13,7 +13,7 @@ function c33400472.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c33400472.cfilter2(c,tp,re)
-	return  c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)
+	return c:IsType(TYPE_MONSTER) and  c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)
 		and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_ONFIELD) 
 		and re:GetOwner():IsSetCard(0x341)
 end

expansions/script/c33401304.lua

@@ -25,20 +25,20 @@ function c33401304.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c33401304.chkfilter1(c,e,tp)
-	return c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and 
+	return (not c:IsSetCard(0xc342)) and  c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and 
 		not c:IsHasEffect(EFFECT_REVIVE_LIMIT) and Duel.IsPlayerCanSpecialSummon(tp,0,POS_FACEUP,tp,c)
 		and Duel.IsExistingMatchingCard(c33401304.chkfilter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode())
 end
 function c33401304.chkfilter2(c,e,tp,cd)
-	return c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd)
+	return (not c:IsSetCard(0xc342)) and c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd)
 		and not c:IsHasEffect(EFFECT_REVIVE_LIMIT) and Duel.IsPlayerCanSpecialSummon(tp,0,POS_FACEUP,1-tp,c)
 end
 function c33401304.filter1(c,e,tp)
-	return c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (not c:IsSetCard(0xc342)) and c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and Duel.IsExistingMatchingCard(c33401304.filter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode())
 end
 function c33401304.filter2(c,e,tp,cd)
-	return c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd)
+	return (not c:IsSetCard(0xc342)) and  c:IsSetCard(0x341) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd)
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK,1-tp)
 end
 function c33401304.target(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -103,5 +103,5 @@ end
 function c33401304.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(1-tp,LOCATION_MZONE)<=0 then return end
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then Duel.SpecialSummon(tc,0,tp,1-tp,false,false,POS_FACEUP) end	 
+	if tc:IsRelateToEffect(e) then Duel.SpecialSummon(tc,0,tp,1-tp,false,false,POS_FACEUP) end   
 end

expansions/script/c81000007.lua

@@ -15,10 +15,10 @@ function c81000007.initial_effect(c)
 	Duel.AddCustomActivityCounter(81000007,ACTIVITY_CHAIN,c81000007.chainfilter)
 end
 function c81000007.chainfilter(re,tp,cid)
-	return re:IsActiveType(TYPE_MONSTER)
+	return not re:IsActiveType(TYPE_MONSTER)
 end
 function c81000007.counterfilter(c)
-	return c:IsType(TYPE_EFFECT)
+	return not c:IsType(TYPE_EFFECT)
 end
 function c81000007.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(81000007,tp,ACTIVITY_SUMMON)==0

expansions/script/c81010057.lua

@@ -15,11 +15,11 @@ function c81010057.initial_effect(c)
 	Duel.AddCustomActivityCounter(81010057,ACTIVITY_FLIPSUMMON,c81010057.counterfilter)
 	Duel.AddCustomActivityCounter(81010057,ACTIVITY_CHAIN,c81010057.chainfilter)
 end
-function c81010057.chainfilter(re,tp,cid)
-	return re:IsActiveType(TYPE_MONSTER)
+function c81010057.chainfilter(re,tp)
+	return not re:IsActiveType(TYPE_MONSTER)
 end
 function c81010057.counterfilter(c)
-	return c:IsType(TYPE_EFFECT)
+	return not c:IsType(TYPE_EFFECT)
 end
 function c81010057.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(81010057,tp,ACTIVITY_SUMMON)==0