Merge remote-tracking branch 'remotes/origin/WIP' into WIP

yugioh-rush.mse-style-WIP/style → data/yugioh-rush.mse-style/style

 mse version: 2.0.0
 game: yugioh
 short name: Rush Duel
-full name: With Extended Art & i18n
+full name: With i18n
 installer group: Yugioh/Series10
 icon: card-sample.png
 position hint: 01
@@ -133,30 +133,30 @@ card style:
 		symbol font:
 			name: yugioh-text-replacements
 			alignment: bottom center
-	grade:
-		left: 351
-		top: 22
-		width: 48
-		height: 46
-		z index: 3
-		alignment: middle center shrink-overflow
-		font:
-			name: Grades
-			size: 15
-			color: rgb(255,255,255)
-		visible: {contains(card.card_type, match: "xros monster")}
-	gate:
-		left: -91.2
-		top: 423.5
-		width: 600
-		height: 15
-		z index: 4
-		alignment: center shrink-overflow
-		font:
-			name: Ro GSan Serif Std B
-			size: 10
-			color: rgb(255,255,255)
-		visible: {contains(card.card_type, match: "xros monster")}
+	#grade:
+	#	left: 351
+	#	top: 22
+	#	width: 48
+	#	height: 46
+	#	z index: 3
+	#	alignment: middle center shrink-overflow
+	#	font:
+	#		name: Grades
+	#		size: 15
+	#		color: rgb(255,255,255)
+	#	visible: {contains(card.card_type, match: "xros monster")}
+	#gate:
+	#	left: -91.2
+	#	top: 423.5
+	#	width: 600
+	#	height: 15
+	#	z index: 4
+	#	alignment: center shrink-overflow
+	#	font:
+	#		name: Ro GSan Serif Std B
+	#		size: 10
+	#		color: rgb(255,255,255)
+	#	visible: {contains(card.card_type, match: "xros monster")}
 	attribute:
 		left: {if contains(card.card_type, match: "xros") then 337 else 338}
 		top: {if contains(card.card_type, match: "xros") then 13 else 15}
@@ -203,26 +203,26 @@ card style:
 		popup style: in place
 		choice images:
 		visible: {not is_nmonster()}
-	gate 1:
-		left: 14.5
-		top: 340
-		width: 98
-		height: 106
-		z index: 1
-		render style:image list
-		popup style: in place
-		choice images:
-		visible: {contains(card.card_type, match: "xros")}
-	gate 2:
-		right: 406.5
-		top: 340
-		width: 98
-		height: 106
-		z index: 1
-		render style:image list
-		popup style: in place
-		choice images:
-		visible: {contains(card.card_type, match: "xros")}
+	#gate 1:
+	#	left: 14.5
+	#	top: 340
+	#	width: 98
+	#	height: 106
+	#	z index: 1
+	#	render style:image list
+	#	popup style: in place
+	#	choice images:
+	#	visible: {contains(card.card_type, match: "xros")}
+	#gate 2:
+	#	right: 406.5
+	#	top: 340
+	#	width: 98
+	#	height: 106
+	#	z index: 1
+	#	render style:image list
+	#	popup style: in place
+	#	choice images:
+	#	visible: {contains(card.card_type, match: "xros")}
 	linkul:
 		left: {13+18}
 		top: {362+18-(if is_pendulum() then (if styling.pendulum_size == "less" then 55 else if styling.pendulum_size == "more" then 105 else 72) else 0)}
@@ -323,7 +323,8 @@ card style:
 			size: 16
 			color: {if card.card_type=="xros monster" or card.card_type=="dual xros monster" or card.card_type=="xyz monster" or card.card_type=="link monster" or card.card_type=="evolute monster" or card.card_type=="bigbang monster" or card.card_type=="dark synchro monster" then rgb(255,255,255) else rgb(0,0,0)}
 		symbol font:
-			name: yugioh-text-replacements
+			#name: yugioh-text-replacements
+			name: yugioh-standard-levels
 			alignment: middle center
 			size: 3.5
 		visible: {not is_nmonster()}
