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

expansions/script/c11200112.lua

 --虚构之炎
 function c11200112.initial_effect(c)
-	local e1=aux.AddRitualProcGreater2(c,c11200112.filter,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK+LOCATION_REMOVED,c11200112.mfilter)
+	local e1=aux.AddRitualProcGreater2Code2(c,11200103,11200104,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK+LOCATION_REMOVED,c11200112.mfilter)
 	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetCost(c11200112.cost)
-	e1:SetCountLimit(1,11200112)
-end
-function c11200112.filter(c)
-	return c:IsCode(11200103,11200104)
+	e1:SetCountLimit(1,11200112+EFFECT_COUNT_CODE_OATH)
 end
 function c11200112.mfilter(c)
 	return c:IsType(TYPE_MONSTER)
 end
 function c11200112.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_SUMMON)==0 and Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0 end
+	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_SUMMON)==0
+		and Duel.GetActivityCount(tp,ACTIVITY_FLIPSUMMON)==0 and Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_SUMMON)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
-	e1:SetTargetRange(1,0)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e1:SetReset(RESET_PHASE+PHASE_END)
+	e1:SetLabelObject(e)
+	e1:SetTargetRange(1,0)
+	e1:SetTarget(c11200112.sumlimit)
 	Duel.RegisterEffect(e1,tp)
-	local e2=e1:Clone()
-	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e2:SetLabelObject(e)
-	e2:SetTarget(c11200112.splimit)
+	local e2=Effect.CreateEffect(e:GetHandler())
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
+	e2:SetCode(EFFECT_CANNOT_SUMMON)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	e2:SetTargetRange(1,0)
 	Duel.RegisterEffect(e2,tp)
+	local e3=e2:Clone()
+	e3:SetCode(EFFECT_CANNOT_FLIP_SUMMON)
+	Duel.RegisterEffect(e3,tp)
 end
-function c11200112.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return se~=e:GetLabelObject()
+function c11200112.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
+	return e:GetLabelObject()~=se
 end

expansions/script/c40008674.lua

@@ -147,6 +147,7 @@ function c40008674.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EVENT_FREE_CHAIN)
 		e2:SetHintTiming(0,TIMING_BATTLE_START+TIMING_BATTLE_END)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetCondition(c40008674.sccon)
 		e2:SetTarget(c40008674.sctg)

expansions/script/c40008680.lua

@@ -147,6 +147,7 @@ function c40008680.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EVENT_FREE_CHAIN)
 		e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetTarget(c40008680.thtg)
 		e2:SetOperation(c40008680.thop)

expansions/script/c40008683.lua

@@ -141,6 +141,7 @@ function c40008683.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EVENT_FREE_CHAIN)
 		e2:SetHintTiming(0,TIMING_BATTLE_START+TIMING_BATTLE_END)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetCondition(c40008683.sccon)
 		e2:SetTarget(c40008683.sctg)

expansions/script/c40008688.lua

@@ -145,6 +145,7 @@ function c40008688.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 		e2:SetType(EFFECT_TYPE_IGNITION)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetTarget(c40008688.thtg)
 		e2:SetOperation(c40008688.thop)

expansions/script/c40008694.lua

@@ -147,6 +147,7 @@ function c40008694.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EVENT_FREE_CHAIN)
 		e2:SetHintTiming(0,TIMING_BATTLE_START+TIMING_BATTLE_END)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetCondition(c40008694.sccon)
 		e2:SetTarget(c40008694.sctg)

expansions/script/c40008697.lua

@@ -139,6 +139,7 @@ function c40008697.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCategory(CATEGORY_TOGRAVE)
 		e2:SetType(EFFECT_TYPE_IGNITION)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetCountLimit(1)
 		e2:SetTarget(c40008688.thtg)
 		e2:SetOperation(c40008688.thop)

expansions/script/c81011020.lua

@@ -2,7 +2,7 @@
 function c81011020.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFunRep(c,c81011023.ffilter,3,true)
+	aux.AddFusionProcFunRep(c,c81011020.ffilter,3,true)
 	--name
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)

expansions/script/c9980197.lua

@@ -42,13 +42,6 @@ function c9980197.initial_effect(c)
 	e1:SetOperation(c9980197.activate)
 	c:RegisterEffect(e1)
 end
-function c9980197.cfilter2(c,tp)
-	return c:IsSetCard(0x6bc8) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
-		and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp
-end
-function c9980197.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c9980197.cfilter2,1,nil,tp)
-end
 function c9980197.filter3(c,e,tp)
 	return c:IsFaceup() and c:IsSetCard(0x6bc8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end

expansions/script/c9980573.lua

@@ -15,7 +15,7 @@ function c9980573.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCountLimit(1,9980573)
+	e1:SetCountLimit(1,99805731)
 	e1:SetTarget(c9980573.target)
 	e1:SetOperation(c9980573.operation)
 	c:RegisterEffect(e1)

expansions/script/c9980577.lua

@@ -42,9 +42,8 @@ function c9980577.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function c9980577.activate(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)>0 then
-		Duel.Draw(tp,1,REASON_EFFECT)
+	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
+	local sg=g:Filter(Card.IsRelateToEffect,nil,e)
+	Duel.Destroy(sg,REASON_EFFECT)
 	Duel.Hint(HINT_MUSIC,0,aux.Stringid(9980577,0))
-	end
 end

expansions/script/c9980580.lua

@@ -38,7 +38,6 @@ function c9980580.initial_effect(c)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCountLimit(1,99805800)
 	e2:SetCondition(c9980580.thcon)
-	e2:SetCost(c9980580.cost)
 	e2:SetTarget(c9980580.thtg)
 	e2:SetOperation(c9980580.thop)
 	c:RegisterEffect(e2)

expansions/script/c9980581.lua

@@ -45,7 +45,6 @@ function c9980581.spcon(e,c)
 	if c==nil then return true end
 	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
 		and Duel.GetFieldGroupCount(c:GetControler(),LOCATION_MZONE,0,nil)<Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_MZONE,nil)
-		Duel.Hint(HINT_MUSIC,0,aux.Stringid(9980581,2))
 end
 function c9980581.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()

expansions/script/c9980705.lua

@@ -53,7 +53,7 @@ function c9980705.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
 	local atk=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_ATTACK)
 	local def=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_DEFENSE)
-	return re:IsActiveType(TYPE_MONSTER) and (atk==0 or def==0) and not c:IsRace(RACE_REPTILE)
+	return re:IsActiveType(TYPE_MONSTER) and (atk==0 or def==0) and not re:IsSetCard(0x3bc1)
 end
 function c9980705.disop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.NegateEffect(ev)

expansions/script/c9980712.lua

@@ -112,6 +112,7 @@ function c9980712.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function c9980712.thop(e,tp,eg,ep,ev,re,r,rp)
+    local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)