Merge remote-tracking branch 'upstream/PHNI' into master

c11496832.lua

@@ -6,6 +6,8 @@ function s.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1,id)
+	e1:SetCondition(aux.bpcon)
 	e1:SetTarget(s.bttg)
 	e1:SetOperation(s.btop)
 	c:RegisterEffect(e1)
@@ -34,8 +36,8 @@ function s.initial_effect(c)
 	e3:SetOperation(s.thop2)
 	c:RegisterEffect(e3)
 end
-function s.bfilter(c,e,tp)
-	return not c:IsSummonableCard() and c:IsSetCard(0x52)
+function s.bfilter(c)
+	return c:IsFaceup() and not c:IsSummonableCard() and c:IsSetCard(0x52) and not c:IsHasEffect(EFFECT_EXTRA_ATTACK)
 end
 function s.bttg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and s.bfilter(chkc) end
@@ -95,4 +97,4 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,tp,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

c47172959.lua

@@ -65,15 +65,18 @@ function s.damrtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
 	if chk==0 then return c:IsStatus(STATUS_OPPO_BATTLE) and bc~=nil end
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,bc:GetAttack())
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,bc:GetDefense())
+	if bc:GetAttack()>0 then
+		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,bc:GetAttack())
+	end
 end
 function s.damrop(e,tp,eg,ep,ev,re,r,rp)
 	local bc=e:GetHandler():GetBattleTarget()
 	local atk=bc:GetAttack()
 	local def=bc:GetDefense()
 	if atk<0 then atk=0 end
-	Duel.Damage(1-tp,atk,REASON_EFFECT,true)
-	Duel.Remove(bc,0,REASON_EFFECT)
+	if bc:IsControler(tp) or bc:IsFacedown() then return end
+	if Duel.Damage(1-tp,atk,REASON_EFFECT,true)~=0 then
+		Duel.Remove(bc,POS_FACEUP,REASON_EFFECT)
+	end
 	Duel.RDComplete()
-end
\ No newline at end of file
+end