Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animal ports from TropiCata to Mainline + egg density fixes for insects and birds #60234

Merged
merged 64 commits into from
Aug 19, 2022

Conversation

Xaritscin
Copy link
Contributor

@Xaritscin Xaritscin commented Aug 17, 2022

Summary

Mods "ports animals from mod"

Purpose of change

Longstanding plan to move several mobs from the mod to mainline based on accuracy and plausibility seeing that they arent exclusive to the tropics.

Describe the solution

The following animals were ported from mod:

-birds: hummingbirds, woodpeckers, rails, cormorants, grebes, geese (domestic variants)
-amphibians: toads (including a zombie version)
-arthropods: butterflies and moths, cicadas, woodlice, diving beetles, water scorpions
-mammals: llamas

EDIT: to evade fails on item test, i updated the weights and volumes of the generic bird(55g/50ml), insect(275g/250ml) and canadian goose(143g/130ml) eggs to get most of the animal eggs out of the "bad density" list. this also fixed it for owlbear eggs in Magiclysm.

Describe alternatives you've considered

I was considering on moving guinea pigs, parrots, cockatoos and budgerigars too but due to New England temperatures i dont think those creatures would survive without indoor heating.

Testing

Grabbed the files and generated a new map, started strolling around, found several of the animals in their respective places. only crashes at load were due to build syntax errors that are being fixed or already solved.

Additional context

most if not all the animals ported have a worldwide distribution, and some like llamas can probably survive just fine in the far north due to their wooly covering.

added geese, rails, grebes, cormorants, hummingbirds and woodpeckers to vanilla birds file along with their offspring.
moved several birds to vanilla game from mod
added several types for eggs for animals that are being ported from mod to vanilla
moved several eggs from mod to vanilla
added monstegroup for eggs from mod
moved several monstergroups from eggs to vanilla files
added toads to vanilla game
moved gastrobufo to vanilla game
added gastrobufo to vanilla game
ported insect dust for butterflies and moths from mod
added insect dust to chitin meal recipes
ported several insects from mod to vanilla
moved several insects from mod to vanilla
ported llamas from mod to vanilla
moved llamas to vanilla
moved butterfly groups to vanilla file
ported butterfly groups from mod to vanilla
ported animal entries on monstergroups from mod to vanilla files
ported several animals in groups to vanilla files
ported monster entries from mod to vanilla
moved monster entries from mod to vanilla
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mods Issues related to mods or modding Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. labels Aug 17, 2022
trying to fix the density errors
@bombasticSlacks
Copy link
Contributor

Alright so all the "cannot assign a value same as default" errors you can just delete the relevant line.

For the density test basically it's saying:

"Your items way X" "A perfect cube made of the same materials of the same volume weighs Y"

If your item weighs more than the perfect cube it doesn't make any sense.

It looks like most the eggs are based off current game eggs. So you would need to fix those.

