Merge pull request #17 from amarillonmc/WIP

Syncing

data/yugioh-series10.mse-style/style

@@ -25,6 +25,7 @@ card height: 614
 card dpi: 178.0156
 
 ############################################################## Extra scripts
+
 ############################################################## Extra style
 styling field:
 	type: info
@@ -212,11 +213,6 @@ styling field:
 	choice: 20thser
 	choice: custom1
 	choice: customvirtualsan
-styling field:
-	type: boolean
-	name: is link card
-	description: 是否为链接魔陷卡 Choosing "Yes" will apply the Link frame even if it's not a Link Monster, used for Link Spell/Traps.
-	initial: no
 styling field:
 	type: info
 	name: Text Formatting
@@ -289,6 +285,19 @@ styling field:
 	name: is ZARC card
 	description: 是否是霸王龙ZARC卡模 Set the pendulum monster to be ZARC monster.
 	initial: no
+styling field:
+	type: info
+	name: Advanced Options
+styling field:
+	type: boolean
+	name: is link card
+	description: 是否为链接魔陷卡 Choosing "Yes" will apply the Link frame even if it's not a Link Monster, used for Link Spell/Traps.
+	initial: no
+#styling field:
+#	type: boolean
+#	name: force not pendulum card
+#	description: 强迫将卡片不作为灵摆处理 Force the card to NOT be a pendulum card.
+#	initial: no
 styling style:
 	language:
 		render style: both
@@ -332,6 +341,8 @@ styling style:
 			ultrafoil: /yugioh.mse-game/icons/ultrafoilpreview.png
 			20thser: /yugioh.mse-game/icons/collectborderpreview.png
 			20thserpendulum: /yugioh.mse-game/icons/collectborderpreview.png
+#script:
+#	if styling.force_not_pendulum_card then card.pendulum == "none"
 ############################################################## Card fields
 card style:
 	############################# Background stuff

data/yugioh.mse-game/card_fields

@@ -89,6 +89,17 @@ card field:
 	choice: conjoint pandemonium
 	choice: conjoint relay
 	choice: conjoint pendulum pandemonium
+#Making Lyris' changes work with the original variant.
+	script:
+		if card.card_type == "pendulum normal monster" or
+		card.card_type == "pendulum effect monster" or
+		card.card_type == "pendulum fusion monster" or
+		card.card_type == "pendulum ritual monster" or
+		card.card_type == "pendulum synchro monster" or
+		card.card_type == "pendulum dark synchro monster" or
+		card.card_type == "pendulum xyz monster"
+		then "pendulum" 
+		else "none"
 
 ############################# Link Marker Border
 card field: