fix

c58947797.lua
fixed not triggering in the Damage Step
c99795159.lua
Effect Damage by Ghostrick Monsters should not be halved

script/c58947797.lua

@@ -14,6 +14,7 @@ function c58947797.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(58947797,1))
 	e2:SetCategory(CATEGORY_TOGRAVE)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCost(c58947797.tgcost)

script/c99795159.lua

@@ -28,7 +28,7 @@ function c99795159.cfilter(e,c)
 	return c:IsFacedown()
 end
 function c99795159.val(e,re,dam,r,rp,rc)
-	if bit.band(r,REASON_EFFECT)~=0 or (rc and not rc:IsSetCard(0x8d)) then
-		return dam/2
-	else return dam end
+	if rc and rc:IsSetCard(0x8d) then
+		return dam
+	else return dam/2 end
 end