Merge pull request #19 from Lyris12/WIP

Add card fields for Xros Monsters

data/yugioh-rush.mse-style/style

@@ -31,7 +31,7 @@ init script:
 	is_monster := {card.card_type == "normal monster" or card.card_type == "effect monster" or card.card_type == "ritual monster" or card.card_type == "synchro monster" or card.card_type == "dark synchro monster" or card.card_type == "xyz monster" or card.card_type == "xros monster" or card.card_type == "link monster" or card.card_type == "dlc monster" or card.card_type == "evolute monster" or card.card_type == "fusion monster" or card.card_type == "token monster" or card.card_type == "obelisk card" or card.card_type == "slifer card" or card.card_type == "ra card" or is_spatial()}
 	is_spatial := {card.card_type == "origin spatial monster" or card.card_type == "altered spatial monster"}
 	is_conjoint := {contains(card.pendulum, match: "conjoint") and not contains(card.card_type, match: "conjoint")}
-	overleveled := {if contains(card.level, match: "*") then (number_of_items(in: replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:"")) > 13) else (card.level != "" and card.level != "1" and card.level != "2" and card.level != "3" and card.level != "4" and card.level != "5" and card.level != "6" and card.level != "7" and card.level != "8" and card.level != "9" and card.level != "10" and card.level != "11" and card.level != "12" and card.level != "13")}
+	overleveled := {if contains(card.level, match: "*") then (number_of_items(in: replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:"")) > 13) else (card.level != "" and not contains(card.level, match: "1") and not contains(card.level, match: "2") and not contains(card.level, match: "3") and not contains(card.level, match: "4") and not contains(card.level, match: "5") and not contains(card.level, match: "6") and not contains(card.level, match: "7") and not contains(card.level, match: "8") and not contains(card.level, match: "9") and not contains(card.level, match: "0") or to_number(replace(replace(replace(replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:""), match:"<sym>", replace:""), match:"</sym>", replace:""), match:" ", replace:"")) > 13)}
 ############################################################## Extra style
 styling field:
 	type: info
@@ -622,7 +622,7 @@ extra card style:
 						else if card.card_type == "timeleap monster" then "levels/rdfuture-"+number_of_items(in: replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:""))+".png"
 						else "levels/rdlevel-"+number_of_items(in: replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:""))+".png"
 					else
-						if card.card_type == "evolute monster" then "levels/rdstage-"+card.level+".png"
+						if card.card_type == "evolute monster" then "levels/rdstage-"+replace(replace(replace(replace(replace(card.level, match:"<sym-auto>", replace:""), match:"</sym-auto>", replace:""), match:"<sym>", replace:""), match:"</sym>", replace:""), match:" ", replace:"")+".png"
 						else if card.card_type == "xyz monster" then "levels/rdrank-"+card.level+".png"
 						else if card.card_type == "origin spatial monster" then "levels/rdorigin-"+card.level+".png"
 						else if card.card_type == "altered spatial monster" then "levels/rdaltered-"+card.level+".png"

data/yugioh-series10-custom.mse-style/style

@@ -359,6 +359,13 @@ card style:
 			synchro monster              : { if styling.extended_artwork=="yes" and styling.template_style=="actual style" then "new/fullart/synchroex.png" else if styling.extended_artwork=="yes" then "fullart/synchroex.png" else if styling.template_style=="actual style" then "new/synchronew.png" else "card-synchro.png" }
 			dark synchro monster         : card-dsynchro.png
 			xyz monster                  : { if styling.extended_artwork=="yes" and styling.template_style=="actual style" then "new/fullart/xyzex.png" else if styling.extended_artwork=="yes" then "fullart/xyzex.png" else if styling.template_style=="actual style" then "new/xyznew.png" else "card-xyz.png" }
