7

expansions/script/c17243611.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetCategory(CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCountLimit(1,m)
 	e1:SetTarget(cm.thtg)
@@ -33,7 +33,7 @@ end
 cm.SetCard_JYMFS=true
 
 function cm.thfilter(c)
-	return c.SetCard_JYMFS and c:IsAbleToHand()
+	return c.SetCard_JYMFS and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil) end

expansions/script/c17243613.lua

@@ -21,6 +21,7 @@ function cm.initial_effect(c)
 	e2:SetHintTiming(0,TIMING_MAIN_END)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,m)
+	e2:SetCondition(cm.lvcon)
 	e2:SetTarget(cm.lvtg)
 	e2:SetOperation(cm.lvop)
 	c:RegisterEffect(e2)
@@ -38,6 +39,9 @@ end
 
 cm.SetCard_JYMFS=true
 
+function cm.lvcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()&(PHASE_MAIN1+PHASE_MAIN2)>0
+end
 function cm.lvfilter(c)
 	return c:IsFaceup() and c:IsLevelAbove(0)
 end

expansions/script/c17243660.lua

@@ -60,7 +60,7 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	if #g>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local tc=g:Select(tp,1,1,nil):GetFirst()
-		Duel.HintSelection(tc)
+		Duel.HintSelection(g)
 		if Duel.SendtoGrave(tc,REASON_EFFECT)~=0 and tc:IsType(TYPE_MONSTER) and tc:IsLocation(LOCATION_GRAVE) and tc:GetBaseAttack()>0 then
 			Duel.BreakEffect()
 			Duel.Damage(1-tp,tc:GetBaseAttack(),REASON_EFFECT)