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

expansions/script/c30683085.lua

@@ -159,35 +159,38 @@ function cm.effop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_CANNOT_REMOVE)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	e1:SetCondition(cm.reascon)
+	e1:SetReset(RESET_EVENT+RESETS_REDIRECT)
 	rc:RegisterEffect(e1,true)
 	--
 	local e0_1=Effect.CreateEffect(c)
 	e0_1:SetType(EFFECT_TYPE_SINGLE)
 	e0_1:SetDescription(aux.Stringid(m,4))
-	e0_1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+	e0_1:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CANNOT_DISABLE)
 	e0_1:SetType(EFFECT_TYPE_SINGLE)
 	e0_1:SetCode(EFFECT_CANNOT_TO_GRAVE_AS_COST)
 	e0_1:SetRange(LOCATION_MZONE)
-	e0_1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	e0_1:SetCondition(cm.reascon)
+	e0_1:SetReset(RESET_EVENT+RESETS_REDIRECT)
 	rc:RegisterEffect(e0_1,true)
 	local e0_2=Effect.CreateEffect(c)
 	e0_2:SetType(EFFECT_TYPE_SINGLE)
 	e0_2:SetDescription(aux.Stringid(m,4))
-	e0_2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+	e0_2:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CANNOT_DISABLE)
 	e0_2:SetType(EFFECT_TYPE_SINGLE)
 	e0_2:SetCode(EFFECT_CANNOT_TO_GRAVE)
 	e0_2:SetRange(LOCATION_MZONE)
-	e0_2:SetReset(RESET_EVENT+RESETS_STANDARD)
+	e0_2:SetCondition(cm.reascon)
+	e0_2:SetReset(RESET_EVENT+RESETS_REDIRECT)
 	rc:RegisterEffect(e0_2,true)
 	--
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetDescription(aux.Stringid(m,4))
-	e4:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+	e4:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CANNOT_DISABLE)
 	e4:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
 	e4:SetValue(LOCATION_EXTRA)
-	e4:SetReset(RESET_EVENT+RESETS_STANDARD)
+	e4:SetReset(RESET_EVENT+RESETS_REDIRECT)
 	rc:RegisterEffect(e4,true)
 	if not rc:IsType(TYPE_EFFECT) then
 		local e3=Effect.CreateEffect(c)
@@ -199,6 +202,9 @@ function cm.effop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	rc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4))
 end
+function cm.effcon(e,tp,eg,ep,ev,re,r,rp)
+	return not (r==REASON_SYNCHRO or r==REASON_FUSION or r==REASON_LINK or r==REASON_XYZ)
+end
 function cm.atklimit(e,c)
 	return c==e:GetHandler()
 end