Zom-animals #6801

Lain- · Mar 20, 2014

So I hear the zoose was added? This PR add two new zom-animals: Zomwolf and Zomcougar

Zomwolf spawns in pack and will howl to alert other zombies (most likely other zom-animals), similar to the shrieker zombie but with smaller volume.
Zomcougar will leap around like their living counterpart (and better at combat too).

I also added the relevant entries about new monsters to mtype.h and tile_id_data.h (as instructed in the doc) for tile.

Add the howling attack to zombie dog too? (Probably not, people already hate zombie dog as is)

KA101 · Mar 20, 2014

Gonna point out that the zombear spawns kick in as normal bear spawns drop off. You'll need to ensure that your zombie-critters do the same. (That was one thing we missed with the zoose.)

Lain- · Mar 20, 2014

Oh so that's what the "start" and "end" mean, am I right?

KA101 · Mar 20, 2014

Oh so that's what the "start" and "end" mean, am I right?

That's my understanding and they're in hours from game start, IIRC. So over the first week, spawns fall offf and are replaced with zed-spawns.

Robik81 · Mar 20, 2014

Silly question, what we will eat when every specie will end in Z form? I also hope all Z animals share common spawn pool, interruptions are annoying as it is already.

Rivet-the-Zombie · Mar 20, 2014

Rivet-the-Zombie reviewed Mar 20, 2014

View changes

Rivet-the-Zombie · Mar 20, 2014

src/monstergenerator.cpp

@@ -137,6 +137,7 @@ void MonsterGenerator::init_death()

    /* Currently Unimplemented */
    //death_map["SHRIEK"] = &mdeath::shriek;// Screams loudly
+    //death_map["HOWL"] = &mdeath::shriek;// Wolf's howling


Looks like you got the howl action and the shriek action crossed here.

Yeah, my bad.

Lain- · Mar 20, 2014

@Robik81 Well then you gotta find another food source >:)
In serious though the animals spawn does not vanish completely, so normal animal will still spawn but with reduced number.

Zireael07 · Mar 20, 2014

eyes shining oh wow, more zed animals!

illi-kun · Mar 20, 2014

illi-kun reviewed Mar 20, 2014

View changes

illi-kun · Mar 20, 2014

src/monattack.cpp

@@ -87,6 +87,17 @@ void mattack::shriek(monster *z)
 g->sound(z->posx(), z->posy(), 50, _("a terrible shriek!"));
 }

