Merge pull request #1059 from DailyShana/patch-1

fix

script/c1945387.lua

@@ -4,23 +4,23 @@ function c1945387.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_FIRE),true)
 	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c1945387.splimit)
+	c:RegisterEffect(e1)
+	--draw
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e2:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e2:SetValue(c1945387.splimit)
+	e2:SetDescription(aux.Stringid(1945387,0))
+	e2:SetCategory(CATEGORY_DRAW)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetCode(EVENT_BATTLE_DESTROYING)
+	e2:SetCondition(c1945387.drcon)
+	e2:SetTarget(c1945387.drtg)
+	e2:SetOperation(c1945387.drop)
 	c:RegisterEffect(e2)
-	--draw
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(1945387,0))
-	e3:SetCategory(CATEGORY_DRAW)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e3:SetCode(EVENT_BATTLE_DESTROYING)
-	e3:SetCondition(c1945387.drcon)
-	e3:SetTarget(c1945387.drtg)
-	e3:SetOperation(c1945387.drop)
-	c:RegisterEffect(e3)
 end
 function c1945387.splimit(e,se,sp,st)
 	return bit.band(st,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION

script/c58996430.lua

@@ -11,6 +11,16 @@ function c58996430.initial_effect(c)
 	e1:SetTarget(c58996430.target)
 	e1:SetOperation(c58996430.operation)
 	c:RegisterEffect(e1)
+	--cannot pendulum summon
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e2:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e2:SetValue(c58996430.splimit)
+	c:RegisterEffect(e2)
+end
+function c58996430.splimit(e,se,sp,st)
+	return se:GetCode()~=EFFECT_SPSUMMON_PROC_G
 end
 function c58996430.condtion(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetPreviousLocation()==LOCATION_DECK

script/c83102080.lua

@@ -11,13 +11,17 @@ function c83102080.initial_effect(c)
 	e1:SetOperation(c83102080.activate)
 	c:RegisterEffect(e1)
 end
-function c83102080.filter(c)
+function c83102080.filter(c,e,tp)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToGraveAsCost()
+		and Duel.IsExistingTarget(c83102080.tgfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler(),c)
+end
+function c83102080.tgfilter(c,tc)
+	return c:IsDestructable() and c~=tc
 end
 function c83102080.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c83102080.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c83102080.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler(),e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c83102080.filter,tp,LOCATION_ONFIELD,0,1,1,e:GetHandler())
+	local g=Duel.SelectMatchingCard(tp,c83102080.filter,tp,LOCATION_ONFIELD,0,1,1,e:GetHandler(),e,tp)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c83102080.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

script/c93543806.lua

---先史遺産ソル·モノリス
+--先史遺産ソル・モノリス
 function c93543806.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)