Merge master into additionalpendulumsummon branch

Author: pyrQ

archetype_setcode_constants.lua

@@ -588,8 +588,11 @@ SET_REGENESIS                     = 0x1be
 SET_DRAGONTAIL                    = 0x1c0
 SET_YUMMY                         = 0x1c1
 SET_K9                            = 0x1c4
---Released but the official English name is unconfirmed
---Pre-release archetypes
 SET_TELEPORT                      = 0x1c5
+--Released but the official English name is unconfirmed
 SET_IMPRISONED_DEITY              = 0x1c6
 SET_ARTMEGIA                      = 0x1c7
+--Pre-release archetypes
+SET_DOOM_KING                     = 0x1c8
+SET_MAGNIFISTORM                  = 0x1c9
+SET_RB                            = 0x1ca

card_counter_constants.lua

@@ -53,10 +53,11 @@ CARD_LABRYNTH_LABYRINTH     = 33407125
 CARD_LIGHT_BARRIER          = 73206827
 CARD_MAGICAL_MIDBREAKER     = 71650854
 CARD_MAX_METALMORPH         = 89812483
-CARD_MEDIUS_THE_INNOCENT    = 101301008
+CARD_MEDIUS_THE_INNOCENT    = 97556336
 CARD_MEMENTOAL_TECUHTLICA   = 23288411
 CARD_MILLENNIUM_CROSS       = 37613663
 CARD_MONSTER_REBORN         = 83764718
+CARD_MYSTICAL_SPACE_TYPHOON = 5318639
 CARD_MYUTANT_ARSENAL        = 7574904
 CARD_MYUTANT_BEAST          = 34695290
 CARD_MYUTANT_MIST           = 61089209

goat/c504700123.lua

@@ -45,6 +45,7 @@ function s.initial_effect(c)
 		end)
 	end)
 end
+s.listed_names={73915052}
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return (Duel.GetCurrentChain(true)==0 and Duel.GetActivityCount(tp,ACTIVITY_SUMMON)==0
 		and Duel.GetActivityCount(tp,ACTIVITY_FLIPSUMMON)==0 and Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0) or
@@ -53,7 +54,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetReset(RESET_PHASE+PHASE_END)
+	e1:SetReset(RESET_PHASE|PHASE_END)
 	e1:SetTargetRange(1,0)
 	e1:SetLabelObject(e)
 	e1:SetTarget(s.sumlimit)
@@ -62,7 +63,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e2:SetCode(EFFECT_CANNOT_SUMMON)
-	e2:SetReset(RESET_PHASE+PHASE_END)
+	e2:SetReset(RESET_PHASE|PHASE_END)
 	e2:SetTargetRange(1,0)
 	Duel.RegisterEffect(e2,tp)
 	local e3=e2:Clone()
@@ -71,7 +72,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local e4=Effect.CreateEffect(e:GetHandler())
 	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_OATH)
 	e4:SetDescription(aux.Stringid(id,1))
-	e4:SetReset(RESET_PHASE+PHASE_END)
+	e4:SetReset(RESET_PHASE|PHASE_END)
 	e4:SetTargetRange(1,0)
 	Duel.RegisterEffect(e4,tp)
 end
@@ -91,12 +92,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		for i=1,4 do
 			local token=Duel.CreateToken(tp,73915051+i)
 			Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
+			--Cannot be tributed for a tribute summon
 			local e1=Effect.CreateEffect(e:GetHandler())
+			e1:SetDescription(3304)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_UNRELEASABLE_SUM)
-			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
 			e1:SetValue(1)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+			e1:SetReset(RESET_EVENT|RESETS_STANDARD)
 			token:RegisterEffect(e1,true)
 		end
 		Duel.SpecialSummonComplete()

official/c10515412.lua

@@ -65,7 +65,7 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCondition(function() return not Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsType,TYPE_NORMAL),tp,LOCATION_MZONE,0,1,nil) end)
 		e1:SetReset(RESET_EVENT|RESETS_STANDARD)
 		tc:RegisterEffect(e1)
-		--Reset e1 when the card is activated (to allow effects of Continuous Spell/Traps to be used when they are face-up) 
+		--Reset e1 when the card is activated (to allow effects of Continuous Spell/Traps to be used when they are face-up)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
@@ -80,8 +80,14 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetCode(EVENT_LEAVE_FIELD_P)
 		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e3:SetReset(RESET_EVENT|RESETS_STANDARD)
-		e3:SetOperation(function(e) if e:GetLabelObject() then e:GetLabelObject():Reset() end end)
+		e3:SetOperation(s.reseteffect)
 		e3:SetLabelObject(e2)
 		tc:RegisterEffect(e3)
 	end
-end
+end
+function s.reseteffect(e,tp,eg,ep,ev,re,r,rp)
+	local on_act_eff=e:GetLabelObject()
+	if on_act_eff and not on_act_eff:IsDeleted() then
+		on_act_eff:Reset()
+	end
+end

official/c11082056.lua

@@ -42,7 +42,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		end
 		if Duel.SendtoGrave(mc,REASON_EFFECT)==0 or not mc:IsLocation(LOCATION_GRAVE) then return end
 		local code=mc:GetCode()
-		if mc:IsPreviousLocation(LOCATION_ONFIELD) and mc:IsPreviousPosition(POS_FACEUP) then 
+		if mc:IsPreviousLocation(LOCATION_ONFIELD) and mc:IsPreviousPosition(POS_FACEUP) then
 			code=mc:GetPreviousCodeOnField()
 		end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)

pre-release/c101301057.lua official/c1122030.luapre-release/c101301057.lua renamed to official/c1122030.lua

@@ -32,7 +32,7 @@ function s.initial_effect(c)
 	e3:SetOperation(function(e) Duel.SendtoGrave(e:GetHandler(),REASON_EFFECT|REASON_REPLACE) end)
 	c:RegisterEffect(e3)
 end
-s.listed_names={CARD_MEDIUS_THE_INNOCENT,101301054} --"Artmegia the Academy City of Divine Arts"
+s.listed_names={CARD_MEDIUS_THE_INNOCENT,74733322} --"Artmegia the Academy City of Divine Arts"
 s.listed_series={SET_ARTMEGIA}
 function s.thfilter(c)
 	return c:IsCode(CARD_MEDIUS_THE_INNOCENT) and c:IsAbleToHand()
@@ -69,7 +69,7 @@ function s.fusmatop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.repfilter(c,tp)
-	return c:IsCode(101301054) and c:IsFaceup() and c:IsControler(tp) and c:IsOnField()
+	return c:IsCode(74733322) and c:IsFaceup() and c:IsControler(tp) and c:IsOnField()
 		and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function s.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

official/c11321089.lua

@@ -72,7 +72,7 @@ function s.drdestg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return hc>0 and fc>0 and Duel.IsPlayerCanDraw(tp,hc) and #dg>=fc end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,hc)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,#dg,fc,1-tp,LOCATION_ONFIELD)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,dg,fc,1-tp,LOCATION_ONFIELD)
 end
 function s.drdesop(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)

pre-release/c101301050.lua official/c12067160.luapre-release/c101301050.lua renamed to official/c12067160.lua

@@ -56,4 +56,4 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local rc=re:GetHandler()
 	return re:IsMonsterEffect() and rc:IsRelateToEffect(re) and c:GetLinkedGroup():IsContains(rc) and not c:IsStatus(STATUS_BATTLE_DESTROYED)
-end
+end