Various card script fixes

- Ectoplasmer: Should look at the Tributed card's printed ATK + the turn player selects what monster will be Tributed but the controller of this card performs the Tributing.
- Indomitable Gladiator Beast: The ATK boost shouldn't be applied if your opponent controls the targeted monster on resolution or if it's no longer a "Gladiator Beast" monster + highlight the cards selected to be returned to the Deck for the cost of its 2nd effect.
- Madolche Teacher Glassouffle: Her 2nd effect shouldn't be usable in the Damage Step + highlight the selected cards before returning them to the Deck(s).
- Marincess Great Bubble Reef: Her 2nd effect should store the number of banished monsters the moment the event took place rather than checking the event group again on resolution.
- Mark of the Rose: Fixed an issue where the changes from its effect being negated and enabled weren't reset properly when it left the field.
- Silent Burning & The Revived Sky God: Shouldn't count themselves in the number of cards in the hand for the "each player draws until they have 6 cards in their hand" part of the activation check.
- Teardrop the Rikka Queen: Her 2nd effect should work with Trap Monsters Tributed in the Monster Zone, but not with Monster Cards Tributed in the Spell & Trap Zone + it should store the number of Tributed monsters the moment the event took place rather than checking the event group again on resolution.
- Vennu, Bright Bird of Divinity: Its 2nd effect should trigger if a Trap Monster in the Monster Zone is Tributed.
- Various other script updates and small fixes.

- Added 'Cost.Reveal' and updated some cards to use it.

- If a monster in the Monster Zone is flipped face-down and back up again it shouldn't be treated as a monster that was Summoned that turn.

Author: pyrQ

official/c10441498.lua

@@ -3,22 +3,29 @@
 local s,id=GetID()
 function s.initial_effect(c)
 	c:EnableReviveLimit()
-	--Change level
+	--Make the Level of 1 face-up monster on the field become equal to the Level of the revealed monster
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetCategory(CATEGORY_LVCHANGE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetRange(LOCATION_MZONE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)
+	e1:SetCost(Cost.Reveal(function(c,e,tp)
+					return c:HasLevel() and Duel.IsExistingTarget(s.lvfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetLevel())
+				end),nil,1,1,
+				function(e,tp,g)
+					e:SetLabel(g:GetFirst():GetLevel())
+				end)
 	e1:SetTarget(s.lvtg)
 	e1:SetOperation(s.lvop)
 	c:RegisterEffect(e1)
-	--Add to hand
+	--Add 1 monster from your GY to your hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
 	e2:SetCategory(CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_RELEASE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
@@ -27,43 +34,36 @@ function s.initial_effect(c)
 	e2:SetOperation(s.thop)
 	c:RegisterEffect(e2)
 end
-s.listed_names={47435107}
-function s.cfilter(c,tp)
-	return c:IsLevelAbove(1) and not c:IsPublic() and Duel.IsExistingTarget(s.lvfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetLevel())
-end
+s.listed_names={47435107} --"Primal Cry"
 function s.lvfilter(c,lv)
-	return c:IsFaceup() and c:IsLevelAbove(1) and c:GetLevel()~=lv
+	return c:HasLevel() and c:IsFaceup() and not c:IsLevel(lv)
 end
 function s.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and s.lvfilter(chkc,e:GetLabel()) end
-	if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_HAND,0,1,nil,tp) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-	local cg=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_HAND,0,1,1,nil,tp)
-	Duel.ConfirmCards(1-tp,cg)
-	Duel.ShuffleHand(tp)
-	local lv=cg:GetFirst():GetLevel()
-	e:SetLabel(lv)
+	if chk==0 then return true end
+	local lv=e:GetLabel()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	Duel.SelectTarget(tp,s.lvfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,lv)
+	local g=Duel.SelectTarget(tp,s.lvfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,lv)
+	Duel.SetOperationInfo(0,CATEGORY_LVCHANGE,g,1,tp,lv)
 end
 function s.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	local lv=e:GetLabel()
-	if tc and tc:IsRelateToEffect(e) and tc:IsFaceup() then
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
+		--That target's Level becomes equal to the Level the revealed monster had, until the end of this turn
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_CHANGE_LEVEL)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetValue(lv)
+		e1:SetCode(EFFECT_CHANGE_LEVEL)
+		e1:SetValue(e:GetLabel())
 		e1:SetReset(RESETS_STANDARD_PHASE_END)
 		tc:RegisterEffect(e1)
 	end
 end
-function s.thfilter2(c,tp)
-	return c:IsMonster() and c:IsPreviousLocation(LOCATION_ONFIELD|LOCATION_HAND) and c:IsPreviousControler(tp)
+function s.thconfilter(c,tp)
+	return c:IsPreviousControler(tp) and (c:IsPreviousLocation(LOCATION_MZONE) or (c:IsPreviousLocation(LOCATION_HAND) and c:IsMonster()))
 end
 function s.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.thfilter2,1,e:GetHandler(),tp)
+	return eg:IsExists(s.thconfilter,1,nil,tp)
 end
 function s.thfilter(c)
 	return c:IsMonster() and c:IsAbleToHand()
