Merge pull request #309 from VanillaSalt/patch34

fix

script/c15471265.lua

@@ -6,6 +6,7 @@ function c15471265.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(TIMING_DAMAGE_STEP)
 	e1:SetCondition(c15471265.condition)
 	e1:SetCost(c15471265.cost)
 	e1:SetTarget(c15471265.target)

script/c16678947.lua

@@ -6,7 +6,6 @@ function c16678947.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
-	e1:SetHintTiming(TIMING_ATTACK,0x11e0)
 	e1:SetCondition(c16678947.condition)
 	e1:SetTarget(c16678947.target)
 	e1:SetOperation(c16678947.activate)

script/c21454943.lua

@@ -7,7 +7,7 @@ function c21454943.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(TIMING_DAMAGE_STEP)
+	e1:SetHintTiming(TIMING_DAMAGE_CAL)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c21454943.condition)
 	e1:SetCost(c21454943.cost)

script/c24707869.lua

@@ -17,7 +17,7 @@ function c24707869.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c24707869.filter(chkc) end
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
 		and Duel.IsExistingTarget(c24707869.filter,tp,LOCATION_REMOVED,0,2,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectTarget(tp,c24707869.filter,tp,LOCATION_REMOVED,0,2,2,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end

script/c27207573.lua

@@ -17,7 +17,7 @@ function c27207573.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
 end
 function c27207573.cfilter(c)
-	return c:IsSetCard(0x100a) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+	return c:IsSetCard(0x100a) and c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
 end
 function c27207573.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c27207573.cfilter,tp,LOCATION_DECK,0,1,nil) end

script/c31828916.lua

@@ -26,7 +26,7 @@ function c31828916.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c31828916.check(e,tp,eg,ep,ev,re,r,rp)
-	if r~=REASON_BATTLE then return end
+	if bit.band(r,REASON_BATTLE)==0 then return end
 	local pg=e:GetLabelObject()
 	if pg then pg:DeleteGroup() end
 	local dg=eg:Filter(Card.IsRace,nil,RACE_MACHINE)

script/c32296881.lua

@@ -10,6 +10,7 @@ function c32296881.initial_effect(c)
 end
 function c32296881.drop(e,tp,eg,ep,ev,re,r,rp)
 	if not re:GetHandler():IsType(TYPE_COUNTER) then return end
+	Duel.Hint(HINT_CARD,0,32296881)
 	Duel.BreakEffect()
 	Duel.Draw(tp,1,REASON_EFFECT)
 end

script/c36280194.lua

@@ -15,7 +15,7 @@ function c36280194.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,5,nil,TYPE_MONSTER)
 end
 function c36280194.filter(c)
-	return c:IsAttackBelow(1500) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_EFFECT)
+	return c:IsAttackBelow(1500) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_EFFECT) and c:IsAbleToHand()
 end
 function c36280194.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c36280194.filter(chkc) end

script/c36757171.lua

@@ -28,7 +28,8 @@ function c36757171.filter(c)
 end
 function c36757171.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c36757171.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c36757171.filter,tp,0,LOCATION_MZONE,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(c36757171.filter,tp,0,LOCATION_MZONE,1,nil)
+		and Duel.IsExistingMatchingCard(c36757171.dfilter,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
 	local g=Duel.SelectTarget(tp,c36757171.filter,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,1,0,0)

script/c37792478.lua

@@ -17,7 +17,7 @@ end
 function c37792478.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c37792478.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c37792478.filter,tp,LOCATION_GRAVE,0,2,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local g=Duel.SelectTarget(tp,c37792478.filter,tp,LOCATION_GRAVE,0,2,2,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,2,0,0)
 end

script/c42328171.lua

@@ -17,7 +17,7 @@ function c42328171.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPosition(POS_FACEUP_ATTACK)
 end
 function c42328171.filter(c)
-	return c:IsSetCard(0x58) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x58) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c42328171.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c42328171.filter(chkc) end

script/c42425831.lua

