ybb

expansions/script/c16110001.lua

@@ -16,7 +16,19 @@ function rkst.Tri(c)
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_SET_PROC)
 	c:RegisterEffect(e2) 
-	return e1,e2
+	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(m,5))
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetCode(EFFECT_SUMMON_PROC)
+	e3:SetCondition(rkst.advcon2)
+	e3:SetOperation(rkst.advop2)
+	e3:SetValue(SUMMON_TYPE_ADVANCE)
+	c:RegisterEffect(e3)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_SET_PROC)
+	c:RegisterEffect(e4)
+	return e1,e2,e3,e4
 end
 function rkst.otfilter(c)
 	return c:IsSummonType(SUMMON_TYPE_ADVANCE)
@@ -46,12 +58,10 @@ function rkst.advop(e,tp,eg,ep,ev,re,r,rp,c)
 	end
 	if not res and res1 then
 		Duel.DiscardDeck(tp,1,REASON_COST)
-		e1:Reset()
 		return
 	end
 	if res1==true and Duel.SelectYesNo(tp,aux.Stringid(m,4)) then
 		Duel.DiscardDeck(tp,1,REASON_COST)
-		e1:Reset()
 		return
 	end
 	sinnte_check = true
@@ -61,6 +71,19 @@ function rkst.advop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.Release(sg,REASON_SUMMON+REASON_MATERIAL)
 	sinnte_check = false
 end
+function rkst.advcon2(e,c,minc)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local res1=false
+	if Duel.IsPlayerAffectedByEffect(tp,16110026) then
+		res1=Duel.IsPlayerCanDiscardDeckAsCost(tp,1)
+	end
+	return res1
+end
+function rkst.advop2(e,tp,eg,ep,ev,re,r,rp,c)
+	local tp=e:GetHandlerPlayer()
+	Duel.DiscardDeck(tp,1,REASON_COST)
+end
 if not cm then return end
 function cm.initial_effect(c)
 	--summon with 1 tribute

expansions/script/c16110050.lua

@@ -91,7 +91,7 @@ function cm.operation3(e,tp,eg,ep,ev,re,r,rp)
 end
 --Effect 3 
 function cm.sumcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(m)==0
+	return e:GetHandler():GetFlagEffect(m)==0 and not e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function cm.sumcon1(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetFlagEffect(m)==0

expansions/script/c19500018.lua

@@ -49,7 +49,7 @@ function c19500018.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c19500018.drcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsReason(REASON_EFFECT) and re:GetHandler():IsSetCard(0x3990) and re:GetHandler():IsSetCard(0x3991)
+	return c:IsReason(REASON_EFFECT) and re:GetHandler():IsSetCard(0x3990,0x3991)
 end
 function c19500018.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end