change&fix

expansions/script/c1000810.lua

@@ -35,7 +35,7 @@ function c1000810.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_IGNITION)
 	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetRange(LOCATION_GRAVE)
-	e5:SetCountLimit(1,7224)
+	e5:SetCountLimit(1,7225)
 	e5:SetCondition(aux.exccon)
 	e5:SetCost(c1000810.fucost)
 	e5:SetTarget(c1000810.futarget)

expansions/script/c1000812.lua

@@ -24,7 +24,7 @@ function c1000812.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetRange(LOCATION_GRAVE)
-	e3:SetCountLimit(1,7226)
+	e3:SetCountLimit(1,7227)
 	e3:SetCondition(aux.exccon)
 	e3:SetCost(c1000812.tgcost)
 	e3:SetTarget(c1000812.tgtarget)

expansions/script/c1000814.lua

@@ -23,7 +23,7 @@ function c1000814.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_GRAVE)
-	e3:SetCountLimit(1,7228)
+	e3:SetCountLimit(1,7229)
 	e3:SetCondition(c1000814.sppcon)
 	e3:SetCost(c1000814.fucost)
 	e3:SetTarget(c1000814.futarget)

expansions/script/c1009018.lua

@@ -30,25 +30,26 @@ function c1009018.initial_effect(c)
 	e3:SetOperation(c1009018.sumop)
 	c:RegisterEffect(e3)
 	--summon with s/t
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e1:SetTargetRange(LOCATION_SZONE,0)
-	e1:SetValue(POS_FACEUP_ATTACK)
-	c:RegisterEffect(e1)
+	local e11=Effect.CreateEffect(c)
+	e11:SetType(EFFECT_TYPE_SINGLE)
+	e11:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e11:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	e11:SetTargetRange(LOCATION_SZONE,0)
+	e11:SetTarget(c1009022.exrtg)
+	e11:SetValue(POS_FACEUP_ATTACK)
+	c:RegisterEffect(e11)
 	--search
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(1009018,1))
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_CHAINING)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,1009018)
-	e2:SetCondition(c1009018.thcon)
-	e2:SetTarget(c1009018.thtg)
-	e2:SetOperation(c1009018.thop)
-	c:RegisterEffect(e2)
+	local e22=Effect.CreateEffect(c)
+	e22:SetDescription(aux.Stringid(1009018,1))
+	e22:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e22:SetType(EFFECT_TYPE_QUICK_O)
+	e22:SetCode(EVENT_CHAINING)
+	e22:SetRange(LOCATION_MZONE)
+	e22:SetCountLimit(1,1009018)
+	e22:SetCondition(c1009018.thcon)
+	e22:SetTarget(c1009018.thtg)
+	e22:SetOperation(c1009018.thop)
+	c:RegisterEffect(e22)
 	--destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(1009018,2))
@@ -62,6 +63,9 @@ function c1009018.initial_effect(c)
 	e4:SetOperation(c1009018.desop)
 	c:RegisterEffect(e4)
 end 
+function c1009018.exrtg(e,c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
+end
 function c1009018.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,1009018)==0 end
 	Duel.RegisterFlagEffect(tp,1009018,RESET_CHAIN,0,1)

expansions/script/c1009019.lua

@@ -8,29 +8,30 @@ function c1009019.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
 	e1:SetTargetRange(LOCATION_SZONE,0)
+	e1:SetTarget(c1009022.exrtg)
 	e1:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e1)
 	--Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(1160)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetRange(LOCATION_SZONE)
