7

expansions/script/c31710060.lua

 --暴风雨 ZTD05
-local s,id=GetID()
+local s,id,o=GetID()
 
 function s.initial_effect(c)
 	aux.AddLinkProcedure(c,s.mfilter,2,2)
@@ -14,6 +14,7 @@ function s.initial_effect(c)
 	e3:SetCondition(s.descon)
 	e3:SetTarget(s.destg)
 	e3:SetOperation(s.desop)
+	e3:SetCountLimit(1,id+o)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(id,2))
@@ -25,6 +26,7 @@ function s.initial_effect(c)
 	--e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetCondition(s.tcon)
 	e4:SetTarget(s.ttg)
+	e4:SetCountLimit(1,id)
 	e4:SetOperation(s.top)
 	c:RegisterEffect(e4)
 end

expansions/script/c81902077.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e0:SetRange(LOCATION_MZONE)
-	e0:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e0:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e0:SetValue(1)
 	c:RegisterEffect(e0)
 	--attach

expansions/script/c81902078.lua

@@ -181,28 +181,13 @@ end
 --predraw
 function cm.dwcon(e,tp,eg,ep,ev,re,r,rp)
 	return tp==Duel.GetTurnPlayer() and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=10
-		and Duel.GetDrawCount(tp)>0
 end
 function cm.dwtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,LOCATION_DECK,0,10,nil) end
-	local dt=Duel.GetDrawCount(tp)
-	if dt~=0 then
-		aux.DrawReplaceCount=0
-		aux.DrawReplaceMax=dt
-		local e1=Effect.CreateEffect(e:GetHandler())
-		e1:SetType(EFFECT_TYPE_FIELD)
-		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-		e1:SetCode(EFFECT_DRAW_COUNT)
-		e1:SetTargetRange(1,0)
-		e1:SetReset(RESET_PHASE+PHASE_DRAW)
-		e1:SetValue(0)
-		Duel.RegisterEffect(e1,tp)
-	end
+	if chk==0 then return aux.IsPlayerCanNormalDraw(tp) and Duel.IsExistingMatchingCard(nil,tp,LOCATION_DECK,0,10,nil) end
+	aux.GiveUpNormalDraw(e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
 end
 function cm.dwop(e,tp,eg,ep,ev,re,r,rp)
-	aux.DrawReplaceCount=aux.DrawReplaceCount+1
-	if aux.DrawReplaceCount>aux.DrawReplaceMax then return end
 	Duel.ConfirmDecktop(tp,10)
 	local g=Duel.GetDecktopGroup(tp,10)
 	if g:GetCount()>0 then

expansions/script/c81902600.lua

@@ -10,6 +10,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,m+EFFECT_FLAG_OATH)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
@@ -18,7 +19,7 @@ function cm.initial_effect(c)
 	e2:SetDescription(aux.Stringid(m,3))
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCountLimit(1,m)
+	e2:SetCountLimit(1,m+100)
 	e2:SetCost(cm.spcost)
 	e2:SetTarget(cm.sptg)
 	e2:SetOperation(cm.spop)
@@ -43,7 +44,7 @@ function cm.filter1(c,e,tp)
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function cm.filter2(c,e,tp,mc,rk,rac)
-	return c:IsRank(rk+1,rk-1) and c:IsRace(rac) and mc:IsCanBeXyzMaterial(c)
+	return c:IsRank(rk+1,rk-1) and c:IsRace(rac) and mc:IsCanBeXyzMaterial(c) and c:IsType(TYPE_XYZ)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)