fix Boar Soldier, Nuvia the Wicked (#523)

c12953226.lua

@@ -2,9 +2,10 @@
 function c12953226.initial_effect(c)
 	--self destroy
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetTarget(c12953226.destg)
 	e1:SetOperation(c12953226.desop)
 	c:RegisterEffect(e1)
 	--atk down
@@ -16,8 +17,14 @@ function c12953226.initial_effect(c)
 	e2:SetValue(c12953226.val)
 	c:RegisterEffect(e2)
 end
+function c12953226.destg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
+end
 function c12953226.desop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Destroy(e:GetHandler(),REASON_RULE)
+	if e:GetHandler():IsRelateToEffect(e) then
+		Duel.Destroy(e:GetHandler(),REASON_EFFECT)
+	end
 end
 function c12953226.val(e,c)
 	local tp=c:GetControler()

c21340051.lua

@@ -2,8 +2,10 @@
 function c21340051.initial_effect(c)
 	--self destroy
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetTarget(c21340051.destg)
 	e1:SetOperation(c21340051.desop)
 	c:RegisterEffect(e1)
 	--atk down
@@ -16,8 +18,14 @@ function c21340051.initial_effect(c)
 	e2:SetValue(-1000)
 	c:RegisterEffect(e2)
 end
+function c21340051.destg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
+end
 function c21340051.desop(e,tp,eg,ep,ev,re,r,rp)
+	if e:GetHandler():IsRelateToEffect(e) then
 		Duel.Destroy(e:GetHandler(),REASON_EFFECT)
+	end
 end
 function c21340051.con(e)
 	return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),0,LOCATION_MZONE)>0