Merge pull request chaosvolt#328 from Dan1ss1mo/fixes

Fixes for some obsolated stuff
Zlorthishen · Mar 24, 2023 · c078ffb · c078ffb
2 parents 6ca104a + 371c49e
commit c078ffb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/Arcana/items/melee.json b/Arcana/items/melee.json
@@ -498,7 +498,7 @@
     "volume": "250 ml",
     "weight": "300 g",
     "bashing": 24,
-    "flags": [ "UNARMED_WEAPON", "BIONIC_WEAPON", "UNBREAKABLE_MELEE", "TRADER_AVOID" ],
+    "flags": [ "BIONIC_WEAPON", "UNBREAKABLE_MELEE", "TRADER_AVOID" ],
     "qualities": [ [ "HAMMER", 1 ] ],
     "techniques": [ "WBLOCK_1", "tec_weapon_kinetic_knockback" ],
     "relic_data": {

diff --git a/Arcana/items/ranged.json b/Arcana/items/ranged.json
@@ -45,7 +45,6 @@
     "ammo_effects": [ "LIGHTNING_JUDGMENT" ],
     "flags": [
       "STAB",
-      "UNARMED_WEAPON",
       "BELT_CLIP",
       "NEVER_JAMS",
       "PRIMITIVE_RANGED_WEAPON",
@@ -320,7 +319,6 @@
     "qualities": [ [ "BUTCHER", 12 ] ],
     "flags": [
       "LIGHT_45",
-      "UNARMED_WEAPON",
       "NEVER_JAMS",
       "UNBREAKABLE_MELEE",
       "FIRE",

diff --git a/Arcana/overmap_and_mapgen/mapgen_variants.json b/Arcana/overmap_and_mapgen/mapgen_variants.json
@@ -2211,7 +2211,7 @@
         "5": "f_machinery_electronic",
         "9": "f_autodoc",
         "0": "f_autodoc_couch",
-        "A": "f_compact_ASRG",
+        "A": "f_compact_ASRG_containment",
         "a": "f_wreckage",
         "b": "f_bench",
         "w": "f_ground_cable",

diff --git a/Arcana/recipes/recipe_ammo.json b/Arcana/recipes/recipe_ammo.json
@@ -476,8 +476,7 @@
         [ "gunpowder", 6 ],
         [ "gunpowder_pistol", 6 ],
         [ "gunpowder_shotgun", 6 ],
-        [ "chem_black_powder", 9 ],
-        [ "chem_match_head_powder", 9 ]
+        [ "chem_black_powder", 9 ]
       ],
       [ [ "silver_small", 10 ], [ "platinum_small", 6 ] ],
       [ [ "essence_dull", 5 ] ]
@@ -504,8 +503,7 @@
         [ "gunpowder", 3 ],
         [ "gunpowder_pistol", 3 ],
         [ "gunpowder_shotgun", 3 ],
-        [ "chem_black_powder", 5 ],
-        [ "chem_match_head_powder", 5 ]
+        [ "chem_black_powder", 5 ]
       ],
       [ [ "silver_small", 10 ], [ "platinum_small", 6 ] ],
       [ [ "essence_dull", 5 ] ],
@@ -532,7 +530,7 @@
     ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
-      [ [ "gunpowder", 16 ], [ "chem_black_powder", 24 ], [ "chem_match_head_powder", 24 ] ],
+      [ [ "gunpowder", 16 ], [ "chem_black_powder", 24 ] ],
       [ [ "silver_small", 16 ], [ "platinum_small", 10 ] ],
       [ [ "essence_dull", 6 ] ],
       [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ]

diff --git a/Arcana/recipes/recipe_magitech.json b/Arcana/recipes/recipe_magitech.json
@@ -497,7 +497,7 @@
       [ "arcana_essence_any", 4 ]
     ],
     "qualities": [ { "id": "WRENCH_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
-    "components": [ [ [ "bio_railgun", 1 ] ], [ [ "cable", 60 ] ], [ [ "monster_fang", 1 ] ] ],
+    "components": [ [ [ "bio_pitch_perfect", 1 ] ], [ [ "cable", 60 ] ], [ [ "monster_fang", 1 ] ] ],
     "flags": [ "SECRET" ]
   },
   {

diff --git a/Arcana/recipes/recipe_others.json b/Arcana/recipes/recipe_others.json
@@ -13,7 +13,7 @@
     "book_learn": [ [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ],
-    "components": [ [ [ "wyrmskin_piece", 1 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ] ]
+    "components": [ [ [ "wyrmskin_piece", 1 ] ], [ [ "ammonia_liquid", 2 ], [ "lye_powder", 200 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/Arcana/recipes/recipe_weapon.json b/Arcana/recipes/recipe_weapon.json
@@ -210,7 +210,7 @@
     "batch_time_factors": [ 80, 4 ],
     "using": [ [ "arcana_essence_any", 1 ], [ "surface_heat", 10 ], [ "waterproofing", 1 ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "canister_empty", 1 ], [ "clay_canister", 1 ] ],
       [ [ "material_quicklime", 1 ], [ "lye", 1 ], [ "lye_powder", 35 ] ],
       [ [ "flame_talisman", 1 ] ]
     ]
@@ -230,7 +230,7 @@
     "batch_time_factors": [ 80, 4 ],
     "using": [ [ "arcana_essence_any", 1 ], [ "surface_heat", 10 ], [ "waterproofing", 1 ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "canister_empty", 1 ], [ "clay_canister", 1 ] ],
       [ [ "material_quicklime", 1 ], [ "lye", 1 ], [ "lye_powder", 35 ] ],
       [ [ "water_talisman", 1 ] ]
     ]
@@ -250,7 +250,7 @@
     "batch_time_factors": [ 80, 4 ],
     "using": [ [ "arcana_essence_any", 1 ], [ "surface_heat", 25 ], [ "waterproofing", 1 ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "canister_empty", 1 ], [ "clay_canister", 1 ] ],
       [ [ "material_quicklime", 1 ], [ "lye", 1 ], [ "lye_powder", 35 ] ],
       [ [ "earth_talisman", 1 ] ]
     ]
@@ -270,7 +270,7 @@
     "batch_time_factors": [ 80, 4 ],
     "using": [ [ "arcana_essence_any", 1 ], [ "surface_heat", 25 ], [ "waterproofing", 1 ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "canister_empty", 1 ], [ "clay_canister", 1 ] ],
       [ [ "material_quicklime", 1 ], [ "lye", 1 ], [ "lye_powder", 35 ] ],
       [ [ "air_talisman", 1 ] ]
     ]
@@ -425,7 +425,7 @@
     "book_learn": [ [ "book_bloodmagic", 5 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "tools": [ [ [ "book_bloodmagic", -1 ] ] ],
-    "components": [ [ [ "hatchet", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ], [ "rag_bloody", 2 ] ], [ [ "essence_blood", 5 ] ] ],
+    "components": [ [ [ "hatchet", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ], [ [ "essence_blood", 5 ] ] ],
     "flags": [ "SECRET" ]
   },
   {