fix

expansions/script/c18700197.lua

 --神之眷属-<I>-风暴编织者
 local cm,m,o=GetID()
-Duel.LoadScript("c33503600.lua")
-cm.code=18700197
-cm.side_code=18700199
 function cm.initial_effect(c)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),2)
 	c:EnableReviveLimit()
@@ -54,10 +51,6 @@ function cm.initial_effect(c)
 	e5:SetTarget(cm.tg)
 	e5:SetOperation(cm.op)
 	c:RegisterEffect(e5)
-	if not rk.Side_Check then
-		rk.Side_Check=true
-		local ce=rk.side_do(c)
-	end
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end
@@ -89,7 +82,9 @@ function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	Suyu_bh.changecode(c)
+	c:SetEntityCode(18700199,true)
+	c:ReplaceEffect(18700199,0,0)
+	Duel.Hint(10,1,18700199)
 end
 function cm.atkcon2(e)
 	local c=e:GetHandler()

expansions/script/c18700199.lua

 --神之眷属-<II>-风暴编织者
 local cm,m,o=GetID()
-Duel.LoadScript("c33503600.lua")
-cm.code=18700197
-cm.side_code=18700199
 function cm.initial_effect(c)
 	c:EnableReviveLimit()
 	local e0=Effect.CreateEffect(c)
@@ -44,10 +41,23 @@ function cm.initial_effect(c)
 	e3:SetTarget(cm.drtg)
 	e3:SetOperation(cm.drop)
 	c:RegisterEffect(e3)
-	if not rk.Side_Check then
-		rk.Side_Check=true
-		local ce=rk.side_do(c)
-	end
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetCode(EVENT_ADJUST)
+	e4:SetRange(LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_HAND+LOCATION_EXTRA)
+	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SET_AVAILABLE)
+	e4:SetCountLimit(1)
+	e4:SetCondition(function (e,tp,eg,ep,ev,re,r,rp)
+		return 18700197 and c:GetOriginalCode()==18700199
+		end)
+	e4:SetOperation(function (e,tp,eg,ep,ev,re,r,rp)
+		c:SetEntityCode(18700197,true)
+		Duel.ConfirmCards(tp,Group.FromCards(c))
+		Duel.ConfirmCards(1-tp,Group.FromCards(c))
+		c:ReplaceEffect(18700197,0,0)
+		c:EnableReviveLimit()
+		end)
+	c:RegisterEffect(e4)
 end
 function cm.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 end

expansions/script/c30900614.lua

@@ -2,16 +2,20 @@
 local m=30900614
 local cm=_G["c"..m]
 function cm.initial_effect(c)
-local e1=Effect.CreateEffect(c)
+	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DISABLE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(TIMING_DAMAGE_STEP,TIMING_DAMAGE_STEP+TIMINGS_CHECK_MONSTER)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
 end
 function cm.disfilter(c)
-	return c:IsFaceup() and c:IsSummonLocation(LOCATION_EXTRA) and (c:GetAttack()>0 or cm.disfilter(c))
+	return c:IsFaceup() and c:IsSummonLocation(LOCATION_EXTRA)
+end
+function cm.chainlm(e,rp,tp)
+	return not e:GetHandler():IsType(TYPE_MONSTER)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.disfilter,tp,0,LOCATION_MZONE,1,nil) end
@@ -21,9 +25,6 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		Duel.SetChainLimit(cm.chainlm)
 	end
 end
-function cm.chainlm(e,rp,tp)
-	return not e:GetHandler():IsType(TYPE_MONSTER)
-end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(cm.disfilter,tp,0,LOCATION_MZONE,nil)
 	local tc=g:GetFirst()
@@ -36,10 +37,9 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_DISABLE_EFFECT)
-		e2:SetValue(RESET_TURN_SET)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(c)
+		local e3=Effect.CreateEffect(e:GetHandler())
 		e3:SetType(EFFECT_TYPE_SINGLE)
 		e3:SetCode(EFFECT_CANNOT_ATTACK)
 		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
@@ -47,4 +47,4 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 		tc=g:GetNext()
 	end
-end
+end
\ No newline at end of file

expansions/script/c33700167.lua

 --降阶魔法 心之牺牲
 function c33700167.initial_effect(c)
-	 --Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCost(c33700167.cost)
-	e1:SetTarget(c33700167.target)
-	e1:SetOperation(c33700167.activate)
-	c:RegisterEffect(e1)
-	Duel.AddCustomActivityCounter(33700167,ACTIVITY_SPSUMMON,c33700167.counterfilter)
+	--Activate
+   local e1=Effect.CreateEffect(c)
+   e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
+   e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+   e1:SetType(EFFECT_TYPE_ACTIVATE)
+   e1:SetCode(EVENT_FREE_CHAIN)
+   e1:SetCost(c33700167.cost)
+   e1:SetTarget(c33700167.target)
+   e1:SetOperation(c33700167.activate)
+   c:RegisterEffect(e1)
+   Duel.AddCustomActivityCounter(33700167,ACTIVITY_SPSUMMON,c33700167.counterfilter)
 end
 function c33700167.counterfilter(c)
