Merge branch 'master' of https://code.moenext.com/mycard/pre-release-database-cdb

script/c101208049.lua

@@ -75,22 +75,19 @@ function s.mtop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function s.attfilter(c,att)
-	return c:IsSetCard(0x2c3) and c:IsAttribute(att)
+function s.attfilter(c)
+	return c:IsSetCard(0x2c3) and c:IsType(TYPE_MONSTER)
 end
 function s.effcon(e,tp,eg,ep,ev,re,r,rp)
 	local g=e:GetHandler():GetOverlayGroup()
-	local att=0x1
-	local r1=0
-	local res=0
-	for i=1,6 do
-		if g:IsExists(s.attfilter,1,nil,att) then
-			res=res+1
+	local att=0
+	for tc in aux.Next(g) do
+		if s.attfilter(tc) then
+			att=att|tc:GetAttribute()
 		end
-		att=att*2
-		r1=r1+1
 	end
-	return res==6
+	local gattr=ATTRIBUTE_EARTH|ATTRIBUTE_WATER|ATTRIBUTE_FIRE|ATTRIBUTE_WIND|ATTRIBUTE_LIGHT|ATTRIBUTE_DARK
+	return att&gattr==gattr
 end
 function s.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()

script/c101208061.lua

@@ -7,6 +7,7 @@ function s.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER|TIMING_END_PHASE)
 	e1:SetCountLimit(1,id)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)