3.0.0 (#6)

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>

data/magic.mse-game/auto_replace

@@ -75,6 +75,9 @@ auto replace:
 auto replace:
 	match: ~
 	replace: CARDNAME>
+auto replace:
+	match: **
+	replace: AUTOREM>
 auto replace:
 	match: '
 	replace: ’
@@ -86,22 +89,22 @@ auto replace:
 	replace: •
 auto replace:
 	match: WETB
-	replace: When CARDNAME enters the battlefield
+	replace: When CARDNAME enters
 auto replace:
-	match: CEBT
-	replace: CARDNAME enters the battlefield tapped.
+	match: EBT
+	replace: enters tapped.
 auto replace:
 	match: ETB
-	replace: enters the battlefield
+	replace: enters
 auto replace:
 	match: etb
-	replace: enters the battlefield
+	replace: enters
 auto replace:
-	match: battlefieldA
-	replace: enters the battlefield or attacks,
+	match: entersA
+	replace: enters or attacks,
 auto replace:
-	match: battlefieldT
-	replace: battlefield tapped
+	match: entersT
+	replace: enters tapped
 auto replace:
 	match: WTD
 	replace: When CARDNAME dies
@@ -127,10 +130,10 @@ auto replace:
 #Abilities
 auto replace:
 	match: CBC
-	replace: CARDNAME can't be countered.
+	replace: This spell can't be countered.
 auto replace:
 	match: CBSA
-	replace: CARDNAME can't be countered by spells or abilities.
+	replace: This spell can't be countered by spells or abilities.
 auto replace:
 	match: WTT
 	replace: Whenever CARDNAME becomes the target of a spell
@@ -217,7 +220,7 @@ auto replace:
 	replace: Destroy target land.
 auto replace:
 	match: CLONE
-	replace: You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
+	replace: You may have CARDNAME enter as a copy of any creature on the battlefield.
 auto replace:
 	match: MUR
 	replace: Destroy target creature.
@@ -232,7 +235,7 @@ auto replace:
 	replace: Destroy target attacking or blocking creature.
 auto replace:
 	match: ORING
-	replace: When CARDNAME enters the battlefield, exile target creature an opponent controls until CARDNAME leaves the battlefield. (That creature returns under its owner's control.)
+	replace: When CARDNAME enters, exile target creature an opponent controls until CARDNAME leaves the battlefield. (That creature returns under its owner's control.)
 auto replace:
 	match: WIDE
 	replace: CARDNAME can block any number of creatures.
@@ -265,7 +268,7 @@ auto replace:
 	replace: Put target creature card from a graveyard onto the battlefield under your control.
 auto replace:
 	match: UNT
-	replace: Whenever another creature enters the battlefield, untap CARDNAME.
+	replace: Whenever another creature enters, untap CARDNAME.
 auto replace:
 	match: XATK
 	replace: Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase.
@@ -346,7 +349,7 @@ auto replace:
 	replace: CARDNAME can't be blocked by creatures with power 2 or less.
 auto replace:
 	match: HYDRA
-	replace: CARDNAME enters the battlefield with X +1/+1 counters on it.
+	replace: CARDNAME enters with X +1/+1 counters on it.
 auto replace:
 	match: FOG
 	replace: Prevent all combat damage that would be dealt this turn.
@@ -379,7 +382,7 @@ auto replace:
 	replace: Target creature attacks this turn if able.
 auto replace:
 	match: MEDDLING
-	replace: As CARDNAME enters the battlefield, choose a nonland card name. Spells with the chosen name can't be cast.
+	replace: As CARDNAME enters, choose a nonland card name. Spells with the chosen name can't be cast.
 auto replace:
 	match: SILENCE
 	replace: Your opponents can't cast spells this turn. (Spells cast before this resolves are unaffected.)
@@ -435,7 +438,7 @@ auto replace:
 	replace: Threshold — If seven or more cards are in your graveyard, {Effect}
 auto replace:
 	match: IMPRINT
-	replace: Imprint — When CARDNAME enters the battlefield, you may exile a {something} from {somewhere}.
+	replace: Imprint — When CARDNAME enters, you may exile a {something} from {somewhere}.
 auto replace:
 	match: CHANNEL
 	replace: Channel — {Cost}, discard CARDNAME: {Effect}
@@ -465,10 +468,10 @@ auto replace:
 	replace: Domain — {Effect} for each basic land type among lands you control.
 auto replace:
 	match: LANDFALLP
-	replace: Landfall — Whenever a land enters the battlefield under your control,
+	replace: Landfall — Whenever a land you control enters,
 auto replace:
 	match: LANDFALLS
-	replace: Landfall — If you had a land enter the battlefield under your control this turn, {Effect}.
+	replace: Landfall — If you had a land enter under your control this turn, {Effect}.
 auto replace:
 	match: METALCRAFTP
 	replace: Metalcraft — {Effect} as long as you control three or more artifacts.
@@ -504,7 +507,7 @@ auto replace:
 	replace: Inspired — Whenever CARDNAME becomes untapped, 
 auto replace:
 	match: CONSTELLATION
-	replace: Constellation — Whenever CARDNAME or another enchantment enters the battlefield under your control, 
+	replace: Constellation — Whenever CARDNAME or another enchantment you control enters, 
 auto replace:
 	match: STRIVE
 	replace: Strive — CARDNAME costs {COST} more to cast for each target beyond the first. 
@@ -537,7 +540,7 @@ auto replace:
 	replace: Spell Mastery — As long as there are two or more instant and/or sorcery cards in your graveyard, {Effect}.
 auto replace:
 	match: RALLY
-	replace: Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, {Effect}.
+	replace: Rally — Whenever CARDNAME or another Ally you control enters, {Effect}.
 auto replace:
 	match: COHORT
 	replace: Cohort — [T], Tap an untapped Ally you control: {Effect}.

data/magic.mse-game/card-symbols/menu_choice_images

@@ -0,0 +1,5 @@
+choice images:
+	none:							{ "" }
+	tombstone:						/magic.mse-game/card-symbols/tombstone.png
+	alchemy:						/magic.mse-game/card-symbols/alchemy.png
+	alchemy old:					/magic.mse-game/card-symbols/alchemy old.png

data/magic.mse-game/corners/menu_choice_images

@@ -0,0 +1,5 @@
+choice images:
+	none:						/magic.mse-game/corners/none.png
+	rounded and antialiased:	/magic.mse-game/corners/rounded_antialiased.png
+	rounded:					/magic.mse-game/corners/rounded.png
+	diagonal:					/magic.mse-game/corners/diagonal.png

data/magic.mse-game/counters/menu_choice_images

@@ -0,0 +1,50 @@
+choice images:
+	none:           /magic.mse-game/counters/none.png
+	custom:         /magic.mse-game/counters/none.png
+	+1/+1:          /magic.mse-game/counters/+1+1.png
+	-1/-1:          /magic.mse-game/counters/-1-1.png
+	acorn:          /magic.mse-game/counters/acorn.png
+	aether:         /magic.mse-game/counters/aether.png
+	arrow:          /magic.mse-game/counters/arrow.png
+	awakening:      /magic.mse-game/counters/awakening.png
+	bounty:         /magic.mse-game/counters/bounty.png
+	charge:         /magic.mse-game/counters/charge.png
+	corpse:         /magic.mse-game/counters/corpse.png
+	deathtouch alt: /magic.mse-game/counters/deathtouch alt.png
+	deathtouch:     /magic.mse-game/counters/deathtouch.png
+	defender:       /magic.mse-game/counters/defender.png
+	doom:           /magic.mse-game/counters/doom.png
+	double strike:  /magic.mse-game/counters/double strike.png
+	egg:            /magic.mse-game/counters/egg.png
+	energy:         /magic.mse-game/counters/energy.png
+	experience:     /magic.mse-game/counters/experience.png
+	finality:       /magic.mse-game/counters/finality.png
+	first strike:   /magic.mse-game/counters/first strike.png
+	flame:          /magic.mse-game/counters/flame.png
+	flood:          /magic.mse-game/counters/flood.png
+	flying:         /magic.mse-game/counters/flying.png
+	goaded:         /magic.mse-game/counters/goaded.png
+	haste:          /magic.mse-game/counters/haste.png
+	hexproof alt:   /magic.mse-game/counters/hexproof alt.png
+	hexproof:       /magic.mse-game/counters/hexproof.png
+	indestructible: /magic.mse-game/counters/indestructible.png
+	lifelink alt:   /magic.mse-game/counters/lifelink alt.png
+	lifelink:       /magic.mse-game/counters/lifelink.png
+	lore:           /magic.mse-game/counters/lore.png
+	menace:         /magic.mse-game/counters/menace.png
+	oil:            /magic.mse-game/counters/oil.png
+	omen:           /magic.mse-game/counters/omen.png
+	poison:         /magic.mse-game/counters/poison.png
+	rad:            /magic.mse-game/counters/rad.png
+	reach:          /magic.mse-game/counters/reach.png
+	shield:         /magic.mse-game/counters/shield.png
+	solved:         /magic.mse-game/counters/solved.png
+	spore:          /magic.mse-game/counters/spore.png
+	stun:           /magic.mse-game/counters/stun.png
+	suspected:      /magic.mse-game/counters/suspected.png
+	ticket:         /magic.mse-game/counters/ticket.png
+	time:           /magic.mse-game/counters/time.png
+	trample:        /magic.mse-game/counters/trample.png
+	unlock:         /magic.mse-game/counters/unlock.png
+	vigilance:      /magic.mse-game/counters/vigilance.png
+	void:           /magic.mse-game/counters/void.png

data/magic.mse-game/custom_addons

@@ -0,0 +1,4 @@
+include file: keywords_custom
+
+## this file won't ever be updated
+## you can safely made your own global addons to the mse script here

data/magic.mse-game/dictionary/magic-words.en_CA

@@ -1 +0,0 @@
-merfolk

data/magic.mse-game/dictionary/magic-words.en_GB

@@ -1 +0,0 @@
-merfolk

data/magic.mse-game/dictionary/magic-words.en_US

@@ -1 +0,0 @@
-merfolk

data/magic.mse-game/dictionary/magic-words.fr_FR

@@ -1,175 +0,0 @@
-148
-mana
-untap/MSDRJZG
-unblockable
-planeswalker
-noncreature
-nonland
-nonenchantment
-nonartifact
-nonwhite
-nonblue
-nonblack
-nonred
-nongreen
-unblock/USDG
-precombat
-postcombat
-scry
-plainswalk
-islandwalk
-swampwalk
-mountainwalk
-forestwalk
-landwalk
-desertwalk
-plainshome
-islandhome
-swamphome
-mountainhome
-foresthome
-landhome
-soulshift
-ninjitsu
-bushido
-lifelink
-gravestorm
-fateseal
-bloodthirst
-djinn
-unattach
-face-down
-face-up
-spell's
-guerrilas
-mages
-exit-the-battlefield
-enter-the-battlefield
-havok
-spectre
-gargadon
-gargadons
-Crovax
-evincar
-and/or
-20/20
-planeswalkers
-Merfolk
-deathtouch
-noncombat
-Urza
-Karn
-Ajani
-Goldmane
-Jace
-Beleren
-Liliana
-Vess
-Chandra
-Nalaar
-Garruk
-Wildspeaker
-Tezzeret
-Elspeth
-Tirel
-Nicol
-Bolas
-Sarkhan
-Vol
-Nissa
-Revane
-Baltrice
-Crucius
-scryers
-+1
-etherium
--1
-Kothophed
-wurm
-Tolaria
-Weatherlight
-Ertai
-Barrin
-Dominaria
-Benalish
-Benalia
-Sisay
-golem
-Keld
-Maraxus
-Volrath
-Mirri
-Multani
-maro-sorcerer
-Squee
-Tahngarth
-Crovax
-Selenia
-Greven
-il-Vec
-Argive
-Samite
-Orim
-Argivian
-Rath
-Starke
-Sidar
-Kondo
-evincar
-multiverse
-Eladamri
-Skyshroud
-guerilla
-Soltari
-Lyna
-Rofellos
-spellcasting
-Korvecdal
-Vuel
-Takara
-self-interest
-Ashnod
-Mishra
-Fallaji
-Gix
-Phyrexia
-Phyrexian
-supremacy
-Tawnos
-Argoth
-Xantcha
-Saproling
-nontoken
-mage
-Ashling
-Jaya
-Maralen
-Mornsong
-non-Sliver
-non-Shapeshifter
-Thopter
-Kraken
-•
-• 
-and/or
-primordial
-non-Dragon
-nonpermanent
-noninstant
-nonplaneswalker
-nonenchantment
-nonsorcery
-nonartifact
-non-Human
-Hellkite
-hexproof
-draughts
-dwarves
-sigil
-dwarven
-axe
-earthen
-hedron
-thrull
-arcun
-merfolk

data/magic.mse-game/dictionary/magic-words.it_IT

@@ -1,175 +0,0 @@
-148
-mana
-untap/MSDRJZG
-unblockable
-planeswalker
-noncreature
-nonland
-nonenchantment
-nonartifact
-nonwhite
-nonblue
-nonblack
-nonred
-nongreen
-unblock/USDG
-precombat
-postcombat
-scry
-plainswalk
-islandwalk
-swampwalk
-mountainwalk
-forestwalk
-landwalk
-desertwalk
-plainshome
-islandhome
-swamphome
-mountainhome
-foresthome
-landhome
-soulshift
-ninjitsu
-bushido
-lifelink
-gravestorm
-fateseal
-bloodthirst
-djinn
-unattach
-face-down
-face-up
-spell's
-guerrilas
-mages
-exit-the-battlefield
-enter-the-battlefield
-havok
-spectre
-gargadon
-gargadons
-Crovax
-evincar
-and/or
-20/20
-planeswalkers
-Merfolk
-deathtouch
-noncombat
-Urza
-Karn
-Ajani
-Goldmane
-Jace
-Beleren
-Liliana
-Vess
-Chandra
-Nalaar
-Garruk
-Wildspeaker
-Tezzeret
-Elspeth
-Tirel
-Nicol
-Bolas
-Sarkhan
-Vol
-Nissa
-Revane
-Baltrice
-Crucius
-scryers
-+1
-etherium
--1
-Kothophed
-wurm
-Tolaria
-Weatherlight
-Ertai
-Barrin
-Dominaria
-Benalish
-Benalia
-Sisay
-golem
-Keld
-Maraxus
-Volrath
-Mirri
-Multani
-maro-sorcerer
-Squee
-Tahngarth
-Crovax
-Selenia
-Greven
-il-Vec
-Argive
-Samite
-Orim
-Argivian
-Rath
-Starke
-Sidar
-Kondo
-evincar
-multiverse
-Eladamri
-Skyshroud
-guerilla
-Soltari
-Lyna
-Rofellos
-spellcasting
-Korvecdal
-Vuel
-Takara
-self-interest
-Ashnod
-Mishra
-Fallaji
-Gix
-Phyrexia
-Phyrexian
-supremacy
-Tawnos
-Argoth
-Xantcha
-Saproling
-nontoken
-mage
-Ashling
-Jaya
-Maralen
-Mornsong
-non-Sliver
-non-Shapeshifter
-Thopter
-Kraken
-•
-• 
-and/or
-primordial
-non-Dragon
-nonpermanent
-noninstant
-nonplaneswalker
-nonenchantment
-nonsorcery
-nonartifact
-non-Human
-Hellkite
-hexproof
-draughts
-dwarves
-sigil
-dwarven
-axe
-earthen
-hedron
-thrull
-arcun
-merfolk

data/magic.mse-game/dictionary/magic-words.pt_BR

@@ -1,175 +0,0 @@
-148
-mana
-untap/MSDRJZG
-unblockable
-planeswalker
-noncreature
-nonland
-nonenchantment
-nonartifact
-nonwhite
-nonblue
-nonblack
-nonred
-nongreen
-unblock/USDG
-precombat
-postcombat
-scry
-plainswalk
-islandwalk
-swampwalk
-mountainwalk
-forestwalk
-landwalk
-desertwalk
-plainshome
-islandhome
-swamphome
-mountainhome
-foresthome
-landhome
-soulshift
-ninjitsu
-bushido
-lifelink
-gravestorm
-fateseal
-bloodthirst
-djinn
-unattach
-face-down
-face-up
-spell's
-guerrilas
-mages
-exit-the-battlefield
-enter-the-battlefield
-havok
-spectre
-gargadon
-gargadons
-Crovax
-evincar
-and/or
-20/20
-planeswalkers
-Merfolk
-deathtouch
-noncombat
-Urza
-Karn
-Ajani
-Goldmane
-Jace
-Beleren
-Liliana
-Vess
-Chandra
-Nalaar
-Garruk
-Wildspeaker
-Tezzeret
-Elspeth
-Tirel
-Nicol
-Bolas
-Sarkhan
-Vol
-Nissa
-Revane
-Baltrice
-Crucius
-scryers
-+1
-etherium
--1
-Kothophed
-wurm
-Tolaria
-Weatherlight
-Ertai
-Barrin
-Dominaria
-Benalish
-Benalia
-Sisay
-golem
-Keld
-Maraxus
-Volrath
-Mirri
-Multani
-maro-sorcerer
-Squee
-Tahngarth
-Crovax
-Selenia
-Greven
-il-Vec
-Argive
-Samite
-Orim
-Argivian
-Rath
-Starke
-Sidar
-Kondo
-evincar
-multiverse
-Eladamri
-Skyshroud
-guerilla
-Soltari
-Lyna
-Rofellos
-spellcasting
-Korvecdal
-Vuel
-Takara
-self-interest
-Ashnod
-Mishra
-Fallaji
-Gix
-Phyrexia
-Phyrexian
-supremacy
-Tawnos
-Argoth
-Xantcha
-Saproling
-nontoken
-mage
-Ashling
-Jaya
-Maralen
-Mornsong
-non-Sliver
-non-Shapeshifter
-Thopter
-Kraken
-•
-• 
-and/or
-primordial
-non-Dragon
-nonpermanent
-noninstant
-nonplaneswalker
-nonenchantment
-nonsorcery
-nonartifact
-non-Human
-Hellkite
-hexproof
-draughts
-dwarves
-sigil
-dwarven
-axe
-earthen
-hedron
-thrull
-arcun
-merfolk

data/magic.mse-game/dictionary/magic-words.ru_RU

@@ -1,175 +0,0 @@
-148
-mana
-untap/MSDRJZG
-unblockable
-planeswalker
-noncreature
-nonland
-nonenchantment
-nonartifact
-nonwhite
-nonblue
-nonblack
-nonred
-nongreen
-unblock/USDG
-precombat
-postcombat
-scry
-plainswalk
-islandwalk
-swampwalk
-mountainwalk
-forestwalk
-landwalk
-desertwalk
-plainshome
-islandhome
-swamphome
-mountainhome
-foresthome
-landhome
-soulshift
-ninjitsu
-bushido
-lifelink
-gravestorm
-fateseal
-bloodthirst
-djinn
-unattach
-face-down
-face-up
-spell's
-guerrilas
-mages
-exit-the-battlefield
-enter-the-battlefield
-havok
-spectre
-gargadon
-gargadons
-Crovax
-evincar
-and/or
-20/20
-planeswalkers
-Merfolk
-deathtouch
-noncombat
-Urza
-Karn
-Ajani
-Goldmane
-Jace
-Beleren
-Liliana
-Vess
-Chandra
-Nalaar
-Garruk
-Wildspeaker
-Tezzeret
-Elspeth
-Tirel
-Nicol
-Bolas
-Sarkhan
-Vol
-Nissa
-Revane
-Baltrice
-Crucius
-scryers
-+1
-etherium
--1
-Kothophed
-wurm
-Tolaria
-Weatherlight
-Ertai
-Barrin
-Dominaria
-Benalish
-Benalia
-Sisay
-golem
-Keld
-Maraxus
-Volrath
-Mirri
-Multani
-maro-sorcerer
-Squee
-Tahngarth
-Crovax
-Selenia
-Greven
-il-Vec
-Argive
-Samite
-Orim
-Argivian
-Rath
-Starke
-Sidar
-Kondo
-evincar
-multiverse
-Eladamri
-Skyshroud
-guerilla
-Soltari
-Lyna
-Rofellos
-spellcasting
-Korvecdal
-Vuel
-Takara
-self-interest
-Ashnod
-Mishra
-Fallaji
-Gix
-Phyrexia
-Phyrexian
-supremacy
-Tawnos
-Argoth
-Xantcha
-Saproling
-nontoken
-mage
-Ashling
-Jaya
-Maralen
-Mornsong
-non-Sliver
-non-Shapeshifter
-Thopter
-Kraken
-•
-• 
-and/or
-primordial
-non-Dragon
-nonpermanent
-noninstant
-nonplaneswalker
-nonenchantment
-nonsorcery
-nonartifact
-non-Human
-Hellkite
-hexproof
-draughts
-dwarves
-sigil
-dwarven
-axe
-earthen
-hedron
-thrull
-arcun
-merfolk

data/magic.mse-game/game

@@ -5,19 +5,19 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2020-04-25
+version: 2024-10-01
 depends on:
 	package: magic-blends.mse-include
-	version: 2014-06-25
+	version: 2024-10-01
 depends on:
-	package: magic-watermarks.mse-include
-	version: 2007-09-23
+	package: magic-modules.mse-include
+	version: 2024-10-01
 
-############################################################## The script
+############################################################## Load the main scripts
 
 init script: include file: script
 
-############################################################## Lots of lists
+############################################################## Load all the fields and lists
 
 ################## There be dragons here. -Liosan ##########################
 include file: card_fields
@@ -26,22 +26,27 @@ include file: statistics
 include file: add_cards_scripts
 include file: packs
 include file: keywords
-include file: keywords_custom
 include file: word_lists
 include file: auto_replace
+#### Add/overwrite things in this file rather than editing the above files
+include file: custom_addons
 
 
 ############################################################## Other stuff
 
+#### Determine the color in the card columns
 card list color script:
 	input := card.card_color
-	if      input == "white" then rgb(156,130,90)
-	else if input == "blue"  then rgb(0,64,168)
-	else if input == "black" then rgb(0,0,0)
-	else if input == "red"   then rgb(168,0,0)
-	else if input == "green" then rgb(0,168,0)
-	else if input == "pink" then rgb(210,60,140)
+	if      input == "white"  then rgb(156,130,90)
+	else if input == "blue"   then rgb(0,64,168)
+	else if input == "black"  then rgb(0,0,0)
+	else if input == "red"    then rgb(168,0,0)
+	else if input == "green"  then rgb(0,168,0)
+	else if input == "pink"   then rgb(210,60,140)
 	else if input == "purple" then rgb(150,100,160)
+	else if input == "yellow" then rgb(190,200,50)
+	else if input == "brown"  then rgb(51, 10, 0)
+	else if input == "orange" then rgb(255, 51, 0)
 	else (
 		artifact := chosen(choice:"artifact")
 		land     := chosen(choice:"land")