Merge pull request #145 from VanillaSalt/patch07

effect property

Merge pull request #145 from VanillaSalt/patch07
effect property
451740fe · Fluorohydride · b9b7106c · 9e40fea4 · 451740fe · 451740fe
Commit 451740fe authored Jul 13, 2012 by Fluorohydride
45 changed files
--- a/script/c11287364.lua
+++ b/script/c11287364.lua
@@ -5,6 +5,7 @@ function c11287364.initial_effect(c)
 	e1:SetDescription(aux.Stringid(11287364,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_BE_MATERIAL)
 	e1:SetCondition(c11287364.atkcon)
 	e1:SetTarget(c11287364.atktg)

--- a/script/c11390349.lua
+++ b/script/c11390349.lua
@@ -16,6 +16,7 @@ function c11390349.initial_effect(c)
 	e3:SetDescription(aux.Stringid(11390349,0))
 	e3:SetCategory(CATEGORY_CONTROL)
 	e3:SetType(EFFECT_TYPE_IGNITION)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)
 	e3:SetTarget(c11390349.ctltg)

--- a/script/c14154221.lua
+++ b/script/c14154221.lua
@@ -11,7 +11,7 @@ function c14154221.initial_effect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c14154221.condition)

--- a/script/c15313433.lua
+++ b/script/c15313433.lua
@@ -5,6 +5,7 @@ function c15313433.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCost(c15313433.cost)
 	e1:SetTarget(c15313433.target)
 	e1:SetOperation(c15313433.activate)

--- a/script/c16111820.lua
+++ b/script/c16111820.lua
@@ -5,6 +5,7 @@ function c16111820.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetRange(LOCATION_HAND+LOCATION_GRAVE)
+	e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
 	e1:SetCondition(c16111820.condition)
 	e1:SetTarget(c16111820.target)

--- a/script/c18489208.lua
+++ b/script/c18489208.lua
@@ -5,6 +5,7 @@ function c18489208.initial_effect(c)
 	e1:SetDescription(aux.Stringid(18489208,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
 	e1:SetCondition(c18489208.con)
 	e1:SetTarget(c18489208.tg)

--- a/script/c19182751.lua
+++ b/script/c19182751.lua
@@ -2,9 +2,8 @@
 function c19182751.initial_effect(c)
 	--search
 	local e1=Effect.CreateEffect(c)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetOperation(c19182751.regop)
 	c:RegisterEffect(e1)

--- a/script/c19980975.lua
+++ b/script/c19980975.lua
@@ -5,6 +5,7 @@ function c19980975.initial_effect(c)
 	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetTarget(c19980975.target)
 	e1:SetOperation(c19980975.activate)
 	c:RegisterEffect(e1)

--- a/script/c25924653.lua
+++ b/script/c25924653.lua
@@ -63,6 +63,7 @@ function c25924653.spgop(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_CHAIN_SOLVING)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetReset(RESET_EVENT+0x1fe0000)
 		e2:SetOperation(c25924653.disop)
 		c:RegisterEffect(e2)
 	end

--- a/script/c259314.lua
+++ b/script/c259314.lua
@@ -36,6 +36,7 @@ function c259314.operation(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_EQUIP)
 		e1:SetCode(EFFECT_UPDATE_DEFENCE)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
 		e1:SetValue(1000)
 		c:RegisterEffect(e1)
 		--Equip limit

--- a/script/c26376390.lua
+++ b/script/c26376390.lua
@@ -5,6 +5,7 @@ function c26376390.initial_effect(c)
 	e1:SetDescription(aux.Stringid(26376390,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetTarget(c26376390.target)
 	e1:SetOperation(c26376390.operation)

--- a/script/c31175914.lua
+++ b/script/c31175914.lua
@@ -5,6 +5,7 @@ function c31175914.initial_effect(c)
 	e1:SetDescription(aux.Stringid(31175914,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_BE_MATERIAL)
 	e1:SetCondition(c31175914.atkcon)
 	e1:SetTarget(c31175914.atktg)

--- a/script/c38643567.lua
+++ b/script/c38643567.lua
@@ -37,11 +37,13 @@ function c38643567.operation(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_EQUIP)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
 		e1:SetValue(500)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_EQUIP)
 		e2:SetCode(EFFECT_UPDATE_DEFENCE)
 		e2:SetValue(500)
+		e2:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e2)
 		--Equip limit
 		local e3=Effect.CreateEffect(c)

--- a/script/c39180960.lua
+++ b/script/c39180960.lua
@@ -5,7 +5,7 @@ function c39180960.initial_effect(c)
 	e1:SetDescription(aux.Stringid(39180960,0))
 	e1:SetCategory(CATEGORY_HANDES)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP)
-	e1:SetOperation(c39180960.target)
+	e1:SetTarget(c39180960.target)
 	e1:SetOperation(c39180960.operation)
 	c:RegisterEffect(e1)
 	--destroyed

--- a/script/c42303365.lua
+++ b/script/c42303365.lua
@@ -3,6 +3,7 @@ function c42303365.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(42303365,0))
 	e1:SetCategory(CATEGORY_CONTROL)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetTarget(c42303365.ctltg)

--- a/script/c45653036.lua
+++ b/script/c45653036.lua
@@ -4,6 +4,7 @@ function c45653036.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetHintTiming(0,0x1e0)
 	e1:SetTarget(c45653036.target)
 	e1:SetOperation(c45653036.activate)

--- a/script/c46668237.lua
+++ b/script/c46668237.lua
@@ -12,6 +12,7 @@ function c46668237.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetRange(LOCATION_HAND+LOCATION_GRAVE)
+	e2:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetLabelObject(e1)
 	e2:SetCondition(c46668237.condition)

--- a/script/c48568432.lua
+++ b/script/c48568432.lua
@@ -40,6 +40,7 @@ function c48568432.initial_effect(c)
 	e5:SetDescription(aux.Stringid(48568432,2))
 	e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e5:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_FIELD)
