Merge pull request #1 from purerosefallen/rei

Saigyoji Aya

expansions/script/c37564026.lua

@@ -35,13 +35,15 @@ function cm.ovfilter(c)
 	return c:IsFaceup() and Senya.check_set_elem(c) and c:IsXyzType(TYPE_XYZ) and c:GetOverlayCount()>=3
 end
 function cm.rmcon(e,tp,eg,ep,ev,re,r,rp)
-	local tp=e:GetHandlerPlayer()
 	local c=e:GetHandler()
-	return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD,1,nil) and c:GetOverlayCount()>1 and c:IsFaceup() and not c:IsDisabled()
+	return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD,1,nil) and c:CheckRemoveOverlayCard(tp,1,REASON_COST)
+		and Duel.GetTurnPlayer()==tp
+		and (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
+		and Duel.GetCurrentChain()==0
 end
 function cm.rmop(e,tp,eg,ep,ev,re,r,rp)  
 	Duel.Hint(HINT_CARD,0,m)
-	e:GetHandler():RemoveOverlayCard(tp,2,2,REASON_EFFECT)
+	e:GetHandler():RemoveOverlayCard(tp,2,2,REASON_COST)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD,1,1,nil)
 	Duel.HintSelection(g)
@@ -53,5 +55,5 @@ function cm.adcon(e)
 end
 function cm.retop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsLocation(LOCATION_MZONE) or e:GetHandler():IsFacedown() then return end
-	Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_EFFECT)
+	Duel.SendtoDeck(e:GetHandler(),nil,0,REASON_EFFECT)
 end
\ No newline at end of file

expansions/script/c37564335.lua

@@ -26,7 +26,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		local mg=Duel.GetRitualMaterial(tp):Filter(Card.IsCanBeRitualMaterial,e:GetHandler(),tempc)
 		return Senya.CheckRitualMaterial(tempc,mg,tp,tempc:GetLevel(),nil,true)
 	end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c37564337.lua

@@ -19,17 +19,18 @@ function cm.initial_effect(c)
 	e1:SetCode(EFFECT_SET_ATTACK)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e1:SetCondition(function(e) return e:GetHandler():GetOverlayCount()>0 end)
 	e1:SetTarget(function(e,c) return c:IsType(TYPE_LINK) end)
 	e1:SetValue(function(e,c) return math.ceil(c:GetBaseAttack()/2) end)
 	c:RegisterEffect(e1)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(710253)
+	e1:SetCode(EFFECT_REMOVE_LINK_MARKER_KOISHI)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetCondition(function(e) return e:GetHandler():GetOverlayCount()>0 end)
 	e1:SetTarget(function(e,c) return c:IsType(TYPE_LINK) end)
-	e1:SetValue(0)
+	e1:SetValue(0xfff)
 	c:RegisterEffect(e1)
 end
 function cm.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c37564342.lua

+--西行寺小绫
+local m=37564342
+local cm=_G["c"..m]
+xpcall(function() require("expansions/script/c37564765") end,function() require("script/c37564765") end)
+cm.dfc_front_side=m+1
+function cm.initial_effect(c)
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(m,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_DESTROYED)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
+	e2:SetRange(LOCATION_HAND)
+	e2:SetCondition(cm.spcon)
+	e2:SetTarget(cm.sptg)
+	e2:SetOperation(cm.spop)
+	c:RegisterEffect(e2)
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(m,1))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
+		return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) and e:GetHandler():IsReason(REASON_DESTROY) and e:GetHandler():IsReason(REASON_BATTLE+REASON_EFFECT)
+	end)
+	e2:SetTarget(cm.target)
+	e2:SetOperation(cm.operation)
+	c:RegisterEffect(e2)
+end
+function cm.spcfilter(c,tp)
+	return c:IsReason(REASON_BATTLE+REASON_EFFECT) and c:IsType(TYPE_EFFECT)
+		and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousSequence()>4
+end
+function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
+	return eg:GetCount()==1 and eg:IsExists(cm.spcfilter,1,nil,tp)
+end
+function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return Duel.GetMZoneCount(tp)>0
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
+end
+function cm.spop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if not c:IsRelateToEffect(e) then return end
+	if Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
+		local tc=eg:GetFirst()
+		if tc and tc:IsType(TYPE_EFFECT) then
+			c:CreateEffectRelation(e)
+			Senya.CopyStatusAndEffect(e,c,tc,false,0x1fe1000,1,2)
+			c:ReleaseEffectRelation(e)
+		end
+		Duel.Hint(11,0,m*16+2)
+	end
+end
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+	if Duel.GetMZoneCount(tp)<=0 then return false end
+		local c=e:GetHandler()
+		local tcode=c.dfc_front_side
+		if not tcode then return false end
+		local tempc=Senya.IgnoreActionCheck(Duel.CreateToken,tp,tcode)
+		return tempc:IsCanBeSpecialSummoned(e,0,tp,true,true)
+	end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if not cm.target(e,tp,eg,ep,ev,re,r,rp,0) or c:IsFacedown() or not c:IsRelateToEffect(e) or c:IsControler(1-tp) or c:IsImmuneToEffect(e) then return end
+	local tcode=c.dfc_front_side
+	c:ReplaceEffect(tcode,0,0)
+	c:SetEntityCode(tcode,true)
+	Duel.SetMetatable(c,_G["c"..tcode])
+	Duel.Hint(11,0,m*16+3)
+	Duel.Hint(HINT_CARD,0,m+1)
+	Duel.ConfirmCards(tp,Group.FromCards(c))
+	Duel.ConfirmCards(1-tp,Group.FromCards(c))	
+	Duel.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)
+end
\ No newline at end of file

