ndyd

expansions/script/c67200027.lua

@@ -25,7 +25,7 @@ function c67200027.initial_effect(c)
 	e4:SetCategory(CATEGORY_DRAW)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_MZONE)
-	e4:SetCountLimit(1,1200000028)
+	e4:SetCountLimit(1,67200028)
 	e4:SetCost(c67200027.ctlcost)
 	e4:SetTarget(c67200027.ctltg)
 	e4:SetOperation(c67200027.ctlop)
@@ -55,7 +55,7 @@ function c67200027.initial_effect(c)
 	e10:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e10:SetType(EFFECT_TYPE_IGNITION)
 	e10:SetRange(LOCATION_PZONE)
-	e10:SetCountLimit(1,12000000029)
+	e10:SetCountLimit(1,67200029)
 	e10:SetCondition(c67200027.spcon)
 	e10:SetTarget(c67200027.sptg)
 	e10:SetOperation(c67200027.spop)
@@ -99,7 +99,7 @@ end
 function c67200027.ctltg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanSendtoGrave(tp) and Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
-	Duel.SetTargetParam(2)
+	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function c67200027.ctlop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c85400100.lua

@@ -176,7 +176,7 @@ function c85400100.bb(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_CANNOT_TRIGGER)
-	e1:SetReset(RESET_PHASE+RESET_SELF_TURN+PHASE_STANDBY)
+	e1:SetReset(RESET_PHASE+PHASE_STANDBY)
 	token:RegisterEffect(e1,true)
 	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetCategory(CATEGORY_RELEASE)
@@ -184,9 +184,9 @@ function c85400100.bb(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(c85400100.ee)
-	e2:SetTarget(c85400100.fb)
-	e2:SetOperation(c85400100.bf)
+	e2:SetCondition(c85400100.jjjk)
+	e2:SetTarget(c85400100.bbba)
+	e2:SetOperation(c85400100.cccda)
 	token:RegisterEffect(e2,true)
 	local e3=Effect.CreateEffect(e:GetHandler())
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
@@ -195,6 +195,19 @@ function c85400100.bb(e,tp,eg,ep,ev,re,r,rp)
 	e3:SetOperation(c85400100.ioo)
 	token:RegisterEffect(e3,true)
 end
+function c85400100.jjjk(de,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetTurnPlayer()~=tp
+end
+function c85400100.bbba(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	Duel.SetOperationInfo(0,CATEGORY_RELEASE,e:GetHandler(),1,0,0)
+end
+function c85400100.cccda(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) then
+		Duel.Release(c,REASON_EFFECT)
+	end
+end
 function c85400100.filte(c,e,tp,ec)
 	return c:IsCode(85400100) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
 end