+	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetRange(LOCATION_SZONE)
 	e5:SetCode(EVENT_BATTLE_DESTROYING)
 	e5:SetCondition(c48568432.spcon2)

--- a/script/c51047350.lua
+++ b/script/c51047350.lua
@@ -4,9 +4,8 @@ function c51047350.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
-	e1:SetProperty(EFFECT_FLAG_SPSUM_PARAM)
+	e1:SetProperty(EFFECT_FLAG_SPSUM_PARAM+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetTargetRange(POS_FACEUP_ATTACK,0)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCondition(c51047350.spcon)
 	e1:SetOperation(c51047350.spop)

--- a/script/c52702748.lua
+++ b/script/c52702748.lua
@@ -14,10 +14,9 @@ function c52702748.initial_effect(c)
 	e2:SetDescription(aux.Stringid(52702748,1))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCategory(CATEGORY_REMOVE)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_REPEAT)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetProperty(EFFECT_FLAG_REPEAT)
 	e2:SetCountLimit(1)
 	e2:SetTarget(c52702748.rmtg)
 	e2:SetOperation(c52702748.rmop)

--- a/script/c52824910.lua
+++ b/script/c52824910.lua
@@ -11,6 +11,7 @@ function c52824910.initial_effect(c)
 	e2:SetDescription(aux.Stringid(52824910,0))
 	e2:SetCategory(CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c52824910.condition)
 	e2:SetTarget(c52824910.target)

--- a/script/c54040221.lua
+++ b/script/c54040221.lua
@@ -5,6 +5,7 @@ function c54040221.initial_effect(c)
 	e1:SetDescription(aux.Stringid(54040221,0))
 	e1:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetTarget(c54040221.tg)
 	e1:SetOperation(c54040221.op)