-	c:RegisterEffect(e1)
+	local e11=Effect.CreateEffect(c)
+	e11:SetDescription(1160)
+	e11:SetType(EFFECT_TYPE_ACTIVATE)
+	e11:SetCode(EVENT_FREE_CHAIN)
+	e11:SetRange(LOCATION_SZONE)
+	c:RegisterEffect(e11)
 	 --negate
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(1009019,1))
-	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
-	e3:SetType(EFFECT_TYPE_QUICK_O)
-	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
-	e3:SetCode(EVENT_CHAINING)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCountLimit(1,1009019)
-	e3:SetCondition(c1009019.negcon)
-	e3:SetCost(c1009019.negcost)
-	e3:SetTarget(c1009019.negtg)
-	e3:SetOperation(c1009019.negop)
-	c:RegisterEffect(e3)
+	local e31=Effect.CreateEffect(c)
+	e31:SetDescription(aux.Stringid(1009019,1))
+	e31:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
+	e31:SetType(EFFECT_TYPE_QUICK_O)
+	e31:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
+	e31:SetCode(EVENT_CHAINING)
+	e31:SetRange(LOCATION_MZONE)
+	e31:SetCountLimit(1,1009019)
+	e31:SetCondition(c1009019.negcon)
+	e31:SetCost(c1009019.negcost)
+	e31:SetTarget(c1009019.negtg)
+	e31:SetOperation(c1009019.negop)
+	c:RegisterEffect(e31)
 	--destory and atk & def down
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(1009019,0))
@@ -79,6 +80,9 @@ function c1009019.initial_effect(c)
 	e8:SetOperation(c1009019.sumsuc)
 	c:RegisterEffect(e8)
 end
+function c1009019.exrtg(e,c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
+end
 function c1009019.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_MUSIC,0,aux.Stringid(1009019,4))
 end 

expansions/script/c1009020.lua

@@ -40,13 +40,14 @@ function c1009020.initial_effect(c)
 	e3:SetOperation(c1009020.sumop)
 	c:RegisterEffect(e3)
 	--summon with s/t
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e1:SetTargetRange(LOCATION_SZONE,0)
-	e1:SetValue(POS_FACEUP_ATTACK)
-	c:RegisterEffect(e1)
+	local e11=Effect.CreateEffect(c)
+	e11:SetType(EFFECT_TYPE_SINGLE)
+	e11:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e11:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	e11:SetTargetRange(LOCATION_SZONE,0)
+	e11:SetTarget(c1009022.exrtg)
+	e11:SetValue(POS_FACEUP_ATTACK)
+	c:RegisterEffect(e11)
 	--destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(1009020,0))
@@ -60,6 +61,9 @@ function c1009020.initial_effect(c)
 	e4:SetOperation(c1009020.desop)
 	c:RegisterEffect(e4)
 end 
+function c1009020.exrtg(e,c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
+end
 function c1009020.reg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	e:GetHandler():RegisterFlagEffect(1009020,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)

expansions/script/c1009021.lua

@@ -3,13 +3,14 @@ function c1009021.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)
 	--summon with s/t
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e1:SetTargetRange(LOCATION_SZONE,0)
-	e1:SetValue(POS_FACEUP_ATTACK)
-	c:RegisterEffect(e1)
+	local e11=Effect.CreateEffect(c)
+	e11:SetType(EFFECT_TYPE_SINGLE)
+	e11:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e11:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	e11:SetTargetRange(LOCATION_SZONE,0)
+	e11:SetTarget(c1009022.exrtg)
+	e11:SetValue(POS_FACEUP_ATTACK)
+	c:RegisterEffect(e11)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(1160)
@@ -18,14 +19,14 @@ function c1009021.initial_effect(c)
 	e1:SetRange(LOCATION_SZONE)
 	c:RegisterEffect(e1)
 	--pendulum set
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(1009021,0))
-	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetRange(LOCATION_PZONE)
-	e1:SetCountLimit(1,1009021)
-	e1:SetTarget(c1009021.pctg)
-	e1:SetOperation(c1009021.pcop)
-	c:RegisterEffect(e1)
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(1009021,0))
+	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetRange(LOCATION_PZONE)
+	e2:SetCountLimit(1,1009021)
+	e2:SetTarget(c1009021.pctg)
+	e2:SetOperation(c1009021.pcop)
+	c:RegisterEffect(e2)
 	 --destroy
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(1009021,3))
@@ -44,19 +45,19 @@ function c1009021.initial_effect(c)
 	e4:SetLabelObject(e3)
 	c:RegisterEffect(e4)
 	--tribute summon
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(1009021,2))
-	e3:SetCategory(CATEGORY_SUMMON)
-	e3:SetType(EFFECT_TYPE_QUICK_O)
-	e3:SetCode(EVENT_FREE_CHAIN)
-	e3:SetHintTiming(0,TIMING_MAIN_END)
-	e3:SetRange(LOCATION_PZONE)
-	e3:SetCountLimit(1)
-	e3:SetCondition(c1009021.sumcon)
-	e3:SetCost(c1009021.cost)
-	e3:SetTarget(c1009021.sumtg)
-	e3:SetOperation(c1009021.sumop)
-	c:RegisterEffect(e3)
+	local e13=Effect.CreateEffect(c)
+	e13:SetDescription(aux.Stringid(1009021,2))
+	e13:SetCategory(CATEGORY_SUMMON)
+	e13:SetType(EFFECT_TYPE_QUICK_O)
+	e13:SetCode(EVENT_FREE_CHAIN)
+	e13:SetHintTiming(0,TIMING_MAIN_END)
+	e13:SetRange(LOCATION_PZONE)
+	e13:SetCountLimit(1)
+	e13:SetCondition(c1009021.sumcon)
+	e13:SetCost(c1009021.cost)
+	e13:SetTarget(c1009021.sumtg)
+	e13:SetOperation(c1009021.sumop)
+	c:RegisterEffect(e13)
 	--destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(1009021,0))
