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

expansions/script/c12001001.lua

@@ -16,7 +16,7 @@ function c12001001.initial_effect(c)
 	e3:SetDescription(aux.Stringid(12001001,1))
 	e3:SetCategory(CATEGORY_DESTROY+CATEGORY_RECOVER)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetCountLimit(1,12001101)
 	e3:SetCondition(c12001001.dscon)

expansions/script/c12001016.lua

@@ -61,7 +61,7 @@ function c12001016.tdop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Draw(tp,2,REASON_EFFECT)
 		Duel.ShuffleDeck(tp)
 		local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_HAND,0,2,2,nil)
-		Duel.SendtoDeck(g,nil,1,REASON_EFFECT)
+		Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
 		else
 		Duel.ShuffleDeck(tp)
 		end

expansions/script/c12029011.lua

@@ -56,7 +56,8 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,0))
 end
 function cm.econ(e,tp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1 and  ( Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_BATTLE )
+	local ph=Duel.GetCurrentPhase()
+    return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1 and  ( ph==PHASE_MAIN1 or ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE )
 end
 function cm.efilter(e,te)
 	return te:GetOwnerPlayer()~=e:GetOwnerPlayer()