Merge branch 'master' of git.mycard.moe:alstroemeria-silentlove/ygopro-222DIY-cards

fbbd4c19 · nanahira · 88954d6f · 01a37042 · fbbd4c19 · fbbd4c19
Commit fbbd4c19 authored Jun 16, 2020 by nanahira
10 changed files
--- a/expansions/222DIY.cdb
+++ b/expansions/222DIY.cdb
--- a/expansions/script/c26800000.lua
+++ b/expansions/script/c26800000.lua
@@ -2,11 +2,11 @@
 Amana=Amana or {}
 --Mogami Shizuka, 81018xxx, 0x81b
 function Amana.AttackBelow(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetCode(EFFECT_CANNOT_ATTACK)
-	e0:SetCondition(Amana.atcon)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetCode(EFFECT_CANNOT_ATTACK)
+	ea:SetCondition(Amana.atcon)
+	c:RegisterEffect(ea)
 end
 function Amana.atcon(e)
 	return e:GetHandler():GetAttack()>=2000
@@ -15,13 +15,13 @@ end
 function Amana.Majsoul(c)
 	Duel.EnableGlobalFlag(GLOBALFLAG_SELF_TOGRAVE)
 	aux.AddCodeList(c,26818000,26818001)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetCode(EFFECT_SELF_TOGRAVE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCondition(Amana.tgcon)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_SELF_TOGRAVE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCondition(Amana.tgcon)
+	c:RegisterEffect(ea)
 end
 function Amana.cfilter(c)
 	return c:IsFaceup() and c:IsCode(26818000,26818001)
@@ -33,24 +33,24 @@ function Amana.tgcon(e)
 end
 --majsoulGirl/Boy
 function Amana.MajsoulGirl(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetCode(EFFECT_CHANGE_CODE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCondition(Amana.namecon)
-	e0:SetValue(26818000)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_CHANGE_CODE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCondition(Amana.namecon)
+	ea:SetValue(26818000)
+	c:RegisterEffect(ea)
 end
 function Amana.MajsoulBoy(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetCode(EFFECT_CHANGE_CODE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCondition(Amana.namecon)
-	e0:SetValue(26818001)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_CHANGE_CODE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCondition(Amana.namecon)
+	ea:SetValue(26818001)
+	c:RegisterEffect(ea)
 end
 function Amana.namecon(e)
 	local ph=Duel.GetCurrentPhase()

--- a/expansions/script/c81000000.lua
+++ b/expansions/script/c81000000.lua
@@ -2,19 +2,19 @@
 Tenka=Tenka or {}
 --Mogami Shizuka, 81018xxx, 0x81b
 function Tenka.Shizuka(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetCode(EFFECT_REFLECT_BATTLE_DAMAGE)
-	e0:SetValue(1)
-	c:RegisterEffect(e0)
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
-	e1:SetCountLimit(1)
-	e1:SetValue(Tenka.valcon)
-	c:RegisterEffect(e1)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetCode(EFFECT_REFLECT_BATTLE_DAMAGE)
+	ea:SetValue(1)
+	c:RegisterEffect(ea)
+	local eb=Effect.CreateEffect(c)
+	eb:SetType(EFFECT_TYPE_SINGLE)
+	eb:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	eb:SetRange(LOCATION_MZONE)
+	eb:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
+	eb:SetCountLimit(1)
+	eb:SetValue(Tenka.valcon)
+	c:RegisterEffect(eb)
 end
 function Tenka.valcon(e,re,r,rp)
 	return bit.band(r,REASON_BATTLE)~=0
@@ -30,24 +30,24 @@ function Tenka.ReikaCon(e,tp,eg,ep,ev,re,r,rp)
 end
 --koikake atk
 function Tenka.KoikakeRitual(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCode(EFFECT_UPDATE_ATTACK)
-	e0:SetCondition(Tenka.atkcon)
-	e0:SetValue(Tenka.btkval)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCode(EFFECT_UPDATE_ATTACK)
+	ea:SetCondition(Tenka.atkcon)
+	ea:SetValue(Tenka.btkval)
+	c:RegisterEffect(ea)
 end
 function Tenka.KoikakeLink(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetCode(EFFECT_UPDATE_ATTACK)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCondition(Tenka.atkcon)
-	e0:SetValue(Tenka.atkval)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetCode(EFFECT_UPDATE_ATTACK)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCondition(Tenka.atkcon)
+	ea:SetValue(Tenka.atkval)
+	c:RegisterEffect(ea)
 end
 function Tenka.atkcon(e)
 	local ph=Duel.GetCurrentPhase()
@@ -66,44 +66,44 @@ end
 --kobayashi maid dragon
 --advanced summon
 function Tenka.MaidDragon(c)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_SZONE,LOCATION_SZONE)
-	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
-	e0:SetValue(POS_FACEUP_ATTACK)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	ea:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	ea:SetTargetRange(LOCATION_SZONE,LOCATION_SZONE)
+	ea:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
+	ea:SetValue(POS_FACEUP_ATTACK)
+	c:RegisterEffect(ea)
 end
 --
 function Tenka.Asamiya(c)
 	c:EnableReviveLimit()
 	aux.AddCodeList(c,81027000)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetCode(EFFECT_CHANGE_CODE)
-	e0:SetRange(LOCATION_MZONE+LOCATION_HAND)
-	e0:SetValue(81027000)
-	c:RegisterEffect(e0)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_CHANGE_CODE)
+	ea:SetRange(LOCATION_MZONE+LOCATION_HAND)
+	ea:SetValue(81027000)
+	c:RegisterEffect(ea)
 end
 --
 function Tenka.EightOne(c)
 	c:EnableReviveLimit()
 	aux.AddCodeList(c,81005036)
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetCode(EFFECT_IMMUNE_EFFECT)
-	e0:SetValue(Tenka.efilter)
-	c:RegisterEffect(e0)
-	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(aux.FALSE)
-	c:RegisterEffect(e1)
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetCode(EFFECT_IMMUNE_EFFECT)
+	ea:SetValue(Tenka.efilter)
+	c:RegisterEffect(ea)
+	local eb=Effect.CreateEffect(c)
+	eb:SetType(EFFECT_TYPE_SINGLE)
+	eb:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	eb:SetCode(EFFECT_SPSUMMON_CONDITION)
+	eb:SetValue(aux.FALSE)
+	c:RegisterEffect(eb)
 end
 function Tenka.efilter(e,te)
 	return te:IsActiveType(TYPE_TRAP)

--- a/expansions/script/c81005032.lua
+++ b/expansions/script/c81005032.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddLinkProcedure(c,cm.mfilter,4,4)
 	--atkup
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
@@ -30,9 +29,6 @@ function cm.initial_effect(c)
 	e5:SetCondition(cm.descon2)
 	c:RegisterEffect(e5)
 end
-function cm.mfilter(c)
-	return c:IsLinkType(TYPE_LINK) and c:GetLink()>=6
-end
 function cm.cfilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_CONTINUOUS) and c:IsType(TYPE_TRAP)
 end

--- a/expansions/script/c81005033.lua
+++ b/expansions/script/c81005033.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddSynchroProcedure(c,nil,aux.NonTuner(Card.IsRace,RACE_PSYCHO),8)
 	--tuner
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,1))

--- a/expansions/script/c81005034.lua
+++ b/expansions/script/c81005034.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddFusionProcFunRep(c,cm.ffilter,4,false)
 	--set
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(m,0))
@@ -37,9 +36,6 @@ function cm.initial_effect(c)
 	e5:SetCondition(cm.descon2)
 	c:RegisterEffect(e5)
 end
-function cm.ffilter(c)
-	return c:IsFusionType(TYPE_EFFECT) and c:GetBaseAttack()>=5000
-end
 function cm.setcon(e,tp,eg,ep,ev,re,r,rp)
 	return re:IsActiveType(TYPE_TRAP)
 end

--- a/expansions/script/c81005035.lua
+++ b/expansions/script/c81005035.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddXyzProcedureLevelFree(c,cm.mfilter,cm.xyzcheck,8,8)
 	--to hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -35,12 +34,6 @@ function cm.initial_effect(c)
 	e5:SetCondition(cm.descon2)
 	c:RegisterEffect(e5)
 end
-function cm.mfilter(c,xyzc)
-	return c:IsXyzType(TYPE_MONSTER) and c:IsXyzLevel(xyzc,9)
-end
-function cm.xyzcheck(g)
-	return g:GetClassCount(Card.GetOriginalCode)==1
-end
 function cm.tgfilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:IsAbleToGrave()
 end

--- a/expansions/script/c81005063.lua
+++ b/expansions/script/c81005063.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddFusionProcFunRep(c,cm.ffilter,9,true)
 	--atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -32,9 +31,6 @@ function cm.initial_effect(c)
 	e5:SetCondition(cm.descon2)
 	c:RegisterEffect(e5)
 end
-function cm.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionType(TYPE_MONSTER) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
-end
 function cm.atkfilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS)
 end

--- a/expansions/script/c81005064.lua
+++ b/expansions/script/c81005064.lua
@@ -4,7 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSummonType,SUMMON_TYPE_FLIP),6,4)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

--- a/expansions/script/c81005068.lua
+++ b/expansions/script/c81005068.lua
@@ -4,8 +4,6 @@ local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
 	Tenka.EightOne(c)
-	aux.AddSynchroMixProcedure(c,aux.Tuner(Card.IsSynchroType,TYPE_SYNCHRO),aux.Tuner(Card.IsSynchroType,TYPE_SYNCHRO),aux.Tuner(Card.IsSynchroType,TYPE_SYNCHRO),aux.NonTuner(Card.IsCode,81011039),1,1)
-	c:EnableReviveLimit()
 	--banish
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DESTROY)