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

expansions/script/c16101100.lua

 --零界的外包
-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
-
+if not pcall(function() dofile("expansions/script/c10199990.lua") end) then dofile("expansions/script/c10199990.lua") end
 --[[
 DIY Record
 

expansions/script/c16101108.lua

 --魔帝连结
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16101108)
 function cm.initial_effect(c)
 	aux.AddCodeList(c,16172004)

expansions/script/c16101111.lua

 --特殊召唤钩子测试
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16101111)
 cm.code=16101111
 cm.side_code=16101112

expansions/script/c16101112.lua

 --特殊召唤钩子测试
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16101112)
 cm.code=16101111
 cm.side_code=16101112

expansions/script/c16101113.lua

 --魔城的霸者 欧尔基亚斯
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16101113)
 function cm.give(c,reset)
 	--

expansions/script/c16172000.lua

 --大欲的招来
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172000)
 local code=16172004
 function cm.initial_effect(c)

expansions/script/c16172001.lua

 --禁时王的大噬
 local m=16172001
 local cm=_G["c"..m]
-Duel.LoadScript("c16199990.lua")
 function cm.initial_effect(c)
 	aux.AddCodeList(c,16172004)
 	local e1=Effect.CreateEffect(c)

expansions/script/c16172002.lua

 --禁时王的凶仆
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172002)
 cm.code=16172002
 cm.side_code=16172003

expansions/script/c16172003.lua

 --禁时王的凶仆 贾巴兰卡
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172003)
 cm.code=16172002
 cm.side_code=16172003

expansions/script/c16172004.lua

 --禁时王
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172004)
 cm.code=16172004
 cm.side_code=16172005
@@ -115,14 +115,13 @@ function cm.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function cm.spop1(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.SetLP(1-tp,Duel.GetLP(1-tp)/2) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		local g=Duel.SelectMatchingCard(tp,cm.spfilter1,tp,LOCATION_DECK,0,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.SendtoHand(g,tp,REASON_EFFECT)
-			Duel.ConfirmCards(1-tp,g)
-		end
+	Duel.SetLP(1-tp,Duel.GetLP(1-tp)/2)
+	Duel.BreakEffect()
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	local g=Duel.SelectMatchingCard(tp,cm.spfilter1,tp,LOCATION_DECK,0,1,1,nil)
+	if g:GetCount()>0 then
+		Duel.SendtoHand(g,tp,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
 	end
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c16172005.lua

 --禁时王的大欲
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172005)
 cm.code=16172004
 cm.side_code=16172005
@@ -102,8 +102,8 @@ function cm.counterop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end  
 function cm.costct(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsCanRemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x2cc,10,REASON_COST) end
-	Duel.RemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x2cc,10,REASON_COST)
+	if chk==0 then return Duel.IsCanRemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x2cc,8,REASON_COST) end
+	Duel.RemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x2cc,8,REASON_COST)
 end
 function cm.targetct(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,true,true) end

expansions/script/c16172006.lua

 --大欲的魔龙
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172006)
 cm.code=16172006
 cm.side_code=16172007

expansions/script/c16172007.lua

 --大欲的魔龙 卡伊扎
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172007)
 cm.code=16172006
 cm.side_code=16172007

expansions/script/c16172008.lua

 --恶性的斩魔
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172008)
 cm.code=16172008
 cm.side_code=16172009

expansions/script/c16172009.lua

 --恶性的斩魔 亚克亚马苏特
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172009)
 cm.code=16172008
 cm.side_code=16172009

expansions/script/c16172010.lua

 --不死鸟缝合
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172010)
 function cm.initial_effect(c)
 	aux.AddCodeList(c,16172004)

expansions/script/c16172012.lua

 --恶击缝合
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m,cm=rk.set(16172012)
 function cm.initial_effect(c)
 	aux.AddCodeList(c,16172004)

expansions/script/c16172018.lua

 --灭界的魔将 巴弗洛梅亚