@@ -41,7 +41,7 @@ function c42425831.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c42425831.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c42425831.cfilter,tp,LOCATION_MZONE,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local cg=Duel.SelectMatchingCard(tp,c42425831.cfilter,tp,LOCATION_MZONE,0,1,1,nil)
 	Duel.SendtoDeck(cg,nil,1,REASON_COST)
 end
@@ -51,7 +51,7 @@ function c42425831.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,2,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
 	e:GetHandler():RegisterFlagEffect(42425831,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
 end
 function c42425831.operation(e,tp,eg,ep,ev,re,r,rp)

script/c43378048.lua

 --混沌幻魔アーミタイル
 function c43378048.initial_effect(c)
+	--fusion material
 	c:EnableReviveLimit()
+	aux.AddFusionProcCode3(c,6007213,32491822,69890967,true,true)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

script/c46833854.lua

@@ -16,11 +16,14 @@ end
 function c46833854.con(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)-Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)>=2
 end
+function c46833854.cfilter(c)
+	return c:IsSetCard(0x35) and not c:IsPublic()
+end
 function c46833854.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsReleasable()
-		and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_HAND,0,1,nil,0x35) end
+		and Duel.IsExistingMatchingCard(c46833854.cfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-	local g=Duel.SelectMatchingCard(tp,Card.IsSetCard,tp,LOCATION_HAND,0,1,1,nil,0x35)
+	local g=Duel.SelectMatchingCard(tp,c46833854.cfilter,tp,LOCATION_HAND,0,1,1,e:GetHandler())
 	Duel.ConfirmCards(1-tp,g)
 	Duel.Release(e:GetHandler(),REASON_COST)
 	Duel.ShuffleHand(tp)
@@ -30,7 +33,7 @@ function c46833854.filter(c)
 end
 function c46833854.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c46833854.filter(chkc) end
-	if chk==0 then return Duel.IsExistingMatchingCard(c46833854.filter,tp,0,LOCATION_ONFIELD,2,nil) end
+	if chk==0 then return Duel.IsExistingTarget(c46833854.filter,tp,0,LOCATION_ONFIELD,2,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c46833854.filter,tp,0,LOCATION_ONFIELD,2,2,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,2,0,0)

script/c55136228.lua

@@ -45,13 +45,16 @@ function c55136228.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e1)
 	end
 end
+function c55136228.cfilter(c)
+	return c:IsSetCard(0x19) and c:IsAbleToDeckAsCost()
+end
 function c55136228.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_GRAVE,0,2,e:GetHandler(),0x19) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c55136228.cfilter,tp,LOCATION_GRAVE,0,2,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local g=Duel.SelectMatchingCard(tp,Card.IsSetCard,tp,LOCATION_GRAVE,0,2,2,e:GetHandler(),0x19)
+	local g=Duel.SelectMatchingCard(tp,c55136228.cfilter,tp,LOCATION_GRAVE,0,2,2,e:GetHandler())
 	Duel.SendtoDeck(g,nil,2,REASON_COST)
 end
-function c55136228.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function c55136228.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToHand() end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
 end

script/c59546528.lua

@@ -31,8 +31,8 @@ function c59546528.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(c59546528.filter,tp,0,LOCATION_SZONE,1,nil) end
 	local ht=Duel.GetMatchingGroupCount(c59546528.cfilter2,tp,LOCATION_HAND,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local eg=Duel.SelectTarget(tp,c59546528.filter,tp,0,LOCATION_SZONE,1,ht,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,eg,eg:GetCount(),0,0)
+	local g=Duel.SelectTarget(tp,c59546528.filter,tp,0,LOCATION_SZONE,1,ht,nil)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
 end
 function c59546528.operation(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)

script/c61505339.lua

@@ -28,7 +28,7 @@ function c61505339.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(c61505339.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c61505339.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function c61505339.spop(e,tp,eg,ep,ev,re,r,rp)

script/c64463828.lua

@@ -7,7 +7,7 @@ function c64463828.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_DUAL))
 	e1:SetCode(EFFECT_DUAL_STATUS)
 	c:RegisterEffect(e1)

