Merge pull request #927 from sidschingis/patch

fix ghostrick field spells

script/c29400787.lua

@@ -5,35 +5,45 @@ function c29400787.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
-	--
+	--atklimit
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-	e2:SetCode(EFFECT_IGNORE_BATTLE_TARGET)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c29400787.cfilter)
+	e2:SetTarget(c29400787.bttg)
+	e2:SetValue(c29400787.btval)
 	c:RegisterEffect(e2)
-	--tohand
+	--direct attack
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(29400787,0))
-	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_DIRECT_ATTACK)
+	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCondition(c29400787.thcon)
-	e3:SetTarget(c29400787.thtg)
-	e3:SetOperation(c29400787.thop)
+	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e3:SetCondition(c29400787.dircon)
 	c:RegisterEffect(e3)
-	--
+	--tohand
 	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_FIELD)
-	e4:SetCode(EFFECT_CHANGE_DAMAGE)
-	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e4:SetDescription(aux.Stringid(29400787,0))
+	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e4:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e4:SetRange(LOCATION_SZONE)
-	e4:SetTargetRange(0,1)
-	e4:SetValue(0)
+	e4:SetCondition(c29400787.thcon)
+	e4:SetTarget(c29400787.thtg)
+	e4:SetOperation(c29400787.thop)
 	c:RegisterEffect(e4)
+	--
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_FIELD)
+	e5:SetCode(EFFECT_CHANGE_DAMAGE)
+	e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e5:SetRange(LOCATION_SZONE)
+	e5:SetTargetRange(0,1)
+	e5:SetValue(0)
+	c:RegisterEffect(e5)
 end
 function c29400787.cfilter(e,c)
 	return c:IsFacedown()
@@ -57,3 +67,13 @@ function c29400787.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
+function c29400787.bttg(e,c)
+	return c:IsFacedown()
+end
+function c29400787.btval(e,c)
+	return not c:IsImmuneToEffect(e)
+end
+function c29400787.dircon(e)
+	local tp=Duel.GetTurnPlayer()
+	return not Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil)
+end
\ No newline at end of file

script/c7617062.lua

@@ -13,29 +13,36 @@ function c7617062.initial_effect(c)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(c7617062.ftarget)
 	c:RegisterEffect(e2)
-	--
+	--atklimit
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
 	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-	e3:SetCode(EFFECT_IGNORE_BATTLE_TARGET)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c7617062.cfilter)
+	e3:SetTarget(c7617062.bttg)
+	e3:SetValue(c7617062.btval)
 	c:RegisterEffect(e3)
-	--pos
+	--direct attack
 	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetType(EFFECT_TYPE_FIELD)
+	e4:SetCode(EFFECT_DIRECT_ATTACK)
+	e4:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e4:SetRange(LOCATION_SZONE)
-	e4:SetCode(EVENT_BATTLE_DAMAGE)
-	e4:SetOperation(c7617062.operation)
+	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e4:SetCondition(c7617062.dircon)
 	c:RegisterEffect(e4)
+	--pos
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e5:SetRange(LOCATION_SZONE)
+	e5:SetCode(EVENT_BATTLE_DAMAGE)
+	e5:SetOperation(c7617062.operation)
+	c:RegisterEffect(e5)
 end
 function c7617062.ftarget(e,c)
 	return not c:IsSetCard(0x8d)
 end
-function c7617062.cfilter(e,c)
-	return c:IsFacedown()
-end
 function c7617062.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=eg:GetFirst()
@@ -51,3 +58,13 @@ end
 function c7617062.posop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ChangePosition(e:GetHandler(),POS_FACEDOWN_DEFENCE)
 end
+function c7617062.bttg(e,c)
+	return c:IsFacedown()
+end
+function c7617062.btval(e,c)
+	return not c:IsImmuneToEffect(e)
+end
+function c7617062.dircon(e)
+	local tp=Duel.GetTurnPlayer()
+	return not Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil)
+end
\ No newline at end of file

script/c99795159.lua

@@ -5,30 +5,47 @@ function c99795159.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
-	--
+	--atklimit
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-	e2:SetCode(EFFECT_IGNORE_BATTLE_TARGET)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c99795159.cfilter)
+	e2:SetTarget(c99795159.bttg)
+	e2:SetValue(c99795159.btval)
 	c:RegisterEffect(e2)
-	--
+	--direct attack
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_DIRECT_ATTACK)
+	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCode(EFFECT_CHANGE_DAMAGE)
-	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e3:SetTargetRange(1,1)
-	e3:SetValue(c99795159.val)
+	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e3:SetCondition(c99795159.dircon)
 	c:RegisterEffect(e3)
-end
-function c99795159.cfilter(e,c)
-	return c:IsFacedown()
+	--
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_FIELD)
+	e4:SetRange(LOCATION_SZONE)
+	e4:SetCode(EFFECT_CHANGE_DAMAGE)
+	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e4:SetTargetRange(1,1)
+	e4:SetValue(c99795159.val)
+	c:RegisterEffect(e4)
 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
 end
+function c99795159.bttg(e,c)
+	return c:IsFacedown()
+end
+function c99795159.btval(e,c)
+	return not c:IsImmuneToEffect(e)
+end
+function c99795159.dircon(e)
+	local tp=Duel.GetTurnPlayer()
+	return not Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil)
+end
\ No newline at end of file