tests are made of evil

CleverRaven · Dec 14, 2024 · bfec42b · bfec42b
1 parent a9b8c3a
commit bfec42b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -1217,7 +1217,7 @@
     "volume": "450 ml",
     "price": "75 cent",
     "price_postapoc": "10 cent",
-    "to_hit": { "grip": "neutral", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "steel", "plastic" ],
     "looks_like": "scrap",
     "symbol": "[",

diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json
@@ -171,8 +171,7 @@
     "id": "counterweight",
     "name": { "str": "counterweight" },
     "description": "A heavy block of steel used for balancing other heavy things.  Can be used as a makeshift anvil.",
-    "weight": "750000 g",
-    "to_hit": -10,
+    "weight": "750 kg",
     "color": "dark_gray",
     "symbol": "]",
     "material": [ "steel" ],
@@ -181,7 +180,6 @@
     "price": "120 USD",
     "price_postapoc": "2 USD 50 cent",
     "category": "veh_parts",
-    "qualities": [ [ "ANVIL", 2 ] ],
-    "melee_damage": { "bash": 25 }
+    "qualities": [ [ "ANVIL", 2 ] ]
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json
@@ -15,8 +15,6 @@
     "type": "test_data",
     "//": "Just junk items",
     "expected_dps": {
-      "banjo": 5.53,
-      "saxophone": 5.55,
       "knuckle_skewer": 5.58,
       "rock_sock": 5.63,
       "2x4": 5.66,

diff --git a/data/mods/TEST_DATA/expected_dps_data/tools_dps.json b/data/mods/TEST_DATA/expected_dps_data/tools_dps.json
@@ -8,7 +8,6 @@
       "honey_scraper": 5.58,
       "heavy_flashlight": 5.66,
       "heavy_flashlight_on": 5.66,
-      "swage": 5.71,
       "hammer_bronze": 5.78,
       "bronze_sickle": 6.13,
       "lug_wrench": 6.18,
@@ -20,13 +19,11 @@
       "big_pliers": 5.49,
       "hoe": 5.28,
       "kevlar_shears": 7.62,
-      "drift": 8.5,
+      "drift": 6.11,
       "awl_steel": 8.53,
       "wrench_large": 8.54,
       "bronze_pickaxe": 7.77,
       "shovel_snow": 5.49,
-      "hotcut_bronze": 9.61,
-      "hotcut": 9.61,
       "crutches": 13.49,
       "digging_stick": 5.58
     }

diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -16,7 +16,6 @@
       "aksemi",
       "alloy_plate",
       "aluminum_boat_hull",
-      "analytical_set_basic",
       "ar10",
       "arisaka_monopod",
       "art_crystal",
@@ -34,7 +33,6 @@
       "atgm_launcher",
       "awl_bone",
       "axmc",
-      "balance_small",
       "ballista",
       "barb_launcher",
       "basket",
@@ -70,8 +68,6 @@
       "cheek_pad",
       "chemical_thrower",
       "chitin_plate",
-      "closed_loop_extractor_large",
-      "closed_loop_extractor_small",
       "colt_army",
       "colt_lightning",
       "colt_navy",
@@ -87,7 +83,6 @@
       "cz600",
       "damaged_shelter_kit",
       "debug_gun_no_mag_well",
-      "draw_plate",
       "drill_rock_primitive",
       "elec_hairtrimmer",
       "electronics_controls",
@@ -107,7 +102,6 @@
       "fs2000",
       "garand",
       "gatling_mech_laser",
-      "gelbox",
       "hammer_pocket_test",
       "hand_controls",
       "hand_rims",
@@ -189,13 +183,10 @@
       "pistol_flintlock",
       "plasma_rifle",
       "plastic_boat_hull",
-      "pressure_tank",
       "pseudo_m203",
       "psl",
       "punch_bone",
       "punch_nail",
-      "rack_test_tube",
-      "rack_test_tube_micro",
       "raft_board",
       "rebar_plate",
       "recoil_stock",
@@ -216,7 +207,6 @@
       "rm88_battle_rifle",
       "robofac_gun",
       "rock",
-      "rotovap",
       "rubik_farthing",
       "ruger_1022",
       "ruger_arr",
@@ -248,11 +238,9 @@
       "smle_mk3",
       "spiked_plate",
       "spring_plate",
-      "stand_ring_clamps",
       "steel_grille",
       "steel_plate",
       "steyr_aug",
-      "still_lab",
       "suppressor",
       "surv_rocket_launcher",
       "survivor_hairtrimmer",