fix

expansions/lflist.conf

@@ -6629,7 +6629,6 @@
 15341821 0 --Dandylion
 57421866 0 --Level Eater
 23434538 0 --Maxx "C"
-21377582 0 --Master Peace, The True Dracoslaying King
 23558733 0 --Phoenixian Cluster Amaryllis
 1357146 0 --Ronintoadin
 75732622 0 --Grinder Golem
@@ -6640,7 +6639,6 @@
 69015963 0 --Cyber-Stein
 62320425 0 --Agido the Ancient Sentry
 25926710 0 --Kelbek the Ancient Vanguard
-36521307 0 --Mathmech Circular
 41855169 0
 55204071 0
 ##EXTRA DECK MONSTERS
@@ -6688,6 +6686,10 @@
 04280258 0 --Apollousa, Bow of the Goddess
 62242678 0 --Hot Red Dragon Archfiend King Calamity
 27552504 0 --Beatrice, Lady of the Eternal
+65330383 0
+30342076 0
+21044178 0
+440556 0
 ##SPELLS CARDS
 69243953 0 --Butterfly Dagger - Elma
 57953380 0 --Card of Safe Return
@@ -6706,7 +6708,6 @@
 55144522 0 --Pot of greed
 34906152 0 --Mass Driver
 41482598 0 --Mirage of Nightmare
-7394770 0 --Brilliant Fusion
 70828912 0 --Premature Burial
 42829885 0 --The Forceful Sentry
 54447022 0 --Soul Charge
@@ -6733,11 +6734,8 @@
 44519536 1 --Left Leg of the forbidden one
 70903634 1 --Right Arm of the forbidden one
 8124921 1 --Right Leg of the forbidden one
-61901281 1 --Black Dragon Collapserpent
 33396948 1 --Exodia the Forbidden One
-99234526 1 --White Dragon Wyverburster
 78872731 1 --Zoodiac Ratpier
-33508719 1 --Morphing Jar
 14536035 1 --Dark Grepher
 12958919 1 --Phantom Skyblaster
 38572779 1 --Miscellaneousaurus
@@ -6750,10 +6748,11 @@
 572850 1 --Tearlaments Scheiren
 38814750 1 --PSY-Framegear Gamma
 33854624 1 --Bystial Magnamhut
-41165831 1 --Unchained Soul of Sharvara
-09674034 1 --Snake-Eye Ash
-90241276 1 --Snake-Eyes Poplar
+21377582 1 --Master Peace, The True Dracoslaying King
+36521307 1 --Mathmech Circular
 91810826 1
+6637331 1
+91800273 1
 ##EXTRA DECK MONSTERS
 39512984 1 --Gem-Knight Master Diamond
 90953320 1 --T.G. Hyper Librarian
@@ -6766,6 +6765,7 @@
 75433814 1 --Number 40: Gimmick Puppet of Strings
 69170557 1 --Number C40: Gimmick Puppet of Dark Strings
 80453041 1
+34909328 1
 ##SPELLS CARDS
 95308449 1 --Final Countdown
 81439173 1 --Foolish Burial
@@ -6803,7 +6803,11 @@
 84211599 1 --Pot of Prosperity
 11110587 1 --That Grass Looks Greener
 46060017 1 --Zoodiac Barrage
+7394770 1 --Brilliant Fusion
 66730191 1
+22007085 1
+65681983 1
+25311006 1
 ##TRAPS CARDS
 32723153 1 --Magical Explosion
 3734202 1 --Naturia Sacred Tree
@@ -6817,11 +6821,18 @@
 55584558 2 --Purrely Delicious Memory
 21347668 2 --Purrely Sleepy Memory
 92107604 2 --Runick Fountain
-34124316 2 --Cyber Jar
-43694650 2 --Danger!? Jackalope?
-99745551 2 --Danger!? Tsuchinoko?
-40177746 2 --Eva
-17330916 2 --Performapal Monkeyboard
+33508719 2 --Morphing Jar
+09674034 2 --Snake-Eye Ash
+90241276 2 --Snake-Eyes Poplar
+99234526 2 --White Dragon Wyverburster
+61901281 2 --Black Dragon Collapserpent
+41165831 2 --Unchained Soul of Sharvara
+34022970 2
+8633261 2
+35844557 2
+32061192 2
+69272449 2
+68337209 2
 
 !THE WILD LIST
 20000 0
