auto update

linonetwo · Oct 19, 2024 · 105df5f · 105df5f
1 parent 32b6484
commit 105df5f
Show file tree

Hide file tree

Showing 34 changed files with 2 additions and 50 deletions.
diff --git a/Kenan-Structured-Modpack/Arcana/item_groups/item_groups_sanguine.json b/Kenan-Structured-Modpack/Arcana/item_groups/item_groups_sanguine.json
@@ -56,7 +56,7 @@
       [ "dao", 35 ],
       [ "khopesh", 10 ],
       [ "q_staff", 5 ],
-      { "collection": [ { "group": "guns_pistol_common" }, { "group": "ammo_pistol_reloaded" } ], "prob": 10 },
+      { "collection": [ { "group": "ammo_pistol_reloaded" } ], "prob": 10 },
       [ "pistol_flintlock", 5 ],
       [ "flintlock_ammo", 10 ],
       [ "robe", 10 ],

diff --git a/...DDA_Arcana_Cata++_Patch/NC_MODCOMPAT.json → ...mod_interactions/Cata++/NC_MODCOMPAT.json b/...DDA_Arcana_Cata++_Patch/NC_MODCOMPAT.json → ...mod_interactions/Cata++/NC_MODCOMPAT.json
diff --git a/...odpack/DDA_Arcana_Cata++_Patch/books.json → ...Arcana/mod_interactions/Cata++/books.json b/...odpack/DDA_Arcana_Cata++_Patch/books.json → ...Arcana/mod_interactions/Cata++/books.json
diff --git a/...a_Cata++_Patch/item_groups_modcompat.json → ...actions/Cata++/item_groups_modcompat.json b/...a_Cata++_Patch/item_groups_modcompat.json → ...actions/Cata++/item_groups_modcompat.json
diff --git a/..._Arcana_Cata++_Patch/mapgen_variants.json → ..._interactions/Cata++/mapgen_variants.json b/..._Arcana_Cata++_Patch/mapgen_variants.json → ..._interactions/Cata++/mapgen_variants.json
diff --git a/.../DDA_Arcana_Cata++_Patch/martialarts.json → .../mod_interactions/Cata++/martialarts.json b/.../DDA_Arcana_Cata++_Patch/martialarts.json → .../mod_interactions/Cata++/martialarts.json
diff --git a/...odpack/DDA_Arcana_Cata++_Patch/melee.json → ...Arcana/mod_interactions/Cata++/melee.json b/...odpack/DDA_Arcana_Cata++_Patch/melee.json → ...Arcana/mod_interactions/Cata++/melee.json
diff --git a/...Cata++_Patch/monster_drops_modcompat.json → ...tions/Cata++/monster_drops_modcompat.json b/...Cata++_Patch/monster_drops_modcompat.json → ...tions/Cata++/monster_drops_modcompat.json
diff --git a/..._Arcana_Cata++_Patch/mutations_other.json → ..._interactions/Cata++/mutations_other.json b/..._Arcana_Cata++_Patch/mutations_other.json → ..._interactions/Cata++/mutations_other.json
diff --git a/.../DDA_Arcana_Cata++_Patch/professions.json → .../mod_interactions/Cata++/professions.json b/.../DDA_Arcana_Cata++_Patch/professions.json → .../mod_interactions/Cata++/professions.json
diff --git a/...dpack/DDA_Arcana_Cata++_Patch/ranged.json → ...rcana/mod_interactions/Cata++/ranged.json b/...dpack/DDA_Arcana_Cata++_Patch/ranged.json → ...rcana/mod_interactions/Cata++/ranged.json
diff --git a/...a_Cata++_Patch/recipe_deconstruction.json → ...actions/Cata++/recipe_deconstruction.json b/...a_Cata++_Patch/recipe_deconstruction.json → ...actions/Cata++/recipe_deconstruction.json
diff --git a/..._Arcana_Cata++_Patch/recipe_magitech.json → ..._interactions/Cata++/recipe_magitech.json b/..._Arcana_Cata++_Patch/recipe_magitech.json → ..._interactions/Cata++/recipe_magitech.json
diff --git a/...ck/DDA_Arcana_Cata++_Patch/scenarios.json → ...na/mod_interactions/Cata++/scenarios.json b/...ck/DDA_Arcana_Cata++_Patch/scenarios.json → ...na/mod_interactions/Cata++/scenarios.json
diff --git a/...A_Arcana_Dinomod_Patch/monster_drops.json → ...d_interactions/DinoMod/monster_drops.json b/...A_Arcana_Dinomod_Patch/monster_drops.json → ...d_interactions/DinoMod/monster_drops.json
diff --git a/...ck/DDA_Arcana_Dinomod_Patch/monsters.json → ...na/mod_interactions/DinoMod/monsters.json b/...ck/DDA_Arcana_Dinomod_Patch/monsters.json → ...na/mod_interactions/DinoMod/monsters.json
diff --git a/...tershock_Patch/item_groups_modcompat.json → ...ons/aftershock/item_groups_modcompat.json b/...tershock_Patch/item_groups_modcompat.json → ...ons/aftershock/item_groups_modcompat.json
diff --git a/..._Arcana_Aftershock_Patch/martialarts.json → ..._interactions/aftershock/martialarts.json b/..._Arcana_Aftershock_Patch/martialarts.json → ..._interactions/aftershock/martialarts.json
diff --git a/...rcana_Aftershock_Patch/monster_drops.json → ...nteractions/aftershock/monster_drops.json b/...rcana_Aftershock_Patch/monster_drops.json → ...nteractions/aftershock/monster_drops.json
diff --git a/...DDA_Arcana_Aftershock_Patch/monsters.json → ...mod_interactions/aftershock/monsters.json b/...DDA_Arcana_Aftershock_Patch/monsters.json → ...mod_interactions/aftershock/monsters.json
diff --git a/...tershock_Patch/recipe_deconstruction.json → ...ons/aftershock/recipe_deconstruction.json b/...tershock_Patch/recipe_deconstruction.json → ...ons/aftershock/recipe_deconstruction.json
diff --git a/...agiclysm_Patch/crafting_requirements.json → ...ions/magiclysm/crafting_requirements.json b/...agiclysm_Patch/crafting_requirements.json → ...ions/magiclysm/crafting_requirements.json
diff --git a/...agiclysm_Patch/item_groups_modcompat.json → ...ions/magiclysm/item_groups_modcompat.json b/...agiclysm_Patch/item_groups_modcompat.json → ...ions/magiclysm/item_groups_modcompat.json
diff --git a/...A_Arcana_Magiclysm_Patch/martialarts.json → ...d_interactions/magiclysm/martialarts.json b/...A_Arcana_Magiclysm_Patch/martialarts.json → ...d_interactions/magiclysm/martialarts.json
diff --git a/...Arcana_Magiclysm_Patch/monster_drops.json → ...interactions/magiclysm/monster_drops.json b/...Arcana_Magiclysm_Patch/monster_drops.json → ...interactions/magiclysm/monster_drops.json
diff --git a/.../DDA_Arcana_Magiclysm_Patch/monsters.json → .../mod_interactions/magiclysm/monsters.json b/.../DDA_Arcana_Magiclysm_Patch/monsters.json → .../mod_interactions/magiclysm/monsters.json
diff --git a/...agiclysm_Patch/recipe_deconstruction.json → ...ions/magiclysm/recipe_deconstruction.json b/...agiclysm_Patch/recipe_deconstruction.json → ...ions/magiclysm/recipe_deconstruction.json
diff --git a/...DDA_Arcana_Magiclysm_Patch/scenarios.json → ...mod_interactions/magiclysm/scenarios.json b/...DDA_Arcana_Magiclysm_Patch/scenarios.json → ...mod_interactions/magiclysm/scenarios.json
diff --git a/.../DDA_Arcana_Magiclysm_Patch/snippets.json → .../mod_interactions/magiclysm/snippets.json b/.../DDA_Arcana_Magiclysm_Patch/snippets.json → .../mod_interactions/magiclysm/snippets.json
diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/modinfo.json
diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json
diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json
diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json
diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ranged.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ranged.json
@@ -453,7 +453,7 @@
     "to_hit": -1,
     "ammo_effects": [ "LIGHTNING" ],
     "flags": [ "NON_FOULING", "NEEDS_NO_LUBE" ],
-    "ammo_to_fire": 50,
+    "ammo_to_fire": 6,
     "ammo": [ "battery" ],
     "pocket_data": [
       {