From a037dfacf30ba25fc7f93401f242b2f09359de91 Mon Sep 17 00:00:00 2001 From: Bella Date: Thu, 3 Dec 2020 21:30:28 -0600 Subject: [PATCH 1/8] adding them moxies --- .../items/comestibles/alienfood.json | 101 +++++++- .../mods/Aftershock/mobs/monster_faction.json | 11 + data/mods/Aftershock/mobs/species.json | 13 + data/mods/Aftershock/mobs/zombies.json | 242 ++++++++++++++++++ .../Aftershock/monsterdrops/monsterdrops.json | 12 + data/mods/Aftershock/speech.json | 42 +++ 6 files changed, 419 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/comestibles/alienfood.json b/data/mods/Aftershock/items/comestibles/alienfood.json index 87637fd4c1de2..ab2c8da882261 100644 --- a/data/mods/Aftershock/items/comestibles/alienfood.json +++ b/data/mods/Aftershock/items/comestibles/alienfood.json @@ -16,7 +16,7 @@ "volume": "5 ml", "charges": 3, "fun": -8, - "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "vitA", 20 ], [ "vitC", 56 ] ] + "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "vitA", 20 ], [ "vitC", 56 ], [ "mutant_toxin", 25 ] ] }, { "id": "yum_lichen_extra", @@ -34,6 +34,103 @@ "volume": "5 ml", "charges": 3, "fun": -3, - "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "vitA", 20 ], [ "vitC", 56 ] ] + "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "vitA", 20 ], [ "vitC", 56 ], [ "mutant_toxin", 25 ] ] + }, + { + "id": "frost_human_flesh", + "copy-from": "flesh", + "type": "COMESTIBLE", + "name": { "str": "chunk of frostbitten human meat", "str_pl": "chunks of frostbitten human meat" }, + "description": "Freshly butchered meat from a frozen human carcass, not the most appetizing.", + "weight": "296 g", + "volume": "250 ml", + "price": 500, + "price_postapoc": 50, + "spoils_in": "1 day", + "calories": 402, + "healthy": -1, + "fun": -10, + "cooks_like": "meat_cooked", + "vitamins": [ [ "vitC", 13 ], [ "calcium", 2 ], [ "iron", 53 ], [ "vitB", 778 ], [ "mutant_toxin", 25 ] ], + "flags": [ "SMOKABLE", "RAW" ], + "smoking_result": "meat_smoked" + }, + { + "id": "frost_hstomach", + "copy-from": "flesh", + "type": "COMESTIBLE", + "name": "frostbitten human stomach", + "description": "A shriveled grey stomach, it hasn't seen use in a very long time.", + "weight": "72 g", + "volume": "250 ml", + "vitamins": [ [ "mutant_toxin", 25 ] ], + "price_postapoc": 25, + "price": 200, + "spoils_in": "8 hours", + "calories": 60, + "quench": 1, + "healthy": -1, + "fun": -15 + }, + { + "type": "COMESTIBLE", + "id": "frost_bone_human", + "category": "spare_parts", + "name": { "str": "frostbitten human bone" }, + "weight": "225 g", + "color": "white", + "symbol": "%", + "description": "A stretched bumpy piece of bone, unpleasant to hold.", + "price": 0, + "price_postapoc": 10, + "material": [ "bone" ], + "milling": { "into": "meal_bone", "conversion_rate": 4 }, + "volume": "250 ml", + "vitamins": [ [ "calcium", 96 ], [ "mutant_toxin", 25 ] ] + }, + { + "type": "COMESTIBLE", + "id": "frost_human_fat", + "name": { "str": "chunk of frostbitten human fat", "str_pl": "chunks of frostbitten human fat" }, + "weight": "220 g", + "color": "pink", + "spoils_in": "3 days", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -10, + "healthy": -5, + "price_postapoc": 250, + "calories": 1923, + "description": "Light green fat, smelling absolutely rancid. You could eat it, but it wouldn't be worth it.", + "price": 0, + "material": [ "flesh" ], + "volume": "250 ml", + "vitamins": [ [ "mutant_toxin", 25 ] ], + "parasites": 32, + "stack_size": 1, + "fun": -20 + }, + { + "type": "COMESTIBLE", + "id": "frost_raw_hleather", + "category": "spare_parts", + "name": "raw frostbitten human skin", + "weight": "100 g", + "volume": "125 ml", + "color": "pink", + "spoils_in": "1 day 12 hours", + "comestible_type": "FOOD", + "symbol": ",", + "quench": -2, + "healthy": -1, + "calories": 350, + "description": "A carefully folded raw skin harvested from a human corpse. It is stained blue from frostbite. You can cure it for storage and tanning, or eat it if you're desperate enough.", + "price": 330, + "price_postapoc": 20, + "material": [ "flesh" ], + "flags": [ "TRADER_AVOID" ], + "vitamins": [ [ "mutant_toxin", 25 ] ], + "stack_size": 1, + "fun": -12 } ] diff --git a/data/mods/Aftershock/mobs/monster_faction.json b/data/mods/Aftershock/mobs/monster_faction.json index e74ee8171bf92..327257628e91a 100644 --- a/data/mods/Aftershock/mobs/monster_faction.json +++ b/data/mods/Aftershock/mobs/monster_faction.json @@ -21,5 +21,16 @@ "neutral": "herbivore", "by_mood": [ "insect", "small_animal", "player" ], "hate": "zombie" + }, + { + "type": "MONSTER_FACTION", + "name": "moxie", + "neutral": "bio_machine", + "hate": [ "small_animal", "herbivore", "insect", "player" ] + }, + { + "type": "MONSTER_FACTION", + "name": "bio_machine", + "neutral": [ "moxie", "small_animal", "herbivore", "insect", "player" ] } ] diff --git a/data/mods/Aftershock/mobs/species.json b/data/mods/Aftershock/mobs/species.json index 56be5a0860dda..6cd2bf9513ef7 100644 --- a/data/mods/Aftershock/mobs/species.json +++ b/data/mods/Aftershock/mobs/species.json @@ -4,5 +4,18 @@ "id": "UPLIFT", "description": "an intelligent animal created by man before the Cataclysm", "fear_triggers": [ "HURT", "FIRE", "FRIEND_DIED" ] + }, + { + "type": "SPECIES", + "id": "MOXIE", + "description": "a humanoid monster", + "footsteps": "shuffling." + }, + { + "type": "SPECIES", + "id": "BIOMACHINE", + "description": "an unusual creature", + "fear_triggers": [ "HURT", "FIRE", "FRIEND_DIED" ], + "footsteps": "shuffling." } ] diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json index 3859737a9de0f..24b61d3a6a319 100644 --- a/data/mods/Aftershock/mobs/zombies.json +++ b/data/mods/Aftershock/mobs/zombies.json @@ -267,5 +267,247 @@ "FILTHY", "LOUDMOVES" ] + }, + { + "id": "mon_moxie_scavenger", + "type": "MONSTER", + "name": { "str": "MoxPhore Scavenger" }, + "description": "A human stands here, towering around 2 meters high. It's flesh is frozen solid, colored black and blue from frostbite. It constantly scratches at its flesh with its claw like hands, surveying the land with frozen and foggy eyes. ", + "default_faction": "moxie", + "bodytype": "human", + "species": [ "MOXIE" ], + "diff": 5, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 100, + "speed": 115, + "material": [ "flesh" ], + "symbol": "A", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 6, + "melee_dice": 2, + "melee_dice_sides": 4, + "melee_cut": 4, + "dodge": 4, + "vision_day": 25, + "regenerates": 5, + "harvest": "frost_human", + "death_drops": "default_moxie_human_death_drops", + "special_attacks": [ + { "type": "bite", "cooldown": 5 }, + { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] } + ], + "death_function": [ "NORMAL" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "SWIMS", + "WARM", + "BASHES", + "GROUP_BASH", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY" + ] + }, + { + "id": "mon_moxie_spartan", + "type": "MONSTER", + "name": { "str": "MoxPhore Spartan" }, + "description": "A human stands here, its body bulging and ripped as the tissue is torn, showing bluish muscle, and grey bones. Ice crystals jut out of its visible wounds as it wanders.", + "default_faction": "moxie", + "bodytype": "human", + "species": [ "MOXIE" ], + "diff": 5, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 270, + "speed": 70, + "material": [ "flesh" ], + "symbol": "$", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 6, + "melee_dice": 2, + "melee_dice_sides": 4, + "melee_cut": 4, + "dodge": 4, + "vision_day": 40, + "regenerates": 15, + "harvest": "frost_human", + "death_drops": "default_moxie_human_death_drops", + "special_attacks": [ + [ "LONGSWIPE", 20 ], + { "type": "bite", "cooldown": 5 }, + { + "id": "scratch", + "cooldown": 10, + "accuracy": 6, + "damage_max_instance": [ + { "damage_type": "stab", "amount": 8, "armor_multiplier": 0.3 }, + { "damage_type": "bash", "amount": 16, "armor_multiplier": 0.3 } + ] + } + ], + "death_function": [ "NORMAL" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "SWIMS", + "WARM", + "BASHES", + "GROUP_BASH", + "DESTROYS", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "PUSH_VEH", + "FILTHY" + ] + }, + { + "id": "mon_moxie_regenerator", + "type": "MONSTER", + "name": { "str": "MoxPhore Scrounger" }, + "description": "A human stands here, comically thin and scratching It's scar-ridden flesh, any flesh it rips off grows back in seconds.", + "default_faction": "moxie", + "bodytype": "human", + "species": [ "MOXIE" ], + "diff": 5, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 30, + "speed": 100, + "material": [ "flesh" ], + "symbol": "Q", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 4, + "melee_dice": 2, + "melee_dice_sides": 2, + "melee_cut": 2, + "dodge": 2, + "vision_day": 40, + "regenerates": 20, + "harvest": "frost_human", + "death_drops": "default_moxie_human_death_drops", + "special_attacks": [ + { "type": "bite", "cooldown": 5 }, + { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 6 } ] } + ], + "death_function": [ "NORMAL" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "SWIMS", + "WARM", + "BASHES", + "GROUP_BASH", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY" + ] + }, + { + "id": "mon_moxie_grabby", + "type": "MONSTER", + "name": { "str": "MoxPhore Tangler" }, + "description": "A human stands here, several rust-colored limbs jut out of its back, moving around and grabbing at the air while the person looks blankly around..", + "default_faction": "moxie", + "bodytype": "human", + "species": [ "MOXIE" ], + "diff": 5, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 110, + "speed": 100, + "material": [ "flesh" ], + "symbol": "V", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 4, + "melee_dice": 2, + "melee_dice_sides": 4, + "melee_cut": 4, + "grab_strength": 5, + "dodge": 2, + "vision_day": 25, + "regenerates": 5, + "harvest": "frost_human", + "death_drops": "default_moxie_human_death_drops", + "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 20 ] ], + "death_function": [ "NORMAL" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "SWIMS", + "WARM", + "BASHES", + "GROUP_BASH", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY" + ] + }, + { + "id": "mon_human_biomachine", + "type": "MONSTER", + "name": { "str": "Speaker" }, + "description": "A starfish like creature stands here, covered in black mettalic fur as it stands out, pointing in a specific direction.", + "default_faction": "bio_machine", + "bodytype": "human", + "species": [ "BIOMACHINE" ], + "diff": 5, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 110, + "speed": 100, + "material": [ "flesh" ], + "symbol": "X", + "color": "red", + "aggression": 0, + "morale": 100, + "melee_skill": 4, + "melee_dice": 2, + "melee_dice_sides": 2, + "melee_cut": 2, + "dodge": 2, + "vision_day": 25, + "regenerates": 5, + "harvest": "frost_human", + "death_drops": "default_moxie_human_death_drops", + "special_attacks": [ [ "PARROT", 0 ] ], + "death_function": [ "NORMAL" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "SWIMS", + "WARM", + "BASHES", + "GROUP_BASH", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY", + "GUILT" + ] } ] diff --git a/data/mods/Aftershock/monsterdrops/monsterdrops.json b/data/mods/Aftershock/monsterdrops/monsterdrops.json index 29c72ce088d0a..23393e4a19af2 100644 --- a/data/mods/Aftershock/monsterdrops/monsterdrops.json +++ b/data/mods/Aftershock/monsterdrops/monsterdrops.json @@ -79,5 +79,17 @@ { "group": "military", "prob": 50 }, { "group": "mil_food", "prob": 100 } ] + }, + { + "id": "frost_human", + "type": "harvest", + "entries": [ + { "drop": "frost_human_flesh", "type": "flesh", "mass_ratio": 0.2 }, + { "drop": "frost_hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, + { "drop": "frost_human_fat", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "frost_bone_human", "type": "bone", "mass_ratio": 0.12 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "frost_raw_hleather", "type": "skin", "mass_ratio": 0.01 } + ] } ] diff --git a/data/mods/Aftershock/speech.json b/data/mods/Aftershock/speech.json index ca377d8624fc4..eebd4c266c7cf 100644 --- a/data/mods/Aftershock/speech.json +++ b/data/mods/Aftershock/speech.json @@ -64,5 +64,47 @@ "speaker": "mon_utilibot_beehive", "sound": "\"bzzzzzz.\"", "volume": 3 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"west, west, west, west, west\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"east, east, east, east, east\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"south, south, south, south, south\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"north, north, north, north, north\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"Where am I? Where am I? Where am I?\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"It's very cold, It's very cold, It's very cold\"", + "volume": 60 + }, + { + "type": "speech", + "speaker": "mon_human_biomachine", + "sound": "\"dark, dark, where is everything\"", + "volume": 60 } ] From 9b3d6f7d09184bf6e9a2f05517d9b6901648e181 Mon Sep 17 00:00:00 2001 From: Bella Date: Sat, 5 Dec 2020 20:37:31 -0600 Subject: [PATCH 2/8] death groups and spawns --- data/mods/Aftershock/mobs/monster_groups.json | 12 ++ .../monsterdrops/monster_default.json | 194 ++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 data/mods/Aftershock/monsterdrops/monster_default.json diff --git a/data/mods/Aftershock/mobs/monster_groups.json b/data/mods/Aftershock/mobs/monster_groups.json index b81b89fcdf451..1dc0246f5d911 100644 --- a/data/mods/Aftershock/mobs/monster_groups.json +++ b/data/mods/Aftershock/mobs/monster_groups.json @@ -131,5 +131,17 @@ { "monster": "mon_uplifted_octupus", "freq": 3, "cost_multiplier": 10 }, { "monster": "mon_zombie_upliftedoctopus", "freq": 1, "cost_multiplier": 10 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_LAB", + "default": "mon_zombie_scientist", + "monsters": [ + { "monster": "mon_moxie_scavenger", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, + { "monster": "mon_moxie_spartan", "freq": 25, "cost_multiplier": 0 }, + { "monster": "mon_moxie_regenerator", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, + { "monster": "mon_moxie_grabby", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, + { "monster": "mon_human_biomachine", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, + ] } ] diff --git a/data/mods/Aftershock/monsterdrops/monster_default.json b/data/mods/Aftershock/monsterdrops/monster_default.json new file mode 100644 index 0000000000000..a87c8985adc54 --- /dev/null +++ b/data/mods/Aftershock/monsterdrops/monster_default.json @@ -0,0 +1,194 @@ +[ + { + "type": "item_group", + "subtype": "collection", + "//": "contains cloth for an average human moxie", + "id": "default_moxie_human_clothes", + "entries": [ + { "group": "coats_unisex_afs", "damage": [ 1, 4 ], "prob": 20 }, + { "item": "thermal_shirt", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "common_gloves_afs", "damage": [ 1, 4 ], "prob": 20 }, + { "group": "hatstore_hats_afs", "damage": [ 1, 4 ], "prob": 20 }, + { "group": "scarfs_unisex_afs", "damage": [ 1, 4 ], "prob": 20 }, + { "group": "accesories_personal_unisex_afs", "damage": [ 1, 4 ], "prob": 15 }, + { + "distribution": [ + { + "collection": [ + { + "distribution": [ + { "group": "male_underwear", "prob": 10, "damage": [ 1, 4 ] }, + { "item": "union_suit", "prob": 90, "damage": [ 1, 4 ] } + ] + }, + { + "distribution": [ + { + "collection": [ + { "group": "pants_unisex_afs", "prob": 60, "damage": [ 1, 4 ] }, + { "group": "shirts_unisex_afs", "prob": 60, "damage": [ 1, 4 ] }, + { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] } + ] + } + ] + }, + { "group": "shoes_unisex_afs", "prob": 30, "damage": [ 1, 4 ] }, + { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 } + ] + }, + { + "collection": [ + { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] }, + { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] }, + { + "distribution": [ + { + "collection": [ + { "group": "pants_unisex_afs", "prob": 60, "damage": [ 1, 4 ] }, + { "group": "shoes_unisex_afs", "prob": 30, "damage": [ 1, 4 ] }, + { "group": "shirts_unisex_afs", "prob": 60, "damage": [ 1, 4 ] }, + { + "distribution": [ + { "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] } ] }, + { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] } + ] + } + ], + "prob": 70 + } + ] + } + ] + } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "//": "items people could have carried in their bags prior to the moxification, that word is a WIP, haha", + "id": "default_moxie_human_item_bags", + "entries": [ + { "group": "bags", "damage": [ 1, 4 ] }, + { "group": "default_moxie_human_items_pockets", "prob": 50 }, + { "group": "homebooks", "prob": 30 }, + { "group": "alcohol_bottled_canned", "prob": 10 }, + { "group": "vending_drink_items", "prob": 25 }, + { "item": "laptop", "prob": 10, "charges-min": 0, "charges-max": 500 }, + { "item": "eink_tablet_pc", "prob": 10, "charges-min": 0, "charges-max": 50 }, + { "item": "vibrator", "prob": 5, "charges-min": 0, "charges-max": 50 }, + { "item": "file", "prob": 10 }, + { "item": "thermos", "prob": 10 }, + { "item": "spray_can", "prob": 10 }, + { + "distribution": [ + { "group": "tools_carpentry", "prob": 33 }, + { "group": "tools_home", "prob": 33 }, + { "group": "tools_electronics", "prob": 33 } + ], + "prob": 5 + }, + { + "distribution": [ + { "item": "camera", "prob": 70, "charges-min": 0, "charges-max": 50 }, + { "item": "camera_pro", "prob": 30, "charges-min": 0, "charges-max": 50 } + ], + "prob": 10 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "//": "items people could have carried in their pockets prior to moxieification", + "id": "default_moxie_human_items_pockets", + "entries": [ + { + "distribution": [ + { "item": "pockknife", "prob": 50 }, + { "item": "knife_folding", "prob": 30 }, + { "item": "knife_swissarmy", "prob": 10 }, + { "item": "switchblade", "prob": 10 } + ], + "prob": 5 + }, + { + "distribution": [ + { "item": "cig", "prob": 65, "charges-min": 0, "charges-max": 20 }, + { "item": "chaw", "prob": 5 }, + { "item": "cigar", "prob": 10 }, + { "item": "handrolled_cig", "prob": 10 }, + { "item": "nic_gum", "prob": 20 }, + { "item": "ecig", "prob": 15 }, + { "collection": [ { "item": "weed" }, { "item": "pipe_glass", "prob": 50 } ], "prob": 10 }, + { "distribution": [ { "item": "joint", "prob": 80 }, { "item": "joint_roach", "prob": 20 } ], "prob": 10 }, + { + "collection": [ + { "item": "tobacco" }, + { "distribution": [ { "item": "rolling_paper", "prob": 80 }, { "item": "pipe_tobacco", "prob": 20 } ] } + ], + "prob": 10 + }, + { "collection": [ { "item": "advanced_ecig" }, { "item": "nicotine_liquid" } ], "prob": 10 }, + { "collection": [ { "item": "crackpipe" }, { "item": "crack" } ], "prob": 5 } + ], + "prob": 50 + }, + { + "distribution": [ + { "item": "lighter", "prob": 100, "charges": [ 0, 100 ] }, + { "item": "ref_lighter", "prob": 40, "charges": [ 0, 50 ] }, + { "item": "matches", "prob": 20, "charges": [ 0, 20 ] } + ], + "prob": 30 + }, + { "distribution": [ { "item": "gum" }, { "item": "caff_gum" } ], "prob": 30 }, + { "item": "mp3", "prob": 18, "charges-min": 0, "charges-max": 15 }, + { "item": "portable_game", "prob": 10, "charges-min": 0, "charges-max": 50 }, + { "item": "game_watch", "prob": 10, "damage": [ 1, 4 ], "charges-min": 0, "charges-max": 50 }, + { "item": "usb_drive", "prob": 10 }, + { "item": "meth", "prob": 2 }, + { "item": "coke", "prob": 2 }, + { "item": "lsd", "prob": 2 }, + { "item": "heroin", "prob": 2 }, + { "item": "mobile_memory_card", "prob": 10 }, + { "item": "flyer", "prob": 30 }, + { "item": "multitool", "prob": 5 }, + { "item": "permanent_marker", "prob": 10, "charges": [ 0, 500 ] }, + { "group": "softdrugs", "prob": 10 }, + { "group": "harddrugs", "prob": 5 }, + { "group": "phones", "prob": 85 }, + { "group": "vending_food_items", "prob": 50 } + ] + }, + { + "type": "item_group", + "subtype": "distribution", + "//": "items that an average zombie carries around and drops on death", + "id": "default_moxie_human_items", + "ammo": 30, + "magazine": 100, + "entries": [ + { "group": "default_moxie_human_item_bags", "prob": 16 }, + { "group": "default_moxie_human_items_pockets", "prob": 20 }, + { "group": "ammo_pistol_common", "prob": 2 }, + { "group": "ammo_shotgun_common", "prob": 1 }, + { "group": "guns_pistol_common", "prob": 2 }, + { "group": "guns_shotgun_common", "prob": 1, "contents-item": "shoulder_strap" }, + { "group": "postman_gear", "prob": 5 }, + { "group": "hardware_plumbing", "prob": 5 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "//": "contains cloth (always), a cash card (10% chance), and a random item (50% chance)", + "id": "default_moxie_human_death_drops", + "entries": [ + { "group": "default_moxie_human_clothes" }, + { "group": "default_moxie_human_items", "prob": 50 }, + { "group": "wallets", "damage": [ 1, 4 ], "prob": 10 } + ] + } +] From 551049dfd3c37d22502bd5d5b5c8379bb318baa9 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sat, 5 Dec 2020 21:50:57 -0600 Subject: [PATCH 3/8] Armor adjustment for vs. ranged encounters. --- data/mods/Aftershock/mobs/zombies.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json index 24b61d3a6a319..e65b004274c19 100644 --- a/data/mods/Aftershock/mobs/zombies.json +++ b/data/mods/Aftershock/mobs/zombies.json @@ -292,7 +292,10 @@ "melee_cut": 4, "dodge": 4, "vision_day": 25, - "regenerates": 5, + "regenerates": 10, + "armor_bullet": 5, + "armor_bash": 3, + "armor_cut": 5, "harvest": "frost_human", "death_drops": "default_moxie_human_death_drops", "special_attacks": [ @@ -323,14 +326,14 @@ "default_faction": "moxie", "bodytype": "human", "species": [ "MOXIE" ], - "diff": 5, + "diff": 10, "volume": "62500 ml", "weight": "81500 g", "hp": 270, "speed": 70, "material": [ "flesh" ], "symbol": "$", - "color": "red", + "color": "i_red", "aggression": 100, "morale": 100, "melee_skill": 6, @@ -340,11 +343,14 @@ "dodge": 4, "vision_day": 40, "regenerates": 15, + "armor_bullet": 30, + "armor_bash": 15, + "armor_cut": 20, "harvest": "frost_human", "death_drops": "default_moxie_human_death_drops", "special_attacks": [ [ "LONGSWIPE", 20 ], - { "type": "bite", "cooldown": 5 }, + [ "GRAB", 20 ], { "id": "scratch", "cooldown": 10, @@ -398,6 +404,9 @@ "dodge": 2, "vision_day": 40, "regenerates": 20, + "armor_bullet": 25, + "armor_bash": 10, + "armor_cut": 20, "harvest": "frost_human", "death_drops": "default_moxie_human_death_drops", "special_attacks": [ From 6648cf6d065918a8ae6239dcba8069a9a48def3f Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sat, 5 Dec 2020 22:05:13 -0600 Subject: [PATCH 4/8] Change neme of Scrounger into Regenerator Droped the Moxphore part because I thought `Moxphore Regenerator` sounded a bit weird --- data/mods/Aftershock/mobs/zombies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json index e65b004274c19..7b5e7ee862eaa 100644 --- a/data/mods/Aftershock/mobs/zombies.json +++ b/data/mods/Aftershock/mobs/zombies.json @@ -382,7 +382,7 @@ { "id": "mon_moxie_regenerator", "type": "MONSTER", - "name": { "str": "MoxPhore Scrounger" }, + "name": { "str": "Regenerator" }, "description": "A human stands here, comically thin and scratching It's scar-ridden flesh, any flesh it rips off grows back in seconds.", "default_faction": "moxie", "bodytype": "human", From 005d0cb8eb3d0a299e9cb99cb7a15119d68a9b80 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sat, 5 Dec 2020 22:27:49 -0600 Subject: [PATCH 5/8] Re-rename regenerator --- data/mods/Aftershock/mobs/zombies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json index 7b5e7ee862eaa..510ec455ac5a2 100644 --- a/data/mods/Aftershock/mobs/zombies.json +++ b/data/mods/Aftershock/mobs/zombies.json @@ -382,7 +382,7 @@ { "id": "mon_moxie_regenerator", "type": "MONSTER", - "name": { "str": "Regenerator" }, + "name": { "str": "MoxPhore Regenerator" }, "description": "A human stands here, comically thin and scratching It's scar-ridden flesh, any flesh it rips off grows back in seconds.", "default_faction": "moxie", "bodytype": "human", From a891102bcc6407cc0b4f76d1536924df44b8b253 Mon Sep 17 00:00:00 2001 From: Bella Date: Sun, 6 Dec 2020 05:15:45 -0600 Subject: [PATCH 6/8] linting and fixes --- data/mods/Aftershock/mobs/monster_groups.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/mobs/monster_groups.json b/data/mods/Aftershock/mobs/monster_groups.json index 1dc0246f5d911..a9c46319d1885 100644 --- a/data/mods/Aftershock/mobs/monster_groups.json +++ b/data/mods/Aftershock/mobs/monster_groups.json @@ -141,7 +141,7 @@ { "monster": "mon_moxie_spartan", "freq": 25, "cost_multiplier": 0 }, { "monster": "mon_moxie_regenerator", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, { "monster": "mon_moxie_grabby", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, - { "monster": "mon_human_biomachine", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }, + { "monster": "mon_human_biomachine", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] } ] } ] From 4fda7b737d86965e940a3634e8c712b56633dffd Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 7 Dec 2020 10:47:08 -0600 Subject: [PATCH 7/8] Fix minor spacing errors --- data/mods/Aftershock/mobs/zombies.json | 2 +- data/mods/Aftershock/speech.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json index 510ec455ac5a2..a4edbaeb1feb5 100644 --- a/data/mods/Aftershock/mobs/zombies.json +++ b/data/mods/Aftershock/mobs/zombies.json @@ -272,7 +272,7 @@ "id": "mon_moxie_scavenger", "type": "MONSTER", "name": { "str": "MoxPhore Scavenger" }, - "description": "A human stands here, towering around 2 meters high. It's flesh is frozen solid, colored black and blue from frostbite. It constantly scratches at its flesh with its claw like hands, surveying the land with frozen and foggy eyes. ", + "description": "A human stands here, towering around 2 meters high. It's flesh is frozen solid, colored black and blue from frostbite. It constantly scratches at its flesh with its claw like hands, surveying the land with frozen and foggy eyes.", "default_faction": "moxie", "bodytype": "human", "species": [ "MOXIE" ], diff --git a/data/mods/Aftershock/speech.json b/data/mods/Aftershock/speech.json index eebd4c266c7cf..cf3ddb6731080 100644 --- a/data/mods/Aftershock/speech.json +++ b/data/mods/Aftershock/speech.json @@ -92,7 +92,7 @@ { "type": "speech", "speaker": "mon_human_biomachine", - "sound": "\"Where am I? Where am I? Where am I?\"", + "sound": "\"Where am I? Where am I? Where am I?\"", "volume": 60 }, { From 55fc9942c6572196302a111ae2ed84f5d33be903 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 7 Dec 2020 21:13:27 -0600 Subject: [PATCH 8/8] Add Moxie clothing item groups Credit for these goes to @Positronic-Girl --- .../Aftershock/itemgroups/clothing_group.json | 176 ++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 data/mods/Aftershock/itemgroups/clothing_group.json diff --git a/data/mods/Aftershock/itemgroups/clothing_group.json b/data/mods/Aftershock/itemgroups/clothing_group.json new file mode 100644 index 0000000000000..b403c9d112b2c --- /dev/null +++ b/data/mods/Aftershock/itemgroups/clothing_group.json @@ -0,0 +1,176 @@ +[ + { + "id": "coats_unisex_afs", + "type": "item_group", + "//": "unisex coats, jackets, cloaks, etc.", + "subtype": "distribution", + "items": [ + { + "distribution": [ + { "item": "cloak", "prob": 80 }, + { "item": "cloak_wool", "prob": 40 }, + { "item": "cloak_leather", "prob": 20 }, + { "item": "cloak_fur", "prob": 10 }, + { "item": "jedi_cloak", "prob": 5 } + ], + "prob": 20 + }, + { + "distribution": [ + { "item": "trenchcoat", "prob": 80 }, + { "item": "trenchcoat_leather", "prob": 60 }, + { "item": "trenchcoat_faux_fur", "prob": 30 }, + { "item": "trenchcoat_fur", "prob": 5 } + ], + "prob": 40 + }, + { + "distribution": [ + { "item": "coat_winter", "prob": 50 }, + { "item": "peacoat", "prob": 50 }, + { "item": "greatcoat", "prob": 35 }, + { "item": "coat_faux_fur", "prob": 20 }, + { "item": "coat_fur", "prob": 10 }, + { "item": "coat_fur_sf", "prob": 5 } + ], + "prob": 80 + }, + { + "distribution": [ + { "item": "jacket_leather", "prob": 50 }, + { "item": "jacket_leather_red", "prob": 25 }, + { "item": "poncho", "prob": 30 }, + { "item": "ski_jacket", "prob": 25 } + ], + "prob": 60 + }, + { "distribution": [ { "item": "army_top", "prob": 40 }, { "item": "blazer", "prob": 70 } ], "prob": 40 } + ] + }, + { + "type": "item_group", + "id": "common_gloves_afs", + "subtype": "distribution", + "entries": [ + { "item": "gloves_light", "prob": 15 }, + { "item": "gloves_leather", "prob": 15 }, + { "item": "gloves_wool", "prob": 15 }, + { "item": "gloves_winter", "prob": 10 }, + { "item": "gloves_liner", "prob": 15 }, + { "item": "mittens", "prob": 5 }, + { "item": "thermal_gloves", "prob": 2 } + ] + }, + { + "type": "item_group", + "id": "hatstore_hats_afs", + "items": [ [ "hat_cotton", 30 ], [ "hat_knit", 40 ], [ "hat_faux_fur", 30 ], [ "hat_fur", 20 ], [ "balclava", 20 ] ] + }, + { + "id": "scarfs_unisex_afs", + "type": "item_group", + "//": "unisex scarfs and fabric coverings", + "subtype": "distribution", + "items": [ + { "item": "bandana", "prob": 90 }, + { "item": "balclava", "prob": 50 }, + { "item": "headscarf", "prob": 50 }, + { "item": "scarf_fur_long", "prob": 10 }, + { "item": "scarf_fur", "prob": 20 }, + { "item": "scarf", "prob": 80 }, + { "item": "scarf_long", "prob": 40 }, + { "item": "long_knit_scarf", "prob": 40 }, + { "item": "knit_scarf", "prob": 80 }, + { "item": "keffiyeh", "prob": 30 }, + { "item": "mask_ski", "prob": 30 }, + { "item": "thermal_mask", "prob": 5 } + ] + }, + { + "id": "accesories_personal_unisex_afs", + "type": "item_group", + "//": "unisex personal accessories", + "subtype": "collection", + "items": [ + { "group": "clothing_glasses", "prob": 50 }, + { "group": "clothing_watch", "prob": 15 }, + { "group": "accessory_ring", "prob": 15 }, + { "group": "accessory_earring", "prob": 15 }, + { "group": "accessory_bracelet", "prob": 15 }, + { "group": "accessory_teeth", "prob": 5 }, + { "group": "accessory_necklace", "prob": 15 }, + { "group": "accessory_cat", "prob": 5 }, + { "group": "accessory_weaponcarry", "prob": 15 }, + { "group": "accessory_sportsgear", "prob": 15 }, + { "item": "tool_belt", "prob": 10 }, + { "item": "leather_belt", "prob": 60 }, + { "item": "wearable_light", "prob": 30, "charges": [ 0, 100 ] }, + { "item": "binoculars", "prob": 10 }, + { "item": "whistle", "prob": 30 }, + { "item": "harmonica_holder", "prob": 10 }, + { "group": "flask_liquor", "prob": 10 } + ] + }, + { + "type": "item_group", + "id": "pants_unisex_afs", + "subtype": "distribution", + "entries": [ + { "item": "jeans", "prob": 90 }, + { "item": "jeans_red", "prob": 50 }, + { "item": "pants", "prob": 75 }, + { "item": "pants_leather", "prob": 60 }, + { "item": "pants_cargo", "prob": 70 }, + { "item": "pants_ski", "prob": 45 }, + { "item": "pants_fur", "prob": 5 }, + { "item": "pants_faux_fur", "prob": 15 }, + { "item": "breeches", "prob": 25 } + ] + }, + { + "id": "shirts_unisex_afs", + "type": "item_group", + "//": "unisex shirts", + "subtype": "distribution", + "items": [ + { "item": "longshirt", "prob": 70 }, + { "item": "arm_warmers", "prob": 20 }, + { "item": "armguard_soft", "prob": 10 }, + { "item": "dress_shirt", "prob": 50 }, + { "item": "flag_shirt", "prob": 15 }, + { "item": "linuxtshirt", "prob": 10 }, + { "item": "polo_shirt", "prob": 30 }, + { "item": "sweater", "prob": 40 }, + { "item": "turtleneck", "prob": 15 }, + { "item": "turtleneck_shirt", "prob": 15 }, + { "item": "sweatshirt", "prob": 50 }, + { "item": "tank_top", "prob": 30 }, + { "item": "tshirt", "prob": 80 }, + { "item": "tshirt_text", "prob": 50 }, + { "item": "waistcoat", "prob": 10 }, + { "item": "wool_hoodie", "prob": 10 }, + { "item": "hoodie", "prob": 40 } + ] + }, + { + "id": "shoes_unisex_afs", + "type": "item_group", + "//": "unisex shoes (there are no men's only shoes)", + "subtype": "distribution", + "items": [ + { + "distribution": [ + { "item": "boots", "prob": 80 }, + { "item": "boots_hiking", "prob": 50 }, + { "item": "boots_steel", "prob": 50 }, + { "item": "boots_combat", "prob": 45 }, + { "item": "boots_fur", "prob": 10 }, + { "item": "boots_winter", "prob": 30 }, + { "item": "knee_high_boots", "prob": 15 }, + { "item": "motorbike_boots", "prob": 35 } + ], + "prob": 60 + } + ] + } +]