+void mattack::howl(monster *z)
+{
+ int j;


please use 4 spaces as indent

illi-kun · Mar 20, 2014

illi-kun reviewed Mar 20, 2014

View changes

illi-kun · Mar 20, 2014

src/monattack.cpp

+void mattack::howl(monster *z)
+{
+ int j;
+ if (rl_dist(z->posx(), z->posy(), g->u.posx, g->u.posy) > 4 ||


usage of the bracket is mandatory rule even for 1-line conditions.

Lain- · Mar 20, 2014

I'm inclined to leave it as it is, partly because my own shortcoming in coding, and also because that code was copied directly from above so I'm unsure whether I should mess with the legacy stuff.

SeanMirrsen · Mar 20, 2014

I wonder, why "zomwolf" and "zomcougar", when "zolf" and "zougar" are just as good? The "zombear" is called that because of the "zombe" part.

By that logic though, we should probably add a "zombeaver". :P

Lain- · Mar 20, 2014

Zolf if ok though "zougar" sounds weird IMO. I think "Zombear" in this case is the rule, not exception so that's why I follow the "zom+animal name" scheme.

KA101 · Mar 21, 2014

There's no direct-quote function, annoyingly enough. @Rivet-the-Zombie clued me in to Git's using the right-arrow (default "go down" in DDA) to quote. Just stick it before the text you want to quote, and double-return after.

@KA101
That final 90 days, what percentage of wildlife we are talking about?

Also, I want my meat and FAT! Is this some sort of vegetarian simulator? First, there should be meat+fat alternative available for the player (animal farm?) before you screw him over with destroying wildlife...

Hmm, how do I actually reply to some post, please?

And you get that. As for your questions, during the period between Winter and the 90th day, you're looking at 4 ways to spawn bears (mostly at night) and 3 shots to get zombears. However, Bears don't show up in winter (the whole hibernation thing) and they're much more likely to show up at night.
To put it in perhaps a more accurate light, there's 20 points of "frequency" allotted to bears at game start. 16 of that will flip to zombears over that time period, 4 points shifting at each interval. However, Bears won't show up in Winter and are more likely to show up at night (1 point anytime, 3 points night) whilst each zombear slot is 4 points, anytime.

Zombears are the most involved of the replacements; bear in mind that not all players are male, and I don't think giant insects became inedible. Ka'lol hunted giant spiders when I was last playing.

Robik81 · Mar 21, 2014

Thanks.

Nothing against eating insect, but I would still prefer to have more options than setting the camp near anthill. Or end up on vegie.

Lain- · Mar 21, 2014

More tweaks, namely the name change (zolf & zougar) and the [FAT] flag for zoose ('cause moose has this too). Unless anything come up, this should be ready to go.

KA101 · Mar 22, 2014

Gonna object to the FAT tag on a zombie critter. Probably rancid or otherwise not useful. (Zombears don't have FAT, but bears do.)

Lain- · Mar 22, 2014

That's make sense, yea gonna do that.

KA101 · Mar 22, 2014

I'm not sure when all the frequency changes happened and don't have a lot of time ATM, but that got an eyebrow-raise. Apart from those I'd think this would be ready to go.

RadaRadaRada · Mar 22, 2014

Frequencies for both animals and their zombie variants seem funky: 60% of bear population are left unaccounted for. Same applies to both moose and cougar. Not certain of intention, but spawn conditions for moose and cougar seem to be messed up.

Lain- · Mar 23, 2014

@KA101 The frequency change was to account for the zombified variants, especially the zombear frequency was reduced because now there are more zom-animal roaming around so the player has to deal with more threat.

Lain- · Mar 23, 2014

@RadaRadaRada The moose and cougar spawn was extended so that they can gradually be replaced by the zombified variant, not instantly vanish over night.
Bear also spawn in cave and yea that was not accounted for, not sure if I should extend that and give some to zom-animals. Probably later though.

RadaRadaRada · Mar 23, 2014

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada · Mar 23, 2014

data/json/monstergroups.json

@@ -17,15 +17,25 @@
      { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] },
      { "monster" : "mon_bear", "freq" : 3, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] },



Total frequency of mon_bear spawns is 20 (This translates as a 2% chance as spawning). As time goes on the frequency falls like this 20/16/12/8/4. Now, the mon_zombear frequency scheme is 0/1/2/3/4. Only 4 points of mon_bear population are accounted for (and "replaced" with) zombified versions of them. So, 12 frequency points of mon_bear population are "lost". If this was an oversight and not an intentional design choice, one should redo whole mon_bear block to accommodate population leak:

{ "monster" : "mon_bear", "freq" : 4, "cost_multiplier" : 10, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 12, "cost_multiplier" : 10, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 72, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 168, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] },

RadaRadaRada's right, you're taking a net loss of bears there. I'd much prefer to see a straight conversion. If you're arguing that some bears die such that the goo can't rez 'em, that should be 1-2 points of frequency at most: that's "blown apart by land mine or shotgun trap" level of damage.

(Player (non-)actions should be separate code, in case anyone's thinking "excessively hunted by the player". For starters, butchering an animal guarantees it won't rez, so hunting kills should count against zom-critter growth too.)

RadaRadaRada · Mar 23, 2014

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada · Mar 23, 2014

data/json/monstergroups.json

+      { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" :   72 },
+      { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" :  168 },
+      { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" :  672 },
+      { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" : 2160 },



For the sake of convenience, readability and general cleanliness, I would suggest to transfer zombie moose, wolf and cougar data blocks right beneath their respective animal/population data blocks: mon_zoose block would go under mon_moose and mon_zomcougar would go right under mon_cougar entry.

Edit.: consider moving zombie wolf data block right beneath dog zombie data block. They draw their populations from all of the canines (including mon_wolf), so you would need to just slice some frequency from mon_dog_zombie spawns. Take note how much frequency mon_wolf loses as the time goes on. Conform to or re-balance rates at your discretion.

RadaRadaRada · Mar 23, 2014

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada · Mar 23, 2014

data/json/monstergroups.json

+      { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 672                         },
+      { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 2160, "conditions" : ["DAY"] },
+      { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3                         },
+      { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "conditions" : ["DAY"] },



Funky spawn conditions. Format this for sake of readability. Try to keep day/night spawn rations in mind, then dispersing frequencies through out the time.

{ "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3 }, { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "conditions" : ["DAY"] }, { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 72 }, { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 72, "conditions" : ["DAY"] }, { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 168 }, { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 168, "conditions" : ["DAY"] }, { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 672 }, { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 672, "conditions" : ["DAY"] }, { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 2160 }, { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 2160, "conditions" : ["DAY"] },

RadaRadaRada · Mar 23, 2014

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada · Mar 23, 2014

data/json/monstergroups.json

+      { "monster" : "mon_cougar", "freq" :  2, "cost_multiplier" : 2, "ends" :   168},
+      { "monster" : "mon_cougar", "freq" : 5, "cost_multiplier" : 2, "ends" :   168, "conditions" : ["DAWN", "DUSK"] },
+      { "monster" : "mon_cougar", "freq" :  3, "cost_multiplier" : 2},
+      { "monster" : "mon_cougar", "freq" : 5, "cost_multiplier" : 2, "conditions" : ["DAWN", "DUSK"] },



Funky spawn conditions. Format this for sake of readability. Try to keep day/night spawn rations in mind, then dispersing frequencies through out the time.

{ "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3 }, { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"] }, { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 72 }, { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 72, "conditions" : ["DAWN", "DUSK"] }, { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 168 }, { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 168, "conditions" : ["DAWN", "DUSK"] }, { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 672 }, { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 672, "conditions" : ["DAWN", "DUSK"] }, { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 2160 }, { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 2160, "conditions" : ["DAWN", "DUSK"] },

Lain- · Mar 24, 2014

Yeah I see what you are getting at. I'll take a look into it when I have some time to spare.

KA101 · Mar 26, 2014

KA101 reviewed Mar 26, 2014

View changes

KA101 · Mar 26, 2014

data/json/monsters.json

+        "id" : "mon_zolf",
+    "name": "zolf",
+    "species":"ZOMBIE",
+    "symbol":"d",


Should probably change these to "w" per the wolf change.

KA101 · Mar 26, 2014

KA101 reviewed Mar 26, 2014

View changes

KA101 · Mar 26, 2014

data/json/monsters.json

+    "special_freq":0,
+    "death_function":"NORMAL",
+    "special_attack":"LEAP",
+    "description":"An otherwise normal-looking cougar, except that its hind legs are swollen and its eyes bulged with black goo.",


swollen, and its eyes bulge with black goo.

KA101 · Mar 26, 2014

Just some stye points left, and I can fix those in the merge if need be.

Lain- changed the title ~~Zom-animals~~ [WIP]Zom-animals Mar 20, 2014

Lain- added some commits Mar 20, 2014

spawn

68c3be3

format

Loading status checks…

d6ba2f2

added description.

Loading status checks…

f81cc98

Lain- changed the title ~~[WIP]Zom-animals~~ Zom-animals Mar 20, 2014

Lain- added some commits Mar 20, 2014

fix build

Loading status checks…

069d384

oops

Loading status checks…

bc23b29

oversight

Loading status checks…

d3b8644

Lain- added some commits Mar 21, 2014

add flags

92a0347

name change

ddc15b9

little buff

881ed32

tweak

f41669e

[FAT] flag for zoose

Loading status checks…

1728096

no [FAT]

Loading status checks…

7838d59

Lain- added some commits Mar 24, 2014

reformat

242b58c

more format and zolf freq. need further inspection.

bc69b26

give zolf back their pack

4527c3b

tweak the zolf spawn

Loading status checks…

d02b460

KA101 self-assigned this Mar 26, 2014

KA101 merged commit d02b460 into CleverRaven:master Mar 27, 2014
1 check passed

1 check passed

default
Details

Lain- deleted the Lain-:zom-animals branch Mar 28, 2014

CleverRaven/Cataclysm-DDA

Join GitHub today

Zom-animals #6801

Conversation

Lain- commented Mar 20, 2014

Lain- added some commits Mar 19, 2014

Lain- changed the title Zom-animals [WIP]Zom-animals Mar 20, 2014

This comment has been minimized.

KA101 commented Mar 20, 2014

This comment has been minimized.

Lain- commented Mar 20, 2014

This comment has been minimized.

KA101 commented Mar 20, 2014

Lain- added some commits Mar 20, 2014

Lain- changed the title [WIP]Zom-animals Zom-animals Mar 20, 2014

Lain- added some commits Mar 20, 2014

This comment has been minimized.

Robik81 commented Mar 20, 2014

Rivet-the-Zombie reviewed Mar 20, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Lain- commented Mar 20, 2014

This comment has been minimized.

Zireael07 commented Mar 20, 2014

illi-kun reviewed Mar 20, 2014 View changes

This comment has been minimized.

illi-kun reviewed Mar 20, 2014 View changes

This comment has been minimized.

This comment has been minimized.

Lain- commented Mar 20, 2014

This comment has been minimized.

SeanMirrsen commented Mar 20, 2014

This comment has been minimized.

Lain- commented Mar 20, 2014

This comment has been minimized.

KA101 commented Mar 21, 2014

This comment has been minimized.

Robik81 commented Mar 21, 2014

Lain- added some commits Mar 21, 2014

This comment has been minimized.

Lain- commented Mar 21, 2014

This comment has been minimized.

KA101 commented Mar 22, 2014

This comment has been minimized.

Lain- commented Mar 22, 2014

This comment has been minimized.

KA101 commented Mar 22, 2014

This comment has been minimized.

RadaRadaRada commented Mar 22, 2014

This comment has been minimized.

Lain- commented Mar 23, 2014

This comment has been minimized.

Lain- commented Mar 23, 2014

RadaRadaRada reviewed Mar 23, 2014 View changes

This comment has been minimized.

This comment has been minimized.

RadaRadaRada reviewed Mar 23, 2014 View changes

This comment has been minimized.

RadaRadaRada reviewed Mar 23, 2014 View changes

This comment has been minimized.

RadaRadaRada reviewed Mar 23, 2014 View changes

This comment has been minimized.

This comment has been minimized.

Lain- commented Mar 24, 2014

Lain- added some commits Mar 24, 2014

KA101 self-assigned this Mar 26, 2014

KA101 reviewed Mar 26, 2014 View changes

This comment has been minimized.

KA101 reviewed Mar 26, 2014 View changes

This comment has been minimized.

This comment has been minimized.

KA101 commented Mar 26, 2014

Hide details View details KA101 merged commit d02b460 into CleverRaven:master Mar 27, 2014 1 check passed

1 check passed

Lain- deleted the Lain-:zom-animals branch Mar 28, 2014

Rivet-the-Zombie reviewed Mar 20, 2014

View changes

illi-kun reviewed Mar 20, 2014

View changes

illi-kun reviewed Mar 20, 2014

View changes

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada reviewed Mar 23, 2014

View changes

RadaRadaRada reviewed Mar 23, 2014

View changes

KA101 reviewed Mar 26, 2014

View changes

KA101 reviewed Mar 26, 2014

View changes

KA101 merged commit `d02b460` into CleverRaven:master Mar 27, 2014
1 check passed