-if not pcall(function() require("expansions/script/c16199990") end) then require("script/c16199990") end
+if not pcall(function() dofile("expansions/script/c16199990.lua") end) then dofile("expansions/script/c16199990.lua") end
 local m=16172018
 local cm=_G["c"..m]
 function cm.initial_effect(c)

expansions/script/c16172019.lua

@@ -2,7 +2,7 @@
 local m=16172019
 local cm=_G["c"..m]
 function cm.initial_effect(c)
-		--Activate
+	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function cm.filter(c,tp)
-	return c:IsCode(16172015,16172017,16172018) and c:IsAbleToHand()
+	return c:IsCode(16172004,16172015,16172017,16172018) and c:IsAbleToHand()
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,tp) end

expansions/script/c16199990.lua

-if not pcall(function() require("expansions/script/c16101100") end) then require("script/c16101100") end
+if not pcall(function() dofile("expansions/script/c16101100.lua") end) then dofile("script/c16101100.lua") end
 rk=rk or {}
 local loc_table_for_reikai={
 ['dk'] = LOCATION_DECK,

expansions/script/c16362009.lua

@@ -28,8 +28,9 @@ function c16362009.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c16362009.spcon(e,tp,eg,ep,ev,re,r,rp)
+	local ph=Duel.GetCurrentPhase()
 	local rc=re:GetHandler()
-	return re:IsActiveType(TYPE_MONSTER)
+	return Duel.GetTurnPlayer()==tp and (ph==PHASE_MAIN1 or ph==PHASE_MAIN2) and re:IsActiveType(TYPE_MONSTER)
 		and rc:IsLocation(LOCATION_MZONE) and rc:IsControler(tp) and rc:IsSetCard(0xdc0)
 end
 function c16362009.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c16362028.lua

@@ -97,7 +97,7 @@ function c16362028.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.BreakEffect()
 		Duel.SendtoGrave(e:GetHandler(),REASON_EFFECT)
 	end
-	local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)

expansions/script/c30900644.lua

+--异界王的威严
+local s,id,o=GetID()
+function s.initial_effect(c)
+aux.AddCodeList(c,30900609)
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,id)
+	e1:SetCondition(s.skipcon)
+	e1:SetOperation(s.skipop)
+	c:RegisterEffect(e1)
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetType(EFFECT_TYPE_QUICK_O)
+	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetRange(LOCATION_GRAVE)
+	e2:SetCondition(s.thcon)
+	e2:SetCost(aux.bfgcost)
+	e2:SetTarget(s.target)
+	e2:SetOperation(s.activate)
+	c:RegisterEffect(e2)
+end
+function s.cfilter(c)
+	return c:IsFaceup() and c:IsCode(30900609)
+end
+function s.skipcon(e,tp,eg,ep,ev,re,r,rp)
+	return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
+		and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil)
+		and not Duel.IsExistingMatchingCard(aux.NOT(s.cfilter),tp,LOCATION_MZONE,0,1,nil)
+		and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)<Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)
+end
+function s.skipop(e,tp,eg,ep,ev,re,r,rp)
+	local ph=Duel.GetCurrentPhase()
+	Duel.SkipPhase(Duel.GetTurnPlayer(),ph,RESET_PHASE+ph,1)
+end
+function s.ffilter(c)
+	return c:IsFaceup() and c:IsCode(30900609)
+end
+function s.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsExistingMatchingCard(s.ffilter,tp,LOCATION_MZONE,0,1,nil)
+end
+function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
+	local sg=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
+	Duel.SetOperationInfo(0,CATEGORY_POSITION,sg,sg:GetCount(),0,0)
+end
+function s.activate(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	local sg=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
+	if sg:GetCount()>0 then
+		Duel.ChangePosition(sg,POS_FACEUP_ATTACK,0,POS_FACEUP_ATTACK,0)
+		local tc=sg:GetFirst()
+		while tc do
+			local e1=Effect.CreateEffect(c)
+			e1:SetType(EFFECT_TYPE_SINGLE)
+			e1:SetCode(EFFECT_MUST_ATTACK)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+			tc:RegisterEffect(e1)
+			local e2=Effect.CreateEffect(c)
+			e2:SetType(EFFECT_TYPE_SINGLE)
+			e2:SetCode(EFFECT_CANNOT_CHANGE_POSITION)
+			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+			tc:RegisterEffect(e2)
+			tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+			tc=sg:GetNext()
+		end
+	end
+end
+function s.befilter(c)
+	return c:GetFlagEffect(id)~=0 and c:IsAttackable()
+end

expansions/script/c30900712.lua

@@ -80,13 +80,4 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(LOCATION_REMOVED)
 		c:RegisterEffect(e1,true)
 	end
-end
-function cm.effcon(e,tp,eg,ep,ev,re,r,rp)
-	return bit.band(r,REASON_XYZ)~=0 and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
-		and e:GetHandler():GetReasonCard():IsSetCard(0xc87)
-end
-function cm.effop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local rc=c:GetReasonCard()
-	local e1=Effect.CreateEffect(rc)
-
+end
\ No newline at end of file

expansions/script/c35100424.lua

@@ -101,7 +101,7 @@ function c35100424.ovltgfilter(c)
 end
 function c35100424.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local b1=e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
-	local b2=Duel.IsExistingMatchingCard(c35100424.ovltgfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,2,nil))
+	local b2=Duel.IsExistingMatchingCard(c35100424.ovltgfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,2,nil)
 	if chk==0 then return b1 or b2 end
 	local op=aux.SelectFromOptions(tp,{b1,aux.Stringid(35100424,2)},{b2,aux.Stringid(35100424,3)})
 	if op==1 then