--- a/script/c56052205.lua
+++ b/script/c56052205.lua
@@ -10,7 +10,7 @@ function c56052205.initial_effect(c)
 	e2:SetDescription(aux.Stringid(56052205,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EVENT_DAMAGE)
 	e2:SetCondition(c56052205.condition)

--- a/script/c56399890.lua
+++ b/script/c56399890.lua
@@ -5,6 +5,7 @@ function c56399890.initial_effect(c)
 	e1:SetDescription(aux.Stringid(56399890,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_TO_GRAVE)
 	e1:SetCondition(c56399890.descon)
 	e1:SetTarget(c56399890.destg)

--- a/script/c58054262.lua
+++ b/script/c58054262.lua
@@ -6,7 +6,6 @@ function c58054262.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(aux.FALSE)
 	c:RegisterEffect(e1)
 	--attack cost
 	local e2=Effect.CreateEffect(c)
@@ -17,9 +16,10 @@ function c58054262.initial_effect(c)
 	c:RegisterEffect(e2)
 	--special summon
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(22666164,0))
+	e3:SetDescription(aux.Stringid(58054262,0))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_IGNITION)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCost(c58054262.spcost)
 	e3:SetTarget(c58054262.sptg)
@@ -37,7 +37,7 @@ function c58054262.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 end
 function c58054262.filter(c,code,e,tp)
-	return c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
+	return c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c58054262.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

--- a/script/c59771339.lua
+++ b/script/c59771339.lua
@@ -7,6 +7,7 @@ function c59771339.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(59771339,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCost(c59771339.cost)

--- a/script/c6112401.lua
+++ b/script/c6112401.lua
@@ -49,6 +49,7 @@ function c6112401.operation(e,tp,eg,ep,ev,re,r,rp)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_EQUIP)
 		e2:SetCode(EFFECT_UPDATE_ATTACK)
+		e2:SetReset(RESET_EVENT+0x1fe0000)
 		e2:SetValue(800)
 		c:RegisterEffect(e2)
 		--Equip limit

--- a/script/c62560742.lua
+++ b/script/c62560742.lua
@@ -7,6 +7,7 @@ function c62560742.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(62560742,0))
 	e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SPECIAL_SUMMON)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)

--- a/script/c63741331.lua
+++ b/script/c63741331.lua
@@ -4,6 +4,7 @@ function c63741331.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCost(c63741331.cost)
 	e1:SetTarget(c63741331.target)
 	e1:SetOperation(c63741331.activate)

--- a/script/c67159705.lua
+++ b/script/c67159705.lua
@@ -39,6 +39,7 @@ function c67159705.initial_effect(c)
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(67159705,2))
 	e5:SetCategory(CATEGORY_DESTROY)
+	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetType(EFFECT_TYPE_IGNITION)
 	e5:SetRange(LOCATION_SZONE)
 	e5:SetCountLimit(1)

--- a/script/c6799227.lua
+++ b/script/c6799227.lua
@@ -4,6 +4,7 @@ function c6799227.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e1:SetCondition(c6799227.condition)
 	e1:SetTarget(c6799227.target)

--- a/script/c7030340.lua
+++ b/script/c7030340.lua
@@ -5,6 +5,7 @@ function c7030340.initial_effect(c)
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetTarget(c7030340.target)
 	e1:SetOperation(c7030340.activate)
 	c:RegisterEffect(e1)

--- a/script/c706925.lua
+++ b/script/c706925.lua
@@ -14,6 +14,7 @@ function c706925.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(706925,1))
 	e2:SetCategory(CATEGORY_DESTROY)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c706925.descon)

--- a/script/c78422252.lua
+++ b/script/c78422252.lua
@@ -3,7 +3,7 @@ function c78422252.initial_effect(c)
 	--negate attack
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(78422252,0))
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_BE_BATTLE_TARGET)
 	e1:SetRange(LOCATION_MZONE)

--- a/script/c78586116.lua
+++ b/script/c78586116.lua
@@ -41,6 +41,7 @@ function c78586116.operation(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_EQUIP)
 		e1:SetCode(EFFECT_CANNOT_ATTACK)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e1)
 		--Equip limit
 		local e2=Effect.CreateEffect(c)

