From 960ec76c151d62661cd8a401c715f4059dbf3aa5 Mon Sep 17 00:00:00 2001
From: Chorus System <ohinchy@gmail.com>
Date: Thu, 9 May 2024 16:37:25 -0400
Subject: [PATCH] Copper Circlet w/ Power Armor, Enchanted Rings Not Conflict,
 Finger Firelighter Dimming (#2)

* Copper circlet can now be worn under power armor

* Update enchanted_rings.json

Enchanted rings no longer conflict

* Finger Firelighter Dimming
---
 Magical Nights/items/alchemy_items.json   |  2 +-
 Magical Nights/items/enchanted_rings.json |  8 +++---
 Magical Nights/items/ethereal_items.json  | 31 +++++++++++++++++++++--
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/Magical Nights/items/alchemy_items.json b/Magical Nights/items/alchemy_items.json
index 6e0647b48ea8..5aab5008f421 100644
--- a/Magical Nights/items/alchemy_items.json	
+++ b/Magical Nights/items/alchemy_items.json	
@@ -66,7 +66,7 @@
     "encumbrance": 1,
     "warmth": 0,
     "material_thickness": 1,
-    "flags": [ "SKINTIGHT", "ONLY_ONE", "COMPACT" ],
+    "flags": [ "SKINTIGHT", "ONLY_ONE", "COMPACT", "POWERARMOR_COMPATIBLE" ],
     "qualities": [ [ "MANA_FOCUS", 1 ] ]
   },
   {
diff --git a/Magical Nights/items/enchanted_rings.json b/Magical Nights/items/enchanted_rings.json
index 9def750cbe6e..e1a92739b2bf 100644
--- a/Magical Nights/items/enchanted_rings.json	
+++ b/Magical Nights/items/enchanted_rings.json	
@@ -13,7 +13,7 @@
     "covers": [ "hand_either" ],
     "coverage": 0,
     "warmth": 0,
-    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE", "COMPACT" ]
   },
   {
     "abstract": "mring_silver",
@@ -29,7 +29,7 @@
     "covers": [ "hand_either" ],
     "coverage": 0,
     "warmth": 0,
-    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE", "COMPACT" ]
   },
   {
     "abstract": "mring_gold",
@@ -45,7 +45,7 @@
     "covers": [ "hand_either" ],
     "coverage": 0,
     "warmth": 0,
-    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE", "COMPACT" ]
   },
   {
     "abstract": "mring_platinum",
@@ -61,7 +61,7 @@
     "covers": [ "hand_either" ],
     "coverage": 0,
     "warmth": 0,
-    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "flags": [ "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "FANCY", "ONLY_ONE", "SKINTIGHT", "POWERARMOR_COMPATIBLE", "COMPACT" ]
   },
   {
     "copy-from": "mring_silver",
diff --git a/Magical Nights/items/ethereal_items.json b/Magical Nights/items/ethereal_items.json
index fc83c3e1ec15..4571147ddddb 100644
--- a/Magical Nights/items/ethereal_items.json	
+++ b/Magical Nights/items/ethereal_items.json	
@@ -27,9 +27,36 @@
     "price": 0,
     "symbol": ",",
     "color": "yellow",
-    "use_action": [ { "type": "firestarter", "moves": 20 } ],
+    "use_action": [ 
+      { 
+        "type": "firestarter", "moves": 20 
+      },
+      {
+        "type": "transform",
+        "msg": "You dim the flame.",
+        "target": "finger_firelighter_off"
+      } 
+  ],
     "flags": [ "TRADER_AVOID", "FIRESTARTER", "LIGHT_8", "FLAMING", "WATER_EXTINGUISH" ]
   },
+  {
+    "id": "finger_firelighter_off",
+    "copy-from": "finger_firelighter",
+    "type": "TOOL",
+    "name": "finger firelighter (dimmed)",
+    "description": "This is a small flame you can hold in your hand.  With a thought, you can cause it to light something on fire, though it is currently dimmed.",
+    "use_action": [ 
+      { 
+        "type": "firestarter", "moves": 20 
+      },
+      {
+        "type": "transform",
+        "msg": "You brighten the flame.",
+        "target": "finger_firelighter"
+      } 
+  ],
+    "flags": [ "TRADER_AVOID", "FIRESTARTER", "FLAMING", "WATER_EXTINGUISH" ]
+  },
   {
     "id": "magic_lamp",
     "type": "ARMOR",
@@ -51,7 +78,7 @@
     "id": "magic_lamp_off",
     "type": "ARMOR",
     "category": "tools",
-    "name": "magic lamp",
+    "name": "magic lamp (dimmed)",
     "description": "a magical aura that you know can be brightened into a powerful light.",
     "weight": "1 g",
     "volume": "250 ml",