expansions/script/c40009599.lua

@@ -58,7 +58,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,cm.tgfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,e,tp)
 	local ctype=bit.band(g:GetFirst():GetType(),TYPE_RITUAL+TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK)
-	local dg=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,nil,e,tp,ctype)
+	local dg=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,nil,e,tp,ctype,tgc)
 	Duel.HintSelection(g)
 	local tc=dg:GetFirst()
 	if g:GetCount()>0 and Duel.SendtoGrave(g,REASON_EFFECT)~=0 then

expansions/script/c5012637.lua

 --上里翔流
 local s,id,o=GetID()
+s.MoJin=true
 function s.initial_effect(c)
 	c:SetUniqueOnField(1,1,id)
 	c:SetSPSummonOnce(id)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,5012604,aux.FilterBoolFunction(Card.IsFusionSetCard,0x50a),1,true,true)
+	aux.AddFusionProcCodeFun(c,5012604,aux.FilterBoolFunction(Card.IsFusionSetCard,MoJin==true),1,true,true)
 	--special summon rule
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetRange(LOCATION_EXTRA)
+	e1:SetCountLimit(1,id)
 	e1:SetCondition(s.hspcon)
 	e1:SetTarget(s.hsptg)
 	e1:SetOperation(s.hspop)
@@ -50,13 +52,13 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.cfilter(c,mc)
-	return ((c:IsFusionSetCard(0x50a) and c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE)) or c:IsFusionCode(5012604)) 
+	return ((c.MoJin==true and c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE)) or c:IsFusionCode(5012604)) 
 		and c:IsAbleToRemoveAsCost() and c:IsCanBeFusionMaterial(mc)
 			and bit.band(c:GetOriginalType(),TYPE_MONSTER)~=0
 end
 function s.fselect(g,tp,mc)
 	return Duel.GetLocationCountFromEx(tp,tp,g,mc)>0
-		and g:IsExists(Card.IsFusionCode,1,nil,5012604) and g:IsExists(Card.IsFusionSetCard,1,nil,0x50a)
+		and g:IsExists(Card.IsFusionCode,1,nil,5012604) and g:IsExists(Card.IsFusionSetCard,1,nil,MoJin==true)
 end
 function s.hspcon(e,c)
 	if c==nil then return true end