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

expansions/script/c33701015.lua

@@ -106,7 +106,8 @@ function s.chainreg(e, tp, eg, ep, ev, re, r, rp)
 	e:GetHandler():RegisterFlagEffect(id, RESET_EVENT + 0x1fc0000 + RESET_CHAIN, 0, 1)
 end
 function s.drcon(e, tp, eg, ep, ev, re, r, rp)
-	return ep ~= tp and e:GetHandler():GetFlagEffect(id) ~= 0
+	local c=e:GetHandler()
+	return Duel.GetTurnPlayer()~=tp and c:IsPreviousControler(tp) and e:GetHandler():GetFlagEffect(id) ~= 0
 end
 function s.drop(e, tp, eg, ep, ev, re, r, rp)
 	Duel.Hint(HINT_CARD, 0, id)

expansions/script/c62699800.lua

@@ -2,7 +2,7 @@
 function c62699800.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TODECK)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TODECK+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)

expansions/script/c62699830.lua

@@ -8,7 +8,7 @@ function c62699830.initial_effect(c)
 	c:RegisterEffect(e0)
 	--add counter
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_COUNTER)
+	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_TOGRAVE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_SZONE)
@@ -41,6 +41,7 @@ function c62699830.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c62699830.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	Duel.SelectTarget(tp,c62699830.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp)
+	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
 function c62699830.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c62699845.lua

@@ -7,7 +7,7 @@ function c62699845.initial_effect(c)
 	aux.AddLinkProcedure(c,c62699845.matfilter,1,1)
 	--counter
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_DESTROY+CATEGORY_DECKDES)
+	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)

expansions/script/c62699907.lua

@@ -3,7 +3,7 @@ function c62699907.initial_effect(c)
 	aux.AddCodeList(c,0x16df)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,62699907)

expansions/script/c62699908.lua

 --旅途的下一站
 function c62699908.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,62699908)