Merge pull request #649 from salix5/patch

fix

script/c2830693.lua

@@ -27,7 +27,7 @@ function c2830693.initial_effect(c)
 end
 function c2830693.eqcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,2830693)==0 end
-	Duel.RegisterFlagEffect(tp,2830693,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
+	Duel.RegisterFlagEffect(tp,2830693,RESET_PHASE+PHASE_END,0,1)
 end
 function c2830693.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local at=Duel.GetAttacker()
@@ -53,7 +53,6 @@ function c2830693.eqop(e,tp,eg,ep,ev,re,r,rp)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_EQUIP)
 		e2:SetCode(EFFECT_CANNOT_ATTACK)
-		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e2:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e2)
 	end
@@ -66,7 +65,7 @@ function c2830693.spcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c2830693.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,2830694)==0 end
-	Duel.RegisterFlagEffect(tp,2830694,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
+	Duel.RegisterFlagEffect(tp,2830694,RESET_PHASE+PHASE_END,0,1)
 end
 function c2830693.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

script/c31516413.lua

@@ -39,6 +39,12 @@ end
 function c31516413.hspop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.SelectReleaseGroup(c:GetControler(),Card.IsSetCard,1,1,nil,0x69)
 	Duel.Release(g,REASON_COST)
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(31516413,2))
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetReset(RESET_EVENT+0x4fc0000)
+	c:RegisterEffect(e1)
 end
 function c31516413.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroupEx(tp,Card.IsSetCard,1,e:GetHandler(),0x69) end

script/c3300267.lua

@@ -39,6 +39,12 @@ end
 function c3300267.hspop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.SelectReleaseGroup(c:GetControler(),Card.IsSetCard,1,1,nil,0x69)
 	Duel.Release(g,REASON_COST)
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(3300267,2))
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetReset(RESET_EVENT+0x4fc0000)
+	c:RegisterEffect(e1)
 end
 function c3300267.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroupEx(tp,Card.IsSetCard,1,e:GetHandler(),0x69) end

script/c5851097.lua

@@ -33,7 +33,7 @@ function c5851097.descon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c5851097.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return not c:IsStatus(STATUS_CHAINING) end
+	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,c,1,0,0)
 end
 function c5851097.desop(e,tp,eg,ep,ev,re,r,rp)