Merge pull request #1201 from DailyShana/patch-4

fix draw check

script/c41510920.lua

@@ -24,7 +24,7 @@ function c41510920.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c41510920.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
 	if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
 		Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)

script/c42548470.lua

@@ -2,6 +2,7 @@
 function c42548470.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DRAW)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
@@ -43,7 +44,7 @@ function c42548470.activate(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetValue(lv1)
 			e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 			tc2:RegisterEffect(e1)
-			if lv1<lv2 then Duel.Draw(tp,1,REASON_EFFECT) end
+			if lv1<lv2 and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(42548470,0)) then Duel.Draw(tp,1,REASON_EFFECT) end
 		else
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_SINGLE)
@@ -51,7 +52,7 @@ function c42548470.activate(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetValue(lv2)
 			e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 			tc1:RegisterEffect(e1)
-			if lv2<lv1 then Duel.Draw(tp,1,REASON_EFFECT) end
+			if lv2<lv1 and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(42548470,0)) then Duel.Draw(tp,1,REASON_EFFECT) end
 		end
 	end
 end

script/c5795980.lua

@@ -2,7 +2,7 @@
 function c5795980.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_DISABLE)
+	e1:SetCategory(CATEGORY_DISABLE+CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
@@ -44,7 +44,7 @@ end
 function c5795980.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and c5795980.tgfilter(chkc,e) and chkc~=e:GetHandler() end
 	if chk==0 then
-		if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)==0 then return false end
+		if not Duel.IsPlayerCanDraw(tp,1) then return false end
 		if e:GetLabel()==1 then
 			e:SetLabel(0)
 			local rg=Duel.GetReleaseGroup(tp)