Merge branch 'master' into 'master'

Master

See merge request mycard/pre-release-database-cdb!6

script/c101204009.lua

@@ -44,7 +44,7 @@ function c101204009.filter(c)
 	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x9b) and c:IsFaceup()
 end
 function c101204009.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c101204009.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c101204009.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(c101204009.tgfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c101204009.filter,tp,LOCATION_MZONE,0,1,1,nil)

script/c101204020.lua

@@ -52,7 +52,7 @@ function s.tokentg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local res=e:GetLabel()==100
 		e:SetLabel(0)
-		return res and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		return res
 	end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)

script/c101204026.lua

@@ -37,9 +37,10 @@ function s.indtg(e,c)
 	return c==tc or c==tc:GetBattleTarget()
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
-	return a:IsRace(RACE_MACHINE+RACE_ILLUSION) and a:IsControler(tp) or d and d:IsRace(RACE_MACHINE+RACE_ILLUSION) and d:IsControler(tp)
+	return a~=c and a:IsControler(tp) and a:IsRace(RACE_MACHINE+RACE_ILLUSION) or d and a~=c and d:IsControler(tp) and d:IsRace(RACE_MACHINE+RACE_ILLUSION)
 end
 function s.filter(c,e,tp)
 	return c:IsFaceupEx() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c101204032.lua

@@ -46,7 +46,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function s.tgop(e,tp,eg,ep,ev,re,r,rp)
-	if not (Duel.GetLocationCount(tp,LOCATION_MZONE)>0) then return end
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local c=e:GetHandler()
 	local sc=e:GetLabelObject()
 	local g=Group.FromCards(c,sc)