Merge pull request #78499 from Karol1223/desk-fna-audit

Desk fan audit
CleverRaven · Dec 12, 2024 · ce7d69c · ce7d69c
2 parents e10cfc1 + 3c59536
commit ce7d69c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -2142,16 +2142,17 @@
     "name": { "str": "desk fan" },
     "description": "A small fan, used to propel air around a room.",
     "color": "light_gray",
-    "price": "10 USD",
+    "price": "25 USD",
     "price_postapoc": "10 cent",
     "material": [ "aluminum", "plastic" ],
-    "flags": [ "WATER_BREAK" ],
+    "flags": [ "WATER_BREAK", "FRAGILE_MELEE" ],
     "ammo": [ "battery" ],
     "charges_per_use": 4,
     "use_action": [ { "type": "link_up", "cable_length": 3, "charge_rate": "35 W" } ],
     "charged_qualities": [ [ "WINNOW", 1 ] ],
-    "weight": "2857 g",
-    "volume": "1 L",
+    "weight": "1588 g",
+    "volume": "19265 ml",
+    "//": "Based on https://www.amazon.com/dp/B000U9WXEC, although the volume calculated from package dimensions has been multiplied by 0.5 because there really is not a reasonable way to calculate fan volume without the numbers going into extremes",
     "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 4 }
   },

diff --git a/data/json/uncraft/recipe_deconstruction.json b/data/json/uncraft/recipe_deconstruction.json
@@ -2561,9 +2561,9 @@
     "result": "fan",
     "type": "uncraft",
     "activity_level": "LIGHT_EXERCISE",
-    "time": "2 m",
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap_aluminum", 1 ] ], [ [ "plastic_chunk", 3 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 2 ] ] ]
+    "time": "5 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "scrap_aluminum", 10 ] ], [ [ "plastic_chunk", 15 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 30 ] ] ]
   },
   {
     "result": "fancy_sunglasses",

diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
@@ -43,7 +43,6 @@
       "vortex",
       "wasp_sting",
       "hotdogs_cooked",
-      "fan",
       "poppysyrup",
       "broken_lab_security_drone_BM2",
       "bot_lab_security_drone_BS",