Tone down Lantern light REs (foundryvtt#7147)

* Tone down Lantern light REs * Apply suggestions from code review
Xynced · Mar 29, 2023 · d528622 · d528622
1 parent 0a30e19
commit d528622
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/packs/data/equipment.db/lantern-bulls-eye.json b/packs/data/equipment.db/lantern-bulls-eye.json
@@ -50,7 +50,7 @@
                         "type": "torch"
                     },
                     "bright": 60,
-                    "color": "#9b7337",
+                    "color": "#975335",
                     "dim": 120,
                     "shadows": 0.2
                 }

diff --git a/packs/data/equipment.db/lantern-hooded.json b/packs/data/equipment.db/lantern-hooded.json
@@ -45,7 +45,7 @@
                         "type": "torch"
                     },
                     "bright": 30,
-                    "color": "#9b7337",
+                    "color": "#975335",
                     "dim": 60,
                     "shadows": 0.2
                 }

diff --git a/packs/data/equipment.db/mechanical-torch.json b/packs/data/equipment.db/mechanical-torch.json
@@ -39,21 +39,25 @@
             {
                 "domain": "all",
                 "key": "RollOption",
-                "label": "PF2E.SpecificRule.MechanicalTorch.LitRadius",
-                "option": "lit-mechanical-torch-radius",
-                "toggleable": true
-            },
-            {
-                "domain": "all",
-                "key": "RollOption",
-                "label": "PF2E.SpecificRule.MechanicalTorch.LitCone",
-                "option": "lit-mechanical-torch-cone",
-                "toggleable": true
+                "label": "PF2E.SpecificRule.MechanicalTorch.Label",
+                "option": "lit-mechanical-torch",
+                "suboptions": [
+                    {
+                        "label": "PF2E.SpecificRule.MechanicalTorch.LitCone",
+                        "value": "cone"
+                    },
+                    {
+                        "label": "PF2E.PF2E.SpecificRule.MechanicalTorch.LitRadius",
+                        "value": "radius"
+                    }
+                ],
+                "toggleable": true,
+                "value": true
             },
             {
                 "key": "TokenLight",
                 "predicate": [
-                    "lit-mechanical-torch-radius"
+                    "lit-mechanical-torch:radius"
                 ],
                 "value": {
                     "animation": {
@@ -62,15 +66,15 @@
                         "type": "torch"
                     },
                     "bright": 20,
-                    "color": "#9b7337",
+                    "color": "#535387",
                     "dim": 60,
                     "shadows": 0.2
                 }
             },
             {
                 "key": "TokenLight",
                 "predicate": [
-                    "lit-mechanical-torch-cone"
+                    "lit-mechanical-torch:cone"
                 ],
                 "value": {
                     "angle": 90,
@@ -80,7 +84,7 @@
                         "type": "torch"
                     },
                     "bright": 40,
-                    "color": "#9b7337",
+                    "color": "#535387",
                     "dim": 80,
                     "shadows": 0.2
                 }

diff --git a/static/lang/re-en.json b/static/lang/re-en.json
@@ -1904,8 +1904,9 @@
                 "SimpleMartialTwoHandedMeleeWeapons": "Simple & Martial Two-Handed Melee Weapons"
             },
             "MechanicalTorch": {
-                "LitCone": "Mechanical torch is lit (cone)",
-                "LitRadius": "Mechanical torch is lit (radius)"
+                "Label": "Mechanical Torch is lit",
+                "LitCone": "Cone",
+                "LitRadius": "Radius"
             },
             "Mindmoppet": {
                 "BrokenShell": "Shell is Broken"