@@ -7002,7 +7013,6 @@
 15341821 1 --Dandylion
 57421866 1 --Level Eater
 23434538 1 --Maxx "C"
-21377582 1 --Master Peace, The True Dracoslaying King
 23558733 1 --Phoenixian Cluster Amaryllis
 1357146 1 --Ronintoadin
 75732622 1 --Grinder Golem
@@ -7013,7 +7023,6 @@
 69015963 1 --Cyber-Stein
 62320425 1 --Agido the Ancient Sentry
 25926710 1 --Kelbek the Ancient Vanguard
-36521307 1 --Mathmech Circular
 41855169 1
 55204071 1
 ##EXTRA DECK MONSTERS
@@ -7061,6 +7070,10 @@
 04280258 1 --Apollousa, Bow of the Goddess
 62242678 1 --Hot Red Dragon Archfiend King Calamity
 27552504 1 --Beatrice, Lady of the Eternal
+65330383 1
+30342076 1
+21044178 1
+440556 1
 ##SPELLS CARDS
 69243953 1 --Butterfly Dagger - Elma
 57953380 1 --Card of Safe Return
@@ -7079,7 +7092,6 @@
 55144522 1 --Pot of greed
 34906152 1 --Mass Driver
 41482598 1 --Mirage of Nightmare
-7394770 1 --Brilliant Fusion
 70828912 1 --Premature Burial
 42829885 1 --The Forceful Sentry
 54447022 1 --Soul Charge

expansions/script/c22348456.lua

@@ -49,20 +49,20 @@ function c22348456.bmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		if e:GetLabel()~=100 then return false end
 		e:SetLabel(0)
-		return Duel.IsExistingMatchingCard(c22348456.bmfilter1,tp,LOCATION_ONFIELD,0,1,nil) and eg:GetFirst():IsType(TYPE_MONSTER) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0
+		return Duel.IsExistingMatchingCard(c22348456.bmfilter1,tp,LOCATION_ONFIELD,0,1,nil) and eg:GetFirst():IsType(TYPE_MONSTER) and Duel.GetLocationCount(eg:GetFirst():GetControler(),LOCATION_SZONE)>0
 	end
 	e:SetLabel(0)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,c22348456.bmfilter1,tp,LOCATION_ONFIELD,0,1,1,nil)
 	Duel.SendtoGrave(g,REASON_COST)
-	e:SetLabelObject(g:GetFirst())
+	e:SetLabel(g:GetFirst():GetType())
 end
 function c22348456.bmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=re:GetHandler()
-	local pc=e:GetLabelObject()
-	if tc:IsRelateToEffect(re) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEDOWN,true)
+	local tt=e:GetLabel()
+	if tc:IsRelateToEffect(re) and Duel.GetLocationCount(eg:GetFirst():GetControler(),LOCATION_SZONE)>0 then
+		Duel.MoveToField(tc,tp,eg:GetFirst():GetControler(),LOCATION_SZONE,POS_FACEDOWN,true)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -70,7 +70,7 @@ function c22348456.bmop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
 		e1:SetValue(TYPE_SPELL)
 		tc:RegisterEffect(e1)
-		if pc:IsType(TYPE_SPELL) then
+		if bit.band(tt,0x2)~=0 then
 			local e2=Effect.CreateEffect(c)
 			e2:SetDescription(aux.Stringid(22348456,0))
 			e2:SetCategory(CATEGORY_DRAW)
@@ -82,7 +82,7 @@ function c22348456.bmop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
 			tc:RegisterEffect(e2)
 		end
-		if pc:IsType(TYPE_TRAP) then
+		if bit.band(tt,0x4)~=0 then
 			local e3=Effect.CreateEffect(c)
 			e3:SetDescription(aux.Stringid(22348456,1))
 			e3:SetCategory(CATEGORY_DESTROY)
@@ -93,7 +93,7 @@ function c22348456.bmop(e,tp,eg,ep,ev,re,r,rp)
 			e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
 			tc:RegisterEffect(e3)
 		end
-		if pc:IsType(TYPE_MONSTER) then
+		if bit.band(tt,0x1)~=0 then
 			local e4=Effect.CreateEffect(c)
 			e4:SetDescription(aux.Stringid(22348456,2))
 			e4:SetCategory(CATEGORY_SPECIAL_SUMMON)