Update "Miracle Draw"

-Should be an optional effect
-Other small fixes

Author: TheRazgriz

unofficial/c511000472.lua

@@ -1,3 +1,4 @@
+--奇跡のドロー！
 --Miracle Draw
 local s,id=GetID()
 function s.initial_effect(c)
@@ -6,42 +7,42 @@ function s.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
-	--draw check
+	--During each Draw Phase, you can declare the card name of the card(s) that will be drawn. If the drawn card(s) is the declared card(s), inflict 1000 damage to your opponent. Otherwise, you take 1000 damage.
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+	e2:SetCategory(CATEGORY_DAMAGE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_PREDRAW)
 	e2:SetRange(LOCATION_SZONE)
-	e2:SetCondition(s.drcon)
+	e2:SetCondition(function(e,tp) return Duel.IsTurnPlayer(tp) end)
 	e2:SetTarget(s.drtg)
 	e2:SetOperation(s.drop)
 	c:RegisterEffect(e2)
 end
-function s.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return tp==Duel.GetTurnPlayer() and Duel.GetDrawCount(tp)>0
-end
 function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	local c=e:GetHandler()
+	if chk==0 then return Duel.GetDrawCount(tp)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	local ac=Duel.AnnounceCard(tp)
-	e:GetHandler():SetHint(CHINT_CARD,ac)
+	c:SetHint(CHINT_CARD,ac)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,PLAYER_EITHER,1000)
 end
 function s.drop(e,tp,eg,ep,ev,re,r,rp)
-	if not e:GetHandler():IsRelateToEffect(e) then return end
+	local c=e:GetHandler()
+	if not c:IsRelateToEffect(e) or Duel.GetDrawCount(tp)==0 then return end
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
-	local e1=Effect.CreateEffect(e:GetHandler())
+	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_DRAW)
 	e1:SetOperation(s.damop)
 	e1:SetLabel(ac)
-	e1:SetReset(RESET_PHASE+PHASE_DRAW)
+	e1:SetReset(RESET_PHASE|PHASE_DRAW)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.damop(e,tp,eg,ep,ev,re,r,rp)
-	if ep~=tp then return end
 	local hg=eg:Filter(Card.IsLocation,nil,LOCATION_HAND)
 	if #hg==0 then return end
 	Duel.ConfirmCards(1-ep,hg)
@@ -51,4 +52,4 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Damage(tp,1000,REASON_EFFECT)
 	end
 	Duel.ShuffleHand(ep)
-end
+end