From 9866a698467da12c80a8acb1c344874041b086f4 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:07:51 -0600 Subject: [PATCH 1/5] Initial commit --- .../Magiclysm/itemgroups/death_drops.json | 122 ++++++++++++++++++ data/mods/Magiclysm/monsters/goblin.json | 86 +----------- 2 files changed, 127 insertions(+), 81 deletions(-) diff --git a/data/mods/Magiclysm/itemgroups/death_drops.json b/data/mods/Magiclysm/itemgroups/death_drops.json index 8d29adc804a9d..bb03402dd878c 100644 --- a/data/mods/Magiclysm/itemgroups/death_drops.json +++ b/data/mods/Magiclysm/itemgroups/death_drops.json @@ -244,6 +244,128 @@ } ] }, + { + "id": "goblin_warrior_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "feral_goblin_death_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "goblin_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "item": "cudgel", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_slinger_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "feral_goblin_death_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "goblin_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "item": "sling", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_chieftan_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "feral_goblin_death_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "goblin_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "goblin_chieftan_weapon_drops", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_scrap_xs", "prob": 40, "damage": [ 1, 4 ] }, + { "item": "xs_legguard_scrap", "prob": 40, "damage": [ 1, 4 ] }, + { "item": "xs_boots_scrap", "prob": 40, "damage": [ 1, 4 ] }, + { "item": "xs_armguard_scrap", "prob": 40, "damage": [ 1, 4 ] }, + { "item": "xs_cuirass_scrap", "prob": 40, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_chieftan_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ + { "group": "survivor_stabbing", "prob": 96, "damage": [ 1, 4 ] }, + { "item": "spear_steel_plus_one", "prob": 3, "damage": [ 1, 4 ] }, + { "item": "rune_biomancer_weapon", "prob": 1, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_bugbear_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "bugbear_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_weapon_drops", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_bugbear_stalker_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "bugbear_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_stalker_weapon_drops", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "bugbear_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "survivor_machete", "prob": 98 }, { "item": "broadsword_plus_one", "prob": 2 } ] + }, + { + "id": "bugbear_stalker_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_stabbing", "prob": 97 }, { "item": "spear_steel_plus_one", "prob": 3 } ] + }, + { + "id": "bugbear_clothing_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "loincloth_fur", "prob": 75 }, + { "item": "footrags_fur", "prob": 25 }, + { "item": "gloves_wraps_fur", "prob": 25 }, + { "item": "bellywrap_fur", "prob": 10 }, + { "item": "chestwrap_fur", "prob": 25 } + ] + }, + { + "id": "bugbear_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "xl_helmet_larmor", "prob": 20 }, + { "item": "xl_gauntlets_larmor", "prob": 20 }, + { "item": "xl_boots_larmor", "prob": 20 }, + { "item": "xl_armguard_larmor", "prob": 20 }, + { "item": "xl_armor_larmor_chest", "prob": 10 } + ] + }, + { + "id": "orc_warrior_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "bugbear_armor_drops", "prob": 96 }, + { "item": "loincloth_fur", "prob": 10 }, + { "item": "footrags_fur", "prob": 10 }, + { "item": "gloves_wraps_fur", "prob": 10 }, + { "item": "bellywrap_fur", "prob": 5 }, + { "item": "chestwrap_fur", "prob": 5 }, + { "group": "bugbear_stalker_drops", "prob": 95 } + ] + }, { "id": "mossling_drops", "type": "item_group", diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json index 38bfa11d342c2..0cb7bb81aad0c 100644 --- a/data/mods/Magiclysm/monsters/goblin.json +++ b/data/mods/Magiclysm/monsters/goblin.json @@ -45,18 +45,7 @@ "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ], - "death_drops": { - "subtype": "collection", - "items": [ - { "group": "feral_goblin_death_drops", "prob": 100 }, - { "item": "helmet_scrap_xs", "prob": 40 }, - { "item": "xs_legguard_scrap", "prob": 40 }, - { "item": "xs_boots_scrap", "prob": 40 }, - { "item": "xs_armguard_scrap", "prob": 40 }, - { "item": "xs_cuirass_scrap", "prob": 40 }, - { "item": "cudgel", "prob": 95 } - ] - }, + "death_drops": "goblin_warrior_death_drops", "armor": { "bash": 12, "cut": 12, "bullet": 4 }, "zombify_into": "mon_zombie_goblin", "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER", "REVIVES", "GROUP_MORALE", "WIELDED_WEAPON" ] @@ -68,18 +57,7 @@ "description": "A goblin, but like something out of history. Over the dirty, tattered remnants of their street clothes, they're wearing improvised armor and carrying a sling with a pouch for extra stones. They look at you like a wolf seeing a particularly juicy hunk of lamb.", "copy-from": "mon_goblin_warrior", "melee_skill": 2, - "death_drops": { - "subtype": "collection", - "items": [ - { "group": "feral_goblin_death_drops", "prob": 100 }, - { "item": "helmet_scrap", "prob": 40 }, - { "item": "legguard_scrap", "prob": 40 }, - { "item": "boots_scrap", "prob": 40 }, - { "item": "armguard_scrap", "prob": 40 }, - { "item": "cuirass_scrap", "prob": 40 }, - { "item": "sling", "prob": 95 } - ] - }, + "death_drops": "goblin_slinger_death_drops", "starting_ammo": { "pebble": 30 }, "extend": { "special_attacks": [ @@ -129,25 +107,7 @@ "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ], - "death_drops": { - "subtype": "collection", - "items": [ - { "group": "feral_goblin_death_drops", "prob": 100 }, - { "item": "helmet_scrap", "prob": 40 }, - { "item": "legguard_scrap", "prob": 40 }, - { "item": "boots_scrap", "prob": 40 }, - { "item": "armguard_scrap", "prob": 40 }, - { "item": "cuirass_scrap", "prob": 40 }, - { - "distribution": [ - { "group": "survivor_stabbing", "prob": 96 }, - { "item": "spear_steel_plus_one", "prob": 3 }, - { "item": "rune_biomancer_weapon", "prob": 1 } - ], - "prob": 100 - } - ] - } + "death_drops": "goblin_chieftan_death_drops" }, { "type": "MONSTER", @@ -324,25 +284,7 @@ } ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "xl_helmet_larmor", "prob": 20 }, - { "item": "xl_gauntlets_larmor", "prob": 20 }, - { "item": "xl_boots_larmor", "prob": 20 }, - { "item": "xl_armguard_larmor", "prob": 20 }, - { "item": "xl_armor_larmor_chest", "prob": 10 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { - "distribution": [ { "item": "survivor_machete", "prob": 98 }, { "item": "broadsword_plus_one", "prob": 2 } ], - "prob": 100 - } - ] - }, + "death_drops": "goblin_bugbear_death_drops", "armor": { "bash": 4, "cut": 12, "bullet": 8 }, "flags": [ "SEES", @@ -384,25 +326,7 @@ "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ], - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "xl_helmet_larmor", "prob": 20 }, - { "item": "xl_gauntlets_larmor", "prob": 20 }, - { "item": "xl_boots_larmor", "prob": 20 }, - { "item": "xl_armguard_larmor", "prob": 20 }, - { "item": "xl_armor_larmor_chest", "prob": 10 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { - "distribution": [ { "group": "survivor_stabbing", "prob": 97 }, { "item": "spear_steel_plus_one", "prob": 3 } ], - "prob": 100 - } - ] - }, + "death_drops": "goblin_bugbear_stalker_drops", "extend": { "flags": [ "CAMOUFLAGE", "SILENTMOVES" ] } } ] From 9981d11b9efcbb55303ab3b92cdb56354d5effe4 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:20:05 -0600 Subject: [PATCH 2/5] Add orcs --- .../Magiclysm/itemgroups/death_drops.json | 88 +++++++++++++++++-- data/mods/Magiclysm/monsters/orcs.json | 84 +----------------- 2 files changed, 84 insertions(+), 88 deletions(-) diff --git a/data/mods/Magiclysm/itemgroups/death_drops.json b/data/mods/Magiclysm/itemgroups/death_drops.json index bb03402dd878c..ebba5261b7e70 100644 --- a/data/mods/Magiclysm/itemgroups/death_drops.json +++ b/data/mods/Magiclysm/itemgroups/death_drops.json @@ -353,17 +353,89 @@ ] }, { - "id": "orc_warrior_drops", + "id": "orc_warrior_death_drops", "type": "item_group", "subtype": "collection", "entries": [ - { "group": "bugbear_armor_drops", "prob": 96 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { "group": "bugbear_stalker_drops", "prob": 95 } + { "group": "orc_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "orc_warrior_weapon_drops", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "orc_archer_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "orc_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "orc_archer_melee_weapon_drops", "prob": 50, "damage": [ 1, 4 ] }, + { "group": "orc_archer_ranged_weapon_drops", "prob": 50, "damage": [ 1, 4 ] } + ] + }, + { + "id": "orc_blood_warrior_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "orc_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "orc_blood_warrior_weapon_drops", "prob": 95, "damage": [ 1, 4 ] } + ] + }, + { + "id": "orc_blood_mage_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "group": "orc_armor_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "bugbear_clothing_drops", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "magic_plants_common", "prob": 10 }, + { "group": "magic_plants_uncommon", "prob": 1 } + ] + }, + { + "id": "orc_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ + { "item": "survivor_machete", "prob": 96 }, + { "item": "arming_sword_plus_one", "prob": 2 }, + { "item": "broadsword_plus_one", "prob": 2 } + ] + }, + { + "id": "orc_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_scrap", "prob": 20 }, + { "item": "armguard_scrap", "prob": 20 }, + { "item": "boots_scrap", "prob": 20 }, + { "item": "legguard_scrap", "prob": 20 }, + { "item": "cuirass_scrap", "prob": 10 } + ] + }, + { + "id": "orc_archer_melee_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "sheath", "contents-item": "knife_combat", "prob": 100 } ] + }, + { + "id": "orc_archer_ranged_weapon_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "longbow", "prob": 85 }, { "item": "quiver_large", "contents-group": "quiver_orc_archer", "prob": 50 } ] + }, + { + "id": "orc_blood_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ + { "item": "mace_pipe_large", "prob": 96 }, + { "item": "mace_plus_one", "prob": 2 }, + { "item": "warhammer_plus_one", "prob": 2 } ] }, { diff --git a/data/mods/Magiclysm/monsters/orcs.json b/data/mods/Magiclysm/monsters/orcs.json index 7f7772bada1f3..42e96804fa402 100644 --- a/data/mods/Magiclysm/monsters/orcs.json +++ b/data/mods/Magiclysm/monsters/orcs.json @@ -71,29 +71,7 @@ ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "zombify_into": "mon_zorc", - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "helmet_scrap", "prob": 20 }, - { "item": "legguard_scrap", "prob": 20 }, - { "item": "boots_scrap", "prob": 20 }, - { "item": "armguard_scrap", "prob": 20 }, - { "item": "cuirass_scrap", "prob": 10 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { - "distribution": [ - { "item": "survivor_machete", "prob": 96 }, - { "item": "arming_sword_plus_one", "prob": 2 }, - { "item": "broadsword_plus_one", "prob": 2 } - ], - "prob": 100 - } - ] - }, + "death_drops": "orc_warrior_death_drops", "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER", "SWARMS", "GROUP_MORALE", "WIELDED_WEAPON" ] }, { @@ -103,24 +81,7 @@ "description": "Like a goblin, but stretched and exaggerated until they're as tall as a human but much more heavily muscled, wearing improvised armor and carrying a bow. They smile silently, baring a set of sharp teeth, as they aim at you.", "copy-from": "mon_orc_warrior", "melee_skill": 2, - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "helmet_scrap", "prob": 40 }, - { "item": "legguard_scrap", "prob": 40 }, - { "item": "boots_scrap", "prob": 40 }, - { "item": "armguard_scrap", "prob": 40 }, - { "item": "cuirass_scrap", "prob": 40 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { "item": "longbow", "prob": 100 }, - { "item": "sheath", "contents-item": "knife_combat", "prob": 50 }, - { "item": "quiver_large", "contents-group": "quiver_orc_archer", "prob": 100 } - ] - }, + "death_drops": "orc_archer_death_drops", "starting_ammo": { "arrow_wood_heavy": 60 }, "extend": { "special_attacks": [ @@ -175,29 +136,7 @@ "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ], - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "helmet_scrap", "prob": 20 }, - { "item": "legguard_scrap", "prob": 10 }, - { "item": "boots_scrap", "prob": 10 }, - { "item": "armguard_scrap", "prob": 30 }, - { "item": "cuirass_scrap", "prob": 20 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { - "distribution": [ - { "item": "mace_pipe_large", "prob": 96 }, - { "item": "mace_plus_one", "prob": 2 }, - { "item": "warhammer_plus_one", "prob": 2 } - ], - "prob": 100 - } - ] - } + "death_drops": "orc_blood_warrior_death_drops" }, { "id": "mon_orc_mage_blood", @@ -240,21 +179,6 @@ "monster_message": "%1$s makes a frenzied cry and as they point, %3$s is surrounded by a red glow." } ], - "death_drops": { - "subtype": "collection", - "items": [ - { "item": "helmet_scrap", "prob": 20 }, - { "item": "legguard_scrap", "prob": 10 }, - { "item": "boots_scrap", "prob": 10 }, - { "item": "cuirass_scrap", "prob": 20 }, - { "item": "loincloth_fur", "prob": 10 }, - { "item": "footrags_fur", "prob": 10 }, - { "item": "gloves_wraps_fur", "prob": 10 }, - { "item": "bellywrap_fur", "prob": 5 }, - { "item": "chestwrap_fur", "prob": 5 }, - { "group": "magic_plants_common", "prob": 10 }, - { "group": "magic_plants_uncommon", "prob": 1 } - ] - } + "death_drops": "orc_blood_mage_death_drops" } ] From 613fa375e1c80d712723f3a700bf79bf4837e09a Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:37:38 -0600 Subject: [PATCH 3/5] Add Innawood integration --- .../Magiclysm/itemgroups/death_drops.json | 1 + .../innawood/orc_goblin_lootgroups.json | 93 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json diff --git a/data/mods/Magiclysm/itemgroups/death_drops.json b/data/mods/Magiclysm/itemgroups/death_drops.json index ebba5261b7e70..9a0307a0282f1 100644 --- a/data/mods/Magiclysm/itemgroups/death_drops.json +++ b/data/mods/Magiclysm/itemgroups/death_drops.json @@ -349,6 +349,7 @@ { "item": "xl_gauntlets_larmor", "prob": 20 }, { "item": "xl_boots_larmor", "prob": 20 }, { "item": "xl_armguard_larmor", "prob": 20 }, + { "item": "xl_legguard_larmor", "prob": 20 }, { "item": "xl_armor_larmor_chest", "prob": 10 } ] }, diff --git a/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json new file mode 100644 index 0000000000000..c755853fbceb5 --- /dev/null +++ b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json @@ -0,0 +1,93 @@ +[ + { + "id": "goblin_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_larmor_xs", "prob": 40 }, + { "item": "xs_legguard_larmor", "prob": 40 }, + { "item": "xs_boots_larmor", "prob": 40 }, + { "item": "xs_armguard_larmor", "prob": 40 }, + { "item": "xs_gauntlets_larmor", "prob": 40 }, + { "item": "armor_larmor_chest_xs", "prob": 40 } + ] + }, + { + "id": "goblin_chieftan_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_stabbing", "prob": 99 }, { "item": "rune_biomancer_weapon", "prob": 1 } ] + }, + { + "id": "bugbear_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "survivor_cutting", "prob": 100 } ] + }, + { + "id": "bugbear_stalker_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_stabbing", "prob": 100 } ] + }, + { + "id": "bugbear_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "xl_helmet_larmor", "prob": 20 }, + { "item": "xl_gauntlets_larmor", "prob": 20 }, + { "item": "xl_boots_larmor", "prob": 20 }, + { "item": "xl_armguard_larmor", "prob": 20 }, + { "item": "xl_legguard_larmor", "prob": 20 }, + { "item": "xl_armor_larmor_chest", "prob": 10 } + ] + }, + { + "id": "orc_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ + { "item": "survivor_machete", "prob": 96 }, + { "item": "arming_sword_plus_one", "prob": 2 }, + { "item": "broadsword_plus_one", "prob": 2 } + ] + }, + { + "id": "orc_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_larmor", "prob": 40 }, + { "item": "legguard_larmor", "prob": 40 }, + { "item": "boots_larmor", "prob": 40 }, + { "item": "armguard_larmor", "prob": 40 }, + { "item": "gauntlets_larmor", "prob": 40 }, + { "item": "armor_larmor_chest", "prob": 40 } + ] + }, + { + "id": "orc_archer_melee_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "sheath", "contents-item": "primitive_knife", "prob": 100 } ] + }, + { + "id": "orc_archer_ranged_weapon_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "longbow", "prob": 85 }, { "item": "quiver_large", "contents-group": "quiver_orc_archer", "prob": 50 } ] + }, + { + "id": "orc_blood_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "lizardfolk_club", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "quiver_orc_archer", + "entries": [ { "item": "arrow_heavy_fire_hardened_fletched", "count": [ 1, 6 ], "charges": [ 1, 10 ] } ] + } +] From 74b7dba2dd0ea4d5273f971d53c0692a401b9657 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 11 Dec 2024 20:47:20 -0600 Subject: [PATCH 4/5] Fixes --- .../Magiclysm/itemgroups/death_drops.json | 4 +- .../innawood/orc_goblin_lootgroups.json | 202 ++++++++++-------- data/mods/Magiclysm/monsters/goblin.json | 2 +- 3 files changed, 112 insertions(+), 96 deletions(-) diff --git a/data/mods/Magiclysm/itemgroups/death_drops.json b/data/mods/Magiclysm/itemgroups/death_drops.json index 9a0307a0282f1..f58777b089ba8 100644 --- a/data/mods/Magiclysm/itemgroups/death_drops.json +++ b/data/mods/Magiclysm/itemgroups/death_drops.json @@ -297,7 +297,7 @@ ] }, { - "id": "goblin_bugbear_drops", + "id": "goblin_bugbear_death_drops", "type": "item_group", "subtype": "collection", "entries": [ @@ -307,7 +307,7 @@ ] }, { - "id": "goblin_bugbear_stalker_drops", + "id": "goblin_bugbear_stalker_death_drops", "type": "item_group", "subtype": "collection", "entries": [ diff --git a/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json index c755853fbceb5..e378aaa341908 100644 --- a/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json +++ b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json @@ -1,93 +1,109 @@ -[ - { - "id": "goblin_armor_drops", - "type": "item_group", - "subtype": "collection", - "entries": [ - { "item": "helmet_larmor_xs", "prob": 40 }, - { "item": "xs_legguard_larmor", "prob": 40 }, - { "item": "xs_boots_larmor", "prob": 40 }, - { "item": "xs_armguard_larmor", "prob": 40 }, - { "item": "xs_gauntlets_larmor", "prob": 40 }, - { "item": "armor_larmor_chest_xs", "prob": 40 } - ] - }, - { - "id": "goblin_chieftan_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "group": "survivor_stabbing", "prob": 99 }, { "item": "rune_biomancer_weapon", "prob": 1 } ] - }, - { - "id": "bugbear_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "item": "survivor_cutting", "prob": 100 } ] - }, - { - "id": "bugbear_stalker_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "group": "survivor_stabbing", "prob": 100 } ] - }, - { - "id": "bugbear_armor_drops", - "type": "item_group", - "subtype": "collection", - "entries": [ - { "item": "xl_helmet_larmor", "prob": 20 }, - { "item": "xl_gauntlets_larmor", "prob": 20 }, - { "item": "xl_boots_larmor", "prob": 20 }, - { "item": "xl_armguard_larmor", "prob": 20 }, - { "item": "xl_legguard_larmor", "prob": 20 }, - { "item": "xl_armor_larmor_chest", "prob": 10 } - ] - }, - { - "id": "orc_warrior_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ - { "item": "survivor_machete", "prob": 96 }, - { "item": "arming_sword_plus_one", "prob": 2 }, - { "item": "broadsword_plus_one", "prob": 2 } - ] - }, - { - "id": "orc_armor_drops", - "type": "item_group", - "subtype": "collection", - "entries": [ - { "item": "helmet_larmor", "prob": 40 }, - { "item": "legguard_larmor", "prob": 40 }, - { "item": "boots_larmor", "prob": 40 }, - { "item": "armguard_larmor", "prob": 40 }, - { "item": "gauntlets_larmor", "prob": 40 }, - { "item": "armor_larmor_chest", "prob": 40 } - ] - }, - { - "id": "orc_archer_melee_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "item": "sheath", "contents-item": "primitive_knife", "prob": 100 } ] - }, - { - "id": "orc_archer_ranged_weapon_drops", - "type": "item_group", - "subtype": "collection", - "entries": [ { "item": "longbow", "prob": 85 }, { "item": "quiver_large", "contents-group": "quiver_orc_archer", "prob": 50 } ] - }, - { - "id": "orc_blood_warrior_weapon_drops", - "type": "item_group", - "subtype": "distribution", - "entries": [ { "item": "lizardfolk_club", "prob": 100 } ] - }, - { - "type": "item_group", - "subtype": "collection", - "id": "quiver_orc_archer", - "entries": [ { "item": "arrow_heavy_fire_hardened_fletched", "count": [ 1, 6 ], "charges": [ 1, 10 ] } ] - } -] +[ + { + "type": "item_group", + "subtype": "collection", + "id": "feral_goblin_death_drops", + "entries": [ + { "group": "shoes_unisex", "prob": 40, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "npc_hat", "prob": 10, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "male_underwear_bottom", "prob": 100, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "female_underwear_top", "prob": 100, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "item": "chestwrap_leather", "prob": 20, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "pants_male", "prob": 75, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "npc_coat", "prob": 2, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, + { "group": "npc_gloves", "prob": 50, "damage": [ 1, 4 ] }, + { "item": "wicker_backpack", "prob": 1, "damage": [ 1, 4 ] } + ] + }, + { + "id": "goblin_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_larmor_xs", "prob": 40 }, + { "item": "xs_legguard_larmor", "prob": 40 }, + { "item": "xs_boots_larmor", "prob": 40 }, + { "item": "xs_armguard_larmor", "prob": 40 }, + { "item": "xs_gauntlets_larmor", "prob": 40 }, + { "item": "armor_larmor_chest_xs", "prob": 40 } + ] + }, + { + "id": "goblin_chieftan_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_stabbing", "prob": 99 }, { "item": "rune_biomancer_weapon", "prob": 1 } ] + }, + { + "id": "bugbear_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_cutting", "prob": 100 } ] + }, + { + "id": "bugbear_stalker_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "group": "survivor_stabbing", "prob": 100 } ] + }, + { + "id": "bugbear_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "xl_helmet_larmor", "prob": 20 }, + { "item": "xl_gauntlets_larmor", "prob": 20 }, + { "item": "xl_boots_larmor", "prob": 20 }, + { "item": "xl_armguard_larmor", "prob": 20 }, + { "item": "xl_legguard_larmor", "prob": 20 }, + { "item": "xl_armor_larmor_chest", "prob": 10 } + ] + }, + { + "id": "orc_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ + { "item": "survivor_machete", "prob": 96 }, + { "item": "arming_sword_plus_one", "prob": 2 }, + { "item": "broadsword_plus_one", "prob": 2 } + ] + }, + { + "id": "orc_armor_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "helmet_larmor", "prob": 40 }, + { "item": "legguard_larmor", "prob": 40 }, + { "item": "boots_larmor", "prob": 40 }, + { "item": "armguard_larmor", "prob": 40 }, + { "item": "gauntlets_larmor", "prob": 40 }, + { "item": "armor_larmor_chest", "prob": 40 } + ] + }, + { + "id": "orc_archer_melee_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "sheath", "contents-item": "primitive_knife", "prob": 100 } ] + }, + { + "id": "orc_archer_ranged_weapon_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "longbow", "prob": 85 }, { "item": "quiver_large", "contents-group": "quiver_orc_archer", "prob": 50 } ] + }, + { + "id": "orc_blood_warrior_weapon_drops", + "type": "item_group", + "subtype": "distribution", + "entries": [ { "item": "lizardfolk_club", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "quiver_orc_archer", + "entries": [ { "item": "arrow_heavy_fire_hardened_fletched", "count": [ 1, 6 ], "charges": [ 1, 10 ] } ] + } +] diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json index 0cb7bb81aad0c..5772f94ab9d9c 100644 --- a/data/mods/Magiclysm/monsters/goblin.json +++ b/data/mods/Magiclysm/monsters/goblin.json @@ -326,7 +326,7 @@ "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ], - "death_drops": "goblin_bugbear_stalker_drops", + "death_drops": "goblin_bugbear_stalker_death_drops", "extend": { "flags": [ "CAMOUFLAGE", "SILENTMOVES" ] } } ] From dfa3de4508017d5b8848e42498359c4f07742101 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 11 Dec 2024 21:01:22 -0600 Subject: [PATCH 5/5] Fix encampment itemgroups --- .../innawood/orc_goblin_lootgroups.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json index e378aaa341908..daf849678e367 100644 --- a/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json +++ b/data/mods/Magiclysm/mod_interactions/innawood/orc_goblin_lootgroups.json @@ -1,4 +1,21 @@ [ + { + "type": "item_group", + "id": "bed", + "subtype": "distribution", + "entries": [ { "item": "grass_blanket", "prob": 2500 } ] + }, + { + "type": "item_group", + "id": "midden_heap", + "//": "a large pile of trash, made for goblin encampments.", + "subtype": "collection", + "items": [ + { "group": "trash_forest", "prob": 95 }, + { "group": "trash_forest", "prob": 70 }, + { "group": "trash_forest", "prob": 25 } + ] + }, { "type": "item_group", "subtype": "collection", @@ -11,7 +28,7 @@ { "item": "chestwrap_leather", "prob": 20, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, { "group": "pants_male", "prob": 75, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, { "group": "npc_coat", "prob": 2, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, - { "group": "npc_gloves", "prob": 50, "damage": [ 1, 4 ] }, + { "group": "npc_gloves", "prob": 50, "damage": [ 1, 4 ], "custom-flags": [ "UNDERSIZE" ] }, { "item": "wicker_backpack", "prob": 1, "damage": [ 1, 4 ] } ] },