bug fix

expansions/script/c12812006.lua

@@ -36,9 +36,6 @@ function c12812006.initial_effect(c)
 	local e4=e3:Clone()
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e4)
-
-	--
-	cm.self_summon_effect=e3
 end
 function cm.psplimit(e,c,tp,sumtp,sumpos)
 	return not c:IsSetCard(0xa73) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
@@ -54,8 +51,9 @@ function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
 end
 function cm.disop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.Destroy(e:GetHandler(),REASON_EFFECT)~=0 then return end
+	   if Duel.Destroy(e:GetHandler(),REASON_EFFECT)~=0 then
 		Duel.NegateEffect(ev)
+	end
 end
 --效果2
 function cm.filter(c)

expansions/script/c16104240.lua

---冲锋陷阵的教团骑士
+--天命真王 梦想王
 if not pcall(function() require("expansions/script/c16104200") end) then require("script/c16104200") end
 local m,cm=rk.set(16104240)
 function cm.initial_effect(c)
@@ -132,7 +132,7 @@ function cm.is_include(value,tab)
 	return false
 end
 function cm.xyz(c)
-	return c:IsSummonType(SUMMON_TYPE_ADVANCE)
+	return c:IsSummonType(SUMMON_TYPE_ADVANCE) and c:IsSetCard(0xccd)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ex=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE)

expansions/script/c16104412.lua

@@ -90,8 +90,8 @@ function cm.splimit(e,c)
 end
 --Effect 2
 function cm.filter(c,e,tp)
-	return (c:IsSetCard(0xccb) 
-		and c:IsType(TYPE_MONSTER) and c:IsFaceup())
+	return c:IsSetCard(0xccb) 
+		and c:IsType(TYPE_MONSTER)
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) 
 		and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end

expansions/script/c16104425.lua

@@ -3,7 +3,6 @@ local m=16104425
 local cm=_G["c"..m]
 Duel.LoadScript("c16199990.lua")
 function cm.initial_effect(c)
-	c:EnableReviveLimit()
 	aux.EnablePendulumAttribute(c)
 	--splimit
 	local e0=Effect.CreateEffect(c)

expansions/script/c33310200.lua

@@ -16,7 +16,8 @@ end
 function c33310200.filter1(c,e)
 	return c:IsPublic() and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e) and c:IsAbleToDeck()
 end
-function c33310200.filter2(c,e,tp,m,f,chkf,m2)
+function c33310200.filter2(c,e,tp,sg,f,chkf,m2)
+	local m=sg:Clone()
 	if c:IsSetCard(0x551) then m:Merge(m2) end
 	return c:IsType(TYPE_FUSION) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)

expansions/script/c33500551.lua

 --GGO 星之骑士 莲
 local m=33500551
 local cm=_G["c"..m]
-local dam=500
+dam=500
 syu_Ggl=syu_Ggl or {}
 function syu_Ggl.sespm(c,code)
 	local tc=c

expansions/script/c71401002.lua

@@ -39,7 +39,7 @@ function c71401002.op2(e,tp,eg,ep,ev,re,r,rp)
 	if tc then
 		local b1=tc:IsAbleToHand()
 		local b2=not tc:IsForbidden() and tc:CheckUniqueOnField(tp)
-		if b1 and (not b2 or Duel.SelectOption(tp,1150,aux.Stringid(71401002,1))==0) then
+		if b1 and (not b2 or Duel.SelectOption(tp,1190,aux.Stringid(71401002,1))==0) then
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,tc)
 		else

expansions/script/c71401007.lua

@@ -33,7 +33,7 @@ function c71401007.con1(e,tp,eg,ep,ev,re,r,rp)
 	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
 end
 function c71401007.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,1,e:GetHandler()) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,1,1,nil)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)

expansions/script/c9310034.lua

@@ -47,6 +47,8 @@ function c9310034.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 c9310034.material_setcode=0x3f91
+c9310034.material_setcode=0x480
+c9310034.material_type=TYPE_SYNCHRO 
 function c9310034.chainop(e,tp,eg,ep,ev,re,r,rp)
 	if re:GetHandler()==e:GetHandler() and ep==tp then
 		Duel.SetChainLimit(c9310034.chainlm)