Merge remote-tracking branch 'upstream/mercury233-patch-2' into develop

c15735108.lua

@@ -30,9 +30,8 @@ function s.sumfilter(c,ec)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetTargetRange(0,LOCATION_MZONE)
 	e1:SetValue(POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e1)
-	local res=c:IsSummonable(true,nil,1)
+	local res=c:IsSummonable(true,nil,1) or c:IsMSetable(true,nil,1)
 	e1:Reset()
 	return res
 end
@@ -44,28 +43,36 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
 	local tc=Duel.SelectMatchingCard(tp,s.sumfilter,tp,LOCATION_HAND,0,1,1,nil,c):GetFirst()
-	if tc then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-		e1:SetRange(LOCATION_HAND)
-		e1:SetTargetRange(0,LOCATION_MZONE)
-		e1:SetValue(POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-		tc:RegisterEffect(e1)
+	if tc then s.summon(e,tp,tc) end
+end
+function s.summon(e,tp,tc)
+	local c=e:GetHandler()
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
+	e1:SetRange(LOCATION_HAND)
+	e1:SetTargetRange(0,LOCATION_MZONE)
+	e1:SetValue(POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	tc:RegisterEffect(e1)
+	local s1=tc:IsSummonable(true,nil,1)
+	local s2=tc:IsMSetable(true,nil,1)
+	if (s1 and s2 and Duel.SelectPosition(tp,tc,POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)==POS_FACEUP_ATTACK) or not s2 then
 		Duel.Summon(tp,tc,true,nil,1)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_UNRELEASABLE_SUM)
-		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
-		e2:SetRange(LOCATION_MZONE)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-		e2:SetValue(1)
-		tc:RegisterEffect(e2,true)
-		local e3=e2:Clone()
-		e3:SetCode(EFFECT_UNRELEASABLE_NONSUM)
-		tc:RegisterEffect(e3,true)
+	else
+		Duel.MSet(tp,tc,true,nil,1)
 	end
+	--cannot be tributed
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetCode(EFFECT_UNRELEASABLE_SUM)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
+	e2:SetValue(1)
+	tc:RegisterEffect(e2,true)
+	local e3=e2:Clone()
+	e3:SetCode(EFFECT_UNRELEASABLE_NONSUM)
+	tc:RegisterEffect(e3,true)
 end
 function s.sumcon2(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
@@ -79,27 +86,6 @@ function s.sumop2(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.IsExistingMatchingCard(s.sumfilter,1-tp,LOCATION_HAND,0,1,nil,c) and Duel.SelectYesNo(1-tp,aux.Stringid(id,2)) then
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SUMMON)
 		local tc=Duel.SelectMatchingCard(1-tp,s.sumfilter,1-tp,LOCATION_HAND,0,1,1,nil,c):GetFirst()
-		if tc then
-			local e1=Effect.CreateEffect(c)
-			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-			e1:SetRange(LOCATION_HAND)
-			e1:SetTargetRange(0,LOCATION_MZONE)
-			e1:SetValue(POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-			tc:RegisterEffect(e1)
-			Duel.Summon(1-tp,tc,true,nil,1)
-			local e2=Effect.CreateEffect(c)
-			e2:SetType(EFFECT_TYPE_SINGLE)
-			e2:SetCode(EFFECT_UNRELEASABLE_SUM)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SINGLE_RANGE)
-			e2:SetRange(LOCATION_MZONE)
-			e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-			e2:SetValue(1)
-			tc:RegisterEffect(e2,true)
-			local e3=e2:Clone()
-			e3:SetCode(EFFECT_UNRELEASABLE_NONSUM)
-			tc:RegisterEffect(e3,true)
-		end
+		s.summon(e,1-tp,tc)
 	end
 end