From 9668a1de6f1939fe9ab3789fd5552152be690aad Mon Sep 17 00:00:00 2001
From: cajun <12363371+CajunAvenger@users.noreply.github.com>
Date: Tue, 24 Sep 2024 06:08:53 -0500
Subject: [PATCH] improve adventure & saga split auto nyx

---
 data/magic-m15-adventure.mse-style/style | 11 ++++++++++-
 data/magic-m15-saga.mse-style/style      | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/magic-m15-adventure.mse-style/style b/data/magic-m15-adventure.mse-style/style
index 42aec7fdb..9e6e5ee2a 100644
--- a/data/magic-m15-adventure.mse-style/style
+++ b/data/magic-m15-adventure.mse-style/style
@@ -156,7 +156,16 @@ init script:
 	is_beyond := 	{ not is_spot() and (auto_ub()		or contains(styling.frames, match:"universes beyond")) }
 	auto_legend :=	{ set.auto_legends									and lang_setting("is_legendary")(card.super_type) }
 	auto_vehicle := { contains(styling.auto_frames, match:"vehicle")	and lang_setting("is_vehicle")(card.sub_type) }
-	auto_nyx :=		{ contains(styling.auto_frames, match:"nyx")		and lang_setting("is_enchantment")(card.super_type) }
+	auto_nyx :=		{ 
+		is_ench := lang_setting("is_enchantment")(card.super_type)
+		if not is_ench
+			then false ## not an enchantment
+		else if not set.auto_nyx
+			then false ## set auto disabled
+		else if not chosen(styling.auto_frames, choice:"nyx")
+			then false ## style auto disabled
+		else true      ## auto nyx
+	}
 	auto_snow :=	{ contains(styling.auto_frames, match:"snow")		and lang_setting("is_snow")(card.super_type) }
 	auto_ub :=		{ contains(styling.auto_frames, match:"universes beyond")		and (card.card_stamp == "universes beyond" or card.card_stamp == "flatstamped universes beyond") }
 	
diff --git a/data/magic-m15-saga.mse-style/style b/data/magic-m15-saga.mse-style/style
index 07f2228e6..bad1a5fb4 100644
--- a/data/magic-m15-saga.mse-style/style
+++ b/data/magic-m15-saga.mse-style/style
@@ -229,7 +229,16 @@ init script:
 	is_snow :=		{ auto_snow()		or contains(styling.other_options, match:"snow") }
 	auto_legend :=	{ set.auto_legends									and lang_setting("is_legendary")(card.super_type) }
 	auto_vehicle := { contains(styling.auto_frames, match:"vehicle")	and lang_setting("is_vehicle")(card.sub_type) }
-	auto_nyx :=		{ (contains(styling.auto_frames, match:"nyx") or set.auto_nyx)		and lang_setting("is_enchantment")(card.super_type) }
+	auto_nyx :=		{ 
+		is_ench := lang_setting("is_enchantment")(card.super_type)
+		if not is_ench
+			then false ## not an enchantment
+		else if not set.auto_nyx
+			then false ## set auto disabled
+		else if not chosen(styling.auto_frames, choice:"nyx")
+			then false ## style auto disabled
+		else true      ## auto nyx
+	}
 	auto_snow :=	{ contains(styling.auto_frames, match:"snow")		and lang_setting("is_snow")(card.super_type) }
 	is_beyond := {
 		chosen(styling.other_options, choice:"universes beyond")