@@ -368,33 +369,36 @@ card style:
 		left: 150
 		top: {if contains(card.card_type, match: "xros monster") then 338 else if is_pendulum() then (if styling.pendulum_size == "less" then 355 else if styling.pendulum_size == "more" then 305 else 338) else 408}
 		width: 70
-		height: 30
+		height: 27
 		z index: 5
 		alignment: right middle shrink-overflow
+		##Fixed size to better match original template
 		font:
 			name: Ro GSan Serif Std B
-			size: 20
+			size: 17
 			color: rgb(255,255,255)
-		symbol font:
-			name: yugioh-text-replacements
-			alignment: middle center
-			size: 6
+		#don't really need this.
+		#symbol font:
+		#	name: yugioh-text-replacements
+		#	alignment: middle center
+		#	size: 6
 		visible: {not is_nmonster()}
 	defense:
 		left: 280
 		top: {if contains(card.card_type, match: "xros monster") then 338 else if is_pendulum() then (if styling.pendulum_size == "less" then 355 else if styling.pendulum_size == "more" then 305 else 338) else 408}
 		width: 70
-		height: 30
+		height: 27
 		z index: 5
 		alignment: right middle shrink-overflow
+		##same.
 		font:
 			name: Ro GSan Serif Std B
-			size: 20
+			size: 17
 			color: rgb(255,255,255)
-		symbol font:
-			name: yugioh-text-replacements
-			alignment: middle center
-			size: 6
+		#symbol font:
+		#	name: yugioh-text-replacements
+		#	alignment: middle center
+		#	size: 6
 		visible: {not is_nmonster()}
 	pendulum text:
 		left: 30
@@ -580,7 +584,9 @@ extra card style:
 						else if card.gate_1 == "none" and card.gate_2 != "none" then "pendulum/rdgate-"+card.gate_2+".png"
 						else "blank2.png"
 					else "blank2.png"
-		visible: {is_pendulum() or card.pendulum == "relay" or contains(card.card_type, match: "xros monster")}
+		#visible: {is_pendulum() or card.pendulum == "relay" or contains(card.card_type, match: "xros monster")}
+		#visible: {if card.pendulum != "none" then true else false}
+		visible: true
 		mask: {if contains(card.card_type, match: "xros monster") then "mask-gate.png" else ""}
 	rdlevel:
 		left: {if is_link() then 13 else 17}

data/yugioh.mse-game/card_fields

@@ -139,6 +139,17 @@ card field:
 	choice: conjoint pendulum pandemonium
 #Making Lyris' changes work with the original variant.
 	script:
+		#if card.stylesheet == "series10" and contains(card.card_type, match: "pendulum") then "pendulum"
+		#if card.stylesheet == "yugioh-series10" and 
+		#(card.card_type=="pendulum normal monster" or 
+		#"pendulum effect monster" or 
+		#"pendulum fusion monster" or 
+		#"pendulum ritual monster" or 
+		#"pendulum synchro monster" or 
+		#"pendulum dark synchro monster" or
+		#"pendulum xyz monster")
+		#then "pendulum"
+		#if card.stylesheet == "series10" then
 			if card.card_type == "pendulum normal monster" or
 			card.card_type == "pendulum effect monster" or
 			card.card_type == "pendulum fusion monster" or
@@ -147,7 +158,7 @@ card field:
 			card.card_type == "pendulum dark synchro monster" or
 			card.card_type == "pendulum xyz monster"
 			then "pendulum" 
-		else "none"
+			#else "none"
 
 ############################# Link Marker Border
 card field:

data/yugioh.mse-game/script

@@ -4,7 +4,8 @@
 	is_en := { styling.language == "english" }
 	is_jp := { styling.language == "japanese" }
 
-	get_sep := {if is_en() then "<color:black>/</color:black>" else if is_cn() then "<i>／</i>" else "／" }
+	#get_sep := {if is_en() then "<color:black>/</color:black>" else if is_cn() then "<i>／</i>" else "／" }
+	get_sep := {if is_en() then "<test>/</test>" else if is_cn() then "<i>／</i>" else "／" }
 	get_sepex := {
 		class :=remove_tags(input);
 		if class == "" then "" else get_sep()