script/c65282484.lua

@@ -44,7 +44,7 @@ function c65282484.chop1(e,tp,eg,ep,ev,re,r,rp)
 	e:GetLabelObject():SetLabel(0)
 end
 function c65282484.chop2(e,tp,eg,ep,ev,re,r,rp)
-	if not re:IsActiveType(TYPE_COUNTER) then return end
+	if rp~=tp or not re:IsActiveType(TYPE_COUNTER) then return end
 	e:GetLabelObject():SetLabel(1)
 end
 function c65282484.spcon(e,tp,eg,ep,ev,re,r,rp)

script/c70583986.lua

@@ -22,22 +22,23 @@ function c70583986.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(tp) and c70583986.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c70583986.filter,tp,LOCATION_ONFIELD,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local eg=Duel.SelectTarget(tp,c70583986.filter,tp,LOCATION_ONFIELD,0,1,11,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,eg,eg:GetCount(),0,0)
+	local g=Duel.SelectTarget(tp,c70583986.filter,tp,LOCATION_ONFIELD,0,1,11,nil)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
 end
 function c70583986.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
 	local rg=tg:Filter(Card.IsRelateToEffect,nil,e)
 	Duel.SendtoHand(rg,nil,REASON_EFFECT)
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and c:IsFaceup() then
+		Duel.BreakEffect()
 		local og=Duel.GetOperatedGroup()
 		local ct=og:FilterCount(Card.IsLocation,nil,LOCATION_HAND)
 		if ct>0 then
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_UPDATE_ATTACK)
-			e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+			e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_END)
 			e1:SetValue(ct*500)
 			c:RegisterEffect(e1)
 		end

script/c79229522.lua

 --キメラテック·フォートレス·ドラゴン
 function c79229522.initial_effect(c)
+	--fusion material
 	c:EnableReviveLimit()
+	aux.AddFusionProcCodeFun(c,70095154,aux.FilterBoolFunction(Card.IsRace,RACE_MACHINE),1,true,true)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

script/c79798060.lua

@@ -66,7 +66,7 @@ function c79798060.sdcon(e)
 end
 function c79798060.descon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return not c:IsReason(REASON_BATTLE) and re and re:GetHandler()~=c
+	return not c:IsReason(REASON_BATTLE) and re and re:GetOwner()~=c
 end
 function c79798060.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c83274244.lua

@@ -34,7 +34,8 @@ end
 function c83274244.atop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e1:SetCode(EVENT_CHAIN_ACTIVATING)
+	e1:SetCode(EVENT_CHAIN_SOLVING)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c83274244.negop)
 	e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_DAMAGE)
 	e:GetHandler():RegisterEffect(e1)

script/c89792713.lua

@@ -28,7 +28,7 @@ function c89792713.checkop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c89792713.filter(c)
-	return c:IsFaceup() and c:GetFlagEffect(89792713)~=0
+	return c:IsFaceup() and c:GetFlagEffect(89792713)~=0 and c:IsDestructable()
 end
 function c89792713.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c89792713.filter(chkc) end

script/c90616316.lua

@@ -35,10 +35,13 @@ function c90616316.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEDOWN_DEFENCE)
 	end
 end
+function c90616316.cfilter(c)
+	return c:IsSetCard(0x35) and not c:IsPublic()
+end
 function c90616316.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_HAND,0,1,nil,0x35) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c90616316.cfilter,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-	local g=Duel.SelectMatchingCard(tp,Card.IsSetCard,tp,LOCATION_HAND,0,1,1,nil,0x35)
+	local g=Duel.SelectMatchingCard(tp,c90616316.cfilter,tp,LOCATION_HAND,0,1,1,nil)
 	Duel.ConfirmCards(1-tp,g)
 	Duel.ShuffleHand(tp)
 end