fix pic&lua#118,124s,161s,163s,187s

expansions/script/c11800004.lua

@@ -40,11 +40,11 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function s.ssfilter(c)
-	return not c:IsSetCard(0x3310) or c:IsFacedown()
+	return  c:IsSetCard(0x3310) 
 end
 function s.sscon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)>0
-		and not Duel.IsExistingMatchingCard(s.ssfilter,tp,LOCATION_MZONE,0,1,nil)
+		and  Duel.IsExistingMatchingCard(s.ssfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.sstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c12400032.lua

@@ -57,9 +57,13 @@ function s.op(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)
+	e2:SetCondition(s.thcon)
 	e2:SetOperation(s.thop)
 	Duel.RegisterEffect(e2,tp)
 end
+function s.thcon(e,tp,eg,ep,ev,re,r,rp)
+		return  Duel.GetTurnPlayer()==tp 
+end
 function s.thfilter(c)
 	return c:IsFaceup() and  ((c:IsType(TYPE_MONSTER) and c:IsLevelAbove(6)) or c:IsSetCard(0x32a1) )
 end

expansions/script/c12400042.lua

@@ -68,7 +68,7 @@ function s.mfilter(c)
 end
 --
 function s.efilter2(e,te)
-	return not (te:IsActiveType(TYPE_MONSTER) and te:GetOwner():IsRace(RACE_MACHINE))
+	return te:IsActiveType(TYPE_MONSTER) and not  te:GetOwner():IsRace(RACE_MACHINE)
 end
 --
 function s.ctcon1(e,tp,eg,ep,ev,re,r,rp)
@@ -158,7 +158,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetMatchingGroup(s.filter10,tp,LOCATION_MZONE,0,e:GetHandler())>0 and c:GetMaterialCount()>0 end
+	if chk==0 then return Duel.GetMatchingGroupCount(s.filter10,tp,LOCATION_MZONE,0,e:GetHandler())>0 and c:GetMaterialCount()>0 end
 end
 function s.filter10(c)
 	return c:IsRace(RACE_MACHINE) and c:IsFaceup()

expansions/script/c12400111.lua

@@ -94,8 +94,8 @@ function s.cpfilter(c)
 end
 function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsControler(tp) and chkc:IsOnField() and s.cpfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_SZONE,0,1,nil)
+	if chkc then return chkc:IsControler(tp) and chkc:IsOnField() and s.thfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(s.cpfilter,tp,LOCATION_SZONE,0,1,nil)
 		and c:IsAbleToRemove() end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
 	local g=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_SZONE,0,1,1,nil)

expansions/script/c12410012.lua

@@ -9,8 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e0:SetRange(LOCATION_EXTRA)
-	e0:SetValue(aux.fuslimit)
+	e0:SetValue(cm.fuslimit)
 	c:RegisterEffect(e0)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
@@ -47,6 +46,9 @@ function cm.initial_effect(c)
 	e7:SetOperation(cm.op7)
 	c:RegisterEffect(e7)
 end
+function cm.fuslimit(e,se,sp,st)
+	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
+end
 function cm.mat(c)
 	return c:GetOriginalRace()==RACE_MACHINE
 end
@@ -78,8 +80,7 @@ function cm.con2(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(cm.e,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-	and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function cm.op2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c16104220.lua

@@ -3,8 +3,14 @@ if not pcall(function() require("expansions/script/c16104200") end) then require
 local m,cm=rk.set(16104220)
 function cm.initial_effect(c)
 	c:SetUniqueOnField(1,0,m)
-	local e1=rsef.ACT(c)
-	local e2=rsef.FV_LIMIT_PLAYER(c,"sp",nil,cm.tg2,{1,0})
+	local e1=rkch.ACT(c)
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetRange(LOCATION_SZONE)
+	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e2:SetTargetRange(1,0)
+	e2:SetValue(cm.tg2)
+	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOKEN+CATEGORY_SPECIAL_SUMMON+CATEGORY_SUMMON)
 	e3:SetDescription(aux.Stringid(m,1))

expansions/script/c16104234.lua

@@ -31,7 +31,7 @@ function cm.initial_effect(c)
 	e5:SetRange(LOCATION_SZONE)
 	e5:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e5:SetTargetRange(1,0)
-	e5:SetValue(cm.limitval)
+	e5:SetValue(cm.sptg)
 	c:RegisterEffect(e5)
 	local e6=e5:Clone()
 	e6:SetCode(EFFECT_CANNOT_SUMMON)

expansions/script/c16150035.lua

 --天命结合
 xpcall(function() require("expansions/script/c16199990") end,function() require("script/c16199990") end)
-local m,cm=rk.set(16150035,"OUMEI")
+local m,cm=rk.set(16150035)
 function cm.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -11,7 +11,7 @@ function cm.initial_effect(c)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1) 
 end