@@ -76,6 +77,9 @@ function c1009021.initial_effect(c)
 	e8:SetOperation(c1009021.sumsuc)
 	c:RegisterEffect(e8)
 end
+function c1009021.exrtg(e,c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
+end
 function c1009021.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_MUSIC,0,aux.Stringid(1009021,4))
 end 

expansions/script/c1009022.lua

@@ -74,7 +74,7 @@ function c1009022.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c1009022.exrtg(e,c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not c:IsStatus(STATUS_LEAVE_CONFIRMED)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
 end
 function c1009022.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end

expansions/script/c1009023.lua

@@ -23,13 +23,14 @@ function c1009023.initial_effect(c)
 	e2:SetOperation(c1009023.desop)
 	c:RegisterEffect(e2)
 	--summon with s/t
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e1:SetTargetRange(LOCATION_SZONE,0)
-	e1:SetValue(POS_FACEUP_ATTACK)
-	c:RegisterEffect(e1)
+	local e11=Effect.CreateEffect(c)
+	e11:SetType(EFFECT_TYPE_SINGLE)
+	e11:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e11:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	e11:SetTargetRange(LOCATION_SZONE,0)
+	e11:SetTarget(c1009022.exrtg)
+	e11:SetValue(POS_FACEUP_ATTACK)
+	c:RegisterEffect(e11)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(1160)
@@ -64,6 +65,9 @@ function c1009023.initial_effect(c)
 	e4:SetOperation(c1009023.desop2)
 	c:RegisterEffect(e4)
 end 
+function c1009023.exrtg(e,c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and not (c:IsStatus(STATUS_LEAVE_CONFIRMED) or c:IsStatus(STATUS_ACTIVATE_DISABLED))
+end
 function c1009023.cfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x520c) and c:IsType(TYPE_PENDULUM) and c:IsAbleToGraveAsCost()
 end

expansions/script/c1009037.lua

@@ -38,15 +38,6 @@ function c1009037.initial_effect(c)
 	e3:SetTarget(c1009037.dttg)
 	e3:SetOperation(c1009037.dtop)
 	c:RegisterEffect(e3)
-	--damage
-	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_DAMAGE)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_LEAVE_FIELD)
-	e3:SetCondition(c1009037.damcon)
-	e3:SetTarget(c1009037.damtg)
-	e3:SetOperation(c1009037.damop)
-	c:RegisterEffect(e3)
 end
 function c1009037.eqlimit(e,c)
 	return c:IsSetCard(0x20c)
@@ -95,19 +86,3 @@ end
 function c1009037.dircon(e)
 	return e:GetHandler():GetControler()==e:GetOwnerPlayer()
 end
-function c1009037.damcon(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local ec=c:GetPreviousEquipTarget()
-	return c:IsReason(REASON_LOST_TARGET) and ec and ec:IsReason(REASON_DESTROY)
-end
-function c1009037.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	local dam=e:GetHandler():GetPreviousEquipTarget():GetBaseAttack()
-	if dam<0 then dam=0 end
-	e:SetLabel(dam)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,dam)
-end
-function c1009037.damop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Damage(1-tp,e:GetLabel(),REASON_EFFECT,true)
-	Duel.RDComplete()
-end