lbw

expansions/script/c12013055.lua

@@ -20,7 +20,7 @@ function cm.initial_effect(c)
 	e2:SetCode(EVENT_FREE_CHAIN)	
 	e2:SetHintTiming(0,TIMING_END_PHASE)
 	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCondition(cm.spcon)
+	e2:SetCondition(cm.thcon)
 	e2:SetCost(cm.spcost)
 	e2:SetTarget(cm.sptg)
 	e2:SetOperation(cm.spop)

expansions/script/c17061070.lua

 --苍空的人偶少女·奥契丝
 local m=17061070
 local cm=_G["c"..m]
-xpcall(function() require("expansions/script/c57300000") end,function() require("script/c57300000") end)
-cm.named_with_doll=true
 function cm.initial_effect(c)
 	--link summon
 	c:EnableReviveLimit()

expansions/script/c21520163.lua

@@ -85,7 +85,7 @@ function c21520163.ccost(e,tp)
 	end
 end
 function c21520163.rfilter(c)
-	return (c:IsAttribute(ATTRIBUTE_DARK) or c:IsAttribute(ATTRIBUTE_LIGHT)) and c:IsAbleToGraveAsCost()
+	return (c:IsAttribute(ATTRIBUTE_DARK) or c:IsAttribute(ATTRIBUTE_LIGHT)) and c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
 end
 function c21520163.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c21520163.rfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c21520164.lua

@@ -84,7 +84,7 @@ function c21520164.ccost(e,tp)
 	end
 end
 function c21520164.filter(c,e,tp)
-	return c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsLevelBelow(4) and c:IsSetCard(0x490)
+	return c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsType(TYPE_MONSTER)
 end
 function c21520164.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 

expansions/script/c21520165.lua

@@ -116,9 +116,9 @@ end
 
 function c21520165.cfilter(c,stname)
 	if stname==nil then 
-		return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and c:IsAbleToGrave()
+		return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 	else 
-		return c:IsSetCard(stname) and c:IsAbleToGrave()
+		return c:IsSetCard(stname) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 	end
 end
 function c21520165.cost1(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c21520166.lua

@@ -108,7 +108,7 @@ function c21520166.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp
 end
 function c21520166.thfilter(c)
-	return (c:IsSetCard(0x490) and c:IsLevelBelow(4) or c:IsCode(21520181)) and c:IsAbleToHand()
+	return ((c:IsSetCard(0x490) and c:IsLevelBelow(4) and c:IsType(TYPE_MONSTER)) or c:IsCode(21520181)) and c:IsAbleToHand()
 end
 function c21520166.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c21520166.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c21520167.lua

@@ -107,7 +107,7 @@ function c21520167.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e2,tp)
 end
 function c21520167.sefilter1(e,c)
-	return c:IsSetCard(0x490) and c:IsFaceup()
+	return c:IsSetCard(0x490) and c:IsFaceup() and c:IsType(TYPE_MONSTER)
 end
 function c21520167.ctfilter(c)
 	return c:IsFaceup() and c:IsCode(21520161) and c:IsAbleToHand()

expansions/script/c21520169.lua

@@ -84,7 +84,7 @@ function c21520169.ccost(e,tp)
 	end
 end
 function c21520169.dfilter(c)
-	return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and not c:IsPublic() 
+	return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and c:IsType(TYPE_MONSTER) and not c:IsPublic() 
 end
 function c21520169.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c21520169.dfilter,tp,LOCATION_HAND,0,1,nil) end

expansions/script/c21520170.lua

@@ -84,7 +84,7 @@ function c21520170.ccost(e,tp)
 	end
 end
 function c21520170.spfilter(c,e,tp)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsType(TYPE_MONSTER)
 end
 function c21520170.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c21520170.spfilter,tp,LOCATION_REMOVED,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end

expansions/script/c21520181.lua

@@ -13,7 +13,7 @@ function c21520181.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_DESTROYED)
 	e2:SetRange(LOCATION_FZONE)
-	e2:SetCountLimit(1,21520181)
+--	e2:SetCountLimit(1,21520181)
 	e2:SetCondition(c21520181.thcon)
 	e2:SetTarget(c21520181.thtg)
 	e2:SetOperation(c21520181.thop)

expansions/script/c21520186.lua

@@ -45,7 +45,7 @@ function c21520186.dafilter(c)
 	return c:IsSetCard(0x490) and c:IsFaceup() and c:GetAttack()<=3000
 end
 function c21520186.csfilter(c)
-	return c:IsSetCard(0x490) and c:IsFaceup()
+	return c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function c21520186.cscon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetType()&(TYPE_SPELL+TYPE_CONTINUOUS)==TYPE_SPELL+TYPE_CONTINUOUS

expansions/script/c21520190.lua

@@ -23,7 +23,7 @@ function c21520190.initial_effect(c)
 	local e2_2=e2:Clone()
 	e2_2:SetCode(EFFECT_UPDATE_DEFENSE)
 	c:RegisterEffect(e2_2)
-	--atk &def
+	--continuous spell
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_SEARCH)
 	e3:SetDescription(aux.Stringid(21520190,1))