-function cm.spfilter1(c,tp)
+function cm.spfilter(c,tp)
 	return rk.check(c,"DAIOUJYUU") and c:IsType(TYPE_MONSTER) and not c:IsForbidden() and c:CheckUniqueOnField(tp)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c16368145.lua

@@ -31,7 +31,7 @@ function c16368145.initial_effect(c)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetTargetRange(0,1)
+	e3:SetTargetRange(1,1)
 	e3:SetCondition(c16368145.actcon)
 	e3:SetValue(c16368145.actlimit)
 	c:RegisterEffect(e3)
@@ -66,5 +66,6 @@ function c16368145.actcon(e)
 		and Duel.IsExistingMatchingCard(Card.IsCode,e:GetHandlerPlayer(),LOCATION_GRAVE,0,1,nil,50218134,16364073)
 end
 function c16368145.actlimit(e,re,tp)
-	return re:GetActivateLocation()==LOCATION_ONFIELD
+	local rc=re:GetHandler()
+	return rc:IsOnField() or re:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
\ No newline at end of file

expansions/script/c16368155.lua

@@ -74,7 +74,7 @@ function c16368155.descon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c16368155.desfilter(c,tp)
 	local g=c:GetColumnGroup()
-	return g:IsExists(Card.IsControler,1,nil,1-tp)
+	return g:IsExists(Card.IsControler,1,nil,1-tp) or c:IsControler(1-tp)
 end
 function c16368155.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() end

expansions/script/c18700203.lua

@@ -17,7 +17,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
+	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_MACHINE))
@@ -27,7 +27,7 @@ function cm.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_UPDATE_ATTACK)
 	e4:SetRange(LOCATION_SZONE)
-	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e4:SetTargetRange(LOCATION_MZONE,0)
 	e4:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_MACHINE))
 	e4:SetValue(800)
 	c:RegisterEffect(e4)

expansions/script/c18700210.lua

@@ -46,7 +46,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
-		if Duel.IsExistingMatchingCard(cm.cfilter2,tp,LOCATION_MZONE+LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
+		if Duel.IsExistingMatchingCard(cm.cfilter2,tp,LOCATION_MZONE+LOCATION_GRAVE,0,1,nil) and Duel.IsExistingMatchingCard(cm.cfilter2,tp,LOCATION_GRAVE,0,1,nil)  and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 			local g2=Duel.SelectMatchingCard(tp,cm.cfilter2,tp,LOCATION_GRAVE,0,1,1,nil)
 			if g2:GetCount()>0 then
 				Duel.SendtoHand(g2,nil,REASON_EFFECT)
@@ -73,8 +73,8 @@ function cm.filter2(c,e,tp,m,f,chkf)
 	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)
 end
-function cm.filter5(c)
-	return aux.IsCodeListed(c,m-9)
+function cm.filter5(c,e)
+	return aux.IsCodeListed(c,m-9) and c:IsType(TYPE_MONSTER) 
 end
 function cm.fcheck(tp,sg,fc)
 	return sg:IsExists(cm.filter5,1,nil)

expansions/script/c18700400.lua

@@ -64,9 +64,14 @@ function cm.damop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
 	local tg=g:Filter(Card.IsRelateToEffect,nil,e)
-	if tg:GetCount()>0 and Duel.Destroy(tg,REASON_EFFECT) then
+	if tg:GetCount()>0 then
+		if Duel.Destroy(tg,REASON_EFFECT)>0 then
 			local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,tg:GetCount()+1,nil)
 			Duel.Destroy(g,REASON_EFFECT)
+		else
+			local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,1,nil)
+			Duel.Destroy(g,REASON_EFFECT)
+		end
 		if Duel.IsExistingMatchingCard(cm.cfilter2,tp,LOCATION_MZONE+LOCATION_GRAVE,0,3,nil) then
 			local e3=Effect.CreateEffect(c)
 			e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)

expansions/script/c18700688.lua

@@ -155,7 +155,7 @@ function cm.sumfilter(c)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)