expansions/script/c37564343.lua

+--西行寺·绫·八分咲
+local m=37564343
+local cm=_G["c"..m]
+xpcall(function() require("expansions/script/c37564765") end,function() require("script/c37564765") end)
+cm.dfc_back_side=m-1
+function cm.initial_effect(c)
+	Senya.DFCBackSideCommonEffect(c)
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetProperty(0x14000+EFFECT_FLAG_CARD_TARGET)
+	e1:SetTarget(cm.target)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)	
+end
+function cm.filter(c)
+	return c:IsType(TYPE_EFFECT)
+end
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.filter(chkc) end
+	if chk==0 then return e:GetHandler():IsOnField() and Duel.IsExistingTarget(cm.filter,tp,LOCATION_GRAVE,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELF)
+	local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_GRAVE,0,1,1,nil)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	local tc=Duel.GetFirstTarget()
+	if c:IsRelateToEffect(e) and c:IsFaceup() then
+		local f=Card.RegisterEffect
+		Card.RegisterEffect=function(tc,e,forced)
+			e:SetCondition(cm.rcon(e:GetCondition()))
+			e:SetCost(cm.rcost(e:GetCost()))
+			if e:IsHasType(EFFECT_TYPE_IGNITION) then
+				e:SetType((e:GetType()-EFFECT_TYPE_IGNITION | EFFECT_TYPE_QUICK_O))
+				e:SetCode(EVENT_FREE_CHAIN)
+				e:SetHintTiming(0,0x1c0)
+			end
+			f(tc,e,forced)
+		end
+		Senya.CopyStatusAndEffect(e,c,tc,false,0x1fe1000,1)
+		Card.RegisterEffect=f
+	end
+end
+function cm.rcon(con)
+	return function(e,tp,eg,ep,ev,re,r,rp)
+		return not con or con(e,tp,eg,ep,ev,re,r,rp) or e:IsHasType(0x7e0)
+	end
+end
+function cm.rcost(cost)
+	return function(e,tp,eg,ep,ev,re,r,rp,chk)
+		if chk==0 then return not cost or cost(e,tp,eg,ep,ev,re,r,rp,0) or e:IsHasType(0x7e0) end
+		return not cost or e:IsHasType(0x7e0) or cost(e,tp,eg,ep,ev,re,r,rp,1)
+	end
+end
\ No newline at end of file

expansions/script/c37564765.lua

@@ -588,8 +588,9 @@ end
 --copy effect c=getcard(nil=orcard) tc=sourcecard ht=showcard(bool) res=reset event(nil=no reset)
 --ctlm=extra count limit
 function cm.CopyStatusAndEffect(e,c,tc,ht,res,resct,ctlm)
-		c=c or e:GetHandler()
-		res=res or RESET_EVENT+0x1fe0000
+		local c=c or e:GetHandler()
+		local res=res or RESET_EVENT+0x1fe0000
+		local resct=resct or 1
 		local cid=nil
 		if tc and c:IsFaceup() and c:IsRelateToEffect(e) then
 			local code=tc:GetOriginalCode()