@@ -31,9 +31,9 @@ function c21520190.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetCountLimit(1)
-	e3:SetCondition(c21520190.thcon)
-	e3:SetTarget(c21520190.thtg)
-	e3:SetOperation(c21520190.thop)
+	e3:SetCondition(c21520190.cscon)
+	e3:SetTarget(c21520190.cstg)
+	e3:SetOperation(c21520190.csop)
 	c:RegisterEffect(e3)
 --[[	if not c21520190.global_check then
 		c21520190.global_check=true
@@ -90,17 +90,17 @@ end
 function c21520190.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0x490)
 end
-function c21520190.thfilter(c)
-	return c:IsRace(RACE_FIEND) and c:IsAbleToHand()
+function c21520190.csfilter(c)
+	return c:IsRace(RACE_FIEND) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 --Group.CheckWithSumEqual(Group g, function f, int sum, int min, int max, ...)
 end
-function c21520190.thcon(e,tp,eg,ep,ev,re,r,rp)
+function c21520190.cscon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetType()&(TYPE_SPELL+TYPE_CONTINUOUS)==TYPE_SPELL+TYPE_CONTINUOUS
 end
-function c21520190.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function c21520190.cstg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return c21520190.filter(chkc) and chkc:IsLocation(LOCATION_ONFIELD) and chkc:GetControler(tp) end
 	if chk==0 then 
-		local g=Duel.GetMatchingGroup(c21520190.thfilter,tp,LOCATION_DECK,0,nil)
+		local g=Duel.GetMatchingGroup(c21520190.csfilter,tp,LOCATION_DECK,0,nil)
 		return g:CheckWithSumEqual(Card.GetOriginalLevel,7,2,2) and Duel.IsExistingTarget(c21520190.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local c=e:GetHandler()
@@ -109,13 +109,13 @@ function c21520190.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,dg,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,2,tp,LOCATION_DECK)
 end
-function c21520190.thop(e,tp,eg,ep,ev,re,r,rp)
+function c21520190.csop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	local tc=Duel.GetFirstTarget()
 	if not tc or not tc:IsRelateToEffect(e) then return end
 	local dg=Group.FromCards(c,tc)
-	local g=Duel.GetMatchingGroup(c21520190.thfilter,tp,LOCATION_DECK,0,nil)
+	local g=Duel.GetMatchingGroup(c21520190.csfilter,tp,LOCATION_DECK,0,nil)
 	if Duel.Destroy(dg,REASON_EFFECT)~=2 or not g:CheckWithSumEqual(Card.GetOriginalLevel,7,2,2) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local sg=g:SelectWithSumEqual(tp,Card.GetOriginalLevel,7,2,2)

expansions/script/c33502001.lua

 --灰色记忆 人偶少女
 local m=33502001
 local cm=_G["c"..m]
-xpcall(function() require("expansions/script/c57300000") end,function() require("script/c57300000") end)
-cm.named_with_doll=true
 function cm.initial_effect(c)
 	--tograve
 	local e2=Effect.CreateEffect(c)

expansions/script/c60151501.lua

 --Ruby Rose
-Duel.LoadScript("c37564765.lua")
-c60151501.Senya_name_with_rose=true
 function c60151501.initial_effect(c)
 	c:SetUniqueOnField(1,0,60151501)
 	--Activate

expansions/script/c60151551.lua

 --Crescent Rose
-Duel.LoadScript("c37564765.lua")
-c60151551.Senya_name_with_rose=true
 function c60151551.initial_effect(c)
 	c:SetUniqueOnField(1,0,60151551)
 	--Activate

expansions/script/c72404107.lua

@@ -95,7 +95,7 @@ function c72404107.activate(e,tp,eg,ep,ev,re,r,rp)
 		
 	else
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-		local g=Duel.SelectMatchingCard(tp,c72404107.filter,tp,LOCATION_DECK,0,1,1,nil)
+		local g=Duel.SelectMatchingCard(tp,c72404107.filter,tp,LOCATION_MZONE,0,1,1,nil)
 		if g:GetCount()>0 then
 		   if Duel.SendtoGrave(g,REASON_RELEASE+REASON_EFFECT)~=0 then
 				local xg=Duel.SelectMatchingCard(tp,c72404107.filter2,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)

expansions/script/c72404127.lua

@@ -34,7 +34,7 @@ function c72404127.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Release(g,REASON_COST)
 end
 function c72404127.filter1(c)
-	return c:IsSetCard(0x720) and c:IsReleasableByEffect()
+	return c:IsSetCard(0x720) and c:IsType(TYPE_MONSTER) and c:IsReleasableByEffect()
 end
 function c72404127.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c72404127.filter1,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c72499000.lua

@@ -51,7 +51,7 @@ function c72499000.operation1(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function c72499000.condition2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_MZONE,3,nil) and Duel.GetFieldGroupCount(c:GetControler(),LOCATION_MZONE,0,nil)==0
+	return Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_MZONE,3,nil) and  Duel.GetFieldGroupCount(e:GetOwner():GetControler(),LOCATION_MZONE,0,nil)==0
 end
 
 function c72499000.target2(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c81012000.lua

 --Flaming Rose
-Duel.LoadScript("c37564765.lua")
-c81012000.Senya_name_with_rose=true
 function c81012000.initial_effect(c)
 	--Activate
 	local e0=aux.AddRitualProcEqual2(c,c81012000.filter,LOCATION_HAND+LOCATION_GRAVE)

expansions/script/c81046011.lua

@@ -25,7 +25,7 @@ function c81046011.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c81046011.spcon(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
+	if c==nil then return true end
 	local tp=c:GetControler()
 	local cg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_GRAVE,0,nil)
 	return cg:GetCount()>7 and cg:GetClassCount(Card.GetCode)==cg:GetCount()

expansions/strings.conf

@@ -791,7 +791,6 @@
 !setname 0x291 精灵王
 !setname 0x292 灵翼
 !setname 0x1292 天殇灵翼
-!setname 0x295 神迹
 !setname 0x296 幻晶兽
 !setname 0x297 亡灵舰队
 !setname 0xc298 荒兽