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

expansions/script/c16107116.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(cm.effcon)
 	e1:SetValue(cm.efilter)
-	c:RegisterEffect(e1)
+	--c:RegisterEffect(e1)
 end
 function cm.effcon(e)
 	return e:GetHandler():GetOverlayCount()>0

expansions/script/c16400225.lua

@@ -7,7 +7,7 @@ function cm.initial_effect(c)
 	--summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_SUMMON)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)

expansions/script/c18031216.lua

@@ -53,7 +53,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 			Duel.HintSelection(rg)
 			local rc=rg:GetFirst()
 			if rc:IsAbleToDeck() and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
-				local ds=Duel.SelectOption(tp,aux.Stringid(id,3),aux.Stringid(id,4))==1
+				local ds=Duel.SelectOption(tp,aux.Stringid(id,4),aux.Stringid(id,3))==1
 				Duel.SendtoDeck(rc,nil,ds,REASON_EFFECT)
 			else
 				Duel.Remove(rg,POS_FACEUP,REASON_EFFECT)

expansions/script/c18700142.lua

 --邺都无常·渡阳司命 墨笙稥
-local m=18700142
-local cm=_G["c"..m]
-Duel.LoadScript("1.lua")
+local cm,m,o=GetID()
 function cm.initial_effect(c)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),3)
 	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_ATKCHANGE)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
+	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DESTROY)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,m)
-	e1:SetHintTiming(TIMING_DAMAGE_STEP+TIMING_END_PHASE)
 	e1:SetTarget(cm.atktg)
 	e1:SetOperation(cm.atkop)
 	c:RegisterEffect(e1)
@@ -22,7 +18,7 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,m+1)
 	e2:SetCost(cm.descost)
@@ -34,7 +30,6 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_TODECK)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
-	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,m+1)
 	e3:SetTarget(cm.rmtg2)
@@ -44,10 +39,8 @@ function cm.initial_effect(c)
 	e4:SetDescription(aux.Stringid(m,3))
 	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetCode(EVENT_FREE_CHAIN)
-	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCategory(CATEGORY_ATKCHANGE)
-	e4:SetProperty(0x200+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e4:SetCountLimit(1,m+2)
 	e4:SetCondition(cm.con4)
 	e4:SetTarget(cm.tg4)

expansions/script/c18700146.lua

 --邺都无常·涤阴司命 夕
-local m=18700146
-local cm=_G["c"..m]
-Duel.LoadScript("1.lua")
+local cm,m,o=GetID()
 function cm.initial_effect(c)
 	c:EnableReviveLimit()
 	local e0=Effect.CreateEffect(c)
@@ -24,7 +22,6 @@ function cm.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,m)
-	e2:SetHintTiming(TIMING_DAMAGE_STEP+TIMING_END_PHASE)
 	e2:SetTarget(cm.atktg)
 	e2:SetOperation(cm.atkop)
 	c:RegisterEffect(e2)
@@ -33,7 +30,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_REMOVE+CATEGORY_DISABLE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
-	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,m+1)
 	e3:SetCost(cm.descost)
@@ -45,7 +42,6 @@ function cm.initial_effect(c)
 	e4:SetCategory(CATEGORY_DISABLE)
 	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetCode(EVENT_FREE_CHAIN)
-	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetCountLimit(1,m+1)
@@ -56,10 +52,8 @@ function cm.initial_effect(c)
 	e5:SetDescription(aux.Stringid(m,3))
 	e5:SetType(EFFECT_TYPE_QUICK_O)
 	e5:SetCode(EVENT_FREE_CHAIN)
-	e5:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetCategory(CATEGORY_ATKCHANGE)
-	e5:SetProperty(0x200+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e5:SetCountLimit(1,m+2)
 	e5:SetCondition(cm.con4)
 	e5:SetTarget(cm.tg4)

expansions/script/c18700254.lua

@@ -130,12 +130,16 @@ end
 function cm.spsumfilter2(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp)
 end
+function c1041278.gcheck(g,e,tp,b1,b2)
+	return b1 and g:IsExists(c1041278.spfilter1,1,nil,e,tp,g)
+		or b2 and g:IsExists(c1041278.spfilter3,2,nil,e,tp)
+end
 function cm.gcheck(g,e,tp)
 	if #g~=2 then return false end
 	local ac=g:GetFirst()
 	local bc=g:GetNext()
-	return cm.spsumfilter1(ac,e,tp) and cm.spsumfilter2(bc,e,tp) and (g:GetClassCount(Card.GetAttack)==1 or g:GetClassCount(Card.GetDefense)==1) and g:GetClassCount(Card.GetRace)==1 and g:GetClassCount(Card.GetAttribute)~=1
-		or cm.spsumfilter1(bc,e,tp) and cm.spsumfilter2(ac,e,tp) and (g:GetClassCount(Card.GetAttack)==1 or g:GetClassCount(Card.GetDefense)==1) and g:GetClassCount(Card.GetRace)==1 and g:GetClassCount(Card.GetAttribute)~=1
+	return (cm.spsumfilter1(ac,e,tp) and cm.spsumfilter2(bc,e,tp) and (g:GetClassCount(Card.GetAttack)==1 or g:GetClassCount(Card.GetDefense)==1) and g:GetClassCount(Card.GetRace)~=1 and g:GetClassCount(Card.GetAttribute)==1)
+		or (cm.spsumfilter1(bc,e,tp) and cm.spsumfilter2(ac,e,tp) and (g:GetClassCount(Card.GetAttack)==1 or g:GetClassCount(Card.GetDefense)==1) and g:GetClassCount(Card.GetRace)~=1 and g:GetClassCount(Card.GetAttribute)==1)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

expansions/script/c79100260.lua

 --律法塔魂的贤王 法墨特
 local m=79100260
+local s=c79100260
 local cm=c79100260
 function cm.initial_effect(c)
 	--fusion summon