Merge pull request CleverRaven#66715 from Karol1223/ceramic-evil

Ceramic shard sanifying
Rewryte · Jul 7, 2023 · e62f537 · e62f537
2 parents 94c819d + 569b87f
commit e62f537
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -40,14 +40,15 @@
     "symbol": "*",
     "color": "white",
     "name": { "str": "ceramic shard" },
-    "description": "A broken ceramic shard.  It is heavy and has a somewhat sharp edge, but it's too irregular to cut properly.",
+    "description": "A broken ceramic shard.  It is relatively heavy for its size and has a somewhat sharp edge, but it's too irregular to cut properly.",
     "material": [ "ceramic" ],
     "flags": [ "TRADER_AVOID" ],
-    "weight": "750 g",
-    "volume": "250 ml",
-    "to_hit": -1,
+    "weight": "150 g",
+    "volume": "50 ml",
+    "longest_side": "8 cm",
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" },
     "qualities": [ [ "BUTCHER", -66 ] ],
-    "melee_damage": { "bash": 5, "cut": 2 }
+    "melee_damage": { "bash": 2, "cut": 2 }
   },
   {
     "type": "GENERIC",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -2162,23 +2162,26 @@
   {
     "result": "ceramic_bowl",
     "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "time": "3 s",
-    "components": [ [ [ "ceramic_shard", 1 ] ] ]
+    "components": [ [ [ "ceramic_shard", 2 ] ] ],
+    "flags": [ "BLIND_EASY" ]
   },
   {
     "result": "ceramic_cup",
     "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "time": "3 s",
-    "components": [ [ [ "ceramic_shard", 1 ] ] ]
+    "components": [ [ [ "ceramic_shard", 2 ] ] ],
+    "flags": [ "BLIND_EASY" ]
   },
   {
     "result": "ceramic_plate",
     "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
+    "activity_level": "NO_EXERCISE",
     "time": "3 s",
-    "components": [ [ [ "ceramic_shard", 1 ] ] ]
+    "components": [ [ [ "ceramic_shard", 2 ] ] ],
+    "flags": [ "BLIND_EASY" ]
   },
   {
     "result": "char_purifier",

diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json
@@ -600,7 +600,8 @@
     "type": "uncraft",
     "activity_level": "NO_EXERCISE",
     "time": "1 s",
-    "components": [ [ [ "glass_shard", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 2 ] ] ],
+    "flags": [ "BLIND_EASY" ]
   },
   {
     "result": "water_faucet",
@@ -625,5 +626,13 @@
     "time": "2 m",
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
     "components": [ [ [ "chunk_cast_iron", 9 ] ] ]
+  },
+  {
+    "result": "ceramic_mug",
+    "type": "uncraft",
+    "activity_level": "NO_EXERCISE",
+    "time": "1 s",
+    "components": [ [ [ "ceramic_shard", 2 ] ] ],
+    "flags": [ "BLIND_EASY" ]
   }
 ]