@@ -73,11 +73,11 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,tp,0)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 	end
 end

official/c14553285.lua

@@ -26,7 +26,7 @@ function s.initial_effect(c)
 	e3:SetCategory(CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetCost(Cost.RemoveCounterFromSelf(2,COUNTER_SPELL))
+	e3:SetCost(Cost.RemoveCounterFromSelf(COUNTER_SPELL,2))
 	e3:SetTarget(s.destg)
 	e3:SetOperation(s.desop)
 	c:RegisterEffect(e3)

official/c20343502.lua

@@ -3,29 +3,29 @@
 --Scripted by Eerie Code
 local s,id=GetID()
 function s.initial_effect(c)
-	--Must be properly summoned before reviving
 	c:EnableReviveLimit()
-	--Xyz summon procedure
+	--Xyz Summon procedure: 2 Level 4 "Madolche" monsters
 	Xyz.AddProcedure(c,aux.FilterBoolFunctionEx(Card.IsSetCard,SET_MADOLCHE),4,2)
-	--Targeted "Madolche" monster becomes unaffected by monster effects
+	--Apply a "this turn, that face-up monster is unaffected by monster effects, except its own" effect to 1 "Madolche" monster on the field
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,id)
 	e1:SetCost(Cost.DetachFromSelf(1))
-	e1:SetTarget(s.immtg)
-	e1:SetOperation(s.immop)
-	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER|TIMING_END_PHASE)
+	e1:SetTarget(s.efftg)
+	e1:SetOperation(s.effop)
+	e1:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E)
 	c:RegisterEffect(e1)
-	--Shuffle up to 2 cards from either GY into deck
+	--Shuffle up to 2 cards from the GYs into the Deck(s)
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,1))
 	e2:SetCategory(CATEGORY_TODECK)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e2:SetProperty(EFFECT_FLAG_DELAY,EFFECT_FLAG2_CHECK_SIMULTANEOUS)
 	e2:SetCode(EVENT_TO_GRAVE)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,{id,1})
 	e2:SetCondition(s.tdcon)
@@ -34,38 +34,31 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 s.listed_series={SET_MADOLCHE}
-function s.immfilter(c)
-	return c:IsSetCard(SET_MADOLCHE) and c:IsFaceup()
-end
-function s.immtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and s.immfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(s.immfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	Duel.SelectTarget(tp,s.immfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsSetCard(SET_MADOLCHE) and chkc:IsFaceup() end
+	if chk==0 then return Duel.IsExistingTarget(aux.FaceupFilter(Card.IsSetCard,SET_MADOLCHE),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO)
+	Duel.SelectTarget(tp,aux.FaceupFilter(Card.IsSetCard,SET_MADOLCHE),tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end
-function s.immop(e,tp,eg,ep,ev,re,r,rp)
+function s.effop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) and tc:IsFaceup() then
-		--Unaffected by monster effects
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
+		--This turn, that face-up monster is unaffected by monster effects, except its own
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetDescription(3101)
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
-		e1:SetRange(LOCATION_MZONE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
 		e1:SetCode(EFFECT_IMMUNE_EFFECT)
-		e1:SetValue(s.efilter)
+		e1:SetValue(function(e,te) return te:IsMonsterEffect() and te:GetOwner()~=e:GetHandler() end)
 		e1:SetReset(RESETS_STANDARD_PHASE_END)
 		tc:RegisterEffect(e1)
 	end
 end
-function s.efilter(e,te)
-	return te:IsMonsterEffect() and te:GetOwner()~=e:GetHandler()
-end
-function s.tdcfilter(c,tp)
+function s.tdconfilter(c,tp)
 	return c:IsSetCard(SET_MADOLCHE) and c:IsControler(tp)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.tdcfilter,1,nil,tp)
+	return eg:IsExists(s.tdconfilter,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) end
@@ -75,6 +68,7 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(Card.IsAbleToDeck),tp,LOCATION_GRAVE,LOCATION_GRAVE,1,2,nil)
 	if #g>0 then
+		Duel.HintSelection(g)
 		Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 	end
-end
+end

official/c21113684.lua

@@ -29,7 +29,7 @@ function s.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)
-	e3:SetCost(Cost.RemoveCounterFromField(1,COUNTER_SPELL))
+	e3:SetCost(Cost.RemoveCounterFromField(COUNTER_SPELL,1))
 	e3:SetTarget(s.efftg)
 	e3:SetOperation(s.effop)
 	c:RegisterEffect(e3)

official/c25311006.lua

@@ -3,83 +3,72 @@
 --Scripted by Eerie Code
 local s,id=GetID()
 function s.initial_effect(c)
-	--activate
+	--Activate 1 of these effects
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH)
-	e1:SetCondition(s.condition)
-	e1:SetTarget(s.target)
+	e1:SetCondition(function(e,tp) return Duel.GetCustomActivityCount(id,1-tp,ACTIVITY_CHAIN)>0 end)
+	e1:SetTarget(s.efftg)
+	e1:SetOperation(s.effop)
 	c:RegisterEffect(e1)
