Merge pull request #1322 from DailyShana/patch-1

fix

script/c14469229.lua

@@ -19,7 +19,7 @@ function c14469229.initial_effect(c)
 	--double
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(14469229,0))
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e3:SetRange(LOCATION_MZONE+LOCATION_HAND)
 	e3:SetCost(c14469229.cost)

script/c19019586.lua

@@ -13,8 +13,9 @@ function c19019586.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(19019586,1))
 	e2:SetCategory(CATEGORY_ATKCHANGE)
-	e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
+	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
+	e2:SetRange(LOCATION_MZONE)
 	e2:SetCost(c19019586.defcost)
 	e2:SetOperation(c19019586.defop)
 	c:RegisterEffect(e2)
@@ -33,10 +34,12 @@ function c19019586.cfilter(c)
 	return c:IsType(TYPE_NORMAL) and c:IsAbleToGraveAsCost()
 end
 function c19019586.defcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c19019586.cfilter,tp,LOCATION_HAND,0,1,nil) end
+	if chk==0 then return e:GetHandler():GetFlagEffect(19019586)==0
+		and Duel.IsExistingMatchingCard(c19019586.cfilter,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,c19019586.cfilter,tp,LOCATION_HAND,0,1,1,nil)
 	Duel.SendtoGrave(g,REASON_COST)
+	e:GetHandler():RegisterFlagEffect(19019586,RESET_PHASE+RESET_DAMAGE_CAL,0,1)
 end
 function c19019586.defop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c22227683.lua

@@ -2,8 +2,9 @@
 function c22227683.initial_effect(c)
 	--atk/def up
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c22227683.condition)
 	e1:SetTarget(c22227683.target)
 	e1:SetOperation(c22227683.operation)
@@ -25,7 +26,9 @@ function c22227683.tgfilter(c)
 	return c:IsSetCard(0xab) and c:IsType(TYPE_MONSTER) and not c:IsCode(22227683) and c:IsAbleToGrave()
 end
 function c22227683.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c22227683.tgfilter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return e:GetHandler():GetFlagEffect(22227683)==0
+		and Duel.IsExistingMatchingCard(c22227683.tgfilter,tp,LOCATION_DECK,0,1,nil) end
+	e:GetHandler():RegisterFlagEffect(22227683,RESET_CHAIN,0,1)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
 function c22227683.operation(e,tp,eg,ep,ev,re,r,rp)

script/c39272762.lua

@@ -18,16 +18,16 @@ function c39272762.initial_effect(c)
 	e2:SetLabelObject(e1)
 	c:RegisterEffect(e2)
 	--attack up
-	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_ATKCHANGE)
-	e1:SetDescription(aux.Stringid(39272762,1))
-	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCost(c39272762.atcost)
-	e1:SetTarget(c39272762.attg)
-	e1:SetOperation(c39272762.atop)
-	c:RegisterEffect(e1)
+	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_ATKCHANGE)
+	e3:SetDescription(aux.Stringid(39272762,1))
+	e3:SetType(EFFECT_TYPE_IGNITION)
+	e3:SetCountLimit(1)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCost(c39272762.atcost)
+	e3:SetTarget(c39272762.attg)
+	e3:SetOperation(c39272762.atop)
+	c:RegisterEffect(e3)
 end
 function c39272762.valcheck(e,c)
 	local g=c:GetMaterial()

script/c54366836.lua

@@ -25,8 +25,9 @@ function c54366836.initial_effect(c)
 	--damage
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(54366836,0))
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetCost(c54366836.damcost2)
 	e3:SetOperation(c54366836.damop2)
 	c:RegisterEffect(e3)
@@ -47,8 +48,10 @@ function c54366836.damop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Damage(p,d,REASON_EFFECT)
 end
 function c54366836.damcost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	local c=e:GetHandler()
+	if chk==0 then return c:GetFlagEffect(54366836)==0 and c:CheckRemoveOverlayCard(tp,1,REASON_COST) end
+	c:RemoveOverlayCard(tp,1,1,REASON_COST)
+	c:RegisterFlagEffect(54366836,RESET_CHAIN,0,1)
 end
 function c54366836.damop2(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

script/c63035430.lua

---摩天楼－スカイスクレイパー
+--摩天楼 －スカイスクレイパー－
 function c63035430.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c7953868.lua

@@ -13,17 +13,17 @@ function c7953868.initial_effect(c)
 	e2:SetCode(EVENT_FLIP_SUMMON_SUCCESS)
 	c:RegisterEffect(e2)
 	--special summon
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(7953868,1))
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCost(c7953868.spcost)
-	e1:SetTarget(c7953868.sptg)
-	e1:SetOperation(c7953868.spop)
-	c:RegisterEffect(e1)
+	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(7953868,1))
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e3:SetType(EFFECT_TYPE_IGNITION)
+	e3:SetCountLimit(1)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCost(c7953868.spcost)
+	e3:SetTarget(c7953868.sptg)
+	e3:SetOperation(c7953868.spop)
+	c:RegisterEffect(e3)
 end
 function c7953868.potg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return e:GetHandler():IsAttackPos() end