-	return c:IsType(TYPE_XYZ)
+   return c:IsType(TYPE_XYZ)
 end
 function c33700167.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return  Duel.GetCustomActivityCount(33700167,tp,ACTIVITY_SPSUMMON)==0 end
+	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_SUMMON)==0 and Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
-	e1:SetTargetRange(1,0)
-	e1:SetTarget(c33700167.splimit)
-	e1:SetLabelObject(e)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e1,tp)
+   e1:SetType(EFFECT_TYPE_FIELD)
+   e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+   e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
+   e1:SetTargetRange(1,0)
+   e1:SetTarget(c33700167.splimit)
+   e1:SetLabelObject(e)
+   e1:SetReset(RESET_PHASE+PHASE_END)
+   Duel.RegisterEffect(e1,tp)
 end
 function c33700167.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return se~=e:GetLabelObject() or not se:IsType(TYPE_XYZ)
+	return se~=e:GetLabelObject()
 end
 function c33700167.filter(c,e,tp)
-	return c:IsFaceup() and c:IsType(TYPE_XYZ)  and c:GetOverlayCount()>0 and Duel.IsExistingMatchingCard(c33700167.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,c:GetRank(),c:GetOverlayCount())
+   return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:GetOverlayCount()>0
+	  and Duel.IsExistingMatchingCard(c33700167.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,c:GetRank(),c:GetOverlayCount(),c:GetRace(),c:GetAttribute())
 end
-function c33700167.filter2(c,e,tp,g,rk,og)
-	return  c:IsType(TYPE_XYZ)  and c:IsCanBeSpecialSummoned(e,0,tp,false,false)  and g:IsCanBeXyzMaterial(c) and c:GetRank()<rk and
-	c:GetRank()>=og
+
+function c33700167.filter2(c,e,tp,tc,rk,og,race,attr)
+   return c:IsType(TYPE_XYZ) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	  and (c:GetRace()==race or c:GetAttribute()==attr)
+	  and c:GetRank()<rk and c:GetRank()>=og
 end
 function c33700167.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c33700167.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c33700167.filter,tp,LOCATION_MZONE,0,1,nil,tp) and Duel.GetMZoneCount(tp)>0 end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,c33700167.filter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
-	 Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,g:GetFirst():GetOverlayCount()*1000)
-	 Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,LOCATION_EXTRA)
+   if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c33700167.filter(chkc,e,tp) end
+   if chk==0 then return Duel.IsExistingTarget(c33700167.filter,tp,LOCATION_MZONE,0,1,nil,e,tp) and Duel.GetMZoneCount(tp)>0 end
+   Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
+   local g=Duel.SelectTarget(tp,c33700167.filter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
+   Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,g:GetFirst():GetOverlayCount()*1000)
+   Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,LOCATION_EXTRA)
 end
 function c33700167.activate(e,tp,eg,ep,ev,re,r,rp)
-	 local tc=Duel.GetFirstTarget()
-	if not tc:IsRelateToEffect(e) then return end
-	local mg=tc:GetOverlayGroup()
-	Duel.SendtoGrave(mg,REASON_EFFECT)
-   if mg:GetCount()>0 and Duel.Recover(tp,mg:GetCount()*1000,REASON_EFFECT)>0 then
-	if Duel.GetMZoneCount(tp)<=0 then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c33700167.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
-	if g:GetCount()>0 and  Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then
-	 Duel.Overlay(g,Group.FromCards(tc,e:GetHandler()))
-	end
-end
+	local c=e:GetHandler()
+   local tc=Duel.GetFirstTarget()
+   if not tc or not tc:IsRelateToEffect(e) then return end
+   local mg=tc:GetOverlayGroup()
+   local ogc=mg:GetCount()
+   Duel.SendtoGrave(mg,REASON_EFFECT)
+   if ogc>0 and Duel.Recover(tp,ogc*1000,REASON_EFFECT)>0 then
+	  if Duel.GetMZoneCount(tp)<=0 then return end
+	  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+	  local g=Duel.SelectMatchingCard(tp,c33700167.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetRank(),ogc,tc:GetRace(),tc:GetAttribute())
+	  local sc=g:GetFirst()
+	  if sc and Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)>0 then
+		 Duel.BreakEffect()
+		 Duel.Overlay(sc,Group.FromCards(tc))
+	  end
+	  	if c:IsRelateToEffect(e) then
+			c:CancelToGrave()
+			Duel.Overlay(sc,Group.FromCards(c))
+		end
+   end
 end