Density cleanup + minor stuff (CleverRaven#70176)

* I went too far * do not remove hydrocarbons * Cleanup what i fixed, but forgot to cleanup * use new values for test_mp3 wetness * Move test material to core to prevent order dependency errors * EOL * move test_material again, now to vanilla * revert material back to test_data file since ehughsbaird fixed the order dependancy issues
tenmillimaster · Dec 15, 2023 · dd9e62c · dd9e62c
1 parent 33b1fd8
commit dd9e62c
Show file tree

Hide file tree

Showing 26 changed files with 180 additions and 209 deletions.
diff --git a/data/json/artifact/altered_object_active.json b/data/json/artifact/altered_object_active.json
@@ -60,7 +60,7 @@
     "description": "Causes you to teleport uncontrollably.",
     "message": "The world loses coherence, with images of nearby places forming and disappearing around you.",
     "valid_targets": [ "self" ],
-    "effect": "spawn_item",
+    "effect": "attack",
     "effect_str": "artifact_teleportitis_aura",
     "shape": "blast",
     "flags": [ "NO_EXPLOSION_SFX" ],
@@ -75,7 +75,7 @@
     "description": "Slows you for a few turns.",
     "message": "The world shifts blue, and reality accelerates around you.",
     "valid_targets": [ "self" ],
-    "effect": "spawn_item",
+    "effect": "attack",
     "effect_str": "artifact_slow_aura",
     "shape": "blast",
     "flags": [ "NO_EXPLOSION_SFX" ],

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -302,7 +302,6 @@
       [ "SICP", 3 ],
       [ "recipe_serum", 2 ],
       [ "recipe_chimera", 1 ],
-      [ "recipe_mil_augs", 1 ],
       [ "recipe_labchem", 1 ],
       { "item": "soldering_iron_portable", "prob": 70, "charges": [ 0, 50 ] },
       [ "solder_wire", 70 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -2374,7 +2374,6 @@
       { "item": "money_bundle_fifty", "prob": 50, "count": [ 1, 5 ] },
       { "item": "money_bundle_hundred", "prob": 10, "count": [ 1, 2 ] },
       { "group": "coins", "prob": 2, "count": [ 1, 10 ] },
-      [ "recipe_mil_augs", 5 ],
       [ "recipe_caseless", 5 ],
       [ "recipe_labchem", 5 ],
       [ "file", 20 ],

diff --git a/data/json/items/armor/altered_object_auras.json b/data/json/items/armor/altered_object_auras.json
@@ -1,58 +1,20 @@
 [
-  {
-    "type": "enchantment",
-    "id": "ench_teleportitis",
-    "intermittent_activation": { "effects": [ { "frequency": "4 seconds", "spell_effects": [ { "id": "AEA_TELEPORT" } ] } ] }
-  },
-  {
-    "type": "enchantment",
-    "id": "ench_slow_aura",
-    "values": [ { "value": "ATTACK_SPEED", "multiply": 1.5 }, { "value": "SPEED", "multiply": 0.5 } ]
-  },
   {
     "id": "artifact_teleportitis_aura",
-    "type": "ARMOR",
-    "name": { "str": "strange pressure" },
-    "description": "You feel a strange force pressing you inwards and inside-out.",
-    "weight": "1g",
-    "volume": "1ml",
-    "price": 3646,
-    "symbol": "o",
-    "color": "white",
-    "flags": [
-      "AURA",
-      "SEMITANGIBLE",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "relic_data": { "passive_effects": [ { "id": "ench_teleportitis" } ] }
+    "type": "effect_type",
+    "name": [ "Strange Pressure" ],
+    "desc": [ "You feel a strange force pressing you inwards and inside-out" ],
+    "enchantments": [
+      {
+        "intermittent_activation": { "effects": [ { "frequency": "4 seconds", "spell_effects": [ { "id": "AEA_TELEPORT" } ] } ] }
+      }
+    ]
   },
   {
     "id": "artifact_slow_aura",
-    "type": "ARMOR",
-    "name": { "str": "temporal distortion" },
-    "description": "A slight temporal distortion appears to be centered around you.",
-    "weight": "1g",
-    "volume": "1ml",
-    "price": 3646,
-    "symbol": "o",
-    "color": "white",
-    "flags": [
-      "AURA",
-      "SEMITANGIBLE",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "relic_data": { "passive_effects": [ { "id": "ench_slow_aura" } ] }
+    "type": "effect_type",
+    "name": [ "Temporal Distortion" ],
+    "desc": [ "A slight temporal distortion appears to be centered around you" ],
+    "enchantments": [ { "values": [ { "value": "ATTACK_SPEED", "multiply": 1.5 }, { "value": "SPEED", "multiply": 0.5 } ] } ]
   }
 ]
diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json
@@ -136,8 +136,8 @@
     "category": "manuals",
     "name": { "str": "lab journal-Dionne", "str_pl": "lab journals-Dionne" },
     "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna.  The team seems quite enthusiastic--if not eager--about their results.",
-    "weight": "1700 g",
-    "volume": "500 ml",
+    "weight": "500 g",
+    "volume": "600 ml",
     "price": 50000,
     "price_postapoc": 2000,
     "material": [ "paper" ],
@@ -176,7 +176,7 @@
     "category": "manuals",
     "name": { "str": "lab journal-Smythe", "str_pl": "lab journals-Smythe" },
     "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037.  The results look promising but the procurement methods seem awfully vague…",
-    "weight": "1700 g",
+    "weight": "400 g",
     "volume": "500 ml",
     "price": 50000,
     "price_postapoc": 2000,
@@ -235,7 +235,7 @@
     "category": "manuals",
     "name": { "str": "lab journal-x-|xp", "str_pl": "lab journals-x-|xp" },
     "description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.",
-    "weight": "1700 g",
+    "weight": "400 g",
     "volume": "500 ml",
     "price": 50000,
     "price_postapoc": 2000,
@@ -258,7 +258,7 @@
       "str_pl": "copies of PE023 \"Medical\": Application and Findings"
     },
     "description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects.  It's stamped \"APPROVED\"…",
-    "weight": "1934 g",
+    "weight": "1450 g",
     "volume": "1750 ml",
     "price": 62000,
     "price_postapoc": 2000,
@@ -298,8 +298,8 @@
     "category": "manuals",
     "name": { "str": "Best Practices for Compound Delivery", "str_pl": "copies of Best Practices for Compound Delivery" },
     "description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results.  The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.",
-    "weight": "1700 g",
-    "volume": "500 ml",
+    "weight": "500 g",
+    "volume": "600 ml",
     "price": 50000,
     "price_postapoc": 2000,
     "material": [ "paper", "plastic" ],

diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json
@@ -123,7 +123,7 @@
     "name": { "str": "computer printout" },
     "description": "One side of this sheet is printed with a meaningless jumble of characters, but the other side shows a complicated, hand-drawn circuit diagram.",
     "weight": "10 g",
-    "volume": "2 ml",
+    "volume": "12 ml",
     "price": 40000,
     "price_postapoc": 1250,
     "material": [ "paper" ],
@@ -140,8 +140,8 @@
     "type": "BOOK",
     "category": "manuals",
     "name": { "str": "Augmentative Tech Review", "str_pl": "issues of Augmentative Tech Review" },
-    "description": "This annual publication covers the various ways in which people use technology to improve their bodies.  There are a few in-depth and thoroughly illustrated articles on prosthetics, though they tend to use too much jargon.",
-    "weight": "1909 g",
+    "description": "This annual publication covers the various ways in which multiple CEOs of different corporations describe the great world of the near future.  There are a few in-depth and thoroughly illustrated articles on prosthetics, though they tend to use too much jargon.",
+    "weight": "400 g",
     "volume": "500 ml",
     "price": 3000,
     "price_postapoc": 750,
@@ -162,7 +162,7 @@
     "name": { "str": "lab journal-Herrera", "str_pl": "lab journals-Herrera" },
     "description": "This hefty binder contains a multitude of diagrams and technical specifications for various electronic materials.  Some of the diagrams use symbols you've not seen before…",
     "weight": "2000 g",
-    "volume": "500 ml",
+    "volume": "2400 ml",
     "price": 56000,
     "price_postapoc": 2000,
     "material": [ "paper", "plastic" ],
@@ -181,7 +181,7 @@
     "category": "manuals",
     "name": { "str": "2XI design binder-CLASSIFIED", "str_pl": "2XI design binders-CLASSIFIED" },
     "description": "This Doubletech Industries binder has several intimidating security warnings on the cover.  Probably because it contains complete design specs, technical drawings, and test results for their military-grade bionic implants.",
-    "weight": "1409 g",
+    "weight": "400 g",
     "volume": "500 ml",
     "price": 74000,
     "price_postapoc": 2500,

diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json
@@ -267,7 +267,7 @@
     "name": { "str": "Rivtech design binder" },
     "description": "This Rivtech binder warns that \"Unauthorized readers are our best test subjects.\" With good reason: it contains complete design specs and technical drawings for their entire line of products.",
     "weight": "1409 g",
-    "volume": "500 ml",
+    "volume": "1700 ml",
     "price": 84000,
     "price_postapoc": 2500,
     "material": [ "paper", "plastic" ],

diff --git a/data/json/items/book/launcher.json b/data/json/items/book/launcher.json
@@ -97,8 +97,8 @@
         "//": "979-8538902606"
       }
     ],
-    "weight": "734 g",
-    "volume": "250 ml",
+    "weight": "650 g",
+    "volume": "919 ml",
     "price": 2000,
     "price_postapoc": 2000,
     "material": [ "paper", "cardboard" ],

diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json
@@ -127,7 +127,7 @@
     "category": "manuals",
     "name": { "str": "Friendly, Humane Fashion", "str_pl": "copies of Friendly, Humane Fashion" },
     "description": "An educational book detailing the uses of fake fur, as well as its benefits and disadvantages.  The prose is rather passionate, and a disclaimer on the cover proudly states that the book is printed and distributed by the Gryphon Animal Rights Organization.",
-    "weight": "2267 g",
+    "weight": "1200 g",
     "volume": "1 L",
     "price": 5000,
     "price_postapoc": 250,