Fix 無垢なる予幻視

script/c101301055.lua

@@ -50,21 +50,30 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.rafilter(c)
-	return c:IsFaceup() and (RACE_ALL&~c:GetRace())~=0 and (ATTRIBUTE_ALL~c:GetAttribute())~=0
+	return c:IsFaceup() and ((RACE_ALL&~c:GetRace())~=0 or (ATTRIBUTE_ALL&~c:GetAttribute())~=0)
 end
 function s.ratg(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 chk==0 then return Duel.IsExistingTarget(s.rafilter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local tc=Duel.SelectTarget(tp,s.rafilter,tp,LOCATION_MZONE,0,1,1,nil):GetFirst()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RACE)
-	local race=Duel.AnnounceRace(tp,1,RACE_ALL)
-	local att=0
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATTRIBUTE)
-	if race==tc:GetRace() then
+	local race,att
+	if ATTRIBUTE_ALL&~tc:GetAttribute()==0 then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RACE)
+		race=Duel.AnnounceRace(tp,1,RACE_ALL&~tc:GetRace())
+		att=tc:GetAttribute()
+	elseif RACE_ALL&~tc:GetRace()==0 then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATTRIBUTE)
 		att=Duel.AnnounceAttribute(tp,1,ATTRIBUTE_ALL~tc:GetAttribute())
+		race=tc:GetRace()
 	else
-		att=Duel.AnnounceAttribute(tp,1,ATTRIBUTE_ALL)
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RACE)
+		race=Duel.AnnounceRace(tp,1,RACE_ALL)
+		if race==tc:GetRace() then
+			att=Duel.AnnounceAttribute(tp,1,ATTRIBUTE_ALL~tc:GetAttribute())
+		else
+			att=Duel.AnnounceAttribute(tp,1,ATTRIBUTE_ALL)
+		end
 	end
 	e:SetLabel(race,att)
 end