Merge remote-tracking branch 'upstream/master' into master

c11961740.lua

@@ -49,6 +49,5 @@ function c11961740.thop(e,tp,eg,ep,ev,re,r,rp)
 	if ct~=2 then return end
 	if Duel.Destroy(c,REASON_EFFECT)>0 and tc:GetFlagEffectLabel(11961740)==fid then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,tc)
 	end
 end

c17535764.lua

@@ -30,9 +30,9 @@ function c17535764.tgop(e,tp,eg,ep,ev,re,r,rp)
 		if tc:IsType(TYPE_NORMAL) and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
 			and Duel.SelectYesNo(tp,aux.Stringid(17535764,1)) then
 			Duel.BreakEffect()
+			if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
 				local g=Duel.GetMatchingGroup(c17535764.desfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil,tc:GetAttack())
-			if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 and g:GetCount()>0
-				and Duel.SelectYesNo(tp,aux.Stringid(17535764,2)) then
+				if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(17535764,2)) then
 					Duel.BreakEffect()
 					Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 					local tc2=g:Select(tp,1,1,nil)
@@ -40,4 +40,5 @@ function c17535764.tgop(e,tp,eg,ep,ev,re,r,rp)
 				end
 			end
 		end
+	end
 end

c26118970.lua

@@ -6,6 +6,7 @@ function c26118970.initial_effect(c)
 	e1:SetDescription(aux.Stringid(26118970,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_BE_MATERIAL)
 	e1:SetCountLimit(1,26118970)
 	e1:SetCondition(c26118970.spcon)

c29251488.lua

@@ -113,9 +113,9 @@ end
 function s.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and s.cfilter(chkc) end
-	if chk==0 then return c:GetFlagEffect(id)==0
+	if chk==0 then return Duel.GetFlagEffect(tp,id+o)==0
 		and Duel.IsExistingTarget(s.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
-	c:RegisterFlagEffect(id,RESET_CHAIN,0,1)
+	Duel.RegisterFlagEffect(tp,id,RESET_CHAIN,0,1)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,s.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end
@@ -142,9 +142,9 @@ function s.rfilter(c)
 end
 function s.rsptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chk==0 then return e:IsCostChecked() and c:GetFlagEffect(id)==0
+	if chk==0 then return e:IsCostChecked() and Duel.GetFlagEffect(tp,id)==0
 		and Duel.IsExistingMatchingCard(s.rfilter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
-	c:RegisterFlagEffect(id,RESET_CHAIN,0,1)
+	Duel.RegisterFlagEffect(tp,id+o,RESET_CHAIN,0,1)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,s.rfilter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	local te,ceg,cep,cev,cre,cr,crp=g:GetFirst():CheckActivateEffect(false,true,true)

c31759689.lua

@@ -22,7 +22,7 @@ function c31759689.initial_effect(c)
 	e3:SetDescription(aux.Stringid(31759689,1))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCategory(CATEGORY_POSITION)
-	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetCondition(c31759689.poscon)
 	e3:SetTarget(c31759689.postg)

c41069676.lua

@@ -58,7 +58,6 @@ function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local tc=g:GetFirst()
 	local te=tc.killer_tune_be_material_effect
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
-	e:SetProperty(te:GetProperty())
 	Duel.ClearTargetCard()
 	e:SetLabelObject(te)
 	local tg=te:GetTarget()

c45171524.lua

---Mitsurugi Prayers
+--巳剣勧請
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate
@@ -65,7 +65,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 				Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
 				local e1=Effect.CreateEffect(e:GetHandler())
 				e1:SetType(EFFECT_TYPE_SINGLE)
-				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
+				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 				e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
 				e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 				tc:RegisterEffect(e1)

c68396121.lua

@@ -55,7 +55,7 @@ function c68396121.negop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c68396121.aclimit(e,re,tp)
-	return re:GetHandler():IsOnField()
+	return re:GetHandler():IsOnField() or re:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 function c68396121.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsAbleToEnterBP()

c8805651.lua

@@ -35,7 +35,7 @@ function s.srfilter(c)
 end
 function s.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.srfilter,tp,LOCATION_GRAVE,0,1,nil)
-		and Duel.GetFlagEffect(tp,id)==0 end
+		and Duel.GetFlagEffect(tp,id+o)==0 end
 	Duel.RegisterFlagEffect(tp,id,RESET_CHAIN,0,1)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
 end
@@ -67,7 +67,7 @@ function s.rstg(e,tp,eg,ep,ev,re,r,rp,chk)
 		aux.RCheckAdditional=nil
 		return res and Duel.GetFlagEffect(tp,id)==0
 	end
-	Duel.RegisterFlagEffect(tp,id,RESET_CHAIN,0,1)
+	Duel.RegisterFlagEffect(tp,id+o,RESET_CHAIN,0,1)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 end
 function s.rsop(e,tp,eg,ep,ev,re,r,rp)

c88923963.lua

@@ -5,6 +5,7 @@ function c88923963.initial_effect(c)
 	e1:SetDescription(aux.Stringid(88923963,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_EQUIP)
 	e1:SetCountLimit(1,88923963)
 	e1:SetCondition(c88923963.tkcon)

c975299.lua

 --巨大要塞ゼロス
 function c975299.initial_effect(c)
+	aux.AddCodeList(c,66947414)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)