fix

script/c1639384.lua

@@ -33,8 +33,8 @@ function c1639384.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if tc:IsFaceup() and tc:IsRelateToEffect(e) then
-		Duel.NegateRelatedChain(tc,RESET_TURN_SET)
 		if not tc:IsDisabled() then
+			Duel.NegateRelatedChain(tc,RESET_TURN_SET)
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)

script/c19028307.lua

@@ -22,16 +22,31 @@ function c19028307.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
 	local n=0
-	if Duel.IsExistingMatchingCard(c19028307.spfilter,tp,LOCATION_MZONE,0,1,c,RACE_BEASTWARRIOR+RACE_MACHINE) then n=-1 end
+	if Duel.IsExistingMatchingCard(c19028307.spfilter,tp,LOCATION_MZONE,0,1,c,RACE_BEASTWARRIOR) then n=n-1 end
+	if Duel.IsExistingMatchingCard(c19028307.spfilter,tp,LOCATION_MZONE,0,1,c,RACE_MACHINE) then n=n-1 end
 	return Duel.GetLocationCount(tp,LOCATION_MZONE)>n
 		and Duel.IsExistingMatchingCard(c19028307.spfilter,tp,0x16,0,1,c,RACE_BEASTWARRIOR)
 		and Duel.IsExistingMatchingCard(c19028307.spfilter,tp,0x16,0,1,c,RACE_MACHINE)
 end
 function c19028307.spop(e,tp,eg,ep,ev,re,r,rp,c)
+	local g1=nil
+	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if ft~=0 then
+		local loc=0x16
+		if ft<0 then loc=LOCATION_MZONE end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g1=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,0x16,0,1,1,c,RACE_BEASTWARRIOR)
+		g1=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,loc,0,1,1,c,RACE_BEASTWARRIOR)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g2=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,0x16,0,1,1,c,RACE_MACHINE)
+		local g2=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,loc,0,1,1,c,RACE_MACHINE)
 		g1:Merge(g2)
+	else
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+		g1=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,LOCATION_MZONE,0,1,1,c,RACE_BEASTWARRIOR+RACE_MACHINE)
+		local rc=RACE_BEASTWARRIOR
+		if g1:GetFirst():IsRace(RACE_BEASTWARRIOR) then rc=RACE_MACHINE end
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+		local g2=Duel.SelectMatchingCard(tp,c19028307.spfilter,tp,0x16,0,1,1,c,rc)
+		g1:Merge(g2)
+	end
 	Duel.Remove(g1,POS_FACEUP,REASON_COST)
 end

script/c99429730.lua

@@ -15,7 +15,7 @@ function c99429730.initial_effect(c)
 	e2:SetDescription(aux.Stringid(99429730,2))
 	e2:SetCategory(CATEGORY_TODECK)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c99429730.tdcon)
 	e2:SetTarget(c99429730.tdtg)

script/c99641328.lua

@@ -15,7 +15,7 @@ function c99641328.initial_effect(c)
 	e2:SetDescription(aux.Stringid(99641328,2))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c99641328.descon)
 	e2:SetTarget(c99641328.destg)