fix: summon condition (fusion monsters)

1664eeeb · salix5 · 0e0229ad · 1664eeeb · 1664eeeb · 1664eeeb
Commit 1664eeeb authored Aug 05, 2020 by salix5
Showing with 6 additions and 9 deletions

c15291624.lua c15291624.lua +1 -1

c37440988.lua c37440988.lua +1 -1

c41685633.lua c41685633.lua +1 -1

c42166000.lua c42166000.lua +1 -1

c65172015.lua c65172015.lua +1 -1

c8198620.lua c8198620.lua +1 -4

No files found.
--- a/c15291624.lua
+++ b/c15291624.lua
@@ -14,7 +14,7 @@ function c15291624.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
-	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetRange(LOCATION_EXTRA)
 	e2:SetCondition(c15291624.spcon)
 	e2:SetOperation(c15291624.spop)

--- a/c37440988.lua
+++ b/c37440988.lua
@@ -13,7 +13,7 @@ function c37440988.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
 	e2:SetRange(LOCATION_EXTRA)
 	e2:SetCondition(c37440988.hspcon)

--- a/c41685633.lua
+++ b/c41685633.lua
@@ -13,7 +13,7 @@ function c41685633.initial_effect(c)
 	--special summon rule
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
 	e2:SetRange(LOCATION_EXTRA)
 	e2:SetCondition(c41685633.sprcon)

--- a/c42166000.lua
+++ b/c42166000.lua
@@ -14,7 +14,7 @@ function c42166000.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
 	e2:SetRange(LOCATION_EXTRA)
 	e2:SetCondition(c42166000.hspcon)

--- a/c65172015.lua
+++ b/c65172015.lua
@@ -12,7 +12,7 @@ function c65172015.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
-	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetRange(LOCATION_EXTRA)
 	e2:SetCondition(c65172015.spcon)
 	e2:SetOperation(c65172015.spop)

--- a/c8198620.lua
+++ b/c8198620.lua
@@ -10,7 +10,7 @@ function c8198620.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	e1:SetRange(LOCATION_EXTRA)
-	e1:SetValue(c8198620.splimit)
+	e1:SetValue(aux.fuslimit)
 	c:RegisterEffect(e1)
 	--battle
 	local e2=Effect.CreateEffect(c)
@@ -31,9 +31,6 @@ function c8198620.initial_effect(c)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)
 end
-function c8198620.splimit(e,se,sp,st)
-	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or bit.band(st,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION
-end
 function c8198620.attg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local bc=e:GetHandler():GetBattleTarget()
 	if chk==0 then return bc and bc:IsRelateToBattle() end