--- a/script/c83269557.lua
+++ b/script/c83269557.lua
@@ -32,6 +32,7 @@ function c83269557.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(83269557,1))
 	e4:SetCategory(CATEGORY_DESTROY)
+	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCondition(aux.IsDualState)
@@ -64,7 +65,6 @@ function c83269557.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c83269557.operation2(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) then
 		Duel.Destroy(tc,REASON_EFFECT)

--- a/script/c87043568.lua
+++ b/script/c87043568.lua
@@ -4,6 +4,7 @@ function c87043568.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_EQUIP)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(c87043568.target)
 	e1:SetOperation(c87043568.operation)
@@ -66,7 +67,7 @@ function c87043568.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:SetLabel(g:GetFirst():GetAttack())
 	Duel.SendtoGrave(g,REASON_COST)
 end
-function c87043568.atkop(e,tp,eg,ep,ev,re,r,rp,chk)
+function c87043568.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local a=Duel.GetAttacker()
 	if c:IsRelateToEffect(e) and a:IsRelateToBattle() and a:IsFaceup() then

--- a/script/c88301833.lua
+++ b/script/c88301833.lua
@@ -9,6 +9,7 @@ function c88301833.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(88301833,0))
 	e2:SetCategory(CATEGORY_TOHAND)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)

--- a/script/c90246973.lua
+++ b/script/c90246973.lua
@@ -20,6 +20,7 @@ function c90246973.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(90246973,0))
 	e3:SetCategory(CATEGORY_REMOVE+CATEGORY_ATKCHANGE)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetCountLimit(1)
 	e3:SetRange(LOCATION_SZONE)

--- a/script/c90740329.lua
+++ b/script/c90740329.lua
@@ -3,6 +3,7 @@ function c90740329.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMING_MAIN_END)
 	e1:SetCondition(c90740329.condition)

--- a/script/c9109991.lua
+++ b/script/c9109991.lua
@@ -9,19 +9,20 @@ function c9109991.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9109991,0))
 	e2:SetCategory(CATEGORY_POSITION)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCode(EVENT_DAMAGE)
+	e2:SetCode(EVENT_BATTLE_DAMAGE)
 	e2:SetCondition(c9109991.condition)
 	e2:SetTarget(c9109991.target)
 	e2:SetOperation(c9109991.operation)
 	c:RegisterEffect(e2)
 end
 function c9109991.condition(e,tp,eg,ep,ev,re,r,rp)
-	return ep~=tp and r==REASON_BATTLE and Duel.GetAttacker()==e:GetHandler() and Duel.GetAttackTarget()==nil
+	return ep~=tp and Duel.GetAttackTarget()==nil
 end
 function c9109991.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:GetControler()~=tp and chkc:IsLocation(LOCATION_MZONE) and chkc:IsAttackPos() end
+	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and chkc:IsAttackPos() end
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATTACK)
 	local g=Duel.SelectTarget(tp,Card.IsAttackPos,tp,0,LOCATION_MZONE,1,1,nil)

--- a/script/c93211836.lua
+++ b/script/c93211836.lua
@@ -4,6 +4,7 @@ function c93211836.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(93211836,0))
 	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetCondition(c93211836.condition)

--- a/script/c95090813.lua
+++ b/script/c95090813.lua
@@ -92,6 +92,7 @@ function c95090813.eqop(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetType(EFFECT_TYPE_EQUIP)
 		e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 		e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
+		e3:SetReset(RESET_EVENT+0x1fe0000)
 		e3:SetValue(c95090813.subval)
 		tc:RegisterEffect(e3)
 	end

--- a/script/c96872283.lua
+++ b/script/c96872283.lua
@@ -5,6 +5,7 @@ function c96872283.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(96872283,0))
 	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(aux.IsDualState)

--- a/script/c99214782.lua
+++ b/script/c99214782.lua
@@ -4,7 +4,7 @@ function c99214782.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_TRIGGER)
-	e1:SetRange(LOCATION_SZONE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetTarget(c99214782.target)
 	c:RegisterEffect(e1)