+			pendulum normal monster: { if styling.template_style=="actual style" then "new/normalnew.png" else if styling.pendulum_size != "default" then "card-normal-pendulum-"+styling.pendulum_size+".png" else "card-normal-pendulum.png" }
+			pendulum effect monster: { if styling.template_style=="actual style" then "new/effectnew.png" else if styling.pendulum_size != "default" then "card-effect-pendulum-"+styling.pendulum_size+".png" else "card-effect-pendulum.png" }
+			pendulum fusion monster: { if styling.is_ZARC_card and styling.pendulum_size=="less" then "ZARC_Small.png" else if styling.is_ZARC_card and styling.pendulum_size=="more" then "ZARC_Large.png" else if styling.is_ZARC_card then "ZARC_Medium.png" else if styling.template_style=="actual style" then "new/fusionnew.png" else if styling.pendulum_size != "default" then "card-fusion-pendulum-"+styling.pendulum_size+".png" else "card-fusion-pendulum.png" }
+			pendulum ritual monster: { if styling.template_style=="actual style" then "new/ritualnew.png" else if styling.pendulum_size != "default" then "card-ritual-pendulum-"+styling.pendulum_size+".png" else "card-ritual-pendulum.png" }
+			pendulum synchro monster: { if styling.is_ZARC_card and styling.pendulum_size=="less" then "ZARC_Small.png" else if styling.is_ZARC_card and styling.pendulum_size=="more" then "ZARC_Large.png" else if styling.is_ZARC_card then "ZARC_Medium.png" else if styling.template_style=="actual style" then "new/synchronew.png" else if styling.pendulum_size != "default" then "card-synchro-pendulum-"+styling.pendulum_size+".png" else "card-synchro-pendulum.png" }
+			pendulum dark synchro monster: card-dsynchro.png
+			pendulum xyz monster: { if styling.is_ZARC_card and styling.pendulum_size=="less" then "ZARC_Small.png" else if styling.is_ZARC_card and styling.pendulum_size=="more" then "ZARC_Large.png" else if styling.is_ZARC_card then "ZARC_Medium.png" else if styling.template_style=="actual style" then "new/xyznew.png" else if styling.pendulum_size != "default" then "card-xyz-pendulum-"+styling.pendulum_size+".png" else "card-xyz-pendulum.png" }
 			bigbang monster : { if styling.template_style=="actual style" then "new/bigbangnew.png" else "card-bigbang.png" }
 			dlc monster : card-dlc.png
 			token monster                : { if styling.extended_artwork=="yes" and styling.template_style=="actual style" then "new/fullart/tokenex.png" else if styling.extended_artwork=="yes" then "fullart/tokenex.png" else if styling.template_style=="actual style" then "new/tokennew.png" else "card-token.png" }
@@ -1121,7 +1128,7 @@ extra card style:
 					else if card.card_type=="spell card" then "pendulum/line-spell.png"
 					else if card.card_type=="trap card" then "pendulum/line-trap.png"
 					else "blank2.png"
-		visible: script: if is_pendulum() then true else false
+		visible: {styling.template_style=="actual style" and card.pendulum != "none" and card.pendulum != "relay"}
 	pendulum border:
 		left: 0
 		top: 0
@@ -1155,4 +1162,4 @@ extra card style:
 					else if card.pendulum == "pandemonium" then "pendulum/pandemonium_md.png" 
 					else if card.pendulum == "pendulum" then "pendulum/pendulum_md.png"
 					else if is_conjoint() and not contains(card.card_type, match: "spell card") and not contains(card.card_type, match: "trap card") then "pendulum/card-conjoint.png"
-		visible: {if card.pendulum != "none" then true else false}
+		visible: {card.pendulum != "none" and styling.template_style=="actual style"}

data/yugioh.mse-game/card_fields

@@ -35,6 +35,8 @@ card field:
 	choice: conjoint trap card
 	choice: trell card
 	choice: skill card
+	choice: xros monster
+	choice: dual xros monster
 	default: card_type()
 	choice colors cardlist:
 		normal monster         :  rgb(197,179,53)
@@ -76,6 +78,52 @@ card field:
 	editable: false
 	choice: none
 	choice: sdoverlay image
+card field:
+	type: text
+	name: grade
+card field:
+	type: text
+	name: gate
+card field:
+	type: choice
+	name: gate 1
+	choice: none
+	choice: bigbang
+	choice: dsynchro
+	choice: effect
+	choice: evolute
+	choice: fusion
+	choice: link
+	choice: normal
+	choice: relay
+	choice: ritual
+	choice: spatial
+	choice: spell
+	choice: synchro
+	choice: timeleap
+	choice: trap
+	choice: xros
+	choice: xyz
+card field:
+	type: choice
+	name: gate 2
+	choice: none
+	choice: bigbang
+	choice: dsynchro
+	choice: effect
+	choice: evolute
+	choice: fusion
+	choice: link
+	choice: normal
+	choice: relay
+	choice: ritual
+	choice: spatial
+	choice: spell
+	choice: synchro
+	choice: timeleap
+	choice: trap
+	choice: xros
+	choice: xyz
 card field:
 	type: choice
 	name: pendulum

data/yugioh.mse-game/word_lists

@@ -28,6 +28,7 @@ word list:
 	word: Warrior
 	word: Winged Beast
 	word: Wyrm
+	word: Xros
 	word: Zombie
 	word: 战士族
 	word: 魔法师族
@@ -114,7 +115,6 @@ word list:
 	word: Fusion
 	word: Gemini
 	word: Pendulum
-	word: Pandemonium
 	word: Ritual
 	word: Spirit
 	word: Synchro
@@ -124,6 +124,27 @@ word list:
 	word: Xyz
 	word: Link
 	word: Skill
+	word: Evolute
+	word: Conjoint
+	word: Pandemonium
+	word: Polarity
+	word: Spatial
+	word: Origin
+	word: Altered
+	word: Corona
+	word: Bigbang
+	word: Timeleap
+	word: Relay
+	word: Deck Master
+	word: Harmony
+	word: Accent
+	word: Bypath
+	word: Toxia
+	word: Annotee
+	word: Chroma
+	word: Perdition
+	word: Impure
+	word: Runic
 	word: 通常
 	word: 同调
 	word: 超量