-	Duel.AddCustomActivityCounter(id,ACTIVITY_CHAIN,s.chainfilter)
+	Duel.AddCustomActivityCounter(id,ACTIVITY_CHAIN,function(re,tp,cid) return not (Duel.IsMainPhase() and re:IsMonsterEffect()) end)
 end
-function s.chainfilter(re,tp,cid)
-	return not (re:IsMonsterEffect() and Duel.IsMainPhase())
-end
-function s.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCustomActivityCount(id,1-tp,ACTIVITY_CHAIN)~=0
-end
-function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local b1=s.drtg(e,tp,eg,ep,ev,re,r,rp,0)
-	local b2=s.cttg(e,tp,eg,ep,ev,re,r,rp,0)
-	local b3=s.tdtg(e,tp,eg,ep,ev,re,r,rp,0)
+function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local b1=Duel.IsPlayerCanDraw(tp,2)
+	local b2=Duel.IsExistingMatchingCard(Card.IsControlerCanBeChanged,tp,0,LOCATION_MZONE,1,nil)
+	local b3=Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0
 	if chk==0 then return b1 or b2 or b3 end
 	local op=Duel.SelectEffect(tp,
-		{b1,aux.Stringid(id,0)},
-		{b2,aux.Stringid(id,1)},
-		{b3,aux.Stringid(id,2)})
+		{b1,aux.Stringid(id,1)},
+		{b2,aux.Stringid(id,2)},
+		{b3,aux.Stringid(id,3)})
+	e:SetLabel(op)
 	if op==1 then
 		e:SetCategory(CATEGORY_DRAW)
 		e:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-		e:SetOperation(s.drop)
-		s.drtg(e,tp,eg,ep,ev,re,r,rp,1)
+		Duel.SetTargetPlayer(tp)
+		Duel.SetTargetParam(2)
+		Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
 	elseif op==2 then
 		e:SetCategory(CATEGORY_CONTROL)
 		e:SetProperty(0)
-		e:SetOperation(s.ctop)
-		s.cttg(e,tp,eg,ep,ev,re,r,rp,1)
+		Duel.SetOperationInfo(0,CATEGORY_CONTROL,nil,1,tp,0)
 	elseif op==3 then
 		e:SetCategory(CATEGORY_TODECK)
 		e:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-		e:SetOperation(s.tdop)
-		s.tdtg(e,tp,eg,ep,ev,re,r,rp,1)
+		Duel.SetTargetPlayer(tp)
+		Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,1-tp,LOCATION_HAND)
 	end
 end
-function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,2) end
-	Duel.SetTargetPlayer(tp)
-	Duel.SetTargetParam(2)
-	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
-end
-function s.drop(e,tp,eg,ep,ev,re,r,rp)
-	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
-	Duel.Draw(p,d,REASON_EFFECT)
-end
-function s.cttg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsControlerCanBeChanged,tp,0,LOCATION_MZONE,1,nil) end
-	local g=Duel.GetFieldGroup(tp,0,LOCATION_MZONE):Filter(Card.IsControlerCanBeChanged,nil)
-	Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,1,0,0)
-end
-function s.ctop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
-	local tc=Duel.SelectMatchingCard(tp,Card.IsControlerCanBeChanged,tp,0,LOCATION_MZONE,1,1,nil):GetFirst()
-	if tc then
-		Duel.GetControl(tc,tp,PHASE_END,1)
-	end
-end
-function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 end
-	Duel.SetTargetPlayer(tp)
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,1-tp,LOCATION_HAND)
-end
-function s.tdop(e,tp,eg,ep,ev,re,r,rp)
-	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
-	local g=Duel.GetFieldGroup(p,0,LOCATION_HAND)
-	if #g>0 then
-		Duel.ConfirmCards(p,g)
-		Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
-		local sg=g:Select(p,1,1,nil)
-		Duel.SendtoDeck(sg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
-		Duel.ShuffleHand(1-p)
+function s.effop(e,tp,eg,ep,ev,re,r,rp)
+	local op=e:GetLabel()
+	if op==1 then
+		--Draw 2 cards
+		local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
+		Duel.Draw(p,d,REASON_EFFECT)
+	elseif op==2 then
+		--Take control of 1 monster your opponent controls until the End Phase
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
+		local g=Duel.SelectMatchingCard(tp,Card.IsControlerCanBeChanged,tp,0,LOCATION_MZONE,1,1,nil)
+		if #g>0 then
+			Duel.HintSelection(g)
+			Duel.GetControl(g,tp,PHASE_END,1)
+		end
+	elseif op==3 then
+		--Look at your opponent's hand, and choose 1 card from it to shuffle into the Deck
+		local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
+		local g=Duel.GetFieldGroup(p,0,LOCATION_HAND)
+		if #g>0 then
+			Duel.ConfirmCards(p,g)
+			Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
+			local sg=g:Select(p,1,1,nil)
+			if #sg>0 then
+				Duel.HintSelection(sg)
+				Duel.SendtoDeck(sg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
+			end
+			Duel.ShuffleHand(1-p)
+		end
 	end
 end