From 105df5f1fefa98aa2b90658049e5b280c77d0d0b Mon Sep 17 00:00:00 2001 From: wave <22638873+waveyl@users.noreply.github.com> Date: Sun, 20 Oct 2024 00:21:10 +0800 Subject: [PATCH] auto update --- .../Arcana/item_groups/item_groups_sanguine.json | 2 +- .../mod_interactions/Cata++}/NC_MODCOMPAT.json | 0 .../mod_interactions/Cata++}/books.json | 0 .../Cata++}/item_groups_modcompat.json | 0 .../mod_interactions/Cata++}/mapgen_variants.json | 0 .../mod_interactions/Cata++}/martialarts.json | 0 .../mod_interactions/Cata++}/melee.json | 0 .../Cata++}/monster_drops_modcompat.json | 0 .../mod_interactions/Cata++}/mutations_other.json | 0 .../mod_interactions/Cata++}/professions.json | 0 .../mod_interactions/Cata++}/ranged.json | 0 .../Cata++}/recipe_deconstruction.json | 0 .../mod_interactions/Cata++}/recipe_magitech.json | 0 .../mod_interactions/Cata++}/scenarios.json | 0 .../mod_interactions/DinoMod}/monster_drops.json | 0 .../mod_interactions/DinoMod}/monsters.json | 0 .../aftershock}/item_groups_modcompat.json | 0 .../mod_interactions/aftershock}/martialarts.json | 0 .../mod_interactions/aftershock}/monster_drops.json | 0 .../mod_interactions/aftershock}/monsters.json | 0 .../aftershock}/recipe_deconstruction.json | 0 .../magiclysm}/crafting_requirements.json | 0 .../magiclysm}/item_groups_modcompat.json | 0 .../mod_interactions/magiclysm}/martialarts.json | 0 .../mod_interactions/magiclysm}/monster_drops.json | 0 .../mod_interactions/magiclysm}/monsters.json | 0 .../magiclysm}/recipe_deconstruction.json | 0 .../mod_interactions/magiclysm}/scenarios.json | 0 .../mod_interactions/magiclysm}/snippets.json | 0 .../DDA_Arcana_Aftershock_Patch/modinfo.json | 12 ------------ .../DDA_Arcana_Cata++_Patch/modinfo.json | 12 ------------ .../DDA_Arcana_Dinomod_Patch/modinfo.json | 12 ------------ .../DDA_Arcana_Magiclysm_Patch/modinfo.json | 12 ------------ .../nocts_cata_mod_DDA/Weapons/c_ranged.json | 2 +- 34 files changed, 2 insertions(+), 50 deletions(-) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/NC_MODCOMPAT.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/books.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/item_groups_modcompat.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/mapgen_variants.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/martialarts.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/melee.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/monster_drops_modcompat.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/mutations_other.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/professions.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/ranged.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/recipe_deconstruction.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/recipe_magitech.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Cata++_Patch => Arcana/mod_interactions/Cata++}/scenarios.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Dinomod_Patch => Arcana/mod_interactions/DinoMod}/monster_drops.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Dinomod_Patch => Arcana/mod_interactions/DinoMod}/monsters.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Aftershock_Patch => Arcana/mod_interactions/aftershock}/item_groups_modcompat.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Aftershock_Patch => Arcana/mod_interactions/aftershock}/martialarts.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Aftershock_Patch => Arcana/mod_interactions/aftershock}/monster_drops.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Aftershock_Patch => Arcana/mod_interactions/aftershock}/monsters.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Aftershock_Patch => Arcana/mod_interactions/aftershock}/recipe_deconstruction.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/crafting_requirements.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/item_groups_modcompat.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/martialarts.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/monster_drops.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/monsters.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/recipe_deconstruction.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/scenarios.json (100%) rename Kenan-Structured-Modpack/{DDA_Arcana_Magiclysm_Patch => Arcana/mod_interactions/magiclysm}/snippets.json (100%) delete mode 100644 Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/modinfo.json delete mode 100644 Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json delete mode 100644 Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json delete mode 100644 Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json diff --git a/Kenan-Structured-Modpack/Arcana/item_groups/item_groups_sanguine.json b/Kenan-Structured-Modpack/Arcana/item_groups/item_groups_sanguine.json index f0d8b5886..de5f1f880 100644 --- 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/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/NC_MODCOMPAT.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/NC_MODCOMPAT.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/NC_MODCOMPAT.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/NC_MODCOMPAT.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/books.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/books.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/books.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/books.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/item_groups_modcompat.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/item_groups_modcompat.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/item_groups_modcompat.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/item_groups_modcompat.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/mapgen_variants.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/mapgen_variants.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/mapgen_variants.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/mapgen_variants.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/martialarts.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/martialarts.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/martialarts.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/martialarts.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/melee.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/melee.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/melee.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/melee.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/monster_drops_modcompat.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/monster_drops_modcompat.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/monster_drops_modcompat.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/monster_drops_modcompat.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/mutations_other.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/mutations_other.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/mutations_other.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/mutations_other.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/professions.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/professions.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/professions.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/professions.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/ranged.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/ranged.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/ranged.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/ranged.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/recipe_deconstruction.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/recipe_deconstruction.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/recipe_deconstruction.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/recipe_deconstruction.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/recipe_magitech.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/recipe_magitech.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/recipe_magitech.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/recipe_magitech.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/scenarios.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/scenarios.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/scenarios.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/Cata++/scenarios.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/monster_drops.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/DinoMod/monster_drops.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/monster_drops.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/DinoMod/monster_drops.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/monsters.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/DinoMod/monsters.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/monsters.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/DinoMod/monsters.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/item_groups_modcompat.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/item_groups_modcompat.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/item_groups_modcompat.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/item_groups_modcompat.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/martialarts.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/martialarts.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/martialarts.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/martialarts.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/monster_drops.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/monster_drops.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/monster_drops.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/monster_drops.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/monsters.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/monsters.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/monsters.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/monsters.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/recipe_deconstruction.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/recipe_deconstruction.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/recipe_deconstruction.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/aftershock/recipe_deconstruction.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/crafting_requirements.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/crafting_requirements.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/crafting_requirements.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/crafting_requirements.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/item_groups_modcompat.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/item_groups_modcompat.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/item_groups_modcompat.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/item_groups_modcompat.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/martialarts.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/martialarts.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/martialarts.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/martialarts.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/monster_drops.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/monster_drops.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/monster_drops.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/monster_drops.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/monsters.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/monsters.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/monsters.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/monsters.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/recipe_deconstruction.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/recipe_deconstruction.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/recipe_deconstruction.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/recipe_deconstruction.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/scenarios.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/scenarios.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/scenarios.json rename to Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/scenarios.json diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/snippets.json b/Kenan-Structured-Modpack/Arcana/mod_interactions/magiclysm/snippets.json similarity index 100% rename from Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/snippets.json rename to Kenan-Structured-Modpack/Arcana/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 deleted file mode 100644 index 5b063d8f5..000000000 --- a/Kenan-Structured-Modpack/DDA_Arcana_Aftershock_Patch/modinfo.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "type": "MOD_INFO", - "id": "Arcana_aftershock_Patch", - "name": "Arcana/Aftershock Patchmod", - "authors": [ "Chaosvolt" ], - "description": "Optional patch mod that allows content in Arcana and Aftershock to interact with each other.", - "version": "DDA version, update 11/29/2022", - "category": "misc_additions", - "dependencies": [ "dda", "Arcana", "aftershock" ] - } -] diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json deleted file mode 100644 index 9d652c3f1..000000000 --- a/Kenan-Structured-Modpack/DDA_Arcana_Cata++_Patch/modinfo.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "type": "MOD_INFO", - "id": "Arcana_Cata++_Patch", - "name": "Arcana/Cata++ Patchmod", - "authors": [ "Chaosvolt", "Noctifer" ], - "description": "Optional patch mod that allows content in Arcana and Cataclysm++ to interact with each other.", - "version": "DDA version, update 5/7/2023", - "category": "misc_additions", - "dependencies": [ "dda", "Arcana", "Cata++" ] - } -] diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json deleted file mode 100644 index 34cd9231b..000000000 --- a/Kenan-Structured-Modpack/DDA_Arcana_Dinomod_Patch/modinfo.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "type": "MOD_INFO", - "id": "Arcana_Dinomod_Patch", - "name": "Arcana/DinoMod Patchmod", - "authors": [ "Chaosvolt" ], - "description": "Optional patch mod that allows content in Arcana and DinoMod to interact with each other.", - "version": "DDA version, update 4/21/2022", - "category": "misc_additions", - "dependencies": [ "dda", "Arcana", "DinoMod" ] - } -] diff --git a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json b/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json deleted file mode 100644 index cd2ee9c23..000000000 --- a/Kenan-Structured-Modpack/DDA_Arcana_Magiclysm_Patch/modinfo.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "type": "MOD_INFO", - "id": "Arcana_Magiclysm_Patch", - "name": "Arcana/Magiclysm Patchmod", - "authors": [ "Chaosvolt" ], - "description": "Optional patch mod that allows content in Arcana and Magiclysm to interact with each other.", - "version": "DDA version, update 4/9/2023", - "category": "misc_additions", - "dependencies": [ "dda", "Arcana", "magiclysm" ] - } -] 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 index 732a08c8e..111cb98ef 100644 --- 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": [ {