md

expansions/script/c10908888.lua

 --嘿的外包
-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
\ No newline at end of file
+Duel.LoadScript("c10199990.lua")
\ No newline at end of file

expansions/script/c16199529.lua

 --华丽的降神
-local m=16199520
+local m=16199529
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 		--Activate

expansions/script/c16199990.lua

-if not pcall(function() require("expansions/script/c16101100") end) then require("script/c16101100") end
+Duel.LoadScript("c16101100.lua")
 rk=rk or {}
 local loc_table_for_reikai={
 ['dk'] = LOCATION_DECK,

expansions/script/c16232011.lua

@@ -39,7 +39,7 @@ function cm.fselect(g,tp)
 	end
 	return g:GetClassCount(Card.GetLocation)==g:GetCount() and res
 end
-function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+function cm.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(cm.costfilter,tp,LOCATION_HAND+LOCATION_DECK,0,nil)
 	if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0
 		and g:CheckSubGroup(cm.fselect,2,2,tp) end

expansions/script/c17033130.lua

 --公主强袭
-xpcall(function() require("expansions/script/c17035021") end,function() require("script/c17035021") end)
+Duel.LoadScript("c17035021.lua")
 function c17033130.initial_effect(c)
 	pcr.Princess_Strike(c)
 end

expansions/script/c17033140.lua

 --公主斩击
-xpcall(function() require("expansions/script/c17035021") end,function() require("script/c17035021") end)
+Duel.LoadScript("c17035021.lua")
 function c17033140.initial_effect(c)
 	pcr.Princess_Slash(c)
 end

expansions/script/c17035230.lua

 --P.C. 凯露/公主形态
+Duel.LoadScript("c17035021.lua")
 function c17035230.initial_effect(c)
 	pcr.Princess_Mode(c)
 	pcr.negate(c)

expansions/script/c18009023.lua

@@ -36,6 +36,7 @@ function cm.atkop1(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SendtoHand(g2,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,g2)
 		end 
+		end
 	end
 end
 function cm.thfilter(c)

expansions/script/c18090001.lua

@@ -11,7 +11,6 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCountLimit(1,id+o)
 	e1:SetTarget(cm.flagtg)
 	e1:SetOperation(cm.flagop)
 	c:RegisterEffect(e1)

expansions/script/c21520187.lua

@@ -75,7 +75,7 @@ function s.thfilter(c,loc)
 	if loc~=nil then 
 		return c:IsSetCard(0x490) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 	else 
-		return (c:IsSetCard(0x490) or or aux.IsSetNameMonsterListed(c,0xc008)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+		return (c:IsSetCard(0x490) or aux.IsSetNameMonsterListed(c,0xc008)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 	end
 end
 function s.rfilter(sg,tc)
@@ -104,11 +104,11 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoHand(thg,nil,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,thg)
 	local dg=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil,LOCATION_DECK)
---	if dg:CheckSubGroup(s.rfilter,1,thg:GetFirst():GetLevel(),thg:GetFirst()) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
+--  if dg:CheckSubGroup(s.rfilter,1,thg:GetFirst():GetLevel(),thg:GetFirst()) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
 	if dg:GetCount()>=2 and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
---		local rg=dg:SelectSubGroup(tp,s.rfilter,false,1,thg:GetFirst():GetLevel(),thg:GetFirst())
+--	  local rg=dg:SelectSubGroup(tp,s.rfilter,false,1,thg:GetFirst():GetLevel(),thg:GetFirst())
 		local rg=dg:Select(tp,1,2,nil)
 		Duel.Remove(rg,POS_FACEUP,REASON_EFFECT)
 	end
@@ -127,11 +127,11 @@ function s.searchop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoHand(thg,nil,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,thg)
 	local dg=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil,LOCATION_DECK)
---	if dg:CheckSubGroup(s.rfilter,1,thg:GetFirst():GetLevel(),thg:GetFirst()) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
+--  if dg:CheckSubGroup(s.rfilter,1,thg:GetFirst():GetLevel(),thg:GetFirst()) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
 	if dg:GetCount()>=2 and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then 
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
---		local rg=dg:SelectSubGroup(tp,s.rfilter,false,1,thg:GetFirst():GetLevel(),thg:GetFirst())
+--	  local rg=dg:SelectSubGroup(tp,s.rfilter,false,1,thg:GetFirst():GetLevel(),thg:GetFirst())
 		local rg=dg:Select(tp,1,2,nil)
 		Duel.Remove(rg,POS_FACEUP,REASON_EFFECT)
 	end

expansions/script/c22000110.lua

 --圣律·露泽莫尔
 Duel.LoadScript("c22000000.lua")
-function s.initial_effect(c)
+function 22000110.initial_effect(c)
 	wco.slp(c,22000110)
 	wco.snp3(c,22000110)
 	--recover
@@ -10,10 +10,10 @@ function s.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCountLimit(1,22000111)
-	e1:SetOperation(s.lvop)
+	e1:SetOperation(22000110.lvop)
 	c:RegisterEffect(e1)
 end
-function s.lvop(e,tp,eg,ep,ev,re,r,rp)
+function 22000110.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local lv=c:GetLevel()
 	local alv=11
@@ -44,10 +44,10 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetCode(EFFECT_DISABLE)
 		e3:SetRange(LOCATION_PZONE)
 		e3:SetTargetRange(0,LOCATION_MZONE)
-		e3:SetTarget(s.distg)
+		e3:SetTarget(22000110.distg)
 		Duel.RegisterEffect(e3,tp)
 	end
 end
-function s.distg(e,c)
+function 22000110.distg(e,c)
 	return c:IsAttack(0)
 end
\ No newline at end of file

expansions/script/c23100085.lua

@@ -24,7 +24,7 @@ function c23100085.initial_effect(c)
 	e2:SetDescription(aux.Stringid(23100085,1))
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetCountLimit(1)
 	e2:SetCost(c23100085.xxcost)
 	e2:SetTarget(c23100085.xxtg)

expansions/script/c23180000.lua

@@ -30,7 +30,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.srfilter(c)
-	return (c:IsCode(81010001) or aux.IsCodeListed(c,81010001) and c:IsAbleToHand() and not c:IsCode(c)
+	return (c:IsCode(81010001) or aux.IsCodeListed(c,81010001)) and c:IsAbleToHand() and not c:IsCode(c)
 end
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.srfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c30000231.lua

 --灭绝机 霍拉格
-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+Duel.LoadScript("c10199990.lua")
 local m,cm=rscf.DefineCard(30000231)
 function cm.initial_effect(c)
 	rscf.SetSummonCondition(c,false,aux.FALSE)

expansions/script/c33910537.lua

@@ -24,6 +24,9 @@ function c33910537.initial_effect(c)
 	e2:SetOperation(c33910537.rmop)
 	c:RegisterEffect(e2)
 end
+function c33910537.indcon(e)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
+end
 
 
 function c33910537.ffilter(c)

expansions/script/c81903000.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_SET_ATTACK_FINAL)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE,EFFECT_FLAG2_WICKED)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(cm.spcon)
 	e1:SetValue(cm.adval)

expansions/script/c9390026.lua

@@ -51,7 +51,7 @@ function cm.spfilter(c,e,tp)
 	return c:IsSetCard(0x9f93) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.costfilter(c,tp)
-	return Duel.GetMZoneCount(tp,c)>0 c:IsType(TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:IsFaceup() and c:IsAbleToGraveAsCost()
+	return Duel.GetMZoneCount(tp,c)>0 and c:IsType(TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:IsFaceup() and c:IsAbleToGraveAsCost()
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.costfilter,tp,LOCATION_ONFIELD,0,1,nil,tp) end