The 3 ways to fix an item are:
Adjust the volume to be more correct. Is the item not big enough?
Adjust the weight to be more correct. Is the item too heavy?
Adjust the materials. Are the materials wrong, or wrong proportionally? (Ex a pair of sandals could be leather, cork and steel. By default that means it's 33% of each but if defined correctly would be like 60% cork, 30% leather, 10% steel buckle)

changed the size of bird eggs to match "medium" size chicken eggs (from 57g and 50ml to 50g and 43 ml). this change was made so as to see if the density errors on item test stop appearing.
matched egg volume to mass to see if it stop sending errors
listed off eggs fixed with the density fix
@github-actions github-actions bot added the Code: Tests Measurement, self-control, statistics, balancing. label Aug 19, 2022
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Aug 19, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 19, 2022
more writting off eggs
changed insect and canadian goose egg volume to match density requirements
wrote off insect eggs now that egg_insect has a correct density
@Xaritscin
Copy link
Contributor Author

Xaritscin commented Aug 19, 2022

Ok all non fish/complex cooking eggs got checked for density fails and basic build isnt throwing errors anymore. at least for this PR, hopefully now the autochecker will finish in due time

owlbear egg also written off -_-
@Xaritscin Xaritscin changed the title Animal ports from TropiCata to Mainline Animal ports from TropiCata to Mainline + egg density fixes for insects and birds Aug 19, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 19, 2022
@bombasticSlacks
Copy link
Contributor

Thanks for fixing the eggs, I know it isn't particularly engaging work but we appreciate you doing it right.

@bombasticSlacks bombasticSlacks merged commit 7451a94 into CleverRaven:master Aug 19, 2022
@Xaritscin Xaritscin deleted the TropiCata-0.7g branch August 20, 2022 01:39
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Aug 21, 2022
* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
…ts and birds (CleverRaven#60234)

* Update bird.json

added geese, rails, grebes, cormorants, hummingbirds and woodpeckers to vanilla birds file along with their offspring.

* Update tropical_bird.json

moved several birds to vanilla game from mod

* Update egg.json

added several types for eggs for animals that are being ported from mod to vanilla

* Update egg.json

moved several eggs from mod to vanilla

* Update eggs.json

added monstegroup for eggs from mod

* Update eggs.json

moved several monstergroups from eggs to vanilla files

* Update reptile_amphibian.json

added toads to vanilla game

* Update tropical_reptile_amphibian.json

moved toads to vanilla

* Update tropical_zanimals.json

moved gastrobufo to vanilla game

* Delete tropical_zanimals.json

* Update zed-animal.json

added gastrobufo to vanilla game

* Update biosignatures.json

ported insect dust for butterflies and moths from mod

* Delete biosignatures.json

* Update recipe_others.json

added insect dust to chitin meal recipes

* Delete recipe_others.json

* Update insect_spider.json

ported several insects from mod to vanilla

* Update tropical_insect_spider.json

moved several insects from mod to vanilla

* Update mammal.json

ported llamas from mod to vanilla

* Update tropical_mammal.json

moved llamas to vanilla

* Update tropical_bugs.json

moved butterfly groups to vanilla file

* Update bugs.json

ported butterfly groups from mod to vanilla

* Update misc.json

ported animal entries on monstergroups from mod to vanilla files

* Update misc.json

ported several animals in groups to vanilla files

* Update wilderness.json

ported monster entries from mod to vanilla

* Update wilderness.json

moved monster entries from mod to vanilla

* Update monster_factions.json

* Update wilderness.json

* Update eggs.json

* Update misc.json

* Update wilderness.json

* Update wilderness.json

* Update bird.json

build fixes

* Update bird.json

* Update eggs.json

build fixes

* Update egg.json

* Update bird.json

* Update egg.json

* Update biosignatures.json

changed chitin dust so it matches other chitinous materials

* Update egg.json

hummingbird egg fixes

* Update eggs.json

added starting date for giant caterpillars to spawn from eggs as per Venera´s feedback

* Update wilderness.json

added starting hours for giant caterpillars to appear on overmap

* Update insect_spider.json

updated harvest type for lepidopterans and cicadas

* Update insect_spider.json

changed growth of mutated butterflies into giants (per Venera's advice)

* Update insect_spider.json

nerfed cicada agression and caterpillar speeds

* Update insect_spider.json

several fixes to cicadas and beetles

* Update misc.json

branch conflict fixes

* Update biosignatures.json

* Update egg.json

trying to fix the density errors

* Update egg.json

* Update egg.json

changed the size of bird eggs to match "medium" size chicken eggs (from 57g and 50ml to 50g and 43 ml). this change was made so as to see if the density errors on item test stop appearing.

* Update egg.json

matched egg volume to mass to see if it stop sending errors

* Update egg.json

* Update known_bad_density.json

listed off eggs fixed with the density fix

* Update egg.json

* Update egg.json

lint fix

* Update known_bad_density.json

more writting off eggs

* Update egg.json

changed insect and canadian goose egg volume to match density requirements

* Update egg.json

* Update known_bad_density.json

* Update egg.json

* Update known_bad_density.json

wrote off insect eggs now that egg_insect has a correct density

* Update known_bad_density.json

* Update known_bad_density.json

owlbear egg also written off -_-

Co-authored-by: Maleclypse <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants