watele

expansions/script/c16110000.lua

@@ -6,6 +6,7 @@ function cm.initial_effect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,m)
 	e1:SetCondition(cm.descon)
 	e1:SetTarget(cm.destg)
@@ -27,7 +28,6 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
 		local tc=g:Select(tp,1,1,nil):GetFirst()
-		Duel.ConfirmCards(1-tp,tc)
 		local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(m,4))
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -41,7 +41,6 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 		e4:SetType(EFFECT_TYPE_IGNITION)
 		e4:SetRange(LOCATION_HAND)
 		e4:SetCountLimit(1)
-		e4:SetCost(cm.sumcost)
 		e4:SetCondition(cm.sumcon)
 		e4:SetTarget(cm.sumtg)
 		e4:SetOperation(cm.sumop)
@@ -49,17 +48,6 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e4)
 	end
 end
-function cm.tdfilter(c)
-	return c:IsSetCard(0xcc5) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToDeckAsCost() and c:IsFaceup()
-end
-function cm.sumcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(cm.tdfilter,tp,LOCATION_REMOVED,0,nil)
-	if chk==0 then return g:GetClassCount(Card.GetCode)>1 end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local tg1=g:SelectSubGroup(tp,aux.dncheck,false,2,2)
-	Duel.SendtoDeck(tg1,nil,2,REASON_EFFECT)
-end
 function cm.sumcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPublic()
 end

expansions/script/c16110001.lua

@@ -47,7 +47,7 @@ function rkst.advop(e,tp,eg,ep,ev,re,r,rp,c)
 	local tp=e:GetHandlerPlayer()
 	local res1=false
 	local mg=Duel.GetMatchingGroup(rkst.otfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
-	local res = Duel.CheckTribute(c,1,1,mg)
+	local res = c:IsLevelAbove(7) and minc<=1 and Duel.CheckTribute(c,1,1,mg)
 	if Duel.IsPlayerAffectedByEffect(tp,16110026) then
 		res1=Duel.IsPlayerCanDiscardDeckAsCost(tp,1)
 	end
@@ -86,6 +86,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_TOGRAVE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,m)
 	e3:SetCondition(cm.descon)
 	e3:SetTarget(cm.destg)
@@ -115,7 +116,7 @@ function cm.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.filter(c)
-	return c:IsAttackAbove(2400) and c:IsDefense(1000) and c:IsAbleToHand()
+	return ((c:IsAttack(2400) and c:IsDefense(1000)) or (c:IsAttack(2800) and c:IsDefense(1000))) and c:IsAbleToHand()
 end
 function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c16110003.lua

@@ -10,6 +10,7 @@ function cm.initial_effect(c)
 	e3:SetDescription(aux.Stringid(m,1))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,m)
 	e3:SetCondition(cm.descon)
 	e3:SetTarget(cm.destg)

expansions/script/c16110016.lua

@@ -11,6 +11,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE+CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,m)
 	e3:SetCondition(cm.descon)
 	e3:SetTarget(cm.destg)

expansions/script/c16110019.lua

@@ -11,6 +11,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_POSITION+CATEGORY_ATKCHANGE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,m)
 	e3:SetCondition(cm.descon)
 	e3:SetTarget(cm.destg)

expansions/script/c16110020.lua

@@ -11,6 +11,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_DAMAGE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCondition(cm.descon)
 	e3:SetTarget(cm.destg)
 	e3:SetOperation(cm.desop)

expansions/script/c16110023.lua

@@ -6,7 +6,7 @@ function cm.initial_effect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.operation)

expansions/script/c85402430.lua

@@ -94,7 +94,7 @@ end
 function c85402430.sprcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.IsExistingMatchingCard(c85402430.fl,tp,LOCATION_ONFIELD+LOCATION_HAND,0,2,nil) and Duel.GetFlagEffect(tp,85402430)==0
+	return Duel.IsExistingMatchingCard(c85402430.fl,tp,LOCATION_ONFIELD+LOCATION_HAND,0,2,nil) and Duel.GetFlagEffect(tp,85402430)==0 and Duel.GetLocationCountFromEx(tp)>0
 end
 function c85402430.sprop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)