From b4511adff52cf5a684d9cd826da3071be52d1633 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 6 Jun 2024 14:03:34 -0500 Subject: [PATCH 01/14] Start with the actual code ports, fixing for item identity Co-Authored-By: RenechCDDA <84619419+renechcdda@users.noreply.github.com> --- src/item.cpp | 8 +++++++ src/item.h | 1 + src/map.cpp | 46 ++++++++++++++++++++++++++++++++++++++++ src/map.h | 7 ++++++ src/monstergenerator.cpp | 2 ++ src/mtype.cpp | 1 + src/mtype.h | 1 + 7 files changed, 66 insertions(+) diff --git a/src/item.cpp b/src/item.cpp index fdce9ba2634a..80b773fb4e77 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -9911,6 +9911,9 @@ detached_ptr item::process_internal( detached_ptr &&self, player *ca if( comestible && !self ) { here.rotten_item_spawn( obj, pos ); } + if( self->is_corpse() ) { + here.handle_decayed_corpse( obj, pos ); + } } return std::move( self ); } @@ -10113,6 +10116,11 @@ std::string item::type_name( unsigned int quantity ) const return ret_name; } +const mtype *item::get_corpse_mon() const +{ + return corpse; +} + std::string item::get_corpse_name() { if( corpse_name.empty() ) { diff --git a/src/item.h b/src/item.h index ffe99649022a..34f4f0b5d82f 100644 --- a/src/item.h +++ b/src/item.h @@ -2322,6 +2322,7 @@ class item : public location_visitable, public game_object void add_component( detached_ptr &&comp ); const location_vector &get_components() const; location_vector &get_components(); + const mtype *get_corpse_mon() const; private: location_vector components; const itype *curammo = nullptr; diff --git a/src/map.cpp b/src/map.cpp index 282412a2a8a8..548792f47b84 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7273,6 +7273,52 @@ void map::remove_rotten_items( Container &items, const tripoint &pnt, temperatur } ); } +void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) +{ + if( !it.is_corpse() ) { + debugmsg( "Tried to decay a non-corpse item %s. Aborted", it.tname() ); + return; + } + const mtype *dead_monster = it.get_corpse_mon(); + if( !dead_monster ) { + debugmsg( "Corpse at tripoint %s has no associated monster?!", pnt.to_string() ); + return; + } + + if( dead_monster->decay.is_null() ) { + return; + } + int decayed_weight_grams = to_gram( dead_monster->weight ); // corpse might have stuff in it! + decayed_weight_grams += std::round( decayed_weight_grams * rng_float( -0.1, 0.1 ) ); + bool notify_player = false; + if( calendar::once_every( 30_minutes ) ) { + //one corpse max in 30 minutes will notify if seen, for *all* the items it left + notify_player = true; + } + + bool anything_left = false; + for( const harvest_entry &entry : dead_monster->decay.obj() ) { + detached_ptr harvest = item::spawn( entry.drop, calendar::turn ); + const float random_decay_modifier = rng_float( 0.0f, static_cast( MAX_SKILL ) ); + const float min_num = entry.scale_num.first * random_decay_modifier + entry.base_num.first; + const float max_num = entry.scale_num.second * random_decay_modifier + entry.base_num.second; + int roll = 0; + if( entry.mass_ratio != 0.00f ) { + roll = static_cast( std::round( entry.mass_ratio * decayed_weight_grams ) ); + roll = std::ceil( static_cast( roll ) / to_gram( harvest->weight() ) ); + } else { + roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); + } + anything_left = roll > 0; + for( int i = 0; i < roll; i++ ) { + add_item_or_charges( pnt, std::move( harvest ) ); + if( anything_left && notify_player && g->u.sees( pnt ) ) { + add_msg( m_info, _( "You notice a %1$s has rotted away, leaving a %2$s" ), it.tname(), harvest->tname() ); + } + } + } +} + void map::rotten_item_spawn( const item &item, const tripoint &pnt ) { if( g->critter_at( pnt ) != nullptr ) { diff --git a/src/map.h b/src/map.h index ec38116d1512..20f5b1ea49c2 100644 --- a/src/map.h +++ b/src/map.h @@ -1666,6 +1666,13 @@ class map */ void spawn_monsters( bool ignore_sight ); + /** + * Checks to see if the corpse that is rotting away generates items when it does. + * @param it item that is spawning creatures + * @param pnt The point on this map where the item is and where bones/etc will be + */ + void handle_decayed_corpse( const item &it, const tripoint &pnt ); + /** * Checks to see if the item that is rotting away generates a creature when it does. * @param item item that is spawning creatures diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 83aa515f2d6d..d6589875ee2f 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -829,6 +829,8 @@ void mtype::load( const JsonObject &jo, const std::string &src ) assign( jo, "harvest", harvest ); + optional( jo, was_loaded, "decay", decay ); + const auto death_reader = make_flag_reader( gen.death_map, "monster death function" ); optional( jo, was_loaded, "death_function", dies, death_reader ); if( dies.empty() ) { diff --git a/src/mtype.cpp b/src/mtype.cpp index 9556997f3ae7..3487006e1567 100644 --- a/src/mtype.cpp +++ b/src/mtype.cpp @@ -53,6 +53,7 @@ mtype::mtype() dies.push_back( &mdeath::normal ); sp_defense = nullptr; harvest = harvest_id( "human" ); + decay = harvest_id( "null" ); luminance = 0; bash_skill = 0; diff --git a/src/mtype.h b/src/mtype.h index 48d71aaa5df1..6a27edb7363c 100644 --- a/src/mtype.h +++ b/src/mtype.h @@ -315,6 +315,7 @@ struct mtype { damage_instance melee_damage; // Basic melee attack damage harvest_id harvest; + harvest_id decay; float luminance; // 0 is default, >0 gives luminance to lightmap unsigned int def_chance; // How likely a special "defensive" move is to trigger (0-100%, default 0) From c3d3163cd56f7cd4c64fb89f9ed6c5d2f5b04934 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 6 Jun 2024 20:08:28 -0500 Subject: [PATCH 02/14] feat (port): corpses decay into items, actually implement in JSON --- data/json/harvest.json | 64 +++---- data/json/harvest_decay.json | 162 ++++++++++++++++++ data/json/monsters/bird.json | 12 +- data/json/monsters/cyborgs.json | 4 +- data/json/monsters/feral_humans.json | 22 +-- data/json/monsters/fish.json | 30 ++-- data/json/monsters/fungus.json | 24 +-- data/json/monsters/insect_spider.json | 96 +++++------ data/json/monsters/jabberwock.json | 6 +- data/json/monsters/mammal.json | 128 +++++++------- data/json/monsters/marloss.json | 4 +- data/json/monsters/mi-go.json | 12 +- data/json/monsters/mutant_animal.json | 20 +-- data/json/monsters/mutant_human.json | 6 +- data/json/monsters/nether.json | 26 +-- data/json/monsters/power_leech.json | 12 +- data/json/monsters/reptile_amphibian.json | 10 +- data/json/monsters/slugs.json | 2 +- data/json/monsters/triffid.json | 18 +- data/json/monsters/zed-animal.json | 22 +-- data/json/monsters/zed-classic.json | 22 +-- data/json/monsters/zed_acid.json | 8 +- data/json/monsters/zed_burned.json | 6 +- data/json/monsters/zed_children.json | 14 +- data/json/monsters/zed_electric.json | 8 +- data/json/monsters/zed_explosive.json | 2 +- data/json/monsters/zed_fusion.json | 4 +- data/json/monsters/zed_lab.json | 4 +- data/json/monsters/zed_medical.json | 6 +- data/json/monsters/zed_misc.json | 52 +++--- data/json/monsters/zed_radiation.json | 10 +- data/json/monsters/zed_skeletal.json | 8 +- data/json/monsters/zed_soldiers.json | 18 +- data/json/monsters/zed_survivor.json | 2 +- .../mod/json/reference/creatures/monsters.md | 16 ++ src/item.cpp | 2 +- src/map.cpp | 22 +-- src/monstergenerator.cpp | 2 +- src/mtype.cpp | 2 +- 39 files changed, 532 insertions(+), 356 deletions(-) create mode 100644 data/json/harvest_decay.json diff --git a/data/json/harvest.json b/data/json/harvest.json index 144311f9d451..c6004d227c5d 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -161,7 +161,7 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -175,7 +175,7 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -188,7 +188,7 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -202,7 +202,7 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -539,6 +539,7 @@ "message": "", "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } @@ -550,11 +551,11 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 } + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } ] }, { @@ -562,9 +563,10 @@ "type": "harvest", "message": "", "entries": [ - { "drop": "mutant_meat", "base_num": [ 40, 55 ], "scale_num": [ 0.5, 0.7 ], "max": 80, "type": "flesh" }, - { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.45, 0.9 ], "max": 15, "type": "skin" }, - { "drop": "mutant_fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" } + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] }, { @@ -574,7 +576,7 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } @@ -587,7 +589,7 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] }, @@ -597,8 +599,8 @@ "message": "What appeared to be insect hairs on the chitin of this creature look more like tiny feathers as you pare them back. Inside is a bundle of bubble-like tissue sacs that appear to be floating, which doesn't fit with what you know about real bees.", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.23 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -611,8 +613,8 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -625,8 +627,8 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.2 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -641,10 +643,11 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.15 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.005 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0045 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.025 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }, { "drop": "egg_dragonfly", "type": "offal", "base_num": [ 5, 35 ], "scale_num": [ 0.3, 0.5 ] } ] }, @@ -655,7 +658,7 @@ "//": "copied from arachnid_flying+egg", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, @@ -793,7 +796,7 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] @@ -805,7 +808,7 @@ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] @@ -818,7 +821,7 @@ { "drop": "meat", "type": "flesh", "mass_ratio": 0.4 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.03 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.001 } @@ -838,10 +841,9 @@ "type": "harvest", "message": "You laboriously hack and dig through the remains of the fungal mass.", "entries": [ - { "drop": "veggy", "base_num": [ 6, 10 ], "scale_num": [ 0.6, 0.8 ], "max": 20, "type": "flesh" }, - { "drop": "veggy_tainted", "base_num": [ 16, 25 ], "scale_num": [ 0.6, 0.8 ], "max": 50, "type": "flesh" }, - { "drop": "plant_sac", "base_num": [ 3, 6 ], "scale_num": [ 0.7, 0.9 ], "max": 10, "type": "offal" }, - { "drop": "stick_fiber", "base_num": [ 4, 8 ], "scale_num": [ 0.5, 0.7 ], "max": 10, "type": "bone" } + { "drop": "veggy_tainted", "type": "flesh", "mass_ratio": 0.5 }, + { "drop": "plant_sac", "type": "offal", "mass_ratio": 0.2 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } ] }, { @@ -1072,7 +1074,7 @@ "id": "triffid_small", "type": "harvest", "entries": [ - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.5 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 } ] @@ -1081,7 +1083,7 @@ "id": "triffid_large", "type": "harvest", "entries": [ - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.4 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 }, { "drop": "stick", "type": "bone", "mass_ratio": 0.05 } @@ -1092,7 +1094,7 @@ "type": "harvest", "entries": [ { "drop": "log", "type": "bone", "mass_ratio": 0.35 }, - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 } ] diff --git a/data/json/harvest_decay.json b/data/json/harvest_decay.json new file mode 100644 index 000000000000..5168f4f77528 --- /dev/null +++ b/data/json/harvest_decay.json @@ -0,0 +1,162 @@ +[ + { + "id": "decay_animal_standard", + "type": "harvest", + "entries": [ { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } ] + }, + { + "id": "decay_animal_wool", + "type": "harvest", + "entries": [ + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.04 } + ] + }, + { + "id": "decay_arthopod_acid", + "type": "harvest", + "entries": [ { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] + }, + { + "id": "decay_arthopod_centipede", + "type": "harvest", + "entries": [ { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] + }, + { + "id": "decay_arthopod_centipede_mega", + "type": "harvest", + "entries": [ + { "drop": "sinew", "type": "bone", "mass_ratio": 0.05 }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.3 } + ] + }, + { + "id": "decay_arthopod_bee", + "type": "harvest", + "entries": [ + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } + ] + }, + { + "id": "decay_arthopod_flying", + "type": "harvest", + "entries": [ + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } + ] + }, + { + "id": "decay_arthopod_standard", + "type": "harvest", + "entries": [ { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } ] + }, + { + "id": "decay_arthopod_wasp", + "type": "harvest", + "entries": [ + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } + ] + }, + { + "id": "decay_bird", + "type": "harvest", + "entries": [ { "drop": "feather", "type": "skin", "mass_ratio": 0.01 } ] + }, + { + "id": "decay_bird_large", + "type": "harvest", + "entries": [ { "drop": "feather", "type": "skin", "mass_ratio": 0.02 }, { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_broken_cyborg", + "type": "harvest", + "entries": [ + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "cable", "base_num": [ 1, 3 ], "scale_num": [ 0.2, 0.6 ], "max": 8, "type": "flesh" }, + { "drop": "bone_human", "base_num": [ 1, 2 ], "scale_num": [ 0.4, 0.7 ], "max": 10, "type": "bone" }, + { "drop": "scrap", "base_num": [ 1, 5 ], "scale_num": [ 0.3, 0.7 ], "max": 12, "type": "bone" } + ] + }, + { + "id": "decay_fish", + "type": "harvest", + "entries": [ { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_flesh_golem", + "type": "harvest", + "entries": [ { "drop": "flesh_golem_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ] + }, + { + "id": "decay_jabberwock", + "type": "harvest", + "entries": [ { "drop": "jabberwock_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ] + }, + { + "id": "decay_human", + "type": "harvest", + "//": "Default result used if decay isn't specified for that monster, also used by generic corpses and NPCs", + "entries": [ + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } + ] + }, + { + "id": "decay_mammal_plus_chitin", + "type": "harvest", + "entries": [ + { "drop": "bone", "type": "bone", "mass_ratio": 0.2 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.01 } + ] + }, + { + "id": "decay_plantlike", + "type": "harvest", + "entries": [ { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_plantlike_triffidqueen", + "type": "harvest", + "entries": [ { "drop": "log", "type": "bone", "mass_ratio": 0.35 }, { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_shellfish", + "type": "harvest", + "entries": [ { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_zombie_mrbones", + "type": "harvest", + "entries": [ + { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } + ] + }, + { + "id": "decay_zombie_kevlar", + "type": "harvest", + "entries": [ + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.035 } + ] + }, + { + "id": "decay_zombie_thorny", + "type": "harvest", + "entries": [ { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 } ] + }, + { + "id": "decay_zombie_standard", + "type": "harvest", + "entries": [ + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } + ] + } +] diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 9349fbe19315..4b2d019ed64c 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -22,7 +22,7 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 4, - "harvest": "bird_tiny", + "harvest": "bird_tiny","decay": "decay_bird", "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "death_function": [ "NORMAL" ], @@ -62,7 +62,7 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "bird_tiny", + "harvest": "bird_tiny","decay": "decay_bird", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_crow", "baby_count": 3, "baby_timer": 8 }, @@ -91,7 +91,7 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "bird_small", + "harvest": "bird_small","decay": "decay_bird", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_duck", "baby_count": 3, "baby_timer": 5 }, @@ -133,7 +133,7 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 3, - "harvest": "bird_small", + "harvest": "bird_small","decay": "decay_bird", "vision_day": 50, "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -179,7 +179,7 @@ "melee_dice_sides": 1, "melee_cut": 3, "dodge": 6, - "harvest": "bird_tiny", + "harvest": "bird_tiny","decay": "decay_bird", "reproduction": { "baby_egg": "egg_cockatrice", "baby_count": 3, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -209,7 +209,7 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 1, - "harvest": "bird_tiny", + "harvest": "bird_tiny","decay": "decay_bird", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 14, "into": "mon_chicken" }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BIRDFOOD" ] diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json index 37a7a628f462..5d22ea81a9cd 100644 --- a/data/json/monsters/cyborgs.json +++ b/data/json/monsters/cyborgs.json @@ -28,7 +28,7 @@ "revert_to_itype": "bot_broken_cyborg", "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], - "harvest": "mon_broken_cyborg", + "harvest": "mon_broken_cyborg","decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", @@ -72,7 +72,7 @@ "revert_to_itype": "bot_prototype_cyborg", "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], - "harvest": "mon_broken_cyborg", + "harvest": "mon_broken_cyborg","decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index d440a8a3d7d9..d33c376d638b 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -22,7 +22,7 @@ "melee_dice_sides": 3, "melee_cut": 0, "dodge": 1, - "harvest": "human", + "harvest": "human","decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -122,7 +122,7 @@ "melee_dice_sides": 3, "melee_cut": 2, "dodge": 1, - "harvest": "CBM_SCI_FERAL", + "harvest": "CBM_SCI_FERAL","decay": "decay_human", "path_settings": { "max_dist": 10 }, "vision_day": 50, "vision_night": 3, @@ -171,7 +171,7 @@ "armor_bullet": 10, "armor_stab": 4, "dodge": 1, - "harvest": "human_maybe_mil_bionics", + "harvest": "human_maybe_mil_bionics","decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -240,7 +240,7 @@ "armor_stab": 4, "dodge": 1, "luminance": 500, - "harvest": "human_maybe_mil_bionics", + "harvest": "human_maybe_mil_bionics","decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -274,7 +274,7 @@ "copy-from": "mon_feral_human_pipe", "melee_dice": 2, "melee_dice_sides": 8, - "harvest": "human_maybe_tech_bionics", + "harvest": "human_maybe_tech_bionics","decay": "decay_human", "death_drops": "feral_humans_death_drops_tool" }, { @@ -303,7 +303,7 @@ "armor_bullet": 6, "vision_day": 50, "vision_night": 3, - "harvest": "human_maybe_survivalist_bionics", + "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", "starting_ammo": { "shot_00": 5 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -365,7 +365,7 @@ "melee_dice_sides": 3, "melee_cut": 0, "dodge": 1, - "harvest": "human", + "harvest": "human","decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -495,7 +495,7 @@ "armor_acid": 4, "vision_day": 50, "vision_night": 3, - "harvest": "human_maybe_survivalist_bionics", + "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", "starting_ammo": { "9mm": 3 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -562,7 +562,7 @@ "vision_day": 50, "vision_night": 4, "luminance": 500, - "harvest": "human_maybe_survivalist_bionics", + "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", "special_attacks": [ [ "PARROT_AT_DANGER", 5 ] ], "death_function": [ "NORMAL" ], "death_drops": "mon_feral_survivalist_death_drops", @@ -612,7 +612,7 @@ "armor_acid": 5, "vision_day": 50, "vision_night": 4, - "harvest": "human_maybe_survivalist_bionics", + "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", "luminance": 500, "starting_ammo": { "223": 10 }, "special_attacks": [ @@ -676,7 +676,7 @@ "armor_cut": 25, "armor_bullet": 35, "dodge": 4, - "harvest": "human_maybe_mil_bionics", + "harvest": "human_maybe_mil_bionics","decay": "decay_human", "vision_night": 5, "path_settings": { "max_dist": 40, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, "special_attacks": [ [ "PARROT_AT_DANGER", 0 ] ], diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index b1706ea5fdf3..e552c20fd6a7 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -27,7 +27,7 @@ "armor_bullet": 24, "vision_day": 30, "vision_night": 20, - "harvest": "mutant_shellfish", + "harvest": "mutant_shellfish","decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], @@ -63,7 +63,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_tiny", + "harvest": "fish_tiny","decay": "null", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -94,7 +94,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small", + "harvest": "fish_small","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -125,7 +125,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small", + "harvest": "fish_small","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -156,7 +156,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_large", + "harvest": "fish_large","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -187,7 +187,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_large", + "harvest": "fish_large","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -511,7 +511,7 @@ "melee_dice_sides": 4, "melee_cut": 1, "luminance": 0, - "harvest": "lobster", + "harvest": "lobster","decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 180 }, "baby_flags": [ "SUMMER", "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -540,7 +540,7 @@ "melee_dice_sides": 3, "melee_cut": 1, "luminance": 0, - "harvest": "shellfish", + "harvest": "shellfish","decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 21 }, "baby_flags": [ "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -571,7 +571,7 @@ "luminance": 5, "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small", + "harvest": "fish_small","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -598,7 +598,7 @@ "luminance": 0, "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small", + "harvest": "fish_small","decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -624,7 +624,7 @@ "dodge": 2, "armor_cut": 8, "armor_bullet": 6, - "harvest": "shellfish", + "harvest": "shellfish","decay": "decay_shellfish", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -657,7 +657,7 @@ "armor_bullet": 14, "vision_day": 30, "vision_night": 15, - "harvest": "mutant_shellfish", + "harvest": "mutant_shellfish","decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -688,7 +688,7 @@ "melee_cut": 2, "dodge": 5, "luminance": 0, - "harvest": "mutant_fish", + "harvest": "mutant_fish","decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 1, "baby_timer": 6 }, "baby_flags": [ "SPRING" ], "death_function": [ "NORMAL" ], @@ -717,7 +717,7 @@ "melee_cut": 2, "dodge": 5, "luminance": 0, - "harvest": "mutant_fish", + "harvest": "mutant_fish","decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 150 }, "baby_flags": [ "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -747,7 +747,7 @@ "dodge": 6, "vision_day": 1, "vision_night": 30, - "harvest": "mutant_fish", + "harvest": "mutant_fish","decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 19 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 5 }, diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json index dac44a5a5e71..98c3ba3c25b2 100644 --- a/data/json/monsters/fungus.json +++ b/data/json/monsters/fungus.json @@ -24,7 +24,7 @@ "armor_bash": 2, "vision_day": 30, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "FUNGUS", "NORMAL" ], @@ -169,7 +169,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "armor_bash": 4, - "harvest": "fungaloid", + "harvest": "fungaloid","decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS", 30 ] ], "death_function": [ "FUNGUS", "NORMAL" ], "flags": [ "STUMBLES", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -197,7 +197,7 @@ "armor_bullet": 8, "special_attacks": [ [ "FUNGUS_SPROUT", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass", + "harvest": "fungaloid_mass","decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -224,7 +224,7 @@ "luminance": 200, "special_attacks": [ [ "FUNGUS_BIG_BLOSSOM", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass", + "harvest": "fungaloid_mass","decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -255,7 +255,7 @@ "special_attacks": [ [ "FUNGUS_FORTIFY", 10 ] ], "death_drops": "marloss_yellow_drops", "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass", + "harvest": "fungaloid_mass","decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "HARDTOSHOOT", "NO_BREATHE", "QUEEN" ] }, { @@ -283,7 +283,7 @@ "armor_bash": 4, "armor_cut": 4, "armor_bullet": 3, - "harvest": "fungaloid", + "harvest": "fungaloid","decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS_GROWTH", 10000 ] ], "death_function": [ "NORMAL" ], "flags": [ "HEARS", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -336,7 +336,7 @@ "armor_bash": 3, "vision_day": 5, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 200 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -402,7 +402,7 @@ "armor_fire": 5, "vision_day": 5, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], "death_function": [ "FUNGUS" ], @@ -436,7 +436,7 @@ "armor_bullet": 36, "vision_day": 5, "vision_night": 5, - "harvest": "mr_bones", + "harvest": "mr_bones","decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "FUNGUS" ], @@ -482,7 +482,7 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ], [ "FUNGUS", 200 ] ], "death_drops": { "subtype": "collection", @@ -522,7 +522,7 @@ "armor_bullet": 1, "vision_day": 3, "vision_night": 3, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGUS", 200 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "POISON", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -555,7 +555,7 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGAL_TRAIL", 3 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 53df33eda948..e6ea8dc70585 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -22,7 +22,7 @@ "melee_cut": 4, "dodge": 4, "armor_bash": 6, - "harvest": "arachnid_acid", + "harvest": "arachnid_acid","decay": "decay_arthopod_acid", "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "HEARS", "GOODHEARING", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "ACIDTRAIL" ] }, @@ -50,7 +50,7 @@ "armor_bash": 12, "armor_cut": 8, "armor_bullet": 6, - "harvest": "meatslug", + "harvest": "meatslug","decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS" ] }, @@ -76,7 +76,7 @@ "melee_dice_sides": 6, "melee_cut": 0, "armor_bash": 2, - "harvest": "mutant_meatslug", + "harvest": "mutant_meatslug","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -102,7 +102,7 @@ "melee_dice_sides": 6, "melee_cut": 3, "armor_bash": 2, - "harvest": "mutant_meatslug", + "harvest": "mutant_meatslug","decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -134,7 +134,7 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid_tainted", + "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 1, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_plague_vector" }, @@ -168,7 +168,7 @@ "melee_cut": 0, "vision_day": 10, "vision_night": 3, - "harvest": "arachnid_tainted", + "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", "upgrades": { "age_grow": 7, "into": "mon_skittering_plague" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -202,7 +202,7 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid_tainted", + "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 3, "baby_timer": 5 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], @@ -237,7 +237,7 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 4, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_pregnant_giant_cockroach" }, @@ -269,7 +269,7 @@ "melee_cut": 0, "vision_day": 10, "vision_night": 3, - "harvest": "mutant_animal_tiny", + "harvest": "mutant_animal_tiny","decay": "null", "upgrades": { "age_grow": 7, "into": "mon_giant_cockroach" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -303,7 +303,7 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 3, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL", "PREG_ROACH" ], @@ -350,7 +350,7 @@ "armor_bullet": 5, "vision_day": 10, "vision_night": 5, - "harvest": "arachnid_bee", + "harvest": "arachnid_bee","decay": "decay_arthopod_bee", "anger_triggers": [ "HURT", "FRIEND_DIED", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "SWARMS", "GROUP_MORALE", "CANPLAY", "PATH_AVOID_FIRE", "LOUDMOVES" ] @@ -435,7 +435,7 @@ "vision_day": 9, "vision_night": 6, "anger_triggers": [ "STALK", "PLAYER_CLOSE" ], - "harvest": "arachnid_centipede", + "harvest": "arachnid_centipede","decay": "decay_arthopod_centipede", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_GIANT" }, "flags": [ "CLIMBS", "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE" ] @@ -478,7 +478,7 @@ "dodge": 0, "proportional": { "vision_day": 0.5, "vision_night": 0.5 }, "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], - "harvest": "arachnid_centipede_mom", + "harvest": "arachnid_centipede_mom","decay": "decay_arthopod_centipede", "reproduction": { "baby_monster": "mon_centipede_small", "baby_count": 2, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_MOM" }, @@ -527,7 +527,7 @@ "vision_day": 12, "vision_night": 7, "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT" ], - "harvest": "arachnid_centipede_mega", + "harvest": "arachnid_centipede_mom_mega","decay": "decay_arthopod_centipede_mega", "flags": [ "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "DESTROYS", "PUSH_MON", "PUSH_VEH" ] }, { @@ -548,7 +548,7 @@ "speed": 95, "vision_day": 15, "dodge": 2, - "harvest": "arachnid_firefly", + "harvest": "arachnid_firefly","decay": "decay_arthopod_flying", "reproduction": { "baby_egg": "egg_firefly", "baby_count": 1, "baby_timer": 15 }, "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "HURT" ], @@ -581,7 +581,7 @@ "dodge": 3, "vision_day": 25, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -622,7 +622,7 @@ "dodge": 2, "vision_day": 45, "vision_night": 5, - "harvest": "arachnid_flying", + "harvest": "arachnid_flying","decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -658,7 +658,7 @@ ], "vision_day": 30, "vision_night": 5, - "harvest": "arachnid_dragonfly_mega", + "harvest": "arachnid_dragonfly_mega","decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_dragonfly", "baby_count": 3, "baby_timer": 1 }, @@ -689,7 +689,7 @@ "dodge": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "HIT_AND_RUN", "CANPLAY", "PATH_AVOID_FIRE" ] @@ -719,7 +719,7 @@ "dodge": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "STUMBLES", "VENOM", "FLIES", "HIT_AND_RUN", "PATH_AVOID_FIRE" ] }, @@ -752,7 +752,7 @@ "armor_acid": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -787,7 +787,7 @@ "armor_acid": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_FIRE" ] @@ -819,7 +819,7 @@ "armor_bullet": 2, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "special_attacks": [ { "type": "leap", "cooldown": 2, "max_range": 5, "allow_no_target": true } ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -854,7 +854,7 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "GRABS", "CAN_DIG", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -887,7 +887,7 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -919,7 +919,7 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "STUMBLES", "CLIMBS", "PATH_AVOID_FIRE" ] }, @@ -951,7 +951,7 @@ "armor_bullet": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -985,7 +985,7 @@ "armor_bullet": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -1018,7 +1018,7 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -1039,7 +1039,7 @@ "volume": "9 L", "weight": "9 kg", "hp": 35, - "harvest": "arachnid_wasp", + "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 16, "into": "mon_wasp_pupa" }, "//": "30 days of development from egg to adult.", "flags": [ "IMMOBILE" ] @@ -1058,7 +1058,7 @@ "volume": "15 L", "weight": "15 kg", "hp": 100, - "harvest": "arachnid_wasp", + "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 10, "into_group": "GROUP_WASP_PUPA" }, "flags": [ "IMMOBILE" ] }, @@ -1107,7 +1107,7 @@ "armor_stab": 4, "vision_day": 15, "vision_night": 5, - "harvest": "arachnid_wasp", + "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1144,7 +1144,7 @@ "name": { "str": "wasp queen" }, "description": "A mutated wasp queen grown to the size of a person, laying a single white egg in each empty cell it comes across while scurrying around on the paper walls of their home. It struggles to fit into some of them, but the newer cells seem to be getting larger…", "copy-from": "mon_wasp_guard", - "harvest": "arachnid_wasp_queen", + "harvest": "arachnid_wasp_queen","decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 2, "baby_timer": 5 }, "upgrades": { "half_life": 30, "into": "mon_wasp_mega" } }, @@ -1196,7 +1196,7 @@ "armor_bullet": 12, "vision_day": 17, "vision_night": 7, - "harvest": "arachnid_wasp", + "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1267,7 +1267,7 @@ "armor_cut": 30, "armor_stab": 18, "armor_bullet": 22, - "harvest": "arachnid_wasp_queen", + "harvest": "arachnid_wasp_queen","decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 4, "baby_timer": 5 }, "extend": { "flags": [ "PUSH_MON" ] }, "delete": { "flags": [ "HARDTOSHOOT" ] } @@ -1298,7 +1298,7 @@ "armor_cut": 6, "armor_bash": 6, "armor_bullet": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "special_attacks": [ [ "DERMATIK", 25 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1327,7 +1327,7 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 1, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "upgrades": { "age_grow": 21, "into": "mon_dermatik" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "POISON", "CAN_DIG", "LARVA" ] @@ -1360,7 +1360,7 @@ "morale": 100, "vision_day": 6, "vision_night": 6, - "harvest": "incubator_mammal", + "harvest": "incubator_mammal","decay": "decay_animal_standard", "special_attacks": [ [ "PARROT", 6 ], { @@ -1425,7 +1425,7 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "upgrades": { "age_grow": 14, "into": "mon_ant_soldier" }, "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1464,7 +1464,7 @@ "special_attacks": [ [ "ACID", 23 ], [ "EAT_FOOD", 30 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid", + "harvest": "arachnid_acid","decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1490,7 +1490,7 @@ "melee_cut": 0, "upgrades": { "age_grow": 3, "into": "mon_ant_acid" }, "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid", + "harvest": "arachnid_acid","decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "LARVA", "POISON", "SMELLS" ] }, { @@ -1522,7 +1522,7 @@ "special_attacks": [ [ "ANTQUEEN", 1 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], - "harvest": "acidant_queen", + "harvest": "acidant_queen","decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "QUEEN", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1556,7 +1556,7 @@ "special_attacks": [ [ "ACID", 15 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid", + "harvest": "arachnid_acid","decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "SHORTACIDTRAIL", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1580,7 +1580,7 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_cut": 0, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "upgrades": { "age_grow": 3, "into": "mon_ant" }, "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "LARVA" ] @@ -1609,7 +1609,7 @@ "armor_bash": 6, "armor_cut": 14, "armor_bullet": 11, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "special_attacks": [ [ "ANTQUEEN", 1 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "death_function": [ "NORMAL" ], @@ -1643,7 +1643,7 @@ "armor_bullet": 10, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_ant_fungus", @@ -1675,7 +1675,7 @@ "armor_cut": 4, "armor_bullet": 3, "vision_day": 10, - "harvest": "arachnid", + "harvest": "arachnid","decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_locust", "baby_count": 20, "baby_timer": 10 }, "baby_flags": [ "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED" ], @@ -1706,7 +1706,7 @@ "dodge": 3, "melee_cut": 0, "vision_day": 10, - "harvest": "mutant_animal_tiny", + "harvest": "mutant_animal_tiny","decay": "null", "upgrades": { "age_grow": 10, "into": "mon_locust" }, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 4, "max_range": 4, "allow_no_target": true }, [ "EAT_CROP", 120 ] ], diff --git a/data/json/monsters/jabberwock.json b/data/json/monsters/jabberwock.json index 68c50183c508..5e3014492597 100644 --- a/data/json/monsters/jabberwock.json +++ b/data/json/monsters/jabberwock.json @@ -26,7 +26,7 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 10 ], [ "ABSORB_MEAT", 10 ] ], "death_function": [ "NORMAL" ], - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "upgrades": { "half_life": 15, "into": "mon_flesh_golem" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -57,7 +57,7 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 8 ], [ "ABSORB_MEAT", 1 ] ], "death_function": [ "NORMAL" ], - "harvest": "flesh_golem", + "harvest": "flesh_golem","decay": "decay_flesh_golem", "upgrades": { "half_life": 15, "into": "mon_jabberwock" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -89,7 +89,7 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 5 ] ], "death_function": [ "JABBERWOCKY" ], - "harvest": "jabberwock", + "harvest": "jabberwock","decay": "decay_jabberwock", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "ATTACKMON", "POISON" ] } ] diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 3208d47f2bee..3c4078a13e23 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -22,7 +22,7 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 8, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "vision_day": 20, "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], @@ -47,7 +47,7 @@ "melee_dice_sides": 3, "melee_cut": 2, "dodge": 2, - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "special_attacks": [ [ "EAT_FOOD", 60 ] ], "upgrades": { "age_grow": 480, "into": "mon_bear" } }, @@ -83,7 +83,7 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_large_fur", + "harvest": "mammal_large_fur","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_bear_cub", "baby_count": 1, "baby_timer": 700 }, "//": "220 days gestation period, the mother and cubs remain together for 16-17 months.", "baby_flags": [ "SPRING" ], @@ -113,7 +113,7 @@ "melee_dice_sides": 6, "melee_cut": 6, "dodge": 2, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -144,7 +144,7 @@ "dodge": 2, "vision_day": 30, "vision_night": 10, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -176,7 +176,7 @@ "melee_dice_sides": 2, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -212,7 +212,7 @@ "armor_bash": 2, "armor_cut": 1, "armor_bullet": 1, - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_boar_wild_piglet", "baby_count": 8, "baby_timer": 154 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 10 }, @@ -250,7 +250,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] }, { @@ -277,7 +277,7 @@ "special_attacks": [ [ "scratch", 10 ] ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "CATFOOD", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ], "upgrades": { "age_grow": 120, "into": "mon_cat" } }, @@ -311,7 +311,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "MEAT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "reproduction": { "baby_monster": "mon_cat_kitten", "baby_count": 4, "baby_timer": 60 }, "flags": [ "SEES", @@ -549,7 +549,7 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -584,7 +584,7 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -629,7 +629,7 @@ "placate_triggers": [ "PLAYER_WEAK" ], "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "upgrades": { "age_grow": 180, "into": "mon_cow" }, "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CATTLEFODDER", "PET_WONT_FOLLOW" ] @@ -665,7 +665,7 @@ "placate_triggers": [ "PLAYER_WEAK" ], "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_cow_calf", "baby_count": 1, "baby_timer": 343 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 40 ] ], @@ -711,7 +711,7 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE", "BLEED" ] }, { @@ -738,7 +738,7 @@ "dodge": 3, "armor_bash": 1, "vision_night": 5, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -771,7 +771,7 @@ "melee_cut": 0, "dodge": 3, "vision_night": 12, - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -802,7 +802,7 @@ "melee_cut": 0, "dodge": 3, "vision_night": 12, - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -823,7 +823,7 @@ "species": [ "MAMMAL" ], "volume": "30000 ml", "weight": "30 kg", - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], @@ -878,7 +878,7 @@ "melee_cut": 1, "dodge": 1, "vision_night": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "upgrades": { "age_grow": 42, "into": "mon_dog" }, "extend": { "flags": [ "NO_BREED" ] } }, @@ -896,7 +896,7 @@ "melee_dice_sides": 2, "melee_cut": 6, "vision_night": 4, - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_bull_pup", "baby_count": 7, "baby_timer": 300 }, "//": "7 puppies and 300-320 days per-litter for size medium canines", "flags": [ @@ -935,7 +935,7 @@ "melee_dice_sides": 1, "melee_cut": 3, "vision_night": 3, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bull" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -957,7 +957,7 @@ "melee_dice_sides": 2, "melee_cut": 5, "special_attacks": [ [ "LUNGE", 5 ] ], - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_pitbullmix_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -984,7 +984,7 @@ "species": [ "MAMMAL" ], "volume": "750 ml", "weight": "1 kg", - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "hp": 7, "speed": 88, "material": [ "flesh" ], @@ -1012,7 +1012,7 @@ "name": { "str": "beagle" }, "description": "An adorable beagle that has managed to survive the apocalypse. Being agile and small, they are difficult to shoot at. Generally attacks in packs.", "weight": "10 kg", - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "hp": 13, "speed": 135, "melee_skill": 2, @@ -1062,7 +1062,7 @@ "melee_cut": 1, "dodge": 1, "vision_night": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_beagle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1124,7 +1124,7 @@ "melee_cut": 2, "dodge": 2, "vision_night": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bcollie" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1145,7 +1145,7 @@ "melee_dice_sides": 2, "melee_cut": 4, "vision_night": 4, - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "fear_triggers": [ "HURT" ], "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_boxer_pup", "baby_count": 4, "baby_timer": 270 }, @@ -1176,7 +1176,7 @@ "melee_cut": 2, "dodge": 1, "vision_night": 3, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_boxer" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1212,7 +1212,7 @@ "melee_dice_sides": 2, "melee_cut": 2, "vision_night": 6, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "HURT" ], "reproduction": { "baby_monster": "mon_dog_chihuahua_pup", "baby_count": 3, "baby_timer": 240 }, "//": "1-3 puppies & 240 days per-litter for size tiny canines", @@ -1253,7 +1253,7 @@ "melee_cut": 1, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_chihuahua" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1276,7 +1276,7 @@ "melee_dice_sides": 2, "vision_night": 6, "fear_triggers": [ "HURT" ], - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_dachshund_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -1318,7 +1318,7 @@ "melee_cut": 1, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_dachshund" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1368,7 +1368,7 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gshepherd" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1394,7 +1394,7 @@ "melee_cut": 5, "dodge": 2, "vision_night": 6, - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_gpyrenees_pup", "baby_count": 7, "baby_timer": 320 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", "flags": [ @@ -1434,7 +1434,7 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gpyrenees" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1459,7 +1459,7 @@ "melee_dice_sides": 2, "melee_cut": 6, "vision_night": 6, - "harvest": "mammal_leather", + "harvest": "mammal_leather","decay": "decay_animal_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_rottweiler_pup", "baby_count": 7, "baby_timer": 300 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", @@ -1500,7 +1500,7 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_rottweiler" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1564,7 +1564,7 @@ "melee_cut": 3, "dodge": 2, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_auscattle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1596,7 +1596,7 @@ "melee_cut": 2, "dodge": 6, "vision_night": 5, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1627,7 +1627,7 @@ "melee_cut": 2, "dodge": 6, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1656,7 +1656,7 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1681,7 +1681,7 @@ "morale": -5, "melee_cut": 0, "dodge": 6, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1715,7 +1715,7 @@ "anger_triggers": [ "FRIEND_ATTACKED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "upgrades": { "age_grow": 450, "into": "mon_horse" }, "special_attacks": [ [ "EAT_CROP", 100 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "WARM", "NO_BREED" ] @@ -1746,7 +1746,7 @@ "fear_triggers": [ "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_horse_foal", "baby_count": 1, "baby_timer": 360 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 60 ] ], @@ -1783,7 +1783,7 @@ "melee_skill": 4, "melee_cut": 0, "dodge": 2, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1811,7 +1811,7 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 6, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1850,7 +1850,7 @@ "death_function": [ "NORMAL" ], "baby_flags": [ "AUTUMN" ], "//": "Baby moose don't actually exist (yet), but autumn is their mating season so baby_flags is defined so that they get angry then", - "harvest": "mammal_large_fur", + "harvest": "mammal_large_fur","decay": "decay_animal_standard", "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BLEED", "ATTACKMON" ] }, @@ -1877,7 +1877,7 @@ "melee_dice_sides": 6, "melee_cut": 2, "dodge": 2, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1911,7 +1911,7 @@ "armor_bullet": 2, "vision_day": 0, "vision_night": 0, - "harvest": "mutant_mammal_large_leather", + "harvest": "mutant_mammal_large_leather","decay": "decay_animal_standard", "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 1 ], { "type": "bite", "cooldown": 6 }, [ "impale", 10 ] ], "anger_triggers": [ "HURT", "SOUND", "STALK" ], "fear_triggers": [ "FIRE" ], @@ -1945,7 +1945,7 @@ "melee_cut": 1, "dodge": 2, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -1973,7 +1973,7 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 4, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2002,7 +2002,7 @@ "melee_dice_sides": 2, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_small_leather", + "harvest": "mammal_small_leather","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -2045,7 +2045,7 @@ "melee_dice_sides": 8, "melee_cut": 4, "dodge": 2, - "harvest": "mammal_large_leather", + "harvest": "mammal_large_leather","decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_pig_piglet", "baby_count": 8, "baby_timer": 154 }, "//": "116 days gestation, 3-5 weeks until the piglets get weaned, 10-30 days of maturation", "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], @@ -2078,7 +2078,7 @@ "melee_cut": 0, "dodge": 6, "reproduction": { "baby_monster": "mon_rabbit", "baby_count": 3, "baby_timer": 55 }, - "harvest": "mammal_small_fur", + "harvest": "mammal_small_fur","decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "PET_WONT_FOLLOW", "WARM" ] @@ -2106,7 +2106,7 @@ "melee_dice_sides": 4, "melee_cut": 1, "dodge": 3, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "vision_night": 5, "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "death_function": [ "NORMAL" ], @@ -2133,7 +2133,7 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_cut": 1, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "special_attacks": [ [ "RATKING", 3 ] ], "death_function": [ "RATKING" ] }, @@ -2162,7 +2162,7 @@ "dodge": 2, "vision_day": 1, "vision_night": 30, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -2191,7 +2191,7 @@ "melee_cut": 1, "dodge": 2, "anger_triggers": [ ], - "harvest": "mammal_small_wool", + "harvest": "mammal_small_wool","decay": "decay_animal_wool", "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -2222,7 +2222,7 @@ "dodge": 2, "starting_ammo": { "milk_raw": 5 }, "anger_triggers": [ ], - "harvest": "mammal_large_wool", + "harvest": "mammal_large_wool","decay": "decay_animal_wool", "reproduction": { "baby_monster": "mon_sheep_lamb", "baby_count": 1, "baby_timer": 275 }, "//": "Sheep are seasonal breeders. The natural sexual season is positioned so that lambs will be born in the spring when the weather is warmer and grass is available.", "baby_flags": [ "SPRING" ], @@ -2265,7 +2265,7 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2292,7 +2292,7 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 3, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2319,7 +2319,7 @@ "melee_cut": 2, "dodge": 4, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2348,7 +2348,7 @@ "dodge": 4, "armor_bash": 1, "vision_night": 5, - "harvest": "mammal_fur", + "harvest": "mammal_fur","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], diff --git a/data/json/monsters/marloss.json b/data/json/monsters/marloss.json index 4bddf7ba93bd..9fdffb06b40d 100644 --- a/data/json/monsters/marloss.json +++ b/data/json/monsters/marloss.json @@ -21,7 +21,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human", + "harvest": "human","decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], @@ -52,7 +52,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human", + "harvest": "human","decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json index 4a9c236b7bb8..bac28581b6bb 100644 --- a/data/json/monsters/mi-go.json +++ b/data/json/monsters/mi-go.json @@ -26,7 +26,7 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -75,7 +75,7 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -125,7 +125,7 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -174,7 +174,7 @@ "armor_bullet": 18, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -227,7 +227,7 @@ "armor_bullet": 22, "vision_day": 50, "vision_night": 25, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -279,7 +279,7 @@ "armor_bullet": 4, "vision_day": 50, "vision_night": 25, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ diff --git a/data/json/monsters/mutant_animal.json b/data/json/monsters/mutant_animal.json index 7c68846ca938..28ed9b936b20 100644 --- a/data/json/monsters/mutant_animal.json +++ b/data/json/monsters/mutant_animal.json @@ -67,7 +67,7 @@ "armor_bullet": 11, "armor_stab": 30, "armor_acid": 8, - "harvest": "mammal_large_chitin", + "harvest": "mammal_large_chitin","decay": "decay_mammal_plus_chitin", "delete": { "fear_triggers": [ "SOUND" ] }, "//": "Doesn't zombify because it shouldn't regain the fur.", "zombify_into": "mon_null" @@ -111,7 +111,7 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mutant_mammal_large_fur", + "harvest": "mutant_mammal_large_fur","decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON", "STUMBLES", "KEENNOSE" ] }, { @@ -138,7 +138,7 @@ "melee_cut": 6, "dodge": 2, "armor_cut": 4, - "harvest": "mutant_mammal_fur", + "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -167,7 +167,7 @@ "melee_dice_sides": 6, "melee_cut": 6, "dodge": 3, - "harvest": "bird_large", + "harvest": "bird_large","decay": "decay_bird_large", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -206,7 +206,7 @@ "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_penetration": 10 } ] } ], - "harvest": "mutant_mammal_fur", + "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", "path_settings": { "max_dist": 7 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -245,7 +245,7 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mutant_mammal_fur", + "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -287,7 +287,7 @@ "armor_cut": 10, "vision_day": 50, "vision_night": 5, - "harvest": "mutant_mammal_large_fur", + "harvest": "mutant_mammal_large_fur","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { @@ -326,7 +326,7 @@ "melee_cut": 0, "dodge": 4, "vision_night": 15, - "harvest": "mutant_mammal_large_leather", + "harvest": "mutant_mammal_large_leather","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -362,7 +362,7 @@ "melee_cut": 0, "dodge": 3, "vision_night": 15, - "harvest": "mutant_mammal_leather", + "harvest": "mutant_mammal_leather","decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -380,7 +380,7 @@ "species": [ "MAMMAL" ], "volume": "30000 ml", "weight": "30 kg", - "harvest": "mutant_mammal_small_fur", + "harvest": "mutant_mammal_small_fur","decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], diff --git a/data/json/monsters/mutant_human.json b/data/json/monsters/mutant_human.json index a0442be37f23..5cf998dfab51 100644 --- a/data/json/monsters/mutant_human.json +++ b/data/json/monsters/mutant_human.json @@ -21,7 +21,7 @@ "melee_dice_sides": 6, "melee_cut": 0, "dodge": 3, - "harvest": "mutant_human", + "harvest": "mutant_human","decay": "decay_human", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { @@ -57,7 +57,7 @@ "armor_bullet": 4, "vision_day": 25, "vision_night": 5, - "harvest": "human_fur_maybe_cyborg", + "harvest": "human_fur_maybe_cyborg","decay": "decay_human", "special_attacks": [ [ "PARROT", 80 ], { @@ -152,7 +152,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 5, - "harvest": "mutant_human", + "harvest": "mutant_human","decay": "decay_human", "death_drops": { "subtype": "collection", "groups": [ [ "subway", 40 ], [ "sewer", 20 ], [ "trash", 5 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ] diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index a9e241904fd5..33941f67a154 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -30,7 +30,7 @@ "special_attacks": [ { "type": "bite", "cooldown": 15 }, [ "impale", 20 ] ], "anger_triggers": [ "HURT", "FRIEND_DIED", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], - "harvest": "bird_large", + "harvest": "bird_large","decay": "decay_bird_large", "flags": [ "HEARS", "KEENNOSE", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS", "SUNDEATH" ] }, { @@ -56,7 +56,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 2, - "harvest": "human", + "harvest": "human","decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 0 ] ], "death_function": [ "AMIGARA", "NORMAL" ], "flags": [ "SMELLS", "HEARS", "SEES", "STUMBLES", "HARDTOSHOOT", "HUMAN" ] @@ -83,7 +83,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human", + "harvest": "human","decay": "decay_human", "special_attacks": [ [ "SHRIEK", 10 ], { "type": "bite", "cooldown": 10 } ], "anger_triggers": [ "NETHER_ATTENTION" ], "death_function": [ "NORMAL" ], @@ -109,7 +109,7 @@ "melee_dice": 1, "melee_dice_sides": 5, "melee_cut": 2, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -219,7 +219,7 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 1, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -274,7 +274,7 @@ "vision_day": 50, "vision_night": 40, "luminance": 25, - "harvest": "zombie_meatslug", + "harvest": "zombie_meatslug","decay": "null", "special_attacks": [ [ "STARE", 12 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "WARM", "FLIES", "FIREY", "NO_BREATHE", "NOHEAD" ] @@ -302,7 +302,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 2, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -360,7 +360,7 @@ "melee_cut": 0, "dodge": 4, "vision_day": 30, - "harvest": "gozu", + "harvest": "gozu","decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 20 ] ], "death_drops": "mon_gozu_death_drops", "death_function": [ "NORMAL" ], @@ -400,7 +400,7 @@ "melee_cut": 2, "dodge": 4, "vision_night": 10, - "harvest": "human", + "harvest": "human","decay": "decay_human", "death_function": [ "NORMAL" ], "anger_triggers": [ "NETHER_ATTENTION" ], "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 8, "armor_multiplier": 0.8 } ] } ], @@ -459,7 +459,7 @@ "armor_bash": 4, "armor_cut": 2, "armor_bullet": 2, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "BLEED", "REVIVES", "CLIMBS", "FILTHY" ] }, @@ -576,7 +576,7 @@ "armor_bash": 6, "armor_cut": 12, "armor_bullet": 10, - "harvest": "human", + "harvest": "human","decay": "decay_human", "special_attacks": [ [ "ACID", 15 ] ], "anger_triggers": [ "PLAYER_WEAK", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -863,7 +863,7 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 6, - "harvest": "human", + "harvest": "human","decay": "decay_human", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "POISON", "HUMAN", "CLIMBS" ] }, @@ -891,7 +891,7 @@ "melee_cut": 8, "dodge": 1, "armor_bash": 6, - "harvest": "meatslug", + "harvest": "meatslug","decay": "null", "special_attacks": [ [ "GENE_STING", 20 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "DESTROYS", "POISON", "VENOM", "NO_BREATHE", "CAN_DIG" ] diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json index 5a6c0490eb32..ff05b94643ea 100644 --- a/data/json/monsters/power_leech.json +++ b/data/json/monsters/power_leech.json @@ -35,7 +35,7 @@ [ "PARROT", 40 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant_bloom", + "harvest": "flesh_plant_bloom","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "QUEEN", "HARDTOSHOOT" ] }, @@ -73,7 +73,7 @@ [ "MON_LEECH_EVOLUTION", 30 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant", + "harvest": "flesh_plant","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -109,7 +109,7 @@ "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": { }, "death_function": [ "NORMAL" ], - "harvest": "flesh_plant", + "harvest": "flesh_plant","decay": "null", "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, { @@ -142,7 +142,7 @@ }, [ "LEECH_SPAWNER", 35 ] ], - "harvest": "flesh_plant", + "harvest": "flesh_plant","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE" ] }, @@ -185,7 +185,7 @@ [ "EVOLVE_KILL_STRIKE", 3 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant", + "harvest": "flesh_plant","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -226,7 +226,7 @@ }, [ "EVOLVE_KILL_STRIKE", 6 ] ], - "harvest": "flesh_plant", + "harvest": "flesh_plant","decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] } diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index aa6d9e66ea6c..703da596aa48 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -22,7 +22,7 @@ "melee_cut": 1, "dodge": 2, "armor_bash": 4, - "harvest": "mutant_animal_large_noskin", + "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -57,7 +57,7 @@ "armor_bullet": 6, "vision_day": 3, "vision_night": 35, - "harvest": "animal_large_noskin", + "harvest": "animal_large_noskin","decay": "decay_animal_standard", "path_settings": { "max_dist": 8 }, "special_attacks": [ { @@ -104,7 +104,7 @@ "dodge": 1, "vision_day": 30, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_tiny","decay": "null", "special_attacks": [ [ "RATTLE", 6 ] ], "anger_triggers": [ "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -141,7 +141,7 @@ "armor_bullet": 3, "vision_day": 30, "vision_night": 5, - "harvest": "mutant_animal_large_noskin", + "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", "special_attacks": [ [ "RATTLE", 6 ], { @@ -182,7 +182,7 @@ "dodge": 1, "vision_day": 1, "vision_night": 30, - "harvest": "mutant_animal_large_noskin", + "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "WARM", "VENOM", "SWIMS" ] diff --git a/data/json/monsters/slugs.json b/data/json/monsters/slugs.json index ee4122a3c6ee..28ba580376fd 100644 --- a/data/json/monsters/slugs.json +++ b/data/json/monsters/slugs.json @@ -55,7 +55,7 @@ "armor_cut": 2, "armor_bullet": 2, "vision_day": 30, - "harvest": "mutant_meatslug", + "harvest": "mutant_meatslug","decay": "null", "special_attacks": [ [ "ACID", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index 6dbd3370f7c4..9ad3ee87eabf 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -43,7 +43,7 @@ "aggression": 100, "morale": 100, "melee_cut": 0, - "harvest": "biollante", + "harvest": "biollante","decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 2 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "biollante", 8 ] ], "//": "80% chance of an item from group biollante" }, "death_function": [ "NORMAL" ], @@ -115,7 +115,7 @@ "melee_dice": 1, "melee_dice_sides": 1, "melee_cut": 1, - "harvest": "triffid_small", + "harvest": "triffid_small","decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid_young" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "NOHEAD", "STUMBLES" ] @@ -139,7 +139,7 @@ "melee_dice": 1, "melee_dice_sides": 4, "melee_cut": 4, - "harvest": "triffid_small", + "harvest": "triffid_small","decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid" }, "special_attacks": [ [ "TRIFFID_GROWTH", 28800 ] ], "death_function": [ "NORMAL" ], @@ -169,7 +169,7 @@ "armor_bash": 10, "armor_cut": 4, "armor_bullet": 3, - "harvest": "triffid_large", + "harvest": "triffid_large","decay": "decay_plantlike", "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", "flags": [ "SEES", "SMELLS", "BASHES", "GROUP_BASH", "NOHEAD", "PARALYZEVENOM" ] @@ -197,7 +197,7 @@ "armor_bash": 12, "armor_cut": 8, "armor_bullet": 6, - "harvest": "triffid_queen", + "harvest": "triffid_queen","decay": "decay_plantlike_triffidqueen", "special_attacks": [ [ "GROWPLANTS", 20 ] ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", @@ -225,7 +225,7 @@ "melee_cut": 0, "dodge": 4, "armor_bash": 18, - "harvest": "triffid_small", + "harvest": "triffid_small","decay": "decay_plantlike", "death_function": [ "NORMAL" ], "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "HARDTOSHOOT", "GRABS", "SWIMS", "PLASTIC" ] }, @@ -252,7 +252,7 @@ "armor_bash": 4, "armor_cut": 6, "armor_bullet": 5, - "harvest": "triffid_large", + "harvest": "triffid_large","decay": "decay_plantlike", "attack_effs": [ { "id": "paralyzepoison", "//": "applying this multiple times makes intensity go up by 3 instead of 1", "duration": 33 }, { "id": "paralyzepoison", "duration": 33 }, @@ -281,7 +281,7 @@ "aggression": 100, "morale": 100, "melee_cut": 0, - "harvest": "triffid_large", + "harvest": "triffid_large","decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 3 ], [ "PARA_STING", 12 ] ], "emit_fields": [ { "emit_id": "emit_pollen_stream", "delay": "1 s" } ], "death_function": [ "NORMAL" ], @@ -308,7 +308,7 @@ "armor_bash": 12, "armor_cut": 16, "armor_bullet": 13, - "harvest": "triffid_small", + "harvest": "triffid_small","decay": "decay_plantlike", "special_attacks": [ [ "TRIFFID_HEARTBEAT", 50 ] ], "death_function": [ "TRIFFID_HEART" ], "flags": [ "NOHEAD", "IMMOBILE", "QUEEN" ] diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index be5f19ae78ed..860b94ca6ede 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -25,7 +25,7 @@ "armor_cut": 2, "armor_bullet": 2, "luminance": 0, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "SWIMS", "AQUATIC", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] }, @@ -54,7 +54,7 @@ "melee_cut": 2, "dodge": 1, "vision_night": 4, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" }, @@ -87,7 +87,7 @@ "armor_stab": 30, "armor_acid": 3, "vision_night": 3, - "harvest": "mr_bones", + "harvest": "mr_bones","decay": "decay_zombie_mrbones", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "POISON", "FILTHY" ] @@ -120,7 +120,7 @@ "armor_bullet": 5, "vision_day": 50, "vision_night": 4, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "dog_cop", 40 ] ], "//": "40% chance of an item from group dog_cop" }, "death_function": [ "NORMAL" ], @@ -151,7 +151,7 @@ "dodge": 1, "vision_day": 30, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 4, "no_infection_chance": 12 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ] @@ -180,7 +180,7 @@ "melee_cut": 4, "dodge": 2, "vision_night": 5, - "harvest": "zombie_fur", + "harvest": "zombie_fur","decay": "decay_zombie_standard", "special_attacks": [ [ "HOWL", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], @@ -215,7 +215,7 @@ "armor_bullet": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_fur", + "harvest": "zombie_fur","decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -245,7 +245,7 @@ "melee_cut": 4, "dodge": 1, "vision_day": 50, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -292,7 +292,7 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -325,7 +325,7 @@ "armor_bullet": 3, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -357,7 +357,7 @@ "armor_bash": 1, "vision_day": 30, "vision_night": 10, - "harvest": "zombie_fur", + "harvest": "zombie_fur","decay": "decay_zombie_standard", "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 18d1c9186b56..58d050dd5da1 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -23,7 +23,7 @@ "armor_bash": 6, "armor_cut": 8, "armor_bullet": 6, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", @@ -71,7 +71,7 @@ "melee_dice_sides": 3, "melee_cut": 0, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -122,7 +122,7 @@ "armor_stab": 6, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics", + "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_cop_death_drops", "death_function": [ "NORMAL" ], @@ -168,7 +168,7 @@ "melee_dice_sides": 3, "melee_cut": 0, "vision_day": 10, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -214,7 +214,7 @@ "armor_bullet": 6, "vision_day": 50, "vision_night": 3, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "special_attacks": [ [ "DANCE", 30 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -248,7 +248,7 @@ "armor_cut": 3, "armor_bullet": 2, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.75, "//": "Fat zombies have stronger jaws" }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -299,7 +299,7 @@ "armor_acid": 3, "armor_fire": 10, "vision_night": 3, - "harvest": "zombie_maybe_tech_bionics", + "harvest": "zombie_maybe_tech_bionics","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_fireman_death_drops", "death_function": [ "NORMAL" ], @@ -347,7 +347,7 @@ "armor_cut": 4, "armor_bullet": 3, "vision_night": 3, - "harvest": "zombie_maybe_sci_bionics", + "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_hazmat_death_drops", "death_function": [ "NORMAL" ], @@ -392,7 +392,7 @@ "melee_dice_sides": 2, "melee_cut": 0, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 3, "no_infection_chance": 10 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -443,7 +443,7 @@ "armor_bullet": 13, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics", + "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 15 ] ], "death_drops": "mon_zombie_swat_death_drops", "death_function": [ "NORMAL" ], @@ -492,7 +492,7 @@ "armor_cut": 1, "armor_bullet": 1, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json index 2d455b3c4d52..19ca722e95bb 100644 --- a/data/json/monsters/zed_acid.json +++ b/data/json/monsters/zed_acid.json @@ -23,7 +23,7 @@ "melee_cut": 0, "dodge": 1, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -74,7 +74,7 @@ "armor_stab": 12, "vision_night": 3, "luminance": 0, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "gun", @@ -135,7 +135,7 @@ "melee_cut": 0, "dodge": 1, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "ACID", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -183,7 +183,7 @@ "melee_dice_sides": 2, "melee_cut": 1, "vision_day": 14, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 22 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], diff --git a/data/json/monsters/zed_burned.json b/data/json/monsters/zed_burned.json index 4fc32bd66fa3..79c7d16fcd9a 100644 --- a/data/json/monsters/zed_burned.json +++ b/data/json/monsters/zed_burned.json @@ -28,7 +28,7 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_CHILD_ZOMBIE_UPGRADE" }, "flags": [ @@ -75,7 +75,7 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 21, "into_group": "GROUP_ZOMBIE_BRUTE" }, @@ -109,7 +109,7 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_ZOMBIE_UPGRADE" }, diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index a0b17c69cd7e..6f220b6e4499 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -21,7 +21,7 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "vision_day": 30, "vision_night": 3, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], @@ -57,7 +57,7 @@ "dodge": 2, "vision_day": 30, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", @@ -107,7 +107,7 @@ "dodge": 1, "vision_day": 10, "vision_night": 10, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -154,7 +154,7 @@ "dodge": 1, "vision_day": 30, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ], [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -201,7 +201,7 @@ "armor_bash": 1, "vision_day": 30, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "BOOMER" ], @@ -234,7 +234,7 @@ "dodge": 2, "vision_day": 10, "vision_night": 10, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "leap", "cooldown": 10, "max_range": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -283,7 +283,7 @@ "armor_bullet": 4, "vision_day": 30, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 15 ], [ "scratch", 10 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_electric.json b/data/json/monsters/zed_electric.json index 16d2ae9df3e4..2394b20edaaa 100644 --- a/data/json/monsters/zed_electric.json +++ b/data/json/monsters/zed_electric.json @@ -27,7 +27,7 @@ "armor_bullet": 6, "vision_night": 3, "luminance": 16, - "harvest": "CBM_SUBS", + "harvest": "CBM_SUBS","decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 15 ], [ "SMASH", 30 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -72,7 +72,7 @@ "melee_cut": 0, "dodge": 2, "luminance": 8, - "harvest": "CBM_CIV", + "harvest": "CBM_CIV","decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 25 ] ], "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", @@ -120,7 +120,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "vision_night": 3, "luminance": 16, - "harvest": "CBM_SUBS", + "harvest": "CBM_SUBS","decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_shock_cloud", "delay": "1 s" } ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -151,7 +151,7 @@ "melee_cut": 0, "dodge": 2, "luminance": 4, - "harvest": "CBM_BASIC", + "harvest": "CBM_BASIC","decay": "decay_zombie_standard", "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index 71527e9a16cb..9df9593d7aa9 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -71,7 +71,7 @@ "armor_cut": 5, "armor_bullet": 4, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "BOOMER_GLOW", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "BOOMER_GLOW" ], diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index a49e90be6c2d..02b741d1d071 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -21,7 +21,7 @@ "melee_cut": 0, "dodge": 1, "armor_bash": 8, - "harvest": "zombie_leather", + "harvest": "zombie_leather","decay": "decay_zombie_standard", "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN" ] @@ -52,7 +52,7 @@ "armor_cut": 5, "armor_bullet": 4, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "ZOMBIE_FUSE", 80 ] ], "death_drops": { "subtype": "collection", diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json index e69a5e620a25..ce834319a289 100644 --- a/data/json/monsters/zed_lab.json +++ b/data/json/monsters/zed_lab.json @@ -25,7 +25,7 @@ "dodge": 1, "vision_day": 50, "vision_night": 3, - "harvest": "CBM_SCI", + "harvest": "CBM_SCI","decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ [ "scratch", 20 ] ], "death_drops": "mon_zombie_scientist_death_drops", @@ -80,7 +80,7 @@ "armor_stab": 4, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_mil_bionics", + "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 10 ], [ "scratch", 10 ] ], "death_drops": "mon_zombie_labsecurity_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_medical.json b/data/json/monsters/zed_medical.json index 0e99dbcf2a68..292d73b6d9fc 100644 --- a/data/json/monsters/zed_medical.json +++ b/data/json/monsters/zed_medical.json @@ -20,7 +20,7 @@ "melee_skill": 3, "armor_acid": 4, "vision_night": 3, - "harvest": "zombie_maybe_sci_bionics", + "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ { "id": "inject" } ], "death_drops": "mon_zombie_medical_death_drops", @@ -43,7 +43,7 @@ "armor_acid": 10, "vision_day": 45, "vision_night": 5, - "harvest": "zombie_maybe_sci_bionics", + "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { @@ -68,7 +68,7 @@ "armor_acid": 20, "vision_day": 50, "vision_night": 10, - "harvest": "zombie_maybe_sci_bionics", + "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "max_consider_range": 5, "move_cost": 0 }, diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 8565528b3adb..a432239e12b9 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -26,7 +26,7 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -85,7 +85,7 @@ "melee_cut": 0, "vision_day": 2, "vision_night": 0, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "//4": "Removed Bite attack to reflect damage to mouth.", "death_drops": "default_zombie_death_drops", @@ -133,7 +133,7 @@ "armor_cut": 6, "armor_bullet": 5, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -184,7 +184,7 @@ "armor_bullet": 11, "armor_stab": 8, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -233,7 +233,7 @@ "armor_bullet": 4, "vision_day": 5, "vision_night": 40, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 40 ], [ "STRETCH_ATTACK", 20 ], [ "LONGSWIPE", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -279,7 +279,7 @@ "melee_cut": 0, "vision_day": 7, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 6 ], [ "scratch", 20 ] ], "//3": "Removed Bite as this creature does not have a 'mouth'.", "death_drops": "default_zombie_death_drops", @@ -327,7 +327,7 @@ "dodge": 1, "vision_day": 30, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -375,7 +375,7 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 3 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -425,7 +425,7 @@ "armor_stab": 10, "vision_day": 30, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "STRETCH_BITE", 10 ], [ "STRETCH_ATTACK", 5 ] ], "death_function": [ "BLOBSPLIT" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "FILTHY" ] @@ -457,7 +457,7 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -502,7 +502,7 @@ "melee_cut": 2, "dodge": 3, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] }, { "type": "leap", "cooldown": 5, "max_range": 5 }, @@ -546,7 +546,7 @@ "armor_bullet": 2, "vision_day": 50, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "JACKSON", 0 ] ], "death_drops": "jackson_drops", "death_function": [ "JACKSON" ], @@ -579,7 +579,7 @@ "armor_bullet": 8, "vision_day": 25, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -642,7 +642,7 @@ "armor_bullet": 2, "vision_day": 50, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "UPGRADE", 10 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -690,7 +690,7 @@ "dodge": 2, "vision_day": 50, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "RESURRECT", 0 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -737,7 +737,7 @@ "melee_cut": 1, "dodge": 1, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "path_settings": { "max_dist": 4 }, "special_attacks": [ [ "scratch", 10 ], @@ -780,7 +780,7 @@ "armor_bullet": 4, "vision_day": 45, "vision_night": 15, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 8, "min_consider_range": 3, "max_consider_range": 7 }, @@ -821,7 +821,7 @@ "dodge": 2, "vision_day": 50, "vision_night": 8, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 1 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -851,7 +851,7 @@ "melee_cut": 0, "vision_day": 3, "vision_night": 40, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -897,7 +897,7 @@ "dodge": 4, "vision_day": 30, "vision_night": 10, - "harvest": "human", + "harvest": "human","decay": "decay_human", "special_attacks": [ [ "BRANDISH", 10 ] ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "fear_triggers": [ "FIRE" ], @@ -941,7 +941,7 @@ "dodge": 1, "vision_day": 50, "vision_night": 4, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 10 ], [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -990,7 +990,7 @@ "armor_bullet": 2, "vision_day": 25, "vision_night": 5, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 6 ], [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -1080,7 +1080,7 @@ "melee_cut": 2, "dodge": 2, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_swimmer_death_drops", "death_function": [ "NORMAL" ], @@ -1132,7 +1132,7 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 2, - "harvest": "CBM_TECH", + "harvest": "CBM_TECH","decay": "decay_zombie_standard", "special_attacks": [ [ "PULL_METAL_WEAPON", 25 ], { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_technician_death_drops", "death_function": [ "NORMAL" ], @@ -1168,7 +1168,7 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 2, - "harvest": "zombie_maybe_tech_bionics", + "harvest": "zombie_maybe_tech_bionics","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_miner_death_drops", "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] @@ -1198,7 +1198,7 @@ "armor_cut": 4, "armor_bullet": 3, "vision_night": 5, - "harvest": "zombie_thorny", + "harvest": "zombie_thorny","decay": "decay_zombie_standard", "attack_effs": [ { "id": "paralyzepoison", "duration": 33 } ], "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "PARA_STING", 30 ] ], "death_drops": "mon_zombie_thorny_death_drops", diff --git a/data/json/monsters/zed_radiation.json b/data/json/monsters/zed_radiation.json index f025f234f44f..5de90c575275 100644 --- a/data/json/monsters/zed_radiation.json +++ b/data/json/monsters/zed_radiation.json @@ -26,7 +26,7 @@ "armor_bullet": 5, "vision_day": 50, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "LONGSWIPE", 8 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 21 } ] } ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -59,7 +59,7 @@ "armor_bullet": 3, "vision_day": 50, "vision_night": 3, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 20 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -93,7 +93,7 @@ "vision_day": 50, "vision_night": 3, "luminance": 8, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 15 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -127,7 +127,7 @@ "vision_day": 50, "vision_night": 3, "luminance": 16, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 10 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -161,7 +161,7 @@ "vision_day": 50, "vision_night": 3, "luminance": 32, - "harvest": "zombie", + "harvest": "zombie","decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json index 6be4156867fc..3ff2d633dd74 100644 --- a/data/json/monsters/zed_skeletal.json +++ b/data/json/monsters/zed_skeletal.json @@ -27,7 +27,7 @@ "armor_acid": 3, "vision_day": 30, "vision_night": 3, - "harvest": "mr_bones", + "harvest": "mr_bones","decay": "decay_zombie_mrbones", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 } ], "upgrades": { "half_life": 15, "into": "mon_skeleton_brute" }, "death_drops": "default_zombie_clothes", @@ -63,7 +63,7 @@ "armor_acid": 1, "vision_day": 35, "vision_night": 3, - "harvest": "mr_bones", + "harvest": "mr_bones","decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 45 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 15, "armor_multiplier": 0.6 } ] } @@ -103,7 +103,7 @@ "armor_acid": 3, "vision_day": 30, "vision_night": 3, - "harvest": "CBM_CIV", + "harvest": "CBM_CIV","decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 }, [ "SHOCKSTORM", 25 ] ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -136,7 +136,7 @@ "armor_bullet": 36, "vision_day": 50, "vision_night": 4, - "harvest": "mr_bones", + "harvest": "mr_bones","decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ], [ "STRETCH_ATTACK", 20 ], diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index 132f1715b0b3..9650627eb4ae 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -27,7 +27,7 @@ "armor_bullet": 35, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_mil_bionics", + "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_soldier_death_drops", "death_function": [ "NORMAL" ], @@ -77,7 +77,7 @@ "armor_bullet": 35, "vision_day": 30, "vision_night": 35, - "harvest": "zombie_maybe_mil_bionics", + "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -215,7 +215,7 @@ "armor_bullet": 40, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_kevlar", + "harvest": "zombie_kevlar","decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }, [ "SMASH", 30 ] @@ -267,7 +267,7 @@ "armor_bullet": 60, "vision_day": 35, "vision_night": 10, - "harvest": "zombie_kevlar", + "harvest": "zombie_kevlar","decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 12, "damage_max_instance": [ { "damage_type": "bash", "amount": 35 } ] }, [ "LONGSWIPE", 20 ], @@ -319,7 +319,7 @@ "armor_bullet": 4, "vision_day": 35, "vision_night": 5, - "harvest": "zombie_maybe_mil_bionics", + "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_military_pilot_death_drops", "death_function": [ "NORMAL" ], @@ -369,7 +369,7 @@ "vision_day": 30, "vision_night": 3, "luminance": 8, - "harvest": "zombie_maybe_heavy_mil_bionics", + "harvest": "zombie_maybe_heavy_mil_bionics","decay": "decay_zombie_standard", "starting_ammo": { "pressurized_tank": 1000 }, "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_flamer", 100 ] ] }, "death_function": [ "FIREBALL" ], @@ -421,7 +421,7 @@ "armor_fire": 10, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_heavy_mil_bionics", + "harvest": "zombie_maybe_heavy_mil_bionics","decay": "decay_zombie_standard", "death_drops": "mon_zombie_armored_death_drops", "death_function": [ "NORMAL" ], "burn_into": "mon_zombie_scorched", @@ -457,7 +457,7 @@ "vision_day": 50, "vision_night": 3, "luminance": 4, - "harvest": "CBM_OP", + "harvest": "CBM_OP","decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "mon_zombie_bio_op_death_drops", @@ -493,7 +493,7 @@ "armor_bash": 15, "armor_cut": 27, "armor_bullet": 30, - "harvest": "CBM_OP2", + "harvest": "CBM_OP2","decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_BIOJUTSU", 15 ] ] } ] diff --git a/data/json/monsters/zed_survivor.json b/data/json/monsters/zed_survivor.json index 9aaaeba2a862..addbeb359c23 100644 --- a/data/json/monsters/zed_survivor.json +++ b/data/json/monsters/zed_survivor.json @@ -27,7 +27,7 @@ "armor_acid": 4, "vision_day": 50, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics", + "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ [ "SHRIEK", 20 ], diff --git a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md index 841c6794850b..d5bec937470f 100644 --- a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md +++ b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md @@ -318,6 +318,22 @@ see ITEM_SPAWN.md. The default subtype is "distribution". How the monster behaves on death. See JSON_FLAGS.md for a list of possible functions. One can add or remove entries in mods via "add:death_function" and "remove:death_function". +## "harvest" + +(string, optional) + +If this monster's death function leaves a corpse behind, this defines what items will be produced when +butchering or dissecting its corpse. If none is specified, it will default to `human`. +Harvest entries, their yields, and mass ratios, are defined in harvest.json + +## "decay" + +(string, optional) + +As with harvest, this defines a harvest entry for any associated corpse, with a default of `decay_human`. +Defines what items will be produced when the the monster's corpse rots away. +Harvest entries, their yields, and mass ratios, are defined in harvest_decay.json + ## "emit_field" (array of objects of emit_id and time_duration, optional) "emit_fields": [ { "emit_id": diff --git a/src/item.cpp b/src/item.cpp index 80b773fb4e77..03ab25222068 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -9911,7 +9911,7 @@ detached_ptr item::process_internal( detached_ptr &&self, player *ca if( comestible && !self ) { here.rotten_item_spawn( obj, pos ); } - if( self->is_corpse() ) { + if( obj.is_corpse() && !self && !obj.corpse->zombify_into ) { here.handle_decayed_corpse( obj, pos ); } } diff --git a/src/map.cpp b/src/map.cpp index 548792f47b84..4ba4b6c0d15b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7285,16 +7285,8 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) return; } - if( dead_monster->decay.is_null() ) { - return; - } int decayed_weight_grams = to_gram( dead_monster->weight ); // corpse might have stuff in it! - decayed_weight_grams += std::round( decayed_weight_grams * rng_float( -0.1, 0.1 ) ); - bool notify_player = false; - if( calendar::once_every( 30_minutes ) ) { - //one corpse max in 30 minutes will notify if seen, for *all* the items it left - notify_player = true; - } + decayed_weight_grams *= rng_float( 0.5, 0.9 ); bool anything_left = false; for( const harvest_entry &entry : dead_monster->decay.obj() ) { @@ -7310,12 +7302,16 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); } anything_left = roll > 0; - for( int i = 0; i < roll; i++ ) { - add_item_or_charges( pnt, std::move( harvest ) ); - if( anything_left && notify_player && g->u.sees( pnt ) ) { - add_msg( m_info, _( "You notice a %1$s has rotted away, leaving a %2$s" ), it.tname(), harvest->tname() ); + if( g->u.sees( pnt ) ) { + if ( anything_left ) { + add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); + } else { + add_msg( m_info, _( "The %1$s decays away to nothing." ), it.tname() ); } } + for( int i = 0; i < roll; i++ ) { + add_item_or_charges( pnt, item::spawn( *harvest ) ); + } } } diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index d6589875ee2f..7275d8958852 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -829,7 +829,7 @@ void mtype::load( const JsonObject &jo, const std::string &src ) assign( jo, "harvest", harvest ); - optional( jo, was_loaded, "decay", decay ); + assign( jo, "decay", decay ); const auto death_reader = make_flag_reader( gen.death_map, "monster death function" ); optional( jo, was_loaded, "death_function", dies, death_reader ); diff --git a/src/mtype.cpp b/src/mtype.cpp index 3487006e1567..e2ea92b4dfef 100644 --- a/src/mtype.cpp +++ b/src/mtype.cpp @@ -53,7 +53,7 @@ mtype::mtype() dies.push_back( &mdeath::normal ); sp_defense = nullptr; harvest = harvest_id( "human" ); - decay = harvest_id( "null" ); + decay = harvest_id( "decay_human" ); luminance = 0; bash_skill = 0; From 1f38d030206b516b1c439689970727f46e293de1 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 01:11:35 +0000 Subject: [PATCH 03/14] style(autofix.ci): automated formatting --- data/json/monsters/bird.json | 18 +- data/json/monsters/cyborgs.json | 6 +- data/json/monsters/feral_humans.json | 33 ++- data/json/monsters/fish.json | 45 ++-- data/json/monsters/fungus.json | 36 ++-- data/json/monsters/insect_spider.json | 144 ++++++++----- data/json/monsters/jabberwock.json | 9 +- data/json/monsters/mammal.json | 192 ++++++++++++------ data/json/monsters/marloss.json | 6 +- data/json/monsters/mi-go.json | 18 +- data/json/monsters/mutant_animal.json | 30 ++- data/json/monsters/mutant_human.json | 9 +- data/json/monsters/nether.json | 39 ++-- data/json/monsters/power_leech.json | 18 +- data/json/monsters/reptile_amphibian.json | 15 +- data/json/monsters/slugs.json | 3 +- data/json/monsters/triffid.json | 27 ++- data/json/monsters/zed-animal.json | 33 ++- data/json/monsters/zed-classic.json | 33 ++- data/json/monsters/zed_acid.json | 12 +- data/json/monsters/zed_burned.json | 9 +- data/json/monsters/zed_children.json | 21 +- data/json/monsters/zed_electric.json | 12 +- data/json/monsters/zed_explosive.json | 3 +- data/json/monsters/zed_fusion.json | 6 +- data/json/monsters/zed_lab.json | 6 +- data/json/monsters/zed_medical.json | 9 +- data/json/monsters/zed_misc.json | 78 ++++--- data/json/monsters/zed_radiation.json | 15 +- data/json/monsters/zed_skeletal.json | 12 +- data/json/monsters/zed_soldiers.json | 27 ++- data/json/monsters/zed_survivor.json | 3 +- .../mod/json/reference/creatures/monsters.md | 12 +- src/map.cpp | 2 +- 34 files changed, 625 insertions(+), 316 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 4b2d019ed64c..5562708be807 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -22,7 +22,8 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 4, - "harvest": "bird_tiny","decay": "decay_bird", + "harvest": "bird_tiny", + "decay": "decay_bird", "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "death_function": [ "NORMAL" ], @@ -62,7 +63,8 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "bird_tiny","decay": "decay_bird", + "harvest": "bird_tiny", + "decay": "decay_bird", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_crow", "baby_count": 3, "baby_timer": 8 }, @@ -91,7 +93,8 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "bird_small","decay": "decay_bird", + "harvest": "bird_small", + "decay": "decay_bird", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_duck", "baby_count": 3, "baby_timer": 5 }, @@ -133,7 +136,8 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 3, - "harvest": "bird_small","decay": "decay_bird", + "harvest": "bird_small", + "decay": "decay_bird", "vision_day": 50, "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -179,7 +183,8 @@ "melee_dice_sides": 1, "melee_cut": 3, "dodge": 6, - "harvest": "bird_tiny","decay": "decay_bird", + "harvest": "bird_tiny", + "decay": "decay_bird", "reproduction": { "baby_egg": "egg_cockatrice", "baby_count": 3, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -209,7 +214,8 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 1, - "harvest": "bird_tiny","decay": "decay_bird", + "harvest": "bird_tiny", + "decay": "decay_bird", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 14, "into": "mon_chicken" }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BIRDFOOD" ] diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json index 5d22ea81a9cd..e6e493b7d1c2 100644 --- a/data/json/monsters/cyborgs.json +++ b/data/json/monsters/cyborgs.json @@ -28,7 +28,8 @@ "revert_to_itype": "bot_broken_cyborg", "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], - "harvest": "mon_broken_cyborg","decay": "decay_broken_cyborg", + "harvest": "mon_broken_cyborg", + "decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", @@ -72,7 +73,8 @@ "revert_to_itype": "bot_prototype_cyborg", "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], - "harvest": "mon_broken_cyborg","decay": "decay_broken_cyborg", + "harvest": "mon_broken_cyborg", + "decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index d33c376d638b..b25c4287216a 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -22,7 +22,8 @@ "melee_dice_sides": 3, "melee_cut": 0, "dodge": 1, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -122,7 +123,8 @@ "melee_dice_sides": 3, "melee_cut": 2, "dodge": 1, - "harvest": "CBM_SCI_FERAL","decay": "decay_human", + "harvest": "CBM_SCI_FERAL", + "decay": "decay_human", "path_settings": { "max_dist": 10 }, "vision_day": 50, "vision_night": 3, @@ -171,7 +173,8 @@ "armor_bullet": 10, "armor_stab": 4, "dodge": 1, - "harvest": "human_maybe_mil_bionics","decay": "decay_human", + "harvest": "human_maybe_mil_bionics", + "decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -240,7 +243,8 @@ "armor_stab": 4, "dodge": 1, "luminance": 500, - "harvest": "human_maybe_mil_bionics","decay": "decay_human", + "harvest": "human_maybe_mil_bionics", + "decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -274,7 +278,8 @@ "copy-from": "mon_feral_human_pipe", "melee_dice": 2, "melee_dice_sides": 8, - "harvest": "human_maybe_tech_bionics","decay": "decay_human", + "harvest": "human_maybe_tech_bionics", + "decay": "decay_human", "death_drops": "feral_humans_death_drops_tool" }, { @@ -303,7 +308,8 @@ "armor_bullet": 6, "vision_day": 50, "vision_night": 3, - "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", + "harvest": "human_maybe_survivalist_bionics", + "decay": "decay_human", "starting_ammo": { "shot_00": 5 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -365,7 +371,8 @@ "melee_dice_sides": 3, "melee_cut": 0, "dodge": 1, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -495,7 +502,8 @@ "armor_acid": 4, "vision_day": 50, "vision_night": 3, - "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", + "harvest": "human_maybe_survivalist_bionics", + "decay": "decay_human", "starting_ammo": { "9mm": 3 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -562,7 +570,8 @@ "vision_day": 50, "vision_night": 4, "luminance": 500, - "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", + "harvest": "human_maybe_survivalist_bionics", + "decay": "decay_human", "special_attacks": [ [ "PARROT_AT_DANGER", 5 ] ], "death_function": [ "NORMAL" ], "death_drops": "mon_feral_survivalist_death_drops", @@ -612,7 +621,8 @@ "armor_acid": 5, "vision_day": 50, "vision_night": 4, - "harvest": "human_maybe_survivalist_bionics","decay": "decay_human", + "harvest": "human_maybe_survivalist_bionics", + "decay": "decay_human", "luminance": 500, "starting_ammo": { "223": 10 }, "special_attacks": [ @@ -676,7 +686,8 @@ "armor_cut": 25, "armor_bullet": 35, "dodge": 4, - "harvest": "human_maybe_mil_bionics","decay": "decay_human", + "harvest": "human_maybe_mil_bionics", + "decay": "decay_human", "vision_night": 5, "path_settings": { "max_dist": 40, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, "special_attacks": [ [ "PARROT_AT_DANGER", 0 ] ], diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index e552c20fd6a7..d7197ccb9baf 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -27,7 +27,8 @@ "armor_bullet": 24, "vision_day": 30, "vision_night": 20, - "harvest": "mutant_shellfish","decay": "decay_shellfish", + "harvest": "mutant_shellfish", + "decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], @@ -63,7 +64,8 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_tiny","decay": "null", + "harvest": "fish_tiny", + "decay": "null", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -94,7 +96,8 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small","decay": "decay_fish", + "harvest": "fish_small", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -125,7 +128,8 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small","decay": "decay_fish", + "harvest": "fish_small", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -156,7 +160,8 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_large","decay": "decay_fish", + "harvest": "fish_large", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -187,7 +192,8 @@ "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_large","decay": "decay_fish", + "harvest": "fish_large", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -511,7 +517,8 @@ "melee_dice_sides": 4, "melee_cut": 1, "luminance": 0, - "harvest": "lobster","decay": "decay_shellfish", + "harvest": "lobster", + "decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 180 }, "baby_flags": [ "SUMMER", "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -540,7 +547,8 @@ "melee_dice_sides": 3, "melee_cut": 1, "luminance": 0, - "harvest": "shellfish","decay": "decay_shellfish", + "harvest": "shellfish", + "decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 21 }, "baby_flags": [ "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -571,7 +579,8 @@ "luminance": 5, "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small","decay": "decay_fish", + "harvest": "fish_small", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -598,7 +607,8 @@ "luminance": 0, "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], - "harvest": "fish_small","decay": "decay_fish", + "harvest": "fish_small", + "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -624,7 +634,8 @@ "dodge": 2, "armor_cut": 8, "armor_bullet": 6, - "harvest": "shellfish","decay": "decay_shellfish", + "harvest": "shellfish", + "decay": "decay_shellfish", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -657,7 +668,8 @@ "armor_bullet": 14, "vision_day": 30, "vision_night": 15, - "harvest": "mutant_shellfish","decay": "decay_shellfish", + "harvest": "mutant_shellfish", + "decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -688,7 +700,8 @@ "melee_cut": 2, "dodge": 5, "luminance": 0, - "harvest": "mutant_fish","decay": "decay_fish", + "harvest": "mutant_fish", + "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 1, "baby_timer": 6 }, "baby_flags": [ "SPRING" ], "death_function": [ "NORMAL" ], @@ -717,7 +730,8 @@ "melee_cut": 2, "dodge": 5, "luminance": 0, - "harvest": "mutant_fish","decay": "decay_fish", + "harvest": "mutant_fish", + "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 150 }, "baby_flags": [ "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -747,7 +761,8 @@ "dodge": 6, "vision_day": 1, "vision_night": 30, - "harvest": "mutant_fish","decay": "decay_fish", + "harvest": "mutant_fish", + "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 19 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 5 }, diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json index 98c3ba3c25b2..fc1ab8061042 100644 --- a/data/json/monsters/fungus.json +++ b/data/json/monsters/fungus.json @@ -24,7 +24,8 @@ "armor_bash": 2, "vision_day": 30, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "FUNGUS", "NORMAL" ], @@ -169,7 +170,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "armor_bash": 4, - "harvest": "fungaloid","decay": "decay_plantlike", + "harvest": "fungaloid", + "decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS", 30 ] ], "death_function": [ "FUNGUS", "NORMAL" ], "flags": [ "STUMBLES", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -197,7 +199,8 @@ "armor_bullet": 8, "special_attacks": [ [ "FUNGUS_SPROUT", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass","decay": "decay_plantlike", + "harvest": "fungaloid_mass", + "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -224,7 +227,8 @@ "luminance": 200, "special_attacks": [ [ "FUNGUS_BIG_BLOSSOM", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass","decay": "decay_plantlike", + "harvest": "fungaloid_mass", + "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -255,7 +259,8 @@ "special_attacks": [ [ "FUNGUS_FORTIFY", 10 ] ], "death_drops": "marloss_yellow_drops", "death_function": [ "FUNGUS", "NORMAL" ], - "harvest": "fungaloid_mass","decay": "decay_plantlike", + "harvest": "fungaloid_mass", + "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "HARDTOSHOOT", "NO_BREATHE", "QUEEN" ] }, { @@ -283,7 +288,8 @@ "armor_bash": 4, "armor_cut": 4, "armor_bullet": 3, - "harvest": "fungaloid","decay": "decay_plantlike", + "harvest": "fungaloid", + "decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS_GROWTH", 10000 ] ], "death_function": [ "NORMAL" ], "flags": [ "HEARS", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -336,7 +342,8 @@ "armor_bash": 3, "vision_day": 5, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 200 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -402,7 +409,8 @@ "armor_fire": 5, "vision_day": 5, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], "death_function": [ "FUNGUS" ], @@ -436,7 +444,8 @@ "armor_bullet": 36, "vision_day": 5, "vision_night": 5, - "harvest": "mr_bones","decay": "decay_zombie_mrbones", + "harvest": "mr_bones", + "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "FUNGUS" ], @@ -482,7 +491,8 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ], [ "FUNGUS", 200 ] ], "death_drops": { "subtype": "collection", @@ -522,7 +532,8 @@ "armor_bullet": 1, "vision_day": 3, "vision_night": 3, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGUS", 200 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "POISON", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -555,7 +566,8 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGAL_TRAIL", 3 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index e6ea8dc70585..11afccf30451 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -22,7 +22,8 @@ "melee_cut": 4, "dodge": 4, "armor_bash": 6, - "harvest": "arachnid_acid","decay": "decay_arthopod_acid", + "harvest": "arachnid_acid", + "decay": "decay_arthopod_acid", "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "HEARS", "GOODHEARING", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "ACIDTRAIL" ] }, @@ -50,7 +51,8 @@ "armor_bash": 12, "armor_cut": 8, "armor_bullet": 6, - "harvest": "meatslug","decay": "null", + "harvest": "meatslug", + "decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS" ] }, @@ -76,7 +78,8 @@ "melee_dice_sides": 6, "melee_cut": 0, "armor_bash": 2, - "harvest": "mutant_meatslug","decay": "null", + "harvest": "mutant_meatslug", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -102,7 +105,8 @@ "melee_dice_sides": 6, "melee_cut": 3, "armor_bash": 2, - "harvest": "mutant_meatslug","decay": "null", + "harvest": "mutant_meatslug", + "decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -134,7 +138,8 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", + "harvest": "arachnid_tainted", + "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 1, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_plague_vector" }, @@ -168,7 +173,8 @@ "melee_cut": 0, "vision_day": 10, "vision_night": 3, - "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", + "harvest": "arachnid_tainted", + "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 7, "into": "mon_skittering_plague" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -202,7 +208,8 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid_tainted","decay": "decay_arthopod_standard", + "harvest": "arachnid_tainted", + "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 3, "baby_timer": 5 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], @@ -237,7 +244,8 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 4, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_pregnant_giant_cockroach" }, @@ -269,7 +277,8 @@ "melee_cut": 0, "vision_day": 10, "vision_night": 3, - "harvest": "mutant_animal_tiny","decay": "null", + "harvest": "mutant_animal_tiny", + "decay": "null", "upgrades": { "age_grow": 7, "into": "mon_giant_cockroach" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -303,7 +312,8 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 3, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL", "PREG_ROACH" ], @@ -350,7 +360,8 @@ "armor_bullet": 5, "vision_day": 10, "vision_night": 5, - "harvest": "arachnid_bee","decay": "decay_arthopod_bee", + "harvest": "arachnid_bee", + "decay": "decay_arthopod_bee", "anger_triggers": [ "HURT", "FRIEND_DIED", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "SWARMS", "GROUP_MORALE", "CANPLAY", "PATH_AVOID_FIRE", "LOUDMOVES" ] @@ -435,7 +446,8 @@ "vision_day": 9, "vision_night": 6, "anger_triggers": [ "STALK", "PLAYER_CLOSE" ], - "harvest": "arachnid_centipede","decay": "decay_arthopod_centipede", + "harvest": "arachnid_centipede", + "decay": "decay_arthopod_centipede", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_GIANT" }, "flags": [ "CLIMBS", "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE" ] @@ -478,7 +490,8 @@ "dodge": 0, "proportional": { "vision_day": 0.5, "vision_night": 0.5 }, "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], - "harvest": "arachnid_centipede_mom","decay": "decay_arthopod_centipede", + "harvest": "arachnid_centipede_mom", + "decay": "decay_arthopod_centipede", "reproduction": { "baby_monster": "mon_centipede_small", "baby_count": 2, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_MOM" }, @@ -527,7 +540,8 @@ "vision_day": 12, "vision_night": 7, "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT" ], - "harvest": "arachnid_centipede_mom_mega","decay": "decay_arthopod_centipede_mega", + "harvest": "arachnid_centipede_mom_mega", + "decay": "decay_arthopod_centipede_mega", "flags": [ "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "DESTROYS", "PUSH_MON", "PUSH_VEH" ] }, { @@ -548,7 +562,8 @@ "speed": 95, "vision_day": 15, "dodge": 2, - "harvest": "arachnid_firefly","decay": "decay_arthopod_flying", + "harvest": "arachnid_firefly", + "decay": "decay_arthopod_flying", "reproduction": { "baby_egg": "egg_firefly", "baby_count": 1, "baby_timer": 15 }, "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "HURT" ], @@ -581,7 +596,8 @@ "dodge": 3, "vision_day": 25, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -622,7 +638,8 @@ "dodge": 2, "vision_day": 45, "vision_night": 5, - "harvest": "arachnid_flying","decay": "decay_arthopod_flying", + "harvest": "arachnid_flying", + "decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -658,7 +675,8 @@ ], "vision_day": 30, "vision_night": 5, - "harvest": "arachnid_dragonfly_mega","decay": "decay_arthopod_flying", + "harvest": "arachnid_dragonfly_mega", + "decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_dragonfly", "baby_count": 3, "baby_timer": 1 }, @@ -689,7 +707,8 @@ "dodge": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "HIT_AND_RUN", "CANPLAY", "PATH_AVOID_FIRE" ] @@ -719,7 +738,8 @@ "dodge": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "STUMBLES", "VENOM", "FLIES", "HIT_AND_RUN", "PATH_AVOID_FIRE" ] }, @@ -752,7 +772,8 @@ "armor_acid": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -787,7 +808,8 @@ "armor_acid": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_FIRE" ] @@ -819,7 +841,8 @@ "armor_bullet": 2, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "special_attacks": [ { "type": "leap", "cooldown": 2, "max_range": 5, "allow_no_target": true } ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -854,7 +877,8 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "GRABS", "CAN_DIG", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -887,7 +911,8 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -919,7 +944,8 @@ "armor_bullet": 5, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "STUMBLES", "CLIMBS", "PATH_AVOID_FIRE" ] }, @@ -951,7 +977,8 @@ "armor_bullet": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -985,7 +1012,8 @@ "armor_bullet": 3, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -1018,7 +1046,8 @@ "armor_bullet": 6, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -1039,7 +1068,8 @@ "volume": "9 L", "weight": "9 kg", "hp": 35, - "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp", + "decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 16, "into": "mon_wasp_pupa" }, "//": "30 days of development from egg to adult.", "flags": [ "IMMOBILE" ] @@ -1058,7 +1088,8 @@ "volume": "15 L", "weight": "15 kg", "hp": 100, - "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp", + "decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 10, "into_group": "GROUP_WASP_PUPA" }, "flags": [ "IMMOBILE" ] }, @@ -1107,7 +1138,8 @@ "armor_stab": 4, "vision_day": 15, "vision_night": 5, - "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp", + "decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1144,7 +1176,8 @@ "name": { "str": "wasp queen" }, "description": "A mutated wasp queen grown to the size of a person, laying a single white egg in each empty cell it comes across while scurrying around on the paper walls of their home. It struggles to fit into some of them, but the newer cells seem to be getting larger…", "copy-from": "mon_wasp_guard", - "harvest": "arachnid_wasp_queen","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp_queen", + "decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 2, "baby_timer": 5 }, "upgrades": { "half_life": 30, "into": "mon_wasp_mega" } }, @@ -1196,7 +1229,8 @@ "armor_bullet": 12, "vision_day": 17, "vision_night": 7, - "harvest": "arachnid_wasp","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp", + "decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1267,7 +1301,8 @@ "armor_cut": 30, "armor_stab": 18, "armor_bullet": 22, - "harvest": "arachnid_wasp_queen","decay": "decay_arthopod_wasp", + "harvest": "arachnid_wasp_queen", + "decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 4, "baby_timer": 5 }, "extend": { "flags": [ "PUSH_MON" ] }, "delete": { "flags": [ "HARDTOSHOOT" ] } @@ -1298,7 +1333,8 @@ "armor_cut": 6, "armor_bash": 6, "armor_bullet": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "special_attacks": [ [ "DERMATIK", 25 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1327,7 +1363,8 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 1, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 21, "into": "mon_dermatik" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "POISON", "CAN_DIG", "LARVA" ] @@ -1360,7 +1397,8 @@ "morale": 100, "vision_day": 6, "vision_night": 6, - "harvest": "incubator_mammal","decay": "decay_animal_standard", + "harvest": "incubator_mammal", + "decay": "decay_animal_standard", "special_attacks": [ [ "PARROT", 6 ], { @@ -1425,7 +1463,8 @@ "armor_bullet": 8, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 14, "into": "mon_ant_soldier" }, "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1464,7 +1503,8 @@ "special_attacks": [ [ "ACID", 23 ], [ "EAT_FOOD", 30 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid","decay": "decay_arthopod_acid", + "harvest": "arachnid_acid", + "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1490,7 +1530,8 @@ "melee_cut": 0, "upgrades": { "age_grow": 3, "into": "mon_ant_acid" }, "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid","decay": "decay_arthopod_acid", + "harvest": "arachnid_acid", + "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "LARVA", "POISON", "SMELLS" ] }, { @@ -1522,7 +1563,8 @@ "special_attacks": [ [ "ANTQUEEN", 1 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], - "harvest": "acidant_queen","decay": "decay_arthopod_acid", + "harvest": "acidant_queen", + "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "QUEEN", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1556,7 +1598,8 @@ "special_attacks": [ [ "ACID", 15 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], - "harvest": "arachnid_acid","decay": "decay_arthopod_acid", + "harvest": "arachnid_acid", + "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "SHORTACIDTRAIL", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1580,7 +1623,8 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_cut": 0, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 3, "into": "mon_ant" }, "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "LARVA" ] @@ -1609,7 +1653,8 @@ "armor_bash": 6, "armor_cut": 14, "armor_bullet": 11, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "special_attacks": [ [ "ANTQUEEN", 1 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "death_function": [ "NORMAL" ], @@ -1643,7 +1688,8 @@ "armor_bullet": 10, "vision_day": 5, "vision_night": 5, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_ant_fungus", @@ -1675,7 +1721,8 @@ "armor_cut": 4, "armor_bullet": 3, "vision_day": 10, - "harvest": "arachnid","decay": "decay_arthopod_standard", + "harvest": "arachnid", + "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_locust", "baby_count": 20, "baby_timer": 10 }, "baby_flags": [ "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED" ], @@ -1706,7 +1753,8 @@ "dodge": 3, "melee_cut": 0, "vision_day": 10, - "harvest": "mutant_animal_tiny","decay": "null", + "harvest": "mutant_animal_tiny", + "decay": "null", "upgrades": { "age_grow": 10, "into": "mon_locust" }, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 4, "max_range": 4, "allow_no_target": true }, [ "EAT_CROP", 120 ] ], diff --git a/data/json/monsters/jabberwock.json b/data/json/monsters/jabberwock.json index 5e3014492597..519022c71e3b 100644 --- a/data/json/monsters/jabberwock.json +++ b/data/json/monsters/jabberwock.json @@ -26,7 +26,8 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 10 ], [ "ABSORB_MEAT", 10 ] ], "death_function": [ "NORMAL" ], - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "upgrades": { "half_life": 15, "into": "mon_flesh_golem" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -57,7 +58,8 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 8 ], [ "ABSORB_MEAT", 1 ] ], "death_function": [ "NORMAL" ], - "harvest": "flesh_golem","decay": "decay_flesh_golem", + "harvest": "flesh_golem", + "decay": "decay_flesh_golem", "upgrades": { "half_life": 15, "into": "mon_jabberwock" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -89,7 +91,8 @@ "vision_night": 3, "special_attacks": [ [ "FLESH_GOLEM", 5 ] ], "death_function": [ "JABBERWOCKY" ], - "harvest": "jabberwock","decay": "decay_jabberwock", + "harvest": "jabberwock", + "decay": "decay_jabberwock", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "ATTACKMON", "POISON" ] } ] diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 3c4078a13e23..abf934b6e09c 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -22,7 +22,8 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 8, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "vision_day": 20, "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], @@ -47,7 +48,8 @@ "melee_dice_sides": 3, "melee_cut": 2, "dodge": 2, - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "special_attacks": [ [ "EAT_FOOD", 60 ] ], "upgrades": { "age_grow": 480, "into": "mon_bear" } }, @@ -83,7 +85,8 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_large_fur","decay": "decay_animal_standard", + "harvest": "mammal_large_fur", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_bear_cub", "baby_count": 1, "baby_timer": 700 }, "//": "220 days gestation period, the mother and cubs remain together for 16-17 months.", "baby_flags": [ "SPRING" ], @@ -113,7 +116,8 @@ "melee_dice_sides": 6, "melee_cut": 6, "dodge": 2, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -144,7 +148,8 @@ "dodge": 2, "vision_day": 30, "vision_night": 10, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -176,7 +181,8 @@ "melee_dice_sides": 2, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -212,7 +218,8 @@ "armor_bash": 2, "armor_cut": 1, "armor_bullet": 1, - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_boar_wild_piglet", "baby_count": 8, "baby_timer": 154 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 10 }, @@ -250,7 +257,8 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] }, { @@ -277,7 +285,8 @@ "special_attacks": [ [ "scratch", 10 ] ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "CATFOOD", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ], "upgrades": { "age_grow": 120, "into": "mon_cat" } }, @@ -311,7 +320,8 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "MEAT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "reproduction": { "baby_monster": "mon_cat_kitten", "baby_count": 4, "baby_timer": 60 }, "flags": [ "SEES", @@ -549,7 +559,8 @@ "melee_dice_sides": 1, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -584,7 +595,8 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -629,7 +641,8 @@ "placate_triggers": [ "PLAYER_WEAK" ], "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "upgrades": { "age_grow": 180, "into": "mon_cow" }, "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CATTLEFODDER", "PET_WONT_FOLLOW" ] @@ -665,7 +678,8 @@ "placate_triggers": [ "PLAYER_WEAK" ], "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_cow_calf", "baby_count": 1, "baby_timer": 343 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 40 ] ], @@ -711,7 +725,8 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE", "BLEED" ] }, { @@ -738,7 +753,8 @@ "dodge": 3, "armor_bash": 1, "vision_night": 5, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -771,7 +787,8 @@ "melee_cut": 0, "dodge": 3, "vision_night": 12, - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -802,7 +819,8 @@ "melee_cut": 0, "dodge": 3, "vision_night": 12, - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -823,7 +841,8 @@ "species": [ "MAMMAL" ], "volume": "30000 ml", "weight": "30 kg", - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], @@ -878,7 +897,8 @@ "melee_cut": 1, "dodge": 1, "vision_night": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "upgrades": { "age_grow": 42, "into": "mon_dog" }, "extend": { "flags": [ "NO_BREED" ] } }, @@ -896,7 +916,8 @@ "melee_dice_sides": 2, "melee_cut": 6, "vision_night": 4, - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_bull_pup", "baby_count": 7, "baby_timer": 300 }, "//": "7 puppies and 300-320 days per-litter for size medium canines", "flags": [ @@ -935,7 +956,8 @@ "melee_dice_sides": 1, "melee_cut": 3, "vision_night": 3, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bull" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -957,7 +979,8 @@ "melee_dice_sides": 2, "melee_cut": 5, "special_attacks": [ [ "LUNGE", 5 ] ], - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_pitbullmix_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -984,7 +1007,8 @@ "species": [ "MAMMAL" ], "volume": "750 ml", "weight": "1 kg", - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "hp": 7, "speed": 88, "material": [ "flesh" ], @@ -1012,7 +1036,8 @@ "name": { "str": "beagle" }, "description": "An adorable beagle that has managed to survive the apocalypse. Being agile and small, they are difficult to shoot at. Generally attacks in packs.", "weight": "10 kg", - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "hp": 13, "speed": 135, "melee_skill": 2, @@ -1062,7 +1087,8 @@ "melee_cut": 1, "dodge": 1, "vision_night": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_beagle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1124,7 +1150,8 @@ "melee_cut": 2, "dodge": 2, "vision_night": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bcollie" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1145,7 +1172,8 @@ "melee_dice_sides": 2, "melee_cut": 4, "vision_night": 4, - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "fear_triggers": [ "HURT" ], "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_boxer_pup", "baby_count": 4, "baby_timer": 270 }, @@ -1176,7 +1204,8 @@ "melee_cut": 2, "dodge": 1, "vision_night": 3, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_boxer" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1212,7 +1241,8 @@ "melee_dice_sides": 2, "melee_cut": 2, "vision_night": 6, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "HURT" ], "reproduction": { "baby_monster": "mon_dog_chihuahua_pup", "baby_count": 3, "baby_timer": 240 }, "//": "1-3 puppies & 240 days per-litter for size tiny canines", @@ -1253,7 +1283,8 @@ "melee_cut": 1, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_chihuahua" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1276,7 +1307,8 @@ "melee_dice_sides": 2, "vision_night": 6, "fear_triggers": [ "HURT" ], - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_dachshund_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -1318,7 +1350,8 @@ "melee_cut": 1, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_dachshund" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1368,7 +1401,8 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gshepherd" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1394,7 +1428,8 @@ "melee_cut": 5, "dodge": 2, "vision_night": 6, - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_gpyrenees_pup", "baby_count": 7, "baby_timer": 320 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", "flags": [ @@ -1434,7 +1469,8 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gpyrenees" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1459,7 +1495,8 @@ "melee_dice_sides": 2, "melee_cut": 6, "vision_night": 6, - "harvest": "mammal_leather","decay": "decay_animal_standard", + "harvest": "mammal_leather", + "decay": "decay_animal_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_rottweiler_pup", "baby_count": 7, "baby_timer": 300 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", @@ -1500,7 +1537,8 @@ "melee_cut": 3, "dodge": 1, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_rottweiler" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1564,7 +1602,8 @@ "melee_cut": 3, "dodge": 2, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_auscattle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1596,7 +1635,8 @@ "melee_cut": 2, "dodge": 6, "vision_night": 5, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1627,7 +1667,8 @@ "melee_cut": 2, "dodge": 6, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1656,7 +1697,8 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1681,7 +1723,8 @@ "morale": -5, "melee_cut": 0, "dodge": 6, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1715,7 +1758,8 @@ "anger_triggers": [ "FRIEND_ATTACKED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "upgrades": { "age_grow": 450, "into": "mon_horse" }, "special_attacks": [ [ "EAT_CROP", 100 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "WARM", "NO_BREED" ] @@ -1746,7 +1790,8 @@ "fear_triggers": [ "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_horse_foal", "baby_count": 1, "baby_timer": 360 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 60 ] ], @@ -1783,7 +1828,8 @@ "melee_skill": 4, "melee_cut": 0, "dodge": 2, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1811,7 +1857,8 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 6, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1850,7 +1897,8 @@ "death_function": [ "NORMAL" ], "baby_flags": [ "AUTUMN" ], "//": "Baby moose don't actually exist (yet), but autumn is their mating season so baby_flags is defined so that they get angry then", - "harvest": "mammal_large_fur","decay": "decay_animal_standard", + "harvest": "mammal_large_fur", + "decay": "decay_animal_standard", "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BLEED", "ATTACKMON" ] }, @@ -1877,7 +1925,8 @@ "melee_dice_sides": 6, "melee_cut": 2, "dodge": 2, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1911,7 +1960,8 @@ "armor_bullet": 2, "vision_day": 0, "vision_night": 0, - "harvest": "mutant_mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mutant_mammal_large_leather", + "decay": "decay_animal_standard", "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 1 ], { "type": "bite", "cooldown": 6 }, [ "impale", 10 ] ], "anger_triggers": [ "HURT", "SOUND", "STALK" ], "fear_triggers": [ "FIRE" ], @@ -1945,7 +1995,8 @@ "melee_cut": 1, "dodge": 2, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -1973,7 +2024,8 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 4, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2002,7 +2054,8 @@ "melee_dice_sides": 2, "melee_cut": 1, "dodge": 4, - "harvest": "mammal_small_leather","decay": "decay_animal_standard", + "harvest": "mammal_small_leather", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -2045,7 +2098,8 @@ "melee_dice_sides": 8, "melee_cut": 4, "dodge": 2, - "harvest": "mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mammal_large_leather", + "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_pig_piglet", "baby_count": 8, "baby_timer": 154 }, "//": "116 days gestation, 3-5 weeks until the piglets get weaned, 10-30 days of maturation", "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], @@ -2078,7 +2132,8 @@ "melee_cut": 0, "dodge": 6, "reproduction": { "baby_monster": "mon_rabbit", "baby_count": 3, "baby_timer": 55 }, - "harvest": "mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mammal_small_fur", + "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "PET_WONT_FOLLOW", "WARM" ] @@ -2106,7 +2161,8 @@ "melee_dice_sides": 4, "melee_cut": 1, "dodge": 3, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "vision_night": 5, "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "death_function": [ "NORMAL" ], @@ -2133,7 +2189,8 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_cut": 1, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "special_attacks": [ [ "RATKING", 3 ] ], "death_function": [ "RATKING" ] }, @@ -2162,7 +2219,8 @@ "dodge": 2, "vision_day": 1, "vision_night": 30, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -2191,7 +2249,8 @@ "melee_cut": 1, "dodge": 2, "anger_triggers": [ ], - "harvest": "mammal_small_wool","decay": "decay_animal_wool", + "harvest": "mammal_small_wool", + "decay": "decay_animal_wool", "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -2222,7 +2281,8 @@ "dodge": 2, "starting_ammo": { "milk_raw": 5 }, "anger_triggers": [ ], - "harvest": "mammal_large_wool","decay": "decay_animal_wool", + "harvest": "mammal_large_wool", + "decay": "decay_animal_wool", "reproduction": { "baby_monster": "mon_sheep_lamb", "baby_count": 1, "baby_timer": 275 }, "//": "Sheep are seasonal breeders. The natural sexual season is positioned so that lambs will be born in the spring when the weather is warmer and grass is available.", "baby_flags": [ "SPRING" ], @@ -2265,7 +2325,8 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 4, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2292,7 +2353,8 @@ "melee_dice_sides": 1, "melee_cut": 0, "dodge": 3, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2319,7 +2381,8 @@ "melee_cut": 2, "dodge": 4, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2348,7 +2411,8 @@ "dodge": 4, "armor_bash": 1, "vision_night": 5, - "harvest": "mammal_fur","decay": "decay_animal_standard", + "harvest": "mammal_fur", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], diff --git a/data/json/monsters/marloss.json b/data/json/monsters/marloss.json index 9fdffb06b40d..2da32b0d54b0 100644 --- a/data/json/monsters/marloss.json +++ b/data/json/monsters/marloss.json @@ -21,7 +21,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], @@ -52,7 +53,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json index bac28581b6bb..2870d34b5516 100644 --- a/data/json/monsters/mi-go.json +++ b/data/json/monsters/mi-go.json @@ -26,7 +26,8 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -75,7 +76,8 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -125,7 +127,8 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -174,7 +177,8 @@ "armor_bullet": 18, "vision_day": 50, "vision_night": 20, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -227,7 +231,8 @@ "armor_bullet": 22, "vision_day": 50, "vision_night": 25, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -279,7 +284,8 @@ "armor_bullet": 4, "vision_day": 50, "vision_night": 25, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ diff --git a/data/json/monsters/mutant_animal.json b/data/json/monsters/mutant_animal.json index 28ed9b936b20..dff1d1c9c3de 100644 --- a/data/json/monsters/mutant_animal.json +++ b/data/json/monsters/mutant_animal.json @@ -67,7 +67,8 @@ "armor_bullet": 11, "armor_stab": 30, "armor_acid": 8, - "harvest": "mammal_large_chitin","decay": "decay_mammal_plus_chitin", + "harvest": "mammal_large_chitin", + "decay": "decay_mammal_plus_chitin", "delete": { "fear_triggers": [ "SOUND" ] }, "//": "Doesn't zombify because it shouldn't regain the fur.", "zombify_into": "mon_null" @@ -111,7 +112,8 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mutant_mammal_large_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_large_fur", + "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON", "STUMBLES", "KEENNOSE" ] }, { @@ -138,7 +140,8 @@ "melee_cut": 6, "dodge": 2, "armor_cut": 4, - "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_fur", + "decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -167,7 +170,8 @@ "melee_dice_sides": 6, "melee_cut": 6, "dodge": 3, - "harvest": "bird_large","decay": "decay_bird_large", + "harvest": "bird_large", + "decay": "decay_bird_large", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -206,7 +210,8 @@ "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_penetration": 10 } ] } ], - "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_fur", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 7 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -245,7 +250,8 @@ "fear_triggers": [ "SOUND" ], "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], - "harvest": "mutant_mammal_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_fur", + "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -287,7 +293,8 @@ "armor_cut": 10, "vision_day": 50, "vision_night": 5, - "harvest": "mutant_mammal_large_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_large_fur", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { @@ -326,7 +333,8 @@ "melee_cut": 0, "dodge": 4, "vision_night": 15, - "harvest": "mutant_mammal_large_leather","decay": "decay_animal_standard", + "harvest": "mutant_mammal_large_leather", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -362,7 +370,8 @@ "melee_cut": 0, "dodge": 3, "vision_night": 15, - "harvest": "mutant_mammal_leather","decay": "decay_animal_standard", + "harvest": "mutant_mammal_leather", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -380,7 +389,8 @@ "species": [ "MAMMAL" ], "volume": "30000 ml", "weight": "30 kg", - "harvest": "mutant_mammal_small_fur","decay": "decay_animal_standard", + "harvest": "mutant_mammal_small_fur", + "decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], diff --git a/data/json/monsters/mutant_human.json b/data/json/monsters/mutant_human.json index 5cf998dfab51..5291c1f30f8d 100644 --- a/data/json/monsters/mutant_human.json +++ b/data/json/monsters/mutant_human.json @@ -21,7 +21,8 @@ "melee_dice_sides": 6, "melee_cut": 0, "dodge": 3, - "harvest": "mutant_human","decay": "decay_human", + "harvest": "mutant_human", + "decay": "decay_human", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { @@ -57,7 +58,8 @@ "armor_bullet": 4, "vision_day": 25, "vision_night": 5, - "harvest": "human_fur_maybe_cyborg","decay": "decay_human", + "harvest": "human_fur_maybe_cyborg", + "decay": "decay_human", "special_attacks": [ [ "PARROT", 80 ], { @@ -152,7 +154,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 5, - "harvest": "mutant_human","decay": "decay_human", + "harvest": "mutant_human", + "decay": "decay_human", "death_drops": { "subtype": "collection", "groups": [ [ "subway", 40 ], [ "sewer", 20 ], [ "trash", 5 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ] diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 33941f67a154..7275465a488f 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -30,7 +30,8 @@ "special_attacks": [ { "type": "bite", "cooldown": 15 }, [ "impale", 20 ] ], "anger_triggers": [ "HURT", "FRIEND_DIED", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], - "harvest": "bird_large","decay": "decay_bird_large", + "harvest": "bird_large", + "decay": "decay_bird_large", "flags": [ "HEARS", "KEENNOSE", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS", "SUNDEATH" ] }, { @@ -56,7 +57,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 2, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 0 ] ], "death_function": [ "AMIGARA", "NORMAL" ], "flags": [ "SMELLS", "HEARS", "SEES", "STUMBLES", "HARDTOSHOOT", "HUMAN" ] @@ -83,7 +85,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 1, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "special_attacks": [ [ "SHRIEK", 10 ], { "type": "bite", "cooldown": 10 } ], "anger_triggers": [ "NETHER_ATTENTION" ], "death_function": [ "NORMAL" ], @@ -109,7 +112,8 @@ "melee_dice": 1, "melee_dice_sides": 5, "melee_cut": 2, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -219,7 +223,8 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 1, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -274,7 +279,8 @@ "vision_day": 50, "vision_night": 40, "luminance": 25, - "harvest": "zombie_meatslug","decay": "null", + "harvest": "zombie_meatslug", + "decay": "null", "special_attacks": [ [ "STARE", 12 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "WARM", "FLIES", "FIREY", "NO_BREATHE", "NOHEAD" ] @@ -302,7 +308,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 2, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -360,7 +367,8 @@ "melee_cut": 0, "dodge": 4, "vision_day": 30, - "harvest": "gozu","decay": "decay_human", + "harvest": "gozu", + "decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 20 ] ], "death_drops": "mon_gozu_death_drops", "death_function": [ "NORMAL" ], @@ -400,7 +408,8 @@ "melee_cut": 2, "dodge": 4, "vision_night": 10, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "death_function": [ "NORMAL" ], "anger_triggers": [ "NETHER_ATTENTION" ], "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 8, "armor_multiplier": 0.8 } ] } ], @@ -459,7 +468,8 @@ "armor_bash": 4, "armor_cut": 2, "armor_bullet": 2, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "BLEED", "REVIVES", "CLIMBS", "FILTHY" ] }, @@ -576,7 +586,8 @@ "armor_bash": 6, "armor_cut": 12, "armor_bullet": 10, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "special_attacks": [ [ "ACID", 15 ] ], "anger_triggers": [ "PLAYER_WEAK", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -863,7 +874,8 @@ "melee_dice_sides": 4, "melee_cut": 0, "dodge": 6, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "POISON", "HUMAN", "CLIMBS" ] }, @@ -891,7 +903,8 @@ "melee_cut": 8, "dodge": 1, "armor_bash": 6, - "harvest": "meatslug","decay": "null", + "harvest": "meatslug", + "decay": "null", "special_attacks": [ [ "GENE_STING", 20 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "DESTROYS", "POISON", "VENOM", "NO_BREATHE", "CAN_DIG" ] diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json index ff05b94643ea..9cc7bebf6029 100644 --- a/data/json/monsters/power_leech.json +++ b/data/json/monsters/power_leech.json @@ -35,7 +35,8 @@ [ "PARROT", 40 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant_bloom","decay": "null", + "harvest": "flesh_plant_bloom", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "QUEEN", "HARDTOSHOOT" ] }, @@ -73,7 +74,8 @@ [ "MON_LEECH_EVOLUTION", 30 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant","decay": "null", + "harvest": "flesh_plant", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -109,7 +111,8 @@ "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": { }, "death_function": [ "NORMAL" ], - "harvest": "flesh_plant","decay": "null", + "harvest": "flesh_plant", + "decay": "null", "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, { @@ -142,7 +145,8 @@ }, [ "LEECH_SPAWNER", 35 ] ], - "harvest": "flesh_plant","decay": "null", + "harvest": "flesh_plant", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE" ] }, @@ -185,7 +189,8 @@ [ "EVOLVE_KILL_STRIKE", 3 ] ], "special_when_hit": [ "ZAPBACK", 100 ], - "harvest": "flesh_plant","decay": "null", + "harvest": "flesh_plant", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -226,7 +231,8 @@ }, [ "EVOLVE_KILL_STRIKE", 6 ] ], - "harvest": "flesh_plant","decay": "null", + "harvest": "flesh_plant", + "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] } diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index 703da596aa48..61123275b3bf 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -22,7 +22,8 @@ "melee_cut": 1, "dodge": 2, "armor_bash": 4, - "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", + "harvest": "mutant_animal_large_noskin", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -57,7 +58,8 @@ "armor_bullet": 6, "vision_day": 3, "vision_night": 35, - "harvest": "animal_large_noskin","decay": "decay_animal_standard", + "harvest": "animal_large_noskin", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 8 }, "special_attacks": [ { @@ -104,7 +106,8 @@ "dodge": 1, "vision_day": 30, "vision_night": 5, - "harvest": "mammal_tiny","decay": "null", + "harvest": "mammal_tiny", + "decay": "null", "special_attacks": [ [ "RATTLE", 6 ] ], "anger_triggers": [ "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -141,7 +144,8 @@ "armor_bullet": 3, "vision_day": 30, "vision_night": 5, - "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", + "harvest": "mutant_animal_large_noskin", + "decay": "decay_animal_standard", "special_attacks": [ [ "RATTLE", 6 ], { @@ -182,7 +186,8 @@ "dodge": 1, "vision_day": 1, "vision_night": 30, - "harvest": "mutant_animal_large_noskin","decay": "decay_animal_standard", + "harvest": "mutant_animal_large_noskin", + "decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "WARM", "VENOM", "SWIMS" ] diff --git a/data/json/monsters/slugs.json b/data/json/monsters/slugs.json index 28ba580376fd..5b3e4bcaeef4 100644 --- a/data/json/monsters/slugs.json +++ b/data/json/monsters/slugs.json @@ -55,7 +55,8 @@ "armor_cut": 2, "armor_bullet": 2, "vision_day": 30, - "harvest": "mutant_meatslug","decay": "null", + "harvest": "mutant_meatslug", + "decay": "null", "special_attacks": [ [ "ACID", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index 9ad3ee87eabf..ae9f43ebfaa0 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -43,7 +43,8 @@ "aggression": 100, "morale": 100, "melee_cut": 0, - "harvest": "biollante","decay": "decay_plantlike", + "harvest": "biollante", + "decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 2 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "biollante", 8 ] ], "//": "80% chance of an item from group biollante" }, "death_function": [ "NORMAL" ], @@ -115,7 +116,8 @@ "melee_dice": 1, "melee_dice_sides": 1, "melee_cut": 1, - "harvest": "triffid_small","decay": "decay_plantlike", + "harvest": "triffid_small", + "decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid_young" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "NOHEAD", "STUMBLES" ] @@ -139,7 +141,8 @@ "melee_dice": 1, "melee_dice_sides": 4, "melee_cut": 4, - "harvest": "triffid_small","decay": "decay_plantlike", + "harvest": "triffid_small", + "decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid" }, "special_attacks": [ [ "TRIFFID_GROWTH", 28800 ] ], "death_function": [ "NORMAL" ], @@ -169,7 +172,8 @@ "armor_bash": 10, "armor_cut": 4, "armor_bullet": 3, - "harvest": "triffid_large","decay": "decay_plantlike", + "harvest": "triffid_large", + "decay": "decay_plantlike", "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", "flags": [ "SEES", "SMELLS", "BASHES", "GROUP_BASH", "NOHEAD", "PARALYZEVENOM" ] @@ -197,7 +201,8 @@ "armor_bash": 12, "armor_cut": 8, "armor_bullet": 6, - "harvest": "triffid_queen","decay": "decay_plantlike_triffidqueen", + "harvest": "triffid_queen", + "decay": "decay_plantlike_triffidqueen", "special_attacks": [ [ "GROWPLANTS", 20 ] ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", @@ -225,7 +230,8 @@ "melee_cut": 0, "dodge": 4, "armor_bash": 18, - "harvest": "triffid_small","decay": "decay_plantlike", + "harvest": "triffid_small", + "decay": "decay_plantlike", "death_function": [ "NORMAL" ], "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "HARDTOSHOOT", "GRABS", "SWIMS", "PLASTIC" ] }, @@ -252,7 +258,8 @@ "armor_bash": 4, "armor_cut": 6, "armor_bullet": 5, - "harvest": "triffid_large","decay": "decay_plantlike", + "harvest": "triffid_large", + "decay": "decay_plantlike", "attack_effs": [ { "id": "paralyzepoison", "//": "applying this multiple times makes intensity go up by 3 instead of 1", "duration": 33 }, { "id": "paralyzepoison", "duration": 33 }, @@ -281,7 +288,8 @@ "aggression": 100, "morale": 100, "melee_cut": 0, - "harvest": "triffid_large","decay": "decay_plantlike", + "harvest": "triffid_large", + "decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 3 ], [ "PARA_STING", 12 ] ], "emit_fields": [ { "emit_id": "emit_pollen_stream", "delay": "1 s" } ], "death_function": [ "NORMAL" ], @@ -308,7 +316,8 @@ "armor_bash": 12, "armor_cut": 16, "armor_bullet": 13, - "harvest": "triffid_small","decay": "decay_plantlike", + "harvest": "triffid_small", + "decay": "decay_plantlike", "special_attacks": [ [ "TRIFFID_HEARTBEAT", 50 ] ], "death_function": [ "TRIFFID_HEART" ], "flags": [ "NOHEAD", "IMMOBILE", "QUEEN" ] diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index 860b94ca6ede..3c7690a0199c 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -25,7 +25,8 @@ "armor_cut": 2, "armor_bullet": 2, "luminance": 0, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "SWIMS", "AQUATIC", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] }, @@ -54,7 +55,8 @@ "melee_cut": 2, "dodge": 1, "vision_night": 4, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" }, @@ -87,7 +89,8 @@ "armor_stab": 30, "armor_acid": 3, "vision_night": 3, - "harvest": "mr_bones","decay": "decay_zombie_mrbones", + "harvest": "mr_bones", + "decay": "decay_zombie_mrbones", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "POISON", "FILTHY" ] @@ -120,7 +123,8 @@ "armor_bullet": 5, "vision_day": 50, "vision_night": 4, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "dog_cop", 40 ] ], "//": "40% chance of an item from group dog_cop" }, "death_function": [ "NORMAL" ], @@ -151,7 +155,8 @@ "dodge": 1, "vision_day": 30, "vision_night": 4, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 4, "no_infection_chance": 12 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ] @@ -180,7 +185,8 @@ "melee_cut": 4, "dodge": 2, "vision_night": 5, - "harvest": "zombie_fur","decay": "decay_zombie_standard", + "harvest": "zombie_fur", + "decay": "decay_zombie_standard", "special_attacks": [ [ "HOWL", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], @@ -215,7 +221,8 @@ "armor_bullet": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_fur","decay": "decay_zombie_standard", + "harvest": "zombie_fur", + "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -245,7 +252,8 @@ "melee_cut": 4, "dodge": 1, "vision_day": 50, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -292,7 +300,8 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -325,7 +334,8 @@ "armor_bullet": 3, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -357,7 +367,8 @@ "armor_bash": 1, "vision_day": 30, "vision_night": 10, - "harvest": "zombie_fur","decay": "decay_zombie_standard", + "harvest": "zombie_fur", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 58d050dd5da1..a9e8f23ca8f1 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -23,7 +23,8 @@ "armor_bash": 6, "armor_cut": 8, "armor_bullet": 6, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", @@ -71,7 +72,8 @@ "melee_dice_sides": 3, "melee_cut": 0, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -122,7 +124,8 @@ "armor_stab": 6, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_survivalist_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_cop_death_drops", "death_function": [ "NORMAL" ], @@ -168,7 +171,8 @@ "melee_dice_sides": 3, "melee_cut": 0, "vision_day": 10, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -214,7 +218,8 @@ "armor_bullet": 6, "vision_day": 50, "vision_night": 3, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "special_attacks": [ [ "DANCE", 30 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -248,7 +253,8 @@ "armor_cut": 3, "armor_bullet": 2, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.75, "//": "Fat zombies have stronger jaws" }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -299,7 +305,8 @@ "armor_acid": 3, "armor_fire": 10, "vision_night": 3, - "harvest": "zombie_maybe_tech_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_tech_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_fireman_death_drops", "death_function": [ "NORMAL" ], @@ -347,7 +354,8 @@ "armor_cut": 4, "armor_bullet": 3, "vision_night": 3, - "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_sci_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_hazmat_death_drops", "death_function": [ "NORMAL" ], @@ -392,7 +400,8 @@ "melee_dice_sides": 2, "melee_cut": 0, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 3, "no_infection_chance": 10 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -443,7 +452,8 @@ "armor_bullet": 13, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_survivalist_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 15 ] ], "death_drops": "mon_zombie_swat_death_drops", "death_function": [ "NORMAL" ], @@ -492,7 +502,8 @@ "armor_cut": 1, "armor_bullet": 1, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json index 19ca722e95bb..79da9cca2ef7 100644 --- a/data/json/monsters/zed_acid.json +++ b/data/json/monsters/zed_acid.json @@ -23,7 +23,8 @@ "melee_cut": 0, "dodge": 1, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -74,7 +75,8 @@ "armor_stab": 12, "vision_night": 3, "luminance": 0, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "gun", @@ -135,7 +137,8 @@ "melee_cut": 0, "dodge": 1, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -183,7 +186,8 @@ "melee_dice_sides": 2, "melee_cut": 1, "vision_day": 14, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 22 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], diff --git a/data/json/monsters/zed_burned.json b/data/json/monsters/zed_burned.json index 79c7d16fcd9a..03ac4103a67d 100644 --- a/data/json/monsters/zed_burned.json +++ b/data/json/monsters/zed_burned.json @@ -28,7 +28,8 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_CHILD_ZOMBIE_UPGRADE" }, "flags": [ @@ -75,7 +76,8 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 21, "into_group": "GROUP_ZOMBIE_BRUTE" }, @@ -109,7 +111,8 @@ "armor_fire": 15, "vision_day": 10, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_ZOMBIE_UPGRADE" }, diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index 6f220b6e4499..0ffff4f4ee7e 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -21,7 +21,8 @@ "melee_dice_sides": 4, "melee_cut": 2, "dodge": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "vision_day": 30, "vision_night": 3, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], @@ -57,7 +58,8 @@ "dodge": 2, "vision_day": 30, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", @@ -107,7 +109,8 @@ "dodge": 1, "vision_day": 10, "vision_night": 10, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -154,7 +157,8 @@ "dodge": 1, "vision_day": 30, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ], [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -201,7 +205,8 @@ "armor_bash": 1, "vision_day": 30, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "BOOMER" ], @@ -234,7 +239,8 @@ "dodge": 2, "vision_day": 10, "vision_night": 10, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "leap", "cooldown": 10, "max_range": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -283,7 +289,8 @@ "armor_bullet": 4, "vision_day": 30, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 15 ], [ "scratch", 10 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_electric.json b/data/json/monsters/zed_electric.json index 2394b20edaaa..461da20cdea4 100644 --- a/data/json/monsters/zed_electric.json +++ b/data/json/monsters/zed_electric.json @@ -27,7 +27,8 @@ "armor_bullet": 6, "vision_night": 3, "luminance": 16, - "harvest": "CBM_SUBS","decay": "decay_zombie_standard", + "harvest": "CBM_SUBS", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 15 ], [ "SMASH", 30 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -72,7 +73,8 @@ "melee_cut": 0, "dodge": 2, "luminance": 8, - "harvest": "CBM_CIV","decay": "decay_zombie_standard", + "harvest": "CBM_CIV", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 25 ] ], "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", @@ -120,7 +122,8 @@ "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "vision_night": 3, "luminance": 16, - "harvest": "CBM_SUBS","decay": "decay_zombie_standard", + "harvest": "CBM_SUBS", + "decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_shock_cloud", "delay": "1 s" } ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -151,7 +154,8 @@ "melee_cut": 0, "dodge": 2, "luminance": 4, - "harvest": "CBM_BASIC","decay": "decay_zombie_standard", + "harvest": "CBM_BASIC", + "decay": "decay_zombie_standard", "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index 9df9593d7aa9..4a94e67bf627 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -71,7 +71,8 @@ "armor_cut": 5, "armor_bullet": 4, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "BOOMER_GLOW", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "BOOMER_GLOW" ], diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index 02b741d1d071..5850f8fd0bb1 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -21,7 +21,8 @@ "melee_cut": 0, "dodge": 1, "armor_bash": 8, - "harvest": "zombie_leather","decay": "decay_zombie_standard", + "harvest": "zombie_leather", + "decay": "decay_zombie_standard", "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN" ] @@ -52,7 +53,8 @@ "armor_cut": 5, "armor_bullet": 4, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "ZOMBIE_FUSE", 80 ] ], "death_drops": { "subtype": "collection", diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json index ce834319a289..cc0f3aca2812 100644 --- a/data/json/monsters/zed_lab.json +++ b/data/json/monsters/zed_lab.json @@ -25,7 +25,8 @@ "dodge": 1, "vision_day": 50, "vision_night": 3, - "harvest": "CBM_SCI","decay": "decay_zombie_standard", + "harvest": "CBM_SCI", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ [ "scratch", 20 ] ], "death_drops": "mon_zombie_scientist_death_drops", @@ -80,7 +81,8 @@ "armor_stab": 4, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_mil_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 10 ], [ "scratch", 10 ] ], "death_drops": "mon_zombie_labsecurity_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_medical.json b/data/json/monsters/zed_medical.json index 292d73b6d9fc..a90bca1220c7 100644 --- a/data/json/monsters/zed_medical.json +++ b/data/json/monsters/zed_medical.json @@ -20,7 +20,8 @@ "melee_skill": 3, "armor_acid": 4, "vision_night": 3, - "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_sci_bionics", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ { "id": "inject" } ], "death_drops": "mon_zombie_medical_death_drops", @@ -43,7 +44,8 @@ "armor_acid": 10, "vision_day": 45, "vision_night": 5, - "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_sci_bionics", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { @@ -68,7 +70,8 @@ "armor_acid": 20, "vision_day": 50, "vision_night": 10, - "harvest": "zombie_maybe_sci_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_sci_bionics", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "max_consider_range": 5, "move_cost": 0 }, diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index a432239e12b9..6e76e114e9ac 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -26,7 +26,8 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -85,7 +86,8 @@ "melee_cut": 0, "vision_day": 2, "vision_night": 0, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "//4": "Removed Bite attack to reflect damage to mouth.", "death_drops": "default_zombie_death_drops", @@ -133,7 +135,8 @@ "armor_cut": 6, "armor_bullet": 5, "vision_night": 4, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -184,7 +187,8 @@ "armor_bullet": 11, "armor_stab": 8, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -233,7 +237,8 @@ "armor_bullet": 4, "vision_day": 5, "vision_night": 40, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 40 ], [ "STRETCH_ATTACK", 20 ], [ "LONGSWIPE", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -279,7 +284,8 @@ "melee_cut": 0, "vision_day": 7, "vision_night": 4, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 6 ], [ "scratch", 20 ] ], "//3": "Removed Bite as this creature does not have a 'mouth'.", "death_drops": "default_zombie_death_drops", @@ -327,7 +333,8 @@ "dodge": 1, "vision_day": 30, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -375,7 +382,8 @@ "dodge": 2, "vision_day": 30, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 3 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -425,7 +433,8 @@ "armor_stab": 10, "vision_day": 30, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "STRETCH_BITE", 10 ], [ "STRETCH_ATTACK", 5 ] ], "death_function": [ "BLOBSPLIT" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "FILTHY" ] @@ -457,7 +466,8 @@ "armor_bullet": 10, "vision_day": 50, "vision_night": 4, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -502,7 +512,8 @@ "melee_cut": 2, "dodge": 3, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] }, { "type": "leap", "cooldown": 5, "max_range": 5 }, @@ -546,7 +557,8 @@ "armor_bullet": 2, "vision_day": 50, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "JACKSON", 0 ] ], "death_drops": "jackson_drops", "death_function": [ "JACKSON" ], @@ -579,7 +591,8 @@ "armor_bullet": 8, "vision_day": 25, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -642,7 +655,8 @@ "armor_bullet": 2, "vision_day": 50, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "UPGRADE", 10 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -690,7 +704,8 @@ "dodge": 2, "vision_day": 50, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "RESURRECT", 0 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -737,7 +752,8 @@ "melee_cut": 1, "dodge": 1, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 4 }, "special_attacks": [ [ "scratch", 10 ], @@ -780,7 +796,8 @@ "armor_bullet": 4, "vision_day": 45, "vision_night": 15, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 8, "min_consider_range": 3, "max_consider_range": 7 }, @@ -821,7 +838,8 @@ "dodge": 2, "vision_day": 50, "vision_night": 8, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 1 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -851,7 +869,8 @@ "melee_cut": 0, "vision_day": 3, "vision_night": 40, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -897,7 +916,8 @@ "dodge": 4, "vision_day": 30, "vision_night": 10, - "harvest": "human","decay": "decay_human", + "harvest": "human", + "decay": "decay_human", "special_attacks": [ [ "BRANDISH", 10 ] ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "fear_triggers": [ "FIRE" ], @@ -941,7 +961,8 @@ "dodge": 1, "vision_day": 50, "vision_night": 4, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 10 ], [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -990,7 +1011,8 @@ "armor_bullet": 2, "vision_day": 25, "vision_night": 5, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 6 ], [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -1080,7 +1102,8 @@ "melee_cut": 2, "dodge": 2, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_swimmer_death_drops", "death_function": [ "NORMAL" ], @@ -1132,7 +1155,8 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 2, - "harvest": "CBM_TECH","decay": "decay_zombie_standard", + "harvest": "CBM_TECH", + "decay": "decay_zombie_standard", "special_attacks": [ [ "PULL_METAL_WEAPON", 25 ], { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_technician_death_drops", "death_function": [ "NORMAL" ], @@ -1168,7 +1192,8 @@ "armor_bullet": 2, "vision_day": 15, "vision_night": 2, - "harvest": "zombie_maybe_tech_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_tech_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_miner_death_drops", "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] @@ -1198,7 +1223,8 @@ "armor_cut": 4, "armor_bullet": 3, "vision_night": 5, - "harvest": "zombie_thorny","decay": "decay_zombie_standard", + "harvest": "zombie_thorny", + "decay": "decay_zombie_standard", "attack_effs": [ { "id": "paralyzepoison", "duration": 33 } ], "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "PARA_STING", 30 ] ], "death_drops": "mon_zombie_thorny_death_drops", diff --git a/data/json/monsters/zed_radiation.json b/data/json/monsters/zed_radiation.json index 5de90c575275..984ed01edebb 100644 --- a/data/json/monsters/zed_radiation.json +++ b/data/json/monsters/zed_radiation.json @@ -26,7 +26,8 @@ "armor_bullet": 5, "vision_day": 50, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "LONGSWIPE", 8 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 21 } ] } ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -59,7 +60,8 @@ "armor_bullet": 3, "vision_day": 50, "vision_night": 3, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 20 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -93,7 +95,8 @@ "vision_day": 50, "vision_night": 3, "luminance": 8, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 15 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -127,7 +130,8 @@ "vision_day": 50, "vision_night": 3, "luminance": 16, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 10 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -161,7 +165,8 @@ "vision_day": 50, "vision_night": 3, "luminance": 32, - "harvest": "zombie","decay": "decay_zombie_standard", + "harvest": "zombie", + "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json index 3ff2d633dd74..951b1a6cf10c 100644 --- a/data/json/monsters/zed_skeletal.json +++ b/data/json/monsters/zed_skeletal.json @@ -27,7 +27,8 @@ "armor_acid": 3, "vision_day": 30, "vision_night": 3, - "harvest": "mr_bones","decay": "decay_zombie_mrbones", + "harvest": "mr_bones", + "decay": "decay_zombie_mrbones", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 } ], "upgrades": { "half_life": 15, "into": "mon_skeleton_brute" }, "death_drops": "default_zombie_clothes", @@ -63,7 +64,8 @@ "armor_acid": 1, "vision_day": 35, "vision_night": 3, - "harvest": "mr_bones","decay": "decay_zombie_mrbones", + "harvest": "mr_bones", + "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 45 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 15, "armor_multiplier": 0.6 } ] } @@ -103,7 +105,8 @@ "armor_acid": 3, "vision_day": 30, "vision_night": 3, - "harvest": "CBM_CIV","decay": "decay_zombie_standard", + "harvest": "CBM_CIV", + "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 }, [ "SHOCKSTORM", 25 ] ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -136,7 +139,8 @@ "armor_bullet": 36, "vision_day": 50, "vision_night": 4, - "harvest": "mr_bones","decay": "decay_zombie_mrbones", + "harvest": "mr_bones", + "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ], [ "STRETCH_ATTACK", 20 ], diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index 9650627eb4ae..ebbeecc3fa02 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -27,7 +27,8 @@ "armor_bullet": 35, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_mil_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_soldier_death_drops", "death_function": [ "NORMAL" ], @@ -77,7 +78,8 @@ "armor_bullet": 35, "vision_day": 30, "vision_night": 35, - "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_mil_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -215,7 +217,8 @@ "armor_bullet": 40, "vision_day": 30, "vision_night": 5, - "harvest": "zombie_kevlar","decay": "decay_zombie_kevlar", + "harvest": "zombie_kevlar", + "decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }, [ "SMASH", 30 ] @@ -267,7 +270,8 @@ "armor_bullet": 60, "vision_day": 35, "vision_night": 10, - "harvest": "zombie_kevlar","decay": "decay_zombie_kevlar", + "harvest": "zombie_kevlar", + "decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 12, "damage_max_instance": [ { "damage_type": "bash", "amount": 35 } ] }, [ "LONGSWIPE", 20 ], @@ -319,7 +323,8 @@ "armor_bullet": 4, "vision_day": 35, "vision_night": 5, - "harvest": "zombie_maybe_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_mil_bionics", + "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_military_pilot_death_drops", "death_function": [ "NORMAL" ], @@ -369,7 +374,8 @@ "vision_day": 30, "vision_night": 3, "luminance": 8, - "harvest": "zombie_maybe_heavy_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_heavy_mil_bionics", + "decay": "decay_zombie_standard", "starting_ammo": { "pressurized_tank": 1000 }, "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_flamer", 100 ] ] }, "death_function": [ "FIREBALL" ], @@ -421,7 +427,8 @@ "armor_fire": 10, "vision_day": 30, "vision_night": 3, - "harvest": "zombie_maybe_heavy_mil_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_heavy_mil_bionics", + "decay": "decay_zombie_standard", "death_drops": "mon_zombie_armored_death_drops", "death_function": [ "NORMAL" ], "burn_into": "mon_zombie_scorched", @@ -457,7 +464,8 @@ "vision_day": 50, "vision_night": 3, "luminance": 4, - "harvest": "CBM_OP","decay": "decay_zombie_standard", + "harvest": "CBM_OP", + "decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "mon_zombie_bio_op_death_drops", @@ -493,7 +501,8 @@ "armor_bash": 15, "armor_cut": 27, "armor_bullet": 30, - "harvest": "CBM_OP2","decay": "decay_zombie_standard", + "harvest": "CBM_OP2", + "decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_BIOJUTSU", 15 ] ] } ] diff --git a/data/json/monsters/zed_survivor.json b/data/json/monsters/zed_survivor.json index addbeb359c23..7137adff6f0c 100644 --- a/data/json/monsters/zed_survivor.json +++ b/data/json/monsters/zed_survivor.json @@ -27,7 +27,8 @@ "armor_acid": 4, "vision_day": 50, "vision_night": 3, - "harvest": "zombie_maybe_survivalist_bionics","decay": "decay_zombie_standard", + "harvest": "zombie_maybe_survivalist_bionics", + "decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ [ "SHRIEK", 20 ], diff --git a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md index d5bec937470f..1f4f8db07c6a 100644 --- a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md +++ b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md @@ -322,17 +322,17 @@ remove entries in mods via "add:death_function" and "remove:death_function". (string, optional) -If this monster's death function leaves a corpse behind, this defines what items will be produced when -butchering or dissecting its corpse. If none is specified, it will default to `human`. -Harvest entries, their yields, and mass ratios, are defined in harvest.json +If this monster's death function leaves a corpse behind, this defines what items will be produced +when butchering or dissecting its corpse. If none is specified, it will default to `human`. Harvest +entries, their yields, and mass ratios, are defined in harvest.json ## "decay" (string, optional) -As with harvest, this defines a harvest entry for any associated corpse, with a default of `decay_human`. -Defines what items will be produced when the the monster's corpse rots away. -Harvest entries, their yields, and mass ratios, are defined in harvest_decay.json +As with harvest, this defines a harvest entry for any associated corpse, with a default of +`decay_human`. Defines what items will be produced when the the monster's corpse rots away. Harvest +entries, their yields, and mass ratios, are defined in harvest_decay.json ## "emit_field" diff --git a/src/map.cpp b/src/map.cpp index 4ba4b6c0d15b..4c9b306a7ac6 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7303,7 +7303,7 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) } anything_left = roll > 0; if( g->u.sees( pnt ) ) { - if ( anything_left ) { + if( anything_left ) { add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); } else { add_msg( m_info, _( "The %1$s decays away to nothing." ), it.tname() ); From c454dd85a884f90bc6f6357a5ad6e23097f82243 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 6 Jun 2024 21:51:51 -0500 Subject: [PATCH 04/14] Way better way to do this --- data/json/monsters/bird.json | 6 -- data/json/monsters/cyborgs.json | 2 - data/json/monsters/feral_humans.json | 11 ---- data/json/monsters/fish.json | 15 ----- data/json/monsters/fungus.json | 12 ---- data/json/monsters/insect_spider.json | 50 +-------------- data/json/monsters/jabberwock.json | 3 - data/json/monsters/mammal.json | 64 ------------------- data/json/monsters/marloss.json | 2 - data/json/monsters/mi-go.json | 6 -- data/json/monsters/mutant_animal.json | 10 --- data/json/monsters/mutant_human.json | 3 - data/json/monsters/nether.json | 13 ---- data/json/monsters/power_leech.json | 6 -- data/json/monsters/reptile_amphibian.json | 5 -- data/json/monsters/slugs.json | 1 - data/json/monsters/triffid.json | 9 --- data/json/monsters/zed-animal.json | 11 ---- data/json/monsters/zed-classic.json | 11 ---- data/json/monsters/zed_acid.json | 4 -- data/json/monsters/zed_burned.json | 3 - data/json/monsters/zed_children.json | 7 -- data/json/monsters/zed_electric.json | 4 -- data/json/monsters/zed_explosive.json | 1 - data/json/monsters/zed_fusion.json | 2 - data/json/monsters/zed_lab.json | 2 - data/json/monsters/zed_medical.json | 3 - data/json/monsters/zed_misc.json | 26 -------- data/json/monsters/zed_radiation.json | 5 -- data/json/monsters/zed_skeletal.json | 4 -- data/json/monsters/zed_soldiers.json | 9 --- data/json/monsters/zed_survivor.json | 1 - .../mod/json/reference/creatures/monsters.md | 8 --- src/map.cpp | 20 +++--- src/monstergenerator.cpp | 2 - src/mtype.cpp | 1 - src/mtype.h | 1 - 37 files changed, 12 insertions(+), 331 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 5562708be807..9349fbe19315 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -23,7 +23,6 @@ "melee_cut": 1, "dodge": 4, "harvest": "bird_tiny", - "decay": "decay_bird", "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "death_function": [ "NORMAL" ], @@ -64,7 +63,6 @@ "melee_cut": 0, "dodge": 4, "harvest": "bird_tiny", - "decay": "decay_bird", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_crow", "baby_count": 3, "baby_timer": 8 }, @@ -94,7 +92,6 @@ "melee_cut": 0, "dodge": 4, "harvest": "bird_small", - "decay": "decay_bird", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_duck", "baby_count": 3, "baby_timer": 5 }, @@ -137,7 +134,6 @@ "melee_cut": 0, "dodge": 3, "harvest": "bird_small", - "decay": "decay_bird", "vision_day": 50, "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -184,7 +180,6 @@ "melee_cut": 3, "dodge": 6, "harvest": "bird_tiny", - "decay": "decay_bird", "reproduction": { "baby_egg": "egg_cockatrice", "baby_count": 3, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -215,7 +210,6 @@ "melee_cut": 1, "dodge": 1, "harvest": "bird_tiny", - "decay": "decay_bird", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 14, "into": "mon_chicken" }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BIRDFOOD" ] diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json index e6e493b7d1c2..37a7a628f462 100644 --- a/data/json/monsters/cyborgs.json +++ b/data/json/monsters/cyborgs.json @@ -29,7 +29,6 @@ "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], "harvest": "mon_broken_cyborg", - "decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", @@ -74,7 +73,6 @@ "special_attacks": [ [ "PARROT", 80 ] ], "death_function": [ "NORMAL" ], "harvest": "mon_broken_cyborg", - "decay": "decay_broken_cyborg", "flags": [ "SEES", "HEARS", diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index b25c4287216a..d440a8a3d7d9 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -23,7 +23,6 @@ "melee_cut": 0, "dodge": 1, "harvest": "human", - "decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -124,7 +123,6 @@ "melee_cut": 2, "dodge": 1, "harvest": "CBM_SCI_FERAL", - "decay": "decay_human", "path_settings": { "max_dist": 10 }, "vision_day": 50, "vision_night": 3, @@ -174,7 +172,6 @@ "armor_stab": 4, "dodge": 1, "harvest": "human_maybe_mil_bionics", - "decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -244,7 +241,6 @@ "dodge": 1, "luminance": 500, "harvest": "human_maybe_mil_bionics", - "decay": "decay_human", "vision_day": 50, "vision_night": 4, "path_settings": { "max_dist": 10 }, @@ -279,7 +275,6 @@ "melee_dice": 2, "melee_dice_sides": 8, "harvest": "human_maybe_tech_bionics", - "decay": "decay_human", "death_drops": "feral_humans_death_drops_tool" }, { @@ -309,7 +304,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "human_maybe_survivalist_bionics", - "decay": "decay_human", "starting_ammo": { "shot_00": 5 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -372,7 +366,6 @@ "melee_cut": 0, "dodge": 1, "harvest": "human", - "decay": "decay_human", "vision_day": 30, "vision_night": 3, "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -503,7 +496,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "human_maybe_survivalist_bionics", - "decay": "decay_human", "starting_ammo": { "9mm": 3 }, "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], @@ -571,7 +563,6 @@ "vision_night": 4, "luminance": 500, "harvest": "human_maybe_survivalist_bionics", - "decay": "decay_human", "special_attacks": [ [ "PARROT_AT_DANGER", 5 ] ], "death_function": [ "NORMAL" ], "death_drops": "mon_feral_survivalist_death_drops", @@ -622,7 +613,6 @@ "vision_day": 50, "vision_night": 4, "harvest": "human_maybe_survivalist_bionics", - "decay": "decay_human", "luminance": 500, "starting_ammo": { "223": 10 }, "special_attacks": [ @@ -687,7 +677,6 @@ "armor_bullet": 35, "dodge": 4, "harvest": "human_maybe_mil_bionics", - "decay": "decay_human", "vision_night": 5, "path_settings": { "max_dist": 40, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, "special_attacks": [ [ "PARROT_AT_DANGER", 0 ] ], diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index d7197ccb9baf..b1706ea5fdf3 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -28,7 +28,6 @@ "vision_day": 30, "vision_night": 20, "harvest": "mutant_shellfish", - "decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], @@ -65,7 +64,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_tiny", - "decay": "null", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -97,7 +95,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_small", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -129,7 +126,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_small", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -161,7 +157,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_large", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -193,7 +188,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_large", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -518,7 +512,6 @@ "melee_cut": 1, "luminance": 0, "harvest": "lobster", - "decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 180 }, "baby_flags": [ "SUMMER", "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -548,7 +541,6 @@ "melee_cut": 1, "luminance": 0, "harvest": "shellfish", - "decay": "decay_shellfish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 21 }, "baby_flags": [ "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], @@ -580,7 +572,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_small", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -608,7 +599,6 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "death_function": [ "NORMAL" ], "harvest": "fish_small", - "decay": "decay_fish", "flags": [ "FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC" ] }, { @@ -635,7 +625,6 @@ "armor_cut": 8, "armor_bullet": 6, "harvest": "shellfish", - "decay": "decay_shellfish", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -669,7 +658,6 @@ "vision_day": 30, "vision_night": 15, "harvest": "mutant_shellfish", - "decay": "decay_shellfish", "path_settings": { "max_dist": 50 }, "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -701,7 +689,6 @@ "dodge": 5, "luminance": 0, "harvest": "mutant_fish", - "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 1, "baby_timer": 6 }, "baby_flags": [ "SPRING" ], "death_function": [ "NORMAL" ], @@ -731,7 +718,6 @@ "dodge": 5, "luminance": 0, "harvest": "mutant_fish", - "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 150 }, "baby_flags": [ "AUTUMN" ], "death_function": [ "NORMAL" ], @@ -762,7 +748,6 @@ "vision_day": 1, "vision_night": 30, "harvest": "mutant_fish", - "decay": "decay_fish", "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 19 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 5 }, diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json index fc1ab8061042..dac44a5a5e71 100644 --- a/data/json/monsters/fungus.json +++ b/data/json/monsters/fungus.json @@ -25,7 +25,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "FUNGUS", "NORMAL" ], @@ -171,7 +170,6 @@ "melee_cut": 0, "armor_bash": 4, "harvest": "fungaloid", - "decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS", 30 ] ], "death_function": [ "FUNGUS", "NORMAL" ], "flags": [ "STUMBLES", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -200,7 +198,6 @@ "special_attacks": [ [ "FUNGUS_SPROUT", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], "harvest": "fungaloid_mass", - "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -228,7 +225,6 @@ "special_attacks": [ [ "FUNGUS_BIG_BLOSSOM", 10 ] ], "death_function": [ "FUNGUS", "NORMAL" ], "harvest": "fungaloid_mass", - "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "QUEEN" ] }, { @@ -260,7 +256,6 @@ "death_drops": "marloss_yellow_drops", "death_function": [ "FUNGUS", "NORMAL" ], "harvest": "fungaloid_mass", - "decay": "decay_plantlike", "flags": [ "NOHEAD", "POISON", "IMMOBILE", "HARDTOSHOOT", "NO_BREATHE", "QUEEN" ] }, { @@ -289,7 +284,6 @@ "armor_cut": 4, "armor_bullet": 3, "harvest": "fungaloid", - "decay": "decay_plantlike", "special_attacks": [ [ "FUNGUS_GROWTH", 10000 ] ], "death_function": [ "NORMAL" ], "flags": [ "HEARS", "POISON", "NO_BREATHE", "NOHEAD" ] @@ -343,7 +337,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "FUNGUS", 200 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -410,7 +403,6 @@ "vision_day": 5, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], "death_function": [ "FUNGUS" ], @@ -445,7 +437,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "mr_bones", - "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "FUNGUS" ], @@ -492,7 +483,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ], [ "FUNGUS", 200 ] ], "death_drops": { "subtype": "collection", @@ -533,7 +523,6 @@ "vision_day": 3, "vision_night": 3, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGUS", 200 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "POISON", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -567,7 +556,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "special_attacks": [ [ "FUNGAL_TRAIL", 3 ] ], "death_function": [ "NORMAL", "FUNGUS" ], "flags": [ "SEES", "SMELLS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 11afccf30451..53df33eda948 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -23,7 +23,6 @@ "dodge": 4, "armor_bash": 6, "harvest": "arachnid_acid", - "decay": "decay_arthopod_acid", "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "HEARS", "GOODHEARING", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "ACIDTRAIL" ] }, @@ -52,7 +51,6 @@ "armor_cut": 8, "armor_bullet": 6, "harvest": "meatslug", - "decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS" ] }, @@ -79,7 +77,6 @@ "melee_cut": 0, "armor_bash": 2, "harvest": "mutant_meatslug", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -106,7 +103,6 @@ "melee_cut": 3, "armor_bash": 2, "harvest": "mutant_meatslug", - "decay": "null", "death_function": [ "WORM" ], "flags": [ "DIGS", "HEARS", "GOODHEARING" ] }, @@ -139,7 +135,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid_tainted", - "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 1, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_plague_vector" }, @@ -174,7 +169,6 @@ "vision_day": 10, "vision_night": 3, "harvest": "arachnid_tainted", - "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 7, "into": "mon_skittering_plague" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -209,7 +203,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid_tainted", - "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach_plague", "baby_count": 3, "baby_timer": 5 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], @@ -245,7 +238,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 4, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 7, "into": "mon_pregnant_giant_cockroach" }, @@ -278,7 +270,6 @@ "vision_day": 10, "vision_night": 3, "harvest": "mutant_animal_tiny", - "decay": "null", "upgrades": { "age_grow": 7, "into": "mon_giant_cockroach" }, "death_function": [ "NORMAL" ], "special_attacks": [ [ "EAT_FOOD", 120 ] ], @@ -313,7 +304,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_roach", "baby_count": 3, "baby_timer": 7 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": [ "NORMAL", "PREG_ROACH" ], @@ -361,7 +351,6 @@ "vision_day": 10, "vision_night": 5, "harvest": "arachnid_bee", - "decay": "decay_arthopod_bee", "anger_triggers": [ "HURT", "FRIEND_DIED", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "SWARMS", "GROUP_MORALE", "CANPLAY", "PATH_AVOID_FIRE", "LOUDMOVES" ] @@ -447,7 +436,6 @@ "vision_night": 6, "anger_triggers": [ "STALK", "PLAYER_CLOSE" ], "harvest": "arachnid_centipede", - "decay": "decay_arthopod_centipede", "death_function": [ "NORMAL" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_GIANT" }, "flags": [ "CLIMBS", "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE" ] @@ -491,7 +479,6 @@ "proportional": { "vision_day": 0.5, "vision_night": 0.5 }, "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], "harvest": "arachnid_centipede_mom", - "decay": "decay_arthopod_centipede", "reproduction": { "baby_monster": "mon_centipede_small", "baby_count": 2, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "upgrades": { "age_grow": 15, "into_group": "GROUP_CENTIPEDE_MOM" }, @@ -540,8 +527,7 @@ "vision_day": 12, "vision_night": 7, "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT" ], - "harvest": "arachnid_centipede_mom_mega", - "decay": "decay_arthopod_centipede_mega", + "harvest": "arachnid_centipede_mega", "flags": [ "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "DESTROYS", "PUSH_MON", "PUSH_VEH" ] }, { @@ -563,7 +549,6 @@ "vision_day": 15, "dodge": 2, "harvest": "arachnid_firefly", - "decay": "decay_arthopod_flying", "reproduction": { "baby_egg": "egg_firefly", "baby_count": 1, "baby_timer": 15 }, "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "HURT" ], @@ -597,7 +582,6 @@ "vision_day": 25, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -639,7 +623,6 @@ "vision_day": 45, "vision_night": 5, "harvest": "arachnid_flying", - "decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "fear_triggers": [ "HURT" ], "death_function": [ "NORMAL" ], @@ -676,7 +659,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "arachnid_dragonfly_mega", - "decay": "decay_arthopod_flying", "anger_triggers": [ "PLAYER_WEAK", "STALK" ], "death_function": [ "NORMAL" ], "reproduction": { "baby_egg": "egg_dragonfly", "baby_count": 3, "baby_timer": 1 }, @@ -708,7 +690,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "STUMBLES", "HIT_AND_RUN", "CANPLAY", "PATH_AVOID_FIRE" ] @@ -739,7 +720,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "STUMBLES", "VENOM", "FLIES", "HIT_AND_RUN", "PATH_AVOID_FIRE" ] }, @@ -773,7 +753,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -809,7 +788,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_FIRE" ] @@ -842,7 +820,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "special_attacks": [ { "type": "leap", "cooldown": 2, "max_range": 5, "allow_no_target": true } ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -878,7 +855,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "GRABS", "CAN_DIG", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -912,7 +888,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] @@ -945,7 +920,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "STUMBLES", "CLIMBS", "PATH_AVOID_FIRE" ] }, @@ -978,7 +952,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -1013,7 +986,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE" ] @@ -1047,7 +1019,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_spider_fungus", @@ -1069,7 +1040,6 @@ "weight": "9 kg", "hp": 35, "harvest": "arachnid_wasp", - "decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 16, "into": "mon_wasp_pupa" }, "//": "30 days of development from egg to adult.", "flags": [ "IMMOBILE" ] @@ -1089,7 +1059,6 @@ "weight": "15 kg", "hp": 100, "harvest": "arachnid_wasp", - "decay": "decay_arthopod_wasp", "upgrades": { "age_grow": 10, "into_group": "GROUP_WASP_PUPA" }, "flags": [ "IMMOBILE" ] }, @@ -1139,7 +1108,6 @@ "vision_day": 15, "vision_night": 5, "harvest": "arachnid_wasp", - "decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1177,7 +1145,6 @@ "description": "A mutated wasp queen grown to the size of a person, laying a single white egg in each empty cell it comes across while scurrying around on the paper walls of their home. It struggles to fit into some of them, but the newer cells seem to be getting larger…", "copy-from": "mon_wasp_guard", "harvest": "arachnid_wasp_queen", - "decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 2, "baby_timer": 5 }, "upgrades": { "half_life": 30, "into": "mon_wasp_mega" } }, @@ -1230,7 +1197,6 @@ "vision_day": 17, "vision_night": 7, "harvest": "arachnid_wasp", - "decay": "decay_arthopod_wasp", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], @@ -1302,7 +1268,6 @@ "armor_stab": 18, "armor_bullet": 22, "harvest": "arachnid_wasp_queen", - "decay": "decay_arthopod_wasp", "reproduction": { "baby_egg": "egg_wasp", "baby_count": 4, "baby_timer": 5 }, "extend": { "flags": [ "PUSH_MON" ] }, "delete": { "flags": [ "HARDTOSHOOT" ] } @@ -1334,7 +1299,6 @@ "armor_bash": 6, "armor_bullet": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "special_attacks": [ [ "DERMATIK", 25 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1364,7 +1328,6 @@ "melee_cut": 1, "dodge": 1, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 21, "into": "mon_dermatik" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "POISON", "CAN_DIG", "LARVA" ] @@ -1398,7 +1361,6 @@ "vision_day": 6, "vision_night": 6, "harvest": "incubator_mammal", - "decay": "decay_animal_standard", "special_attacks": [ [ "PARROT", 6 ], { @@ -1464,7 +1426,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 14, "into": "mon_ant_soldier" }, "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -1504,7 +1465,6 @@ "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], "harvest": "arachnid_acid", - "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1531,7 +1491,6 @@ "upgrades": { "age_grow": 3, "into": "mon_ant_acid" }, "death_function": [ "ACID", "NORMAL" ], "harvest": "arachnid_acid", - "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "LARVA", "POISON", "SMELLS" ] }, { @@ -1564,7 +1523,6 @@ "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "harvest": "acidant_queen", - "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "CLIMBS", "HEARS", "QUEEN", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1599,7 +1557,6 @@ "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "ACID", "NORMAL" ], "harvest": "arachnid_acid", - "decay": "decay_arthopod_acid", "flags": [ "ACIDPROOF", "SHORTACIDTRAIL", "CLIMBS", "HEARS", "POISON", "SEES", "SMELLS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, { @@ -1624,7 +1581,6 @@ "melee_dice_sides": 3, "melee_cut": 0, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "upgrades": { "age_grow": 3, "into": "mon_ant" }, "death_function": [ "NORMAL" ], "flags": [ "SMELLS", "LARVA" ] @@ -1654,7 +1610,6 @@ "armor_cut": 14, "armor_bullet": 11, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "special_attacks": [ [ "ANTQUEEN", 1 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "death_function": [ "NORMAL" ], @@ -1689,7 +1644,6 @@ "vision_day": 5, "vision_night": 5, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_ant_fungus", @@ -1722,7 +1676,6 @@ "armor_bullet": 3, "vision_day": 10, "harvest": "arachnid", - "decay": "decay_arthopod_standard", "reproduction": { "baby_egg": "egg_locust", "baby_count": 20, "baby_timer": 10 }, "baby_flags": [ "AUTUMN" ], "anger_triggers": [ "FRIEND_ATTACKED" ], @@ -1754,7 +1707,6 @@ "melee_cut": 0, "vision_day": 10, "harvest": "mutant_animal_tiny", - "decay": "null", "upgrades": { "age_grow": 10, "into": "mon_locust" }, "death_function": [ "NORMAL" ], "special_attacks": [ { "type": "leap", "cooldown": 4, "max_range": 4, "allow_no_target": true }, [ "EAT_CROP", 120 ] ], diff --git a/data/json/monsters/jabberwock.json b/data/json/monsters/jabberwock.json index 519022c71e3b..68c50183c508 100644 --- a/data/json/monsters/jabberwock.json +++ b/data/json/monsters/jabberwock.json @@ -27,7 +27,6 @@ "special_attacks": [ [ "FLESH_GOLEM", 10 ], [ "ABSORB_MEAT", 10 ] ], "death_function": [ "NORMAL" ], "harvest": "zombie", - "decay": "decay_zombie_standard", "upgrades": { "half_life": 15, "into": "mon_flesh_golem" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -59,7 +58,6 @@ "special_attacks": [ [ "FLESH_GOLEM", 8 ], [ "ABSORB_MEAT", 1 ] ], "death_function": [ "NORMAL" ], "harvest": "flesh_golem", - "decay": "decay_flesh_golem", "upgrades": { "half_life": 15, "into": "mon_jabberwock" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "ATTACKMON", "POISON" ] }, @@ -92,7 +90,6 @@ "special_attacks": [ [ "FLESH_GOLEM", 5 ] ], "death_function": [ "JABBERWOCKY" ], "harvest": "jabberwock", - "decay": "decay_jabberwock", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "ATTACKMON", "POISON" ] } ] diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index abf934b6e09c..3208d47f2bee 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -23,7 +23,6 @@ "melee_cut": 1, "dodge": 8, "harvest": "mammal_tiny", - "decay": "null", "vision_day": 20, "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], @@ -49,7 +48,6 @@ "melee_cut": 2, "dodge": 2, "harvest": "mammal_fur", - "decay": "decay_animal_standard", "special_attacks": [ [ "EAT_FOOD", 60 ] ], "upgrades": { "age_grow": 480, "into": "mon_bear" } }, @@ -86,7 +84,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mammal_large_fur", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_bear_cub", "baby_count": 1, "baby_timer": 700 }, "//": "220 days gestation period, the mother and cubs remain together for 16-17 months.", "baby_flags": [ "SPRING" ], @@ -117,7 +114,6 @@ "melee_cut": 6, "dodge": 2, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -149,7 +145,6 @@ "vision_day": 30, "vision_night": 10, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -182,7 +177,6 @@ "melee_cut": 1, "dodge": 4, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -219,7 +213,6 @@ "armor_cut": 1, "armor_bullet": 1, "harvest": "mammal_fur", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_boar_wild_piglet", "baby_count": 8, "baby_timer": 154 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "path_settings": { "max_dist": 10 }, @@ -258,7 +251,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] }, { @@ -286,7 +278,6 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], "harvest": "mammal_tiny", - "decay": "null", "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "CATFOOD", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ], "upgrades": { "age_grow": 120, "into": "mon_cat" } }, @@ -321,7 +312,6 @@ "placate_triggers": [ "MEAT", "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], "harvest": "mammal_tiny", - "decay": "null", "reproduction": { "baby_monster": "mon_cat_kitten", "baby_count": 4, "baby_timer": 60 }, "flags": [ "SEES", @@ -560,7 +550,6 @@ "melee_cut": 1, "dodge": 4, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -596,7 +585,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mammal_fur", - "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -642,7 +630,6 @@ "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "upgrades": { "age_grow": 180, "into": "mon_cow" }, "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CATTLEFODDER", "PET_WONT_FOLLOW" ] @@ -679,7 +666,6 @@ "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" }, "death_function": [ "NORMAL" ], "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_cow_calf", "baby_count": 1, "baby_timer": 343 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 40 ] ], @@ -726,7 +712,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mammal_fur", - "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE", "BLEED" ] }, { @@ -754,7 +739,6 @@ "armor_bash": 1, "vision_night": 5, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -788,7 +772,6 @@ "dodge": 3, "vision_night": 12, "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -820,7 +803,6 @@ "dodge": 3, "vision_night": 12, "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -842,7 +824,6 @@ "volume": "30000 ml", "weight": "30 kg", "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], @@ -898,7 +879,6 @@ "dodge": 1, "vision_night": 4, "harvest": "mammal_tiny", - "decay": "null", "upgrades": { "age_grow": 42, "into": "mon_dog" }, "extend": { "flags": [ "NO_BREED" ] } }, @@ -917,7 +897,6 @@ "melee_cut": 6, "vision_night": 4, "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_bull_pup", "baby_count": 7, "baby_timer": 300 }, "//": "7 puppies and 300-320 days per-litter for size medium canines", "flags": [ @@ -957,7 +936,6 @@ "melee_cut": 3, "vision_night": 3, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bull" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -980,7 +958,6 @@ "melee_cut": 5, "special_attacks": [ [ "LUNGE", 5 ] ], "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_pitbullmix_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -1008,7 +985,6 @@ "volume": "750 ml", "weight": "1 kg", "harvest": "mammal_tiny", - "decay": "null", "hp": 7, "speed": 88, "material": [ "flesh" ], @@ -1037,7 +1013,6 @@ "description": "An adorable beagle that has managed to survive the apocalypse. Being agile and small, they are difficult to shoot at. Generally attacks in packs.", "weight": "10 kg", "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "hp": 13, "speed": 135, "melee_skill": 2, @@ -1088,7 +1063,6 @@ "dodge": 1, "vision_night": 4, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_beagle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1151,7 +1125,6 @@ "dodge": 2, "vision_night": 4, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_bcollie" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1173,7 +1146,6 @@ "melee_cut": 4, "vision_night": 4, "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "fear_triggers": [ "HURT" ], "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_boxer_pup", "baby_count": 4, "baby_timer": 270 }, @@ -1205,7 +1177,6 @@ "dodge": 1, "vision_night": 3, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_boxer" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1242,7 +1213,6 @@ "melee_cut": 2, "vision_night": 6, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "HURT" ], "reproduction": { "baby_monster": "mon_dog_chihuahua_pup", "baby_count": 3, "baby_timer": 240 }, "//": "1-3 puppies & 240 days per-litter for size tiny canines", @@ -1284,7 +1254,6 @@ "dodge": 1, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_chihuahua" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1308,7 +1277,6 @@ "vision_night": 6, "fear_triggers": [ "HURT" ], "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_dachshund_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size small canines", "flags": [ @@ -1351,7 +1319,6 @@ "dodge": 1, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_dachshund" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1402,7 +1369,6 @@ "dodge": 1, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gshepherd" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1429,7 +1395,6 @@ "dodge": 2, "vision_night": 6, "harvest": "mammal_fur", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_dog_gpyrenees_pup", "baby_count": 7, "baby_timer": 320 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", "flags": [ @@ -1470,7 +1435,6 @@ "dodge": 1, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_gpyrenees" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1496,7 +1460,6 @@ "melee_cut": 6, "vision_night": 6, "harvest": "mammal_leather", - "decay": "decay_animal_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "reproduction": { "baby_monster": "mon_dog_rottweiler_pup", "baby_count": 7, "baby_timer": 300 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", @@ -1538,7 +1501,6 @@ "dodge": 1, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_rottweiler" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1603,7 +1565,6 @@ "dodge": 2, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "upgrades": { "age_grow": 42, "into": "mon_dog_auscattle" }, "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], @@ -1636,7 +1597,6 @@ "dodge": 6, "vision_night": 5, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1668,7 +1628,6 @@ "dodge": 6, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1698,7 +1657,6 @@ "melee_cut": 2, "dodge": 4, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1724,7 +1682,6 @@ "melee_cut": 0, "dodge": 6, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] @@ -1759,7 +1716,6 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "upgrades": { "age_grow": 450, "into": "mon_horse" }, "special_attacks": [ [ "EAT_CROP", 100 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "WARM", "NO_BREED" ] @@ -1791,7 +1747,6 @@ "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_horse_foal", "baby_count": 1, "baby_timer": 360 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 60 ] ], @@ -1829,7 +1784,6 @@ "melee_cut": 0, "dodge": 2, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1858,7 +1812,6 @@ "melee_cut": 2, "dodge": 6, "harvest": "mammal_tiny", - "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1898,7 +1851,6 @@ "baby_flags": [ "AUTUMN" ], "//": "Baby moose don't actually exist (yet), but autumn is their mating season so baby_flags is defined so that they get angry then", "harvest": "mammal_large_fur", - "decay": "decay_animal_standard", "special_attacks": [ [ "EAT_CROP", 60 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BLEED", "ATTACKMON" ] }, @@ -1926,7 +1878,6 @@ "melee_cut": 2, "dodge": 2, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ] @@ -1961,7 +1912,6 @@ "vision_day": 0, "vision_night": 0, "harvest": "mutant_mammal_large_leather", - "decay": "decay_animal_standard", "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 1 ], { "type": "bite", "cooldown": 6 }, [ "impale", 10 ] ], "anger_triggers": [ "HURT", "SOUND", "STALK" ], "fear_triggers": [ "FIRE" ], @@ -1996,7 +1946,6 @@ "dodge": 2, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -2025,7 +1974,6 @@ "melee_cut": 2, "dodge": 4, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2055,7 +2003,6 @@ "melee_cut": 1, "dodge": 4, "harvest": "mammal_small_leather", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -2099,7 +2046,6 @@ "melee_cut": 4, "dodge": 2, "harvest": "mammal_large_leather", - "decay": "decay_animal_standard", "reproduction": { "baby_monster": "mon_pig_piglet", "baby_count": 8, "baby_timer": 154 }, "//": "116 days gestation, 3-5 weeks until the piglets get weaned, 10-30 days of maturation", "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], @@ -2133,7 +2079,6 @@ "dodge": 6, "reproduction": { "baby_monster": "mon_rabbit", "baby_count": 3, "baby_timer": 55 }, "harvest": "mammal_small_fur", - "decay": "decay_animal_standard", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "PET_WONT_FOLLOW", "WARM" ] @@ -2162,7 +2107,6 @@ "melee_cut": 1, "dodge": 3, "harvest": "mammal_tiny", - "decay": "null", "vision_night": 5, "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "death_function": [ "NORMAL" ], @@ -2190,7 +2134,6 @@ "melee_dice_sides": 3, "melee_cut": 1, "harvest": "mammal_tiny", - "decay": "null", "special_attacks": [ [ "RATKING", 3 ] ], "death_function": [ "RATKING" ] }, @@ -2220,7 +2163,6 @@ "vision_day": 1, "vision_night": 30, "harvest": "mammal_tiny", - "decay": "null", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -2250,7 +2192,6 @@ "dodge": 2, "anger_triggers": [ ], "harvest": "mammal_small_wool", - "decay": "decay_animal_wool", "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "PLAYER_WEAK" ], "death_function": [ "NORMAL" ], @@ -2282,7 +2223,6 @@ "starting_ammo": { "milk_raw": 5 }, "anger_triggers": [ ], "harvest": "mammal_large_wool", - "decay": "decay_animal_wool", "reproduction": { "baby_monster": "mon_sheep_lamb", "baby_count": 1, "baby_timer": 275 }, "//": "Sheep are seasonal breeders. The natural sexual season is positioned so that lambs will be born in the spring when the weather is warmer and grass is available.", "baby_flags": [ "SPRING" ], @@ -2326,7 +2266,6 @@ "melee_cut": 0, "dodge": 4, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2354,7 +2293,6 @@ "melee_cut": 0, "dodge": 3, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM" ] @@ -2382,7 +2320,6 @@ "dodge": 4, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] @@ -2412,7 +2349,6 @@ "armor_bash": 1, "vision_night": 5, "harvest": "mammal_fur", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], diff --git a/data/json/monsters/marloss.json b/data/json/monsters/marloss.json index 2da32b0d54b0..4bddf7ba93bd 100644 --- a/data/json/monsters/marloss.json +++ b/data/json/monsters/marloss.json @@ -22,7 +22,6 @@ "melee_cut": 0, "dodge": 1, "harvest": "human", - "decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], @@ -54,7 +53,6 @@ "melee_cut": 0, "dodge": 1, "harvest": "human", - "decay": "decay_human", "vision_day": 30, "vision_night": 3, "special_attacks": [ [ "scratch", 15 ] ], diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json index 2870d34b5516..4a9c236b7bb8 100644 --- a/data/json/monsters/mi-go.json +++ b/data/json/monsters/mi-go.json @@ -27,7 +27,6 @@ "vision_day": 50, "vision_night": 20, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -77,7 +76,6 @@ "vision_day": 50, "vision_night": 20, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -128,7 +126,6 @@ "vision_day": 50, "vision_night": 20, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -178,7 +175,6 @@ "vision_day": 50, "vision_night": 20, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -232,7 +228,6 @@ "vision_day": 50, "vision_night": 25, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ @@ -285,7 +280,6 @@ "vision_day": 50, "vision_night": 25, "harvest": "zombie_meatslug", - "decay": "null", "path_settings": { "max_dist": 50 }, "scents_ignored": [ "sc_fetid" ], "special_attacks": [ diff --git a/data/json/monsters/mutant_animal.json b/data/json/monsters/mutant_animal.json index dff1d1c9c3de..7c68846ca938 100644 --- a/data/json/monsters/mutant_animal.json +++ b/data/json/monsters/mutant_animal.json @@ -68,7 +68,6 @@ "armor_stab": 30, "armor_acid": 8, "harvest": "mammal_large_chitin", - "decay": "decay_mammal_plus_chitin", "delete": { "fear_triggers": [ "SOUND" ] }, "//": "Doesn't zombify because it shouldn't regain the fur.", "zombify_into": "mon_null" @@ -113,7 +112,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mutant_mammal_large_fur", - "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON", "STUMBLES", "KEENNOSE" ] }, { @@ -141,7 +139,6 @@ "dodge": 2, "armor_cut": 4, "harvest": "mutant_mammal_fur", - "decay": "decay_animal_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -171,7 +168,6 @@ "melee_cut": 6, "dodge": 3, "harvest": "bird_large", - "decay": "decay_bird_large", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "death_function": [ "NORMAL" ], @@ -211,7 +207,6 @@ } ], "harvest": "mutant_mammal_fur", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 7 }, "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], @@ -251,7 +246,6 @@ "placate_triggers": [ "MEAT" ], "death_function": [ "NORMAL" ], "harvest": "mutant_mammal_fur", - "decay": "decay_animal_standard", "flags": [ "SEES", "HEARS", @@ -294,7 +288,6 @@ "vision_day": 50, "vision_night": 5, "harvest": "mutant_mammal_large_fur", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { @@ -334,7 +327,6 @@ "dodge": 4, "vision_night": 15, "harvest": "mutant_mammal_large_leather", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -371,7 +363,6 @@ "dodge": 3, "vision_night": 15, "harvest": "mutant_mammal_leather", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], @@ -390,7 +381,6 @@ "volume": "30000 ml", "weight": "30 kg", "harvest": "mutant_mammal_small_fur", - "decay": "decay_animal_standard", "hp": 30, "speed": 150, "material": [ "flesh" ], diff --git a/data/json/monsters/mutant_human.json b/data/json/monsters/mutant_human.json index 5291c1f30f8d..a0442be37f23 100644 --- a/data/json/monsters/mutant_human.json +++ b/data/json/monsters/mutant_human.json @@ -22,7 +22,6 @@ "melee_cut": 0, "dodge": 3, "harvest": "mutant_human", - "decay": "decay_human", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { @@ -59,7 +58,6 @@ "vision_day": 25, "vision_night": 5, "harvest": "human_fur_maybe_cyborg", - "decay": "decay_human", "special_attacks": [ [ "PARROT", 80 ], { @@ -155,7 +153,6 @@ "melee_cut": 0, "dodge": 5, "harvest": "mutant_human", - "decay": "decay_human", "death_drops": { "subtype": "collection", "groups": [ [ "subway", 40 ], [ "sewer", 20 ], [ "trash", 5 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ] diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 7275465a488f..a9e241904fd5 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -31,7 +31,6 @@ "anger_triggers": [ "HURT", "FRIEND_DIED", "FRIEND_ATTACKED" ], "death_function": [ "NORMAL" ], "harvest": "bird_large", - "decay": "decay_bird_large", "flags": [ "HEARS", "KEENNOSE", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS", "SUNDEATH" ] }, { @@ -58,7 +57,6 @@ "melee_cut": 0, "dodge": 2, "harvest": "human", - "decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 0 ] ], "death_function": [ "AMIGARA", "NORMAL" ], "flags": [ "SMELLS", "HEARS", "SEES", "STUMBLES", "HARDTOSHOOT", "HUMAN" ] @@ -86,7 +84,6 @@ "melee_cut": 0, "dodge": 1, "harvest": "human", - "decay": "decay_human", "special_attacks": [ [ "SHRIEK", 10 ], { "type": "bite", "cooldown": 10 } ], "anger_triggers": [ "NETHER_ATTENTION" ], "death_function": [ "NORMAL" ], @@ -113,7 +110,6 @@ "melee_dice_sides": 5, "melee_cut": 2, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -224,7 +220,6 @@ "melee_cut": 2, "dodge": 1, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -280,7 +275,6 @@ "vision_night": 40, "luminance": 25, "harvest": "zombie_meatslug", - "decay": "null", "special_attacks": [ [ "STARE", 12 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "WARM", "FLIES", "FIREY", "NO_BREATHE", "NOHEAD" ] @@ -309,7 +303,6 @@ "melee_cut": 0, "dodge": 2, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "FEAR_PARALYZE", 0 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -368,7 +361,6 @@ "dodge": 4, "vision_day": 30, "harvest": "gozu", - "decay": "decay_human", "special_attacks": [ [ "FEAR_PARALYZE", 20 ] ], "death_drops": "mon_gozu_death_drops", "death_function": [ "NORMAL" ], @@ -409,7 +401,6 @@ "dodge": 4, "vision_night": 10, "harvest": "human", - "decay": "decay_human", "death_function": [ "NORMAL" ], "anger_triggers": [ "NETHER_ATTENTION" ], "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 8, "armor_multiplier": 0.8 } ] } ], @@ -469,7 +460,6 @@ "armor_cut": 2, "armor_bullet": 2, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "BLEED", "REVIVES", "CLIMBS", "FILTHY" ] }, @@ -587,7 +577,6 @@ "armor_cut": 12, "armor_bullet": 10, "harvest": "human", - "decay": "decay_human", "special_attacks": [ [ "ACID", 15 ] ], "anger_triggers": [ "PLAYER_WEAK", "FRIEND_DIED" ], "death_function": [ "NORMAL" ], @@ -875,7 +864,6 @@ "melee_cut": 0, "dodge": 6, "harvest": "human", - "decay": "decay_human", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "GOODHEARING", "POISON", "HUMAN", "CLIMBS" ] }, @@ -904,7 +892,6 @@ "dodge": 1, "armor_bash": 6, "harvest": "meatslug", - "decay": "null", "special_attacks": [ [ "GENE_STING", 20 ] ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "DESTROYS", "POISON", "VENOM", "NO_BREATHE", "CAN_DIG" ] diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json index 9cc7bebf6029..5a6c0490eb32 100644 --- a/data/json/monsters/power_leech.json +++ b/data/json/monsters/power_leech.json @@ -36,7 +36,6 @@ ], "special_when_hit": [ "ZAPBACK", 100 ], "harvest": "flesh_plant_bloom", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "QUEEN", "HARDTOSHOOT" ] }, @@ -75,7 +74,6 @@ ], "special_when_hit": [ "ZAPBACK", 100 ], "harvest": "flesh_plant", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -112,7 +110,6 @@ "death_drops": { }, "death_function": [ "NORMAL" ], "harvest": "flesh_plant", - "decay": "null", "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ] }, { @@ -146,7 +143,6 @@ [ "LEECH_SPAWNER", 35 ] ], "harvest": "flesh_plant", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE" ] }, @@ -190,7 +186,6 @@ ], "special_when_hit": [ "ZAPBACK", 100 ], "harvest": "flesh_plant", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] }, @@ -232,7 +227,6 @@ [ "EVOLVE_KILL_STRIKE", 6 ] ], "harvest": "flesh_plant", - "decay": "null", "death_function": [ "NORMAL" ], "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ] } diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index 61123275b3bf..aa6d9e66ea6c 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -23,7 +23,6 @@ "dodge": 2, "armor_bash": 4, "harvest": "mutant_animal_large_noskin", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -59,7 +58,6 @@ "vision_day": 3, "vision_night": 35, "harvest": "animal_large_noskin", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 8 }, "special_attacks": [ { @@ -107,7 +105,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "mammal_tiny", - "decay": "null", "special_attacks": [ [ "RATTLE", 6 ] ], "anger_triggers": [ "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], @@ -145,7 +142,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "mutant_animal_large_noskin", - "decay": "decay_animal_standard", "special_attacks": [ [ "RATTLE", 6 ], { @@ -187,7 +183,6 @@ "vision_day": 1, "vision_night": 30, "harvest": "mutant_animal_large_noskin", - "decay": "decay_animal_standard", "path_settings": { "max_dist": 5 }, "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "WARM", "VENOM", "SWIMS" ] diff --git a/data/json/monsters/slugs.json b/data/json/monsters/slugs.json index 5b3e4bcaeef4..ee4122a3c6ee 100644 --- a/data/json/monsters/slugs.json +++ b/data/json/monsters/slugs.json @@ -56,7 +56,6 @@ "armor_bullet": 2, "vision_day": 30, "harvest": "mutant_meatslug", - "decay": "null", "special_attacks": [ [ "ACID", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index ae9f43ebfaa0..6dbd3370f7c4 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -44,7 +44,6 @@ "morale": 100, "melee_cut": 0, "harvest": "biollante", - "decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 2 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "biollante", 8 ] ], "//": "80% chance of an item from group biollante" }, "death_function": [ "NORMAL" ], @@ -117,7 +116,6 @@ "melee_dice_sides": 1, "melee_cut": 1, "harvest": "triffid_small", - "decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid_young" }, "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "NOHEAD", "STUMBLES" ] @@ -142,7 +140,6 @@ "melee_dice_sides": 4, "melee_cut": 4, "harvest": "triffid_small", - "decay": "decay_plantlike", "upgrades": { "age_grow": 14, "into": "mon_triffid" }, "special_attacks": [ [ "TRIFFID_GROWTH", 28800 ] ], "death_function": [ "NORMAL" ], @@ -173,7 +170,6 @@ "armor_cut": 4, "armor_bullet": 3, "harvest": "triffid_large", - "decay": "decay_plantlike", "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", "flags": [ "SEES", "SMELLS", "BASHES", "GROUP_BASH", "NOHEAD", "PARALYZEVENOM" ] @@ -202,7 +198,6 @@ "armor_cut": 8, "armor_bullet": 6, "harvest": "triffid_queen", - "decay": "decay_plantlike_triffidqueen", "special_attacks": [ [ "GROWPLANTS", 20 ] ], "death_function": [ "NORMAL" ], "fungalize_into": "mon_fungaloid", @@ -231,7 +226,6 @@ "dodge": 4, "armor_bash": 18, "harvest": "triffid_small", - "decay": "decay_plantlike", "death_function": [ "NORMAL" ], "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "HARDTOSHOOT", "GRABS", "SWIMS", "PLASTIC" ] }, @@ -259,7 +253,6 @@ "armor_cut": 6, "armor_bullet": 5, "harvest": "triffid_large", - "decay": "decay_plantlike", "attack_effs": [ { "id": "paralyzepoison", "//": "applying this multiple times makes intensity go up by 3 instead of 1", "duration": 33 }, { "id": "paralyzepoison", "duration": 33 }, @@ -289,7 +282,6 @@ "morale": 100, "melee_cut": 0, "harvest": "triffid_large", - "decay": "decay_plantlike", "special_attacks": [ [ "SPIT_SAP", 3 ], [ "PARA_STING", 12 ] ], "emit_fields": [ { "emit_id": "emit_pollen_stream", "delay": "1 s" } ], "death_function": [ "NORMAL" ], @@ -317,7 +309,6 @@ "armor_cut": 16, "armor_bullet": 13, "harvest": "triffid_small", - "decay": "decay_plantlike", "special_attacks": [ [ "TRIFFID_HEARTBEAT", 50 ] ], "death_function": [ "TRIFFID_HEART" ], "flags": [ "NOHEAD", "IMMOBILE", "QUEEN" ] diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index 3c7690a0199c..be5f19ae78ed 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -26,7 +26,6 @@ "armor_bullet": 2, "luminance": 0, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "SWIMS", "AQUATIC", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] }, @@ -56,7 +55,6 @@ "dodge": 1, "vision_night": 4, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" }, @@ -90,7 +88,6 @@ "armor_acid": 3, "vision_night": 3, "harvest": "mr_bones", - "decay": "decay_zombie_mrbones", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "POISON", "FILTHY" ] @@ -124,7 +121,6 @@ "vision_day": 50, "vision_night": 4, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "dog_cop", 40 ] ], "//": "40% chance of an item from group dog_cop" }, "death_function": [ "NORMAL" ], @@ -156,7 +152,6 @@ "vision_day": 30, "vision_night": 4, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 4, "no_infection_chance": 12 } ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ] @@ -186,7 +181,6 @@ "dodge": 2, "vision_night": 5, "harvest": "zombie_fur", - "decay": "decay_zombie_standard", "special_attacks": [ [ "HOWL", 10 ] ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], @@ -222,7 +216,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie_fur", - "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -253,7 +246,6 @@ "dodge": 1, "vision_day": 50, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], @@ -301,7 +293,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -335,7 +326,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "death_function": [ "NORMAL" ], @@ -368,7 +358,6 @@ "vision_day": 30, "vision_night": 10, "harvest": "zombie_fur", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index a9e8f23ca8f1..18d1c9186b56 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -24,7 +24,6 @@ "armor_cut": 8, "armor_bullet": 6, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 } ], "death_drops": { "subtype": "collection", @@ -73,7 +72,6 @@ "melee_cut": 0, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -125,7 +123,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie_maybe_survivalist_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_cop_death_drops", "death_function": [ "NORMAL" ], @@ -172,7 +169,6 @@ "melee_cut": 0, "vision_day": 10, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -219,7 +215,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "special_attacks": [ [ "DANCE", 30 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -254,7 +249,6 @@ "armor_bullet": 2, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.75, "//": "Fat zombies have stronger jaws" }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -306,7 +300,6 @@ "armor_fire": 10, "vision_night": 3, "harvest": "zombie_maybe_tech_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_fireman_death_drops", "death_function": [ "NORMAL" ], @@ -355,7 +348,6 @@ "armor_bullet": 3, "vision_night": 3, "harvest": "zombie_maybe_sci_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_drops": "mon_zombie_hazmat_death_drops", "death_function": [ "NORMAL" ], @@ -401,7 +393,6 @@ "melee_cut": 0, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 2, "accuracy": 3, "no_infection_chance": 10 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -453,7 +444,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie_maybe_survivalist_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 15 ] ], "death_drops": "mon_zombie_swat_death_drops", "death_function": [ "NORMAL" ], @@ -503,7 +493,6 @@ "armor_bullet": 1, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json index 79da9cca2ef7..2d455b3c4d52 100644 --- a/data/json/monsters/zed_acid.json +++ b/data/json/monsters/zed_acid.json @@ -24,7 +24,6 @@ "dodge": 1, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -76,7 +75,6 @@ "vision_night": 3, "luminance": 0, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "gun", @@ -138,7 +136,6 @@ "dodge": 1, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], @@ -187,7 +184,6 @@ "melee_cut": 1, "vision_day": 14, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "ACID_BARF", 22 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "ACID", "NORMAL" ], diff --git a/data/json/monsters/zed_burned.json b/data/json/monsters/zed_burned.json index 03ac4103a67d..4fc32bd66fa3 100644 --- a/data/json/monsters/zed_burned.json +++ b/data/json/monsters/zed_burned.json @@ -29,7 +29,6 @@ "vision_day": 10, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_CHILD_ZOMBIE_UPGRADE" }, "flags": [ @@ -77,7 +76,6 @@ "vision_day": 10, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 21, "into_group": "GROUP_ZOMBIE_BRUTE" }, @@ -112,7 +110,6 @@ "vision_day": 10, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ] ], "death_function": [ "SMOKEBURST", "NORMAL" ], "upgrades": { "half_life": 14, "into_group": "GROUP_ZOMBIE_UPGRADE" }, diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index 0ffff4f4ee7e..a0b17c69cd7e 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -22,7 +22,6 @@ "melee_cut": 2, "dodge": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "vision_day": 30, "vision_night": 3, "special_attacks": [ { "type": "bite", "cooldown": 2 } ], @@ -59,7 +58,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", @@ -110,7 +108,6 @@ "vision_day": 10, "vision_night": 10, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -158,7 +155,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 5 ], [ "scratch", 15 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -206,7 +202,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 5 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "BOOMER" ], @@ -240,7 +235,6 @@ "vision_day": 10, "vision_night": 10, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "leap", "cooldown": 10, "max_range": 5 } ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], @@ -290,7 +284,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 15 ], [ "scratch", 10 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_electric.json b/data/json/monsters/zed_electric.json index 461da20cdea4..16d2ae9df3e4 100644 --- a/data/json/monsters/zed_electric.json +++ b/data/json/monsters/zed_electric.json @@ -28,7 +28,6 @@ "vision_night": 3, "luminance": 16, "harvest": "CBM_SUBS", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 15 ], [ "SMASH", 30 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -74,7 +73,6 @@ "dodge": 2, "luminance": 8, "harvest": "CBM_CIV", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHOCKSTORM", 25 ] ], "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", @@ -123,7 +121,6 @@ "vision_night": 3, "luminance": 16, "harvest": "CBM_SUBS", - "decay": "decay_zombie_standard", "emit_fields": [ { "emit_id": "emit_shock_cloud", "delay": "1 s" } ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "default_zombie_death_drops", @@ -155,7 +152,6 @@ "dodge": 2, "luminance": 4, "harvest": "CBM_BASIC", - "decay": "decay_zombie_standard", "special_when_hit": [ "ZAPBACK", 100 ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index 4a94e67bf627..71527e9a16cb 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -72,7 +72,6 @@ "armor_bullet": 4, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "BOOMER_GLOW", 20 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_items", "death_function": [ "BOOMER_GLOW" ], diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index 5850f8fd0bb1..a49e90be6c2d 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -22,7 +22,6 @@ "dodge": 1, "armor_bash": 8, "harvest": "zombie_leather", - "decay": "decay_zombie_standard", "fear_triggers": [ "HURT", "FIRE" ], "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN" ] @@ -54,7 +53,6 @@ "armor_bullet": 4, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "ZOMBIE_FUSE", 80 ] ], "death_drops": { "subtype": "collection", diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json index cc0f3aca2812..e69a5e620a25 100644 --- a/data/json/monsters/zed_lab.json +++ b/data/json/monsters/zed_lab.json @@ -26,7 +26,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "CBM_SCI", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ [ "scratch", 20 ] ], "death_drops": "mon_zombie_scientist_death_drops", @@ -82,7 +81,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie_maybe_mil_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 10 ], [ "scratch", 10 ] ], "death_drops": "mon_zombie_labsecurity_death_drops", "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/zed_medical.json b/data/json/monsters/zed_medical.json index a90bca1220c7..0e99dbcf2a68 100644 --- a/data/json/monsters/zed_medical.json +++ b/data/json/monsters/zed_medical.json @@ -21,7 +21,6 @@ "armor_acid": 4, "vision_night": 3, "harvest": "zombie_maybe_sci_bionics", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ { "id": "inject" } ], "death_drops": "mon_zombie_medical_death_drops", @@ -45,7 +44,6 @@ "vision_day": 45, "vision_night": 5, "harvest": "zombie_maybe_sci_bionics", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { @@ -71,7 +69,6 @@ "vision_day": 50, "vision_night": 10, "harvest": "zombie_maybe_sci_bionics", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "max_consider_range": 5, "move_cost": 0 }, diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 6e76e114e9ac..8565528b3adb 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -27,7 +27,6 @@ "vision_day": 15, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -87,7 +86,6 @@ "vision_day": 2, "vision_night": 0, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ] ], "//4": "Removed Bite attack to reflect damage to mouth.", "death_drops": "default_zombie_death_drops", @@ -136,7 +134,6 @@ "armor_bullet": 5, "vision_night": 4, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -188,7 +185,6 @@ "armor_stab": 8, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 30 ], [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -238,7 +234,6 @@ "vision_day": 5, "vision_night": 40, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 40 ], [ "STRETCH_ATTACK", 20 ], [ "LONGSWIPE", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -285,7 +280,6 @@ "vision_day": 7, "vision_night": 4, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "GRAB", 6 ], [ "scratch", 20 ] ], "//3": "Removed Bite as this creature does not have a 'mouth'.", "death_drops": "default_zombie_death_drops", @@ -334,7 +328,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -383,7 +376,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 3 ], { "type": "bite", "cooldown": 5 } ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -434,7 +426,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "STRETCH_BITE", 10 ], [ "STRETCH_ATTACK", 5 ] ], "death_function": [ "BLOBSPLIT" ], "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "FILTHY" ] @@ -467,7 +458,6 @@ "vision_day": 50, "vision_night": 4, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SMASH", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], @@ -513,7 +503,6 @@ "dodge": 3, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] }, { "type": "leap", "cooldown": 5, "max_range": 5 }, @@ -558,7 +547,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "JACKSON", 0 ] ], "death_drops": "jackson_drops", "death_function": [ "JACKSON" ], @@ -592,7 +580,6 @@ "vision_day": 25, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -656,7 +643,6 @@ "vision_day": 50, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "UPGRADE", 10 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -705,7 +691,6 @@ "vision_day": 50, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 10 }, "special_attacks": [ [ "RESURRECT", 0 ] ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], @@ -753,7 +738,6 @@ "dodge": 1, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 4 }, "special_attacks": [ [ "scratch", 10 ], @@ -797,7 +781,6 @@ "vision_day": 45, "vision_night": 15, "harvest": "zombie", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 5 }, "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 8, "min_consider_range": 3, "max_consider_range": 7 }, @@ -839,7 +822,6 @@ "vision_day": 50, "vision_night": 8, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 1 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -870,7 +852,6 @@ "vision_day": 3, "vision_night": 40, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -917,7 +898,6 @@ "vision_day": 30, "vision_night": 10, "harvest": "human", - "decay": "decay_human", "special_attacks": [ [ "BRANDISH", 10 ] ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "fear_triggers": [ "FIRE" ], @@ -962,7 +942,6 @@ "vision_day": 50, "vision_night": 4, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "SHRIEK", 10 ], [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -1012,7 +991,6 @@ "vision_day": 25, "vision_night": 5, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.7 }, [ "GRAB", 6 ], [ "scratch", 15 ] ], "death_drops": "default_zombie_death_drops", "death_function": [ "NORMAL" ], @@ -1103,7 +1081,6 @@ "dodge": 2, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_swimmer_death_drops", "death_function": [ "NORMAL" ], @@ -1156,7 +1133,6 @@ "vision_day": 15, "vision_night": 2, "harvest": "CBM_TECH", - "decay": "decay_zombie_standard", "special_attacks": [ [ "PULL_METAL_WEAPON", 25 ], { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_technician_death_drops", "death_function": [ "NORMAL" ], @@ -1193,7 +1169,6 @@ "vision_day": 15, "vision_night": 2, "harvest": "zombie_maybe_tech_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 20 } ], "death_drops": "mon_zombie_miner_death_drops", "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] @@ -1224,7 +1199,6 @@ "armor_bullet": 3, "vision_night": 5, "harvest": "zombie_thorny", - "decay": "decay_zombie_standard", "attack_effs": [ { "id": "paralyzepoison", "duration": 33 } ], "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "PARA_STING", 30 ] ], "death_drops": "mon_zombie_thorny_death_drops", diff --git a/data/json/monsters/zed_radiation.json b/data/json/monsters/zed_radiation.json index 984ed01edebb..f025f234f44f 100644 --- a/data/json/monsters/zed_radiation.json +++ b/data/json/monsters/zed_radiation.json @@ -27,7 +27,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "LONGSWIPE", 8 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 21 } ] } ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -61,7 +60,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 20 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -96,7 +94,6 @@ "vision_night": 3, "luminance": 8, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 15 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -131,7 +128,6 @@ "vision_night": 3, "luminance": 16, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 10 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], @@ -166,7 +162,6 @@ "vision_night": 3, "luminance": 32, "harvest": "zombie", - "decay": "decay_zombie_standard", "special_attacks": [ [ "LUNGE", 5 ] ], "death_drops": "mon_necropolis_general_death_drops", "death_function": [ "MELT" ], diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json index 951b1a6cf10c..6be4156867fc 100644 --- a/data/json/monsters/zed_skeletal.json +++ b/data/json/monsters/zed_skeletal.json @@ -28,7 +28,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "mr_bones", - "decay": "decay_zombie_mrbones", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 } ], "upgrades": { "half_life": 15, "into": "mon_skeleton_brute" }, "death_drops": "default_zombie_clothes", @@ -65,7 +64,6 @@ "vision_day": 35, "vision_night": 3, "harvest": "mr_bones", - "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 45 ], { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 15, "armor_multiplier": 0.6 } ] } @@ -106,7 +104,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "CBM_CIV", - "decay": "decay_zombie_standard", "special_attacks": [ [ "scratch", 10 ], { "type": "bite", "cooldown": 5 }, [ "SHOCKSTORM", 25 ] ], "death_drops": "default_zombie_clothes", "death_function": [ "NORMAL" ], @@ -140,7 +137,6 @@ "vision_day": 50, "vision_night": 4, "harvest": "mr_bones", - "decay": "decay_zombie_mrbones", "special_attacks": [ [ "SMASH", 20 ], [ "STRETCH_ATTACK", 20 ], diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index ebbeecc3fa02..132f1715b0b3 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -28,7 +28,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie_maybe_mil_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_soldier_death_drops", "death_function": [ "NORMAL" ], @@ -79,7 +78,6 @@ "vision_day": 30, "vision_night": 35, "harvest": "zombie_maybe_mil_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", @@ -218,7 +216,6 @@ "vision_day": 30, "vision_night": 5, "harvest": "zombie_kevlar", - "decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }, [ "SMASH", 30 ] @@ -271,7 +268,6 @@ "vision_day": 35, "vision_night": 10, "harvest": "zombie_kevlar", - "decay": "decay_zombie_kevlar", "special_attacks": [ { "id": "slam", "cooldown": 12, "damage_max_instance": [ { "damage_type": "bash", "amount": 35 } ] }, [ "LONGSWIPE", 20 ], @@ -324,7 +320,6 @@ "vision_day": 35, "vision_night": 5, "harvest": "zombie_maybe_mil_bionics", - "decay": "decay_zombie_standard", "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_military_pilot_death_drops", "death_function": [ "NORMAL" ], @@ -375,7 +370,6 @@ "vision_night": 3, "luminance": 8, "harvest": "zombie_maybe_heavy_mil_bionics", - "decay": "decay_zombie_standard", "starting_ammo": { "pressurized_tank": 1000 }, "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_flamer", 100 ] ] }, "death_function": [ "FIREBALL" ], @@ -428,7 +422,6 @@ "vision_day": 30, "vision_night": 3, "harvest": "zombie_maybe_heavy_mil_bionics", - "decay": "decay_zombie_standard", "death_drops": "mon_zombie_armored_death_drops", "death_function": [ "NORMAL" ], "burn_into": "mon_zombie_scorched", @@ -465,7 +458,6 @@ "vision_night": 3, "luminance": 4, "harvest": "CBM_OP", - "decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "mon_zombie_bio_op_death_drops", @@ -502,7 +494,6 @@ "armor_cut": 27, "armor_bullet": 30, "harvest": "CBM_OP2", - "decay": "decay_zombie_standard", "special_attacks": [ [ "BIO_OP_BIOJUTSU", 15 ] ] } ] diff --git a/data/json/monsters/zed_survivor.json b/data/json/monsters/zed_survivor.json index 7137adff6f0c..9aaaeba2a862 100644 --- a/data/json/monsters/zed_survivor.json +++ b/data/json/monsters/zed_survivor.json @@ -28,7 +28,6 @@ "vision_day": 50, "vision_night": 3, "harvest": "zombie_maybe_survivalist_bionics", - "decay": "decay_zombie_standard", "path_settings": { "max_dist": 3 }, "special_attacks": [ [ "SHRIEK", 20 ], diff --git a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md index 1f4f8db07c6a..e7c01b72e112 100644 --- a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md +++ b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md @@ -326,14 +326,6 @@ If this monster's death function leaves a corpse behind, this defines what items when butchering or dissecting its corpse. If none is specified, it will default to `human`. Harvest entries, their yields, and mass ratios, are defined in harvest.json -## "decay" - -(string, optional) - -As with harvest, this defines a harvest entry for any associated corpse, with a default of -`decay_human`. Defines what items will be produced when the the monster's corpse rots away. Harvest -entries, their yields, and mass ratios, are defined in harvest_decay.json - ## "emit_field" (array of objects of emit_id and time_duration, optional) "emit_fields": [ { "emit_id": diff --git a/src/map.cpp b/src/map.cpp index 4c9b306a7ac6..238f82b41846 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7289,8 +7289,9 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) decayed_weight_grams *= rng_float( 0.5, 0.9 ); bool anything_left = false; - for( const harvest_entry &entry : dead_monster->decay.obj() ) { - detached_ptr harvest = item::spawn( entry.drop, calendar::turn ); + for( const harvest_entry &entry : dead_monster->harvest.obj() ) { + if( entry.type != "bionic" && entry.type != "bionic_group" ) { + detached_ptr harvest = item::spawn( entry.drop, it.birthday() ); const float random_decay_modifier = rng_float( 0.0f, static_cast( MAX_SKILL ) ); const float min_num = entry.scale_num.first * random_decay_modifier + entry.base_num.first; const float max_num = entry.scale_num.second * random_decay_modifier + entry.base_num.second; @@ -7302,17 +7303,18 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); } anything_left = roll > 0; - if( g->u.sees( pnt ) ) { - if( anything_left ) { - add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); - } else { - add_msg( m_info, _( "The %1$s decays away to nothing." ), it.tname() ); - } - } for( int i = 0; i < roll; i++ ) { add_item_or_charges( pnt, item::spawn( *harvest ) ); } } + } + if( g->u.sees( pnt ) ) { + if( anything_left ) { + add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); + } else { + add_msg( m_info, _( "The %1$s decays away to nothing." ), it.tname() ); + } + } } void map::rotten_item_spawn( const item &item, const tripoint &pnt ) diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 7275d8958852..83aa515f2d6d 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -829,8 +829,6 @@ void mtype::load( const JsonObject &jo, const std::string &src ) assign( jo, "harvest", harvest ); - assign( jo, "decay", decay ); - const auto death_reader = make_flag_reader( gen.death_map, "monster death function" ); optional( jo, was_loaded, "death_function", dies, death_reader ); if( dies.empty() ) { diff --git a/src/mtype.cpp b/src/mtype.cpp index e2ea92b4dfef..9556997f3ae7 100644 --- a/src/mtype.cpp +++ b/src/mtype.cpp @@ -53,7 +53,6 @@ mtype::mtype() dies.push_back( &mdeath::normal ); sp_defense = nullptr; harvest = harvest_id( "human" ); - decay = harvest_id( "decay_human" ); luminance = 0; bash_skill = 0; diff --git a/src/mtype.h b/src/mtype.h index 6a27edb7363c..48d71aaa5df1 100644 --- a/src/mtype.h +++ b/src/mtype.h @@ -315,7 +315,6 @@ struct mtype { damage_instance melee_damage; // Basic melee attack damage harvest_id harvest; - harvest_id decay; float luminance; // 0 is default, >0 gives luminance to lightmap unsigned int def_chance; // How likely a special "defensive" move is to trigger (0-100%, default 0) From 5057405edc86d3d910d0eedd957c383e1fe65245 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 6 Jun 2024 21:52:28 -0500 Subject: [PATCH 05/14] Delete harvest_decay.json --- data/json/harvest_decay.json | 162 ----------------------------------- 1 file changed, 162 deletions(-) delete mode 100644 data/json/harvest_decay.json diff --git a/data/json/harvest_decay.json b/data/json/harvest_decay.json deleted file mode 100644 index 5168f4f77528..000000000000 --- a/data/json/harvest_decay.json +++ /dev/null @@ -1,162 +0,0 @@ -[ - { - "id": "decay_animal_standard", - "type": "harvest", - "entries": [ { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } ] - }, - { - "id": "decay_animal_wool", - "type": "harvest", - "entries": [ - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.04 } - ] - }, - { - "id": "decay_arthopod_acid", - "type": "harvest", - "entries": [ { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] - }, - { - "id": "decay_arthopod_centipede", - "type": "harvest", - "entries": [ { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] - }, - { - "id": "decay_arthopod_centipede_mega", - "type": "harvest", - "entries": [ - { "drop": "sinew", "type": "bone", "mass_ratio": 0.05 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.3 } - ] - }, - { - "id": "decay_arthopod_bee", - "type": "harvest", - "entries": [ - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, - { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } - ] - }, - { - "id": "decay_arthopod_flying", - "type": "harvest", - "entries": [ - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } - ] - }, - { - "id": "decay_arthopod_standard", - "type": "harvest", - "entries": [ { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } ] - }, - { - "id": "decay_arthopod_wasp", - "type": "harvest", - "entries": [ - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, - { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } - ] - }, - { - "id": "decay_bird", - "type": "harvest", - "entries": [ { "drop": "feather", "type": "skin", "mass_ratio": 0.01 } ] - }, - { - "id": "decay_bird_large", - "type": "harvest", - "entries": [ { "drop": "feather", "type": "skin", "mass_ratio": 0.02 }, { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_broken_cyborg", - "type": "harvest", - "entries": [ - { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "cable", "base_num": [ 1, 3 ], "scale_num": [ 0.2, 0.6 ], "max": 8, "type": "flesh" }, - { "drop": "bone_human", "base_num": [ 1, 2 ], "scale_num": [ 0.4, 0.7 ], "max": 10, "type": "bone" }, - { "drop": "scrap", "base_num": [ 1, 5 ], "scale_num": [ 0.3, 0.7 ], "max": 12, "type": "bone" } - ] - }, - { - "id": "decay_fish", - "type": "harvest", - "entries": [ { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_flesh_golem", - "type": "harvest", - "entries": [ { "drop": "flesh_golem_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ] - }, - { - "id": "decay_jabberwock", - "type": "harvest", - "entries": [ { "drop": "jabberwock_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ] - }, - { - "id": "decay_human", - "type": "harvest", - "//": "Default result used if decay isn't specified for that monster, also used by generic corpses and NPCs", - "entries": [ - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } - ] - }, - { - "id": "decay_mammal_plus_chitin", - "type": "harvest", - "entries": [ - { "drop": "bone", "type": "bone", "mass_ratio": 0.2 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.01 } - ] - }, - { - "id": "decay_plantlike", - "type": "harvest", - "entries": [ { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_plantlike_triffidqueen", - "type": "harvest", - "entries": [ { "drop": "log", "type": "bone", "mass_ratio": 0.35 }, { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_shellfish", - "type": "harvest", - "entries": [ { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_zombie_mrbones", - "type": "harvest", - "entries": [ - { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } - ] - }, - { - "id": "decay_zombie_kevlar", - "type": "harvest", - "entries": [ - { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, - { "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.035 } - ] - }, - { - "id": "decay_zombie_thorny", - "type": "harvest", - "entries": [ { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 } ] - }, - { - "id": "decay_zombie_standard", - "type": "harvest", - "entries": [ - { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } - ] - } -] From f324e9cf2196ab3f2418d13bad31ba6544036f72 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 02:53:27 +0000 Subject: [PATCH 06/14] style(autofix.ci): automated formatting --- src/map.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 238f82b41846..e5ce2900393d 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7290,24 +7290,24 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) bool anything_left = false; for( const harvest_entry &entry : dead_monster->harvest.obj() ) { - if( entry.type != "bionic" && entry.type != "bionic_group" ) { - detached_ptr harvest = item::spawn( entry.drop, it.birthday() ); - const float random_decay_modifier = rng_float( 0.0f, static_cast( MAX_SKILL ) ); - const float min_num = entry.scale_num.first * random_decay_modifier + entry.base_num.first; - const float max_num = entry.scale_num.second * random_decay_modifier + entry.base_num.second; - int roll = 0; - if( entry.mass_ratio != 0.00f ) { - roll = static_cast( std::round( entry.mass_ratio * decayed_weight_grams ) ); - roll = std::ceil( static_cast( roll ) / to_gram( harvest->weight() ) ); - } else { - roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); - } - anything_left = roll > 0; - for( int i = 0; i < roll; i++ ) { - add_item_or_charges( pnt, item::spawn( *harvest ) ); + if( entry.type != "bionic" && entry.type != "bionic_group" ) { + detached_ptr harvest = item::spawn( entry.drop, it.birthday() ); + const float random_decay_modifier = rng_float( 0.0f, static_cast( MAX_SKILL ) ); + const float min_num = entry.scale_num.first * random_decay_modifier + entry.base_num.first; + const float max_num = entry.scale_num.second * random_decay_modifier + entry.base_num.second; + int roll = 0; + if( entry.mass_ratio != 0.00f ) { + roll = static_cast( std::round( entry.mass_ratio * decayed_weight_grams ) ); + roll = std::ceil( static_cast( roll ) / to_gram( harvest->weight() ) ); + } else { + roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); + } + anything_left = roll > 0; + for( int i = 0; i < roll; i++ ) { + add_item_or_charges( pnt, item::spawn( *harvest ) ); + } } } - } if( g->u.sees( pnt ) ) { if( anything_left ) { add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); From 87570881f066193b53b96dfe3547a5ffa04e9bec Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Fri, 7 Jun 2024 13:55:02 -0500 Subject: [PATCH 07/14] Move now-unrelated changes to separate PR --- data/json/harvest.json | 64 +++++++++---------- .../mod/json/reference/creatures/monsters.md | 8 --- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index c6004d227c5d..144311f9d451 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -161,7 +161,7 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -175,7 +175,7 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -188,7 +188,7 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -202,7 +202,7 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } @@ -539,7 +539,6 @@ "message": "", "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } @@ -551,11 +550,11 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 } ] }, { @@ -563,10 +562,9 @@ "type": "harvest", "message": "", "entries": [ - { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, - { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } + { "drop": "mutant_meat", "base_num": [ 40, 55 ], "scale_num": [ 0.5, 0.7 ], "max": 80, "type": "flesh" }, + { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.45, 0.9 ], "max": 15, "type": "skin" }, + { "drop": "mutant_fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" } ] }, { @@ -576,7 +574,7 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 } @@ -589,7 +587,7 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 } ] }, @@ -599,8 +597,8 @@ "message": "What appeared to be insect hairs on the chitin of this creature look more like tiny feathers as you pare them back. Inside is a bundle of bubble-like tissue sacs that appear to be floating, which doesn't fit with what you know about real bees.", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.23 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -613,8 +611,8 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -627,8 +625,8 @@ "message": "", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.2 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.003 }, + { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" }, @@ -643,11 +641,10 @@ "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.15 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.02 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.005 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0045 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.025 }, - { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }, + { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 }, { "drop": "egg_dragonfly", "type": "offal", "base_num": [ 5, 35 ], "scale_num": [ 0.3, 0.5 ] } ] }, @@ -658,7 +655,7 @@ "//": "copied from arachnid_flying+egg", "entries": [ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, @@ -796,7 +793,7 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] @@ -808,7 +805,7 @@ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] @@ -821,7 +818,7 @@ { "drop": "meat", "type": "flesh", "mass_ratio": 0.4 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.03 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.001 } @@ -841,9 +838,10 @@ "type": "harvest", "message": "You laboriously hack and dig through the remains of the fungal mass.", "entries": [ - { "drop": "veggy_tainted", "type": "flesh", "mass_ratio": 0.5 }, - { "drop": "plant_sac", "type": "offal", "mass_ratio": 0.2 }, - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 } + { "drop": "veggy", "base_num": [ 6, 10 ], "scale_num": [ 0.6, 0.8 ], "max": 20, "type": "flesh" }, + { "drop": "veggy_tainted", "base_num": [ 16, 25 ], "scale_num": [ 0.6, 0.8 ], "max": 50, "type": "flesh" }, + { "drop": "plant_sac", "base_num": [ 3, 6 ], "scale_num": [ 0.7, 0.9 ], "max": 10, "type": "offal" }, + { "drop": "stick_fiber", "base_num": [ 4, 8 ], "scale_num": [ 0.5, 0.7 ], "max": 10, "type": "bone" } ] }, { @@ -1074,7 +1072,7 @@ "id": "triffid_small", "type": "harvest", "entries": [ - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.5 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 } ] @@ -1083,7 +1081,7 @@ "id": "triffid_large", "type": "harvest", "entries": [ - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.4 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 }, { "drop": "stick", "type": "bone", "mass_ratio": 0.05 } @@ -1094,7 +1092,7 @@ "type": "harvest", "entries": [ { "drop": "log", "type": "bone", "mass_ratio": 0.35 }, - { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.15 }, { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 } ] diff --git a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md index e7c01b72e112..841c6794850b 100644 --- a/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md +++ b/doc/src/content/docs/en/mod/json/reference/creatures/monsters.md @@ -318,14 +318,6 @@ see ITEM_SPAWN.md. The default subtype is "distribution". How the monster behaves on death. See JSON_FLAGS.md for a list of possible functions. One can add or remove entries in mods via "add:death_function" and "remove:death_function". -## "harvest" - -(string, optional) - -If this monster's death function leaves a corpse behind, this defines what items will be produced -when butchering or dissecting its corpse. If none is specified, it will default to `human`. Harvest -entries, their yields, and mass ratios, are defined in harvest.json - ## "emit_field" (array of objects of emit_id and time_duration, optional) "emit_fields": [ { "emit_id": From b235efb6d361794d81aaac0cf46811a03cbb4628 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 8 Jun 2024 02:21:28 -0500 Subject: [PATCH 08/14] Now works off-map too Father I crave violence --- src/item.cpp | 4 ++-- src/map.cpp | 21 ++++++++++++--------- src/map.h | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/item.cpp b/src/item.cpp index 03ab25222068..b1cfa1416076 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -9911,8 +9911,8 @@ detached_ptr item::process_internal( detached_ptr &&self, player *ca if( comestible && !self ) { here.rotten_item_spawn( obj, pos ); } - if( obj.is_corpse() && !self && !obj.corpse->zombify_into ) { - here.handle_decayed_corpse( obj, pos ); + if( obj.is_corpse() && !self ) { + here.handle_decayed_corpse( obj, here.getglobal( pos ) ); } } return std::move( self ); diff --git a/src/map.cpp b/src/map.cpp index e5ce2900393d..1ab11527be3f 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7273,7 +7273,7 @@ void map::remove_rotten_items( Container &items, const tripoint &pnt, temperatur } ); } -void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) +void map::handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ) { if( !it.is_corpse() ) { debugmsg( "Tried to decay a non-corpse item %s. Aborted", it.tname() ); @@ -7304,17 +7304,10 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) } anything_left = roll > 0; for( int i = 0; i < roll; i++ ) { - add_item_or_charges( pnt, item::spawn( *harvest ) ); + add_item_or_charges( getlocal( pnt ), item::spawn( *harvest ) ); } } } - if( g->u.sees( pnt ) ) { - if( anything_left ) { - add_msg( m_info, _( "The %1$s decays away, leaving something behind." ), it.tname() ); - } else { - add_msg( m_info, _( "The %1$s decays away to nothing." ), it.tname() ); - } - } } void map::rotten_item_spawn( const item &item, const tripoint &pnt ) @@ -7653,6 +7646,16 @@ void map::actualize( const tripoint &grid ) // plants contain a seed item which must not be removed under any circumstances if( !furn.has_flag( "DONT_REMOVE_ROTTEN" ) ) { temperature_flag temperature = temperature_flag_at_point( *this, pnt ); + // Absolutely goofy, but checking for decay must be done early instead of in `remove_rotten_items` to avoid crashes + for( const auto &it : tmpsub->get_items( { x, y } ) ) { + if( it->is_corpse() ) { + detached_ptr tmp = item::spawn( it->typeId(), it->birthday() ); + tmp = item::process_rot( std::move( tmp ), pnt ); + if( !tmp ) { + handle_decayed_corpse( *it, getglobal( pnt ) ); + } + } + } remove_rotten_items( tmpsub->get_items( { x, y } ), pnt, temperature ); } diff --git a/src/map.h b/src/map.h index 20f5b1ea49c2..a0c35b511696 100644 --- a/src/map.h +++ b/src/map.h @@ -1671,7 +1671,7 @@ class map * @param it item that is spawning creatures * @param pnt The point on this map where the item is and where bones/etc will be */ - void handle_decayed_corpse( const item &it, const tripoint &pnt ); + void handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ); /** * Checks to see if the item that is rotting away generates a creature when it does. From 9dbcd08ad21bb36b36b3293a1c45b5a8ca824161 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 8 Jun 2024 02:39:08 -0500 Subject: [PATCH 09/14] A fix and some aesthetics --- data/json/harvest.json | 62 +++++++++++++++++++++--------------------- src/map.cpp | 2 -- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index ef472612fe44..fa0e5f29ebaf 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -110,8 +110,8 @@ { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "liver", "type": "offal", "mass_ratio": 0.01 }, { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.13 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -129,8 +129,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.08 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.075 } ] @@ -148,8 +148,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.04 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -161,8 +161,8 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -175,8 +175,8 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -188,8 +188,8 @@ "entries": [ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -202,8 +202,8 @@ { "drop": "cyborg_harvest_uncommon", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] }, { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 }, { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -218,8 +218,8 @@ { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 }, { "drop": "liver", "type": "offal", "mass_ratio": 0.01 }, { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.13 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -233,8 +233,8 @@ { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.05 }, { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -252,8 +252,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.08 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -268,8 +268,8 @@ { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 }, { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -287,8 +287,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.04 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -303,8 +303,8 @@ { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 }, { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -322,8 +322,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.04 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -357,8 +357,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.04 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -373,8 +373,8 @@ { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.2 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.2 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }, { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 } ] @@ -389,8 +389,8 @@ { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 }, { "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] @@ -408,8 +408,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -426,8 +426,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -444,8 +444,8 @@ { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 }, { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 }, { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -529,8 +529,8 @@ { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "stomach", "scale_num": [ 0, 1 ], "max": 1, "type": "offal" }, - { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 } ] }, { @@ -784,8 +784,8 @@ "//": "spooky scary skeletons", "type": "harvest", "entries": [ - { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 } + { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 } ] }, { @@ -796,8 +796,8 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -808,8 +808,8 @@ { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -821,8 +821,8 @@ { "drop": "meat", "type": "flesh", "mass_ratio": 0.4 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.03 }, { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.001 } ] @@ -876,8 +876,8 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -911,8 +911,8 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -935,8 +935,8 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, @@ -981,8 +981,8 @@ { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, + { "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 }, { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.03 } ] }, diff --git a/src/map.cpp b/src/map.cpp index f9f0e43e2f82..1b1fd521a5c5 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7288,7 +7288,6 @@ void map::handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ) int decayed_weight_grams = to_gram( dead_monster->weight ); // corpse might have stuff in it! decayed_weight_grams *= rng_float( 0.5, 0.9 ); - bool anything_left = false; for( const harvest_entry &entry : dead_monster->harvest.obj() ) { if( entry.type != "bionic" && entry.type != "bionic_group" ) { detached_ptr harvest = item::spawn( entry.drop, it.birthday() ); @@ -7302,7 +7301,6 @@ void map::handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ) } else { roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); } - anything_left = roll > 0; for( int i = 0; i < roll; i++ ) { add_item_or_charges( getlocal( pnt ), item::spawn( *harvest ) ); } From 3ffca8f05456a3645f6a7ccf02e7f62ee664edb1 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 8 Jun 2024 14:32:11 -0500 Subject: [PATCH 10/14] Goofy ahh attempt to fix dupe --- src/map.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 1b1fd521a5c5..7447238927c7 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7648,9 +7648,9 @@ void map::actualize( const tripoint &grid ) for( const auto &it : tmpsub->get_items( { x, y } ) ) { if( it->is_corpse() ) { detached_ptr tmp = item::spawn( it->typeId(), it->birthday() ); - tmp = item::process_rot( std::move( tmp ), pnt ); - if( !tmp ) { - handle_decayed_corpse( *it, getglobal( pnt ) ); + it = item::actualize_rot( std::move( it ), pnt, temperature, get_weather() ); + if( !it ) { + handle_decayed_corpse( *tmp, getglobal( pnt ) ); } } } From 7f3ce809977fa091ada8150acbf688a5de0a478d Mon Sep 17 00:00:00 2001 From: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Date: Sun, 9 Jun 2024 07:14:18 +0100 Subject: [PATCH 11/14] Reworks how the logic works There's one part I hate about this and that's the way I have to move stuff out of the `remove_with()` function to make it work. Sort of works but non-count_by_charges harvest materials don't stack when spawning for some reason? --- src/item.cpp | 12 ++++++------ src/map.cpp | 37 +++++++++++++++++-------------------- src/map.h | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/item.cpp b/src/item.cpp index bc810ba00f43..29bc92dc15c8 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -9916,14 +9916,14 @@ detached_ptr item::process_internal( detached_ptr &&self, player *ca } // All foods that go bad have temperature if( ( self->is_food() || self->is_corpse() ) ) { - bool comestible = self->is_comestible(); item &obj = *self; self = process_rot( std::move( self ), seals, pos, carrier, flag, weather_generator ); - if( comestible && !self ) { - here.rotten_item_spawn( obj, pos ); - } - if( obj.is_corpse() && !self ) { - here.handle_decayed_corpse( obj, here.getglobal( pos ) ); + if( !self ) { + if( obj.is_comestible() ) { + here.rotten_item_spawn( obj, pos ); + } else if( obj.is_corpse() ) { + here.handle_decayed_corpse( obj, pos ); + } } } return std::move( self ); diff --git a/src/map.cpp b/src/map.cpp index 7447238927c7..df92ffdcdeac 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7263,25 +7263,32 @@ void map::loadn( const tripoint &grid, const bool update_vehicles ) template void map::remove_rotten_items( Container &items, const tripoint &pnt, temperature_flag temperature ) { - items.remove_with( [this, &pnt, &temperature]( detached_ptr &&it ) { + std::vector corpses_handle; + items.remove_with( [this, &pnt, &temperature, &corpses_handle]( detached_ptr &&it ) { item &obj = *it; it = item::actualize_rot( std::move( it ), pnt, temperature, get_weather() ); - if( !it && obj.is_comestible() ) { - rotten_item_spawn( obj, pnt ); + // When !it, that means the item was removed from the world, ie: has rotted. + if( !it ) { + if( obj.is_comestible() ) { + rotten_item_spawn( obj, pnt ); + } else if( obj.is_corpse() ) { + corpses_handle.push_back( &obj ); + } } return std::move( it ); } ); + + for( const item *corpse : corpses_handle ) { + handle_decayed_corpse( *corpse, pnt ); + } + } -void map::handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ) +void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) { - if( !it.is_corpse() ) { - debugmsg( "Tried to decay a non-corpse item %s. Aborted", it.tname() ); - return; - } const mtype *dead_monster = it.get_corpse_mon(); if( !dead_monster ) { - debugmsg( "Corpse at tripoint %s has no associated monster?!", pnt.to_string() ); + debugmsg( "Corpse at tripoint %s has no associated monster?!", getglobal( pnt ).to_string() ); return; } @@ -7302,7 +7309,7 @@ void map::handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ) roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); } for( int i = 0; i < roll; i++ ) { - add_item_or_charges( getlocal( pnt ), item::spawn( *harvest ) ); + add_item_or_charges( pnt, item::spawn( *harvest ) ); } } } @@ -7644,16 +7651,6 @@ void map::actualize( const tripoint &grid ) // plants contain a seed item which must not be removed under any circumstances if( !furn.has_flag( "DONT_REMOVE_ROTTEN" ) ) { temperature_flag temperature = temperature_flag_at_point( *this, pnt ); - // Absolutely goofy, but checking for decay must be done early instead of in `remove_rotten_items` to avoid crashes - for( const auto &it : tmpsub->get_items( { x, y } ) ) { - if( it->is_corpse() ) { - detached_ptr tmp = item::spawn( it->typeId(), it->birthday() ); - it = item::actualize_rot( std::move( it ), pnt, temperature, get_weather() ); - if( !it ) { - handle_decayed_corpse( *tmp, getglobal( pnt ) ); - } - } - } remove_rotten_items( tmpsub->get_items( { x, y } ), pnt, temperature ); } diff --git a/src/map.h b/src/map.h index a0c35b511696..20f5b1ea49c2 100644 --- a/src/map.h +++ b/src/map.h @@ -1671,7 +1671,7 @@ class map * @param it item that is spawning creatures * @param pnt The point on this map where the item is and where bones/etc will be */ - void handle_decayed_corpse( const item &it, const tripoint_abs_ms &pnt ); + void handle_decayed_corpse( const item &it, const tripoint &pnt ); /** * Checks to see if the item that is rotting away generates a creature when it does. From ffb435adc9980791d9e4423cb0e335962bcfe5d9 Mon Sep 17 00:00:00 2001 From: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Date: Mon, 10 Jun 2024 00:08:55 +0100 Subject: [PATCH 12/14] Document code --- src/item.cpp | 1 + src/map.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/item.cpp b/src/item.cpp index 29bc92dc15c8..45bcd20aa558 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -9918,6 +9918,7 @@ detached_ptr item::process_internal( detached_ptr &&self, player *ca if( ( self->is_food() || self->is_corpse() ) ) { item &obj = *self; self = process_rot( std::move( self ), seals, pos, carrier, flag, weather_generator ); + // If the item has rotted away, then self becomes a null pointer. if( !self ) { if( obj.is_comestible() ) { here.rotten_item_spawn( obj, pos ); diff --git a/src/map.cpp b/src/map.cpp index df92ffdcdeac..2e9e2231fac5 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7272,12 +7272,15 @@ void map::remove_rotten_items( Container &items, const tripoint &pnt, temperatur if( obj.is_comestible() ) { rotten_item_spawn( obj, pnt ); } else if( obj.is_corpse() ) { + // Corpses cannot be handled at this stage, as it causes memory errors by adding + // items to the Container that haven't been accounted for. corpses_handle.push_back( &obj ); } } return std::move( it ); } ); + // Now that all the removing is done, add items from corpse spawns. for( const item *corpse : corpses_handle ) { handle_decayed_corpse( *corpse, pnt ); } From 4fc6be684d09e72217eddb6e9559a4eaaddd07a6 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Mon, 10 Jun 2024 01:18:53 -0500 Subject: [PATCH 13/14] Copper wire fix --- src/map.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/map.cpp b/src/map.cpp index 2e9e2231fac5..06c07ebcdd71 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -7312,6 +7312,11 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) roll = std::min( entry.max, std::round( rng_float( min_num, max_num ) ) ); } for( int i = 0; i < roll; i++ ) { + // This sanity-checks harvest yields that have a default stack amount, e.g. copper wire from cyborgs + if( harvest->charges > 1 ) { + harvest->charges = 1; + } + add_item_or_charges( pnt, item::spawn( *harvest ) ); } } From d48b5b3584664b2c6f68a41e9e6406db39caa72c Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Mon, 10 Jun 2024 13:26:21 -0500 Subject: [PATCH 14/14] Add chance to get CBMs from decay --- src/map.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/map.cpp b/src/map.cpp index 06c07ebcdd71..3a6961e19584 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -109,8 +109,11 @@ static const ammo_effect_str_id ammo_effect_LASER( "LASER" ); static const ammo_effect_str_id ammo_effect_LIGHTNING( "LIGHTNING" ); static const ammo_effect_str_id ammo_effect_PLASMA( "PLASMA" ); +static const fault_id fault_bionic_nonsterile( "fault_bionic_nonsterile" ); + static const itype_id itype_autoclave( "autoclave" ); static const itype_id itype_battery( "battery" ); +static const itype_id itype_burnt_out_bionic( "burnt_out_bionic" ); static const itype_id itype_chemistry_set( "chemistry_set" ); static const itype_id itype_dehydrator( "dehydrator" ); static const itype_id itype_electrolysis_kit( "electrolysis_kit" ); @@ -7321,6 +7324,27 @@ void map::handle_decayed_corpse( const item &it, const tripoint &pnt ) } } } + for( item * const &comp : it.get_components() ) { + if( comp->is_bionic() ) { + // If CBM, decay successfully at same minimum as dissection + // otherwise, yield burnt-out bionic and remove non-sterile if present + if( !one_in( 10 ) ) { + comp->convert( itype_burnt_out_bionic ); + if( comp->has_fault( fault_bionic_nonsterile ) ) { + comp->faults.erase( fault_bionic_nonsterile ); + } + } + add_item_or_charges( pnt, item::spawn( *comp ) ); + } else { + // Same odds to spawn at all, clearing non-sterile if needed + if( one_in( 10 ) ) { + if( comp->has_fault( fault_bionic_nonsterile ) ) { + comp->faults.erase( fault_bionic_nonsterile ); + } + add_item_or_charges( pnt, item::spawn( *comp ) ); + } + } + } } void map::rotten_item_spawn( const item &item, const tripoint &pnt )