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

Tamable Wildlife: Tamable Bugs #61020

Merged
merged 24 commits into from
Sep 17, 2022
Merged

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented Sep 15, 2022

Summary

Content "Makes all invertebrates with larval forms present in the game tamable in one way or another when Tamable Wildlife is installed"

Purpose of change

I've had the code for insect taming laying around for over a month now. Initially, I wanted to keep it a 3rd party mod but I was told that it may work for Tamable Wildlife and after talking with the creator it appears that this is indeed the case.

Describe the solution

  • Makes all invertebrates with larval forms tamable with the exception of caterpillars (they need some cleanup, better to do that first than to have to remake their code twice) and spiders (their larval forms are aggressive and they don't hatch from eggs so the method used for taming aggressive larva couldn't work)
  • Adds a new food item: Sweet Goop, used to uniformly tame all invertebrate larva
  • Adds 'tame eggs' for the mutants whose larval forms are aggressive. These include dragonflies, mantis, antlions, cicadas, water beetles and water scorpions

Describe alternatives you've considered

I've considered removing the Sweet Goop and just have herbivorous insects tame with cattle fodder and carnivorous tame with catfood but I feel like having one food item to tame all bugs is going to save on the confusion among players. I also considered not doing the whole 'tame eggs' thing but according to Termineitor this approach may work. If I misunderstood anything please let me know and I will edit accordingly.

Testing

Doesn't crash, friendly larvae are indeed not hostile, recipes seem to work as intended.

Additional context

@Termineitor244 you requested to be pinged under this PR, if I did anything wrong or misunderstood anything from our conversation please let me know and I'll fix it up.

@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: Tamable Wildlife Spawn Creatures, items, vehicles, locations appearing on map labels Sep 15, 2022
Copy link
Contributor

@Termineitor244 Termineitor244 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent! If it works in game and it passes the tests then, for me, its good to go.

The only things I would personally change could be the recipes, I would probably add something aromatic to imitate/simulate that you are using some kind of pheromones to trick the baby insect into liking you/recognize you as its parent/same species/whatever, but that can always be done later. And the egg items could have a changed description saying how the tamed egg is diferent from the normal ones, maybe "It keeps quiet when you pass your hand" and a generic "This insect name egg has been carefully tended to tame its host since birth, it smells sweet and seems more timid than normal insect name eggs" could probably do as an extended description.

The goop recipe is fine, but maybe add a fire and boiling requirements? I have the impression that something like that would be a bunch of sugar boiled together into a goop like texture.

Oh, you can change the description of the mod to declare it now includes mutant insects too! For the people that do not follow github.

Apart from that I can only say... Good work! And thank you for your contribution! All insect lovers will surely like this PR.

Copy link
Contributor

@Termineitor244 Termineitor244 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 15, 2022
@Karol1223
Copy link
Contributor Author

I would probably add something aromatic to imitate/simulate that you are using some kind of pheromones to trick the baby insect into liking you/recognize you as its parent/same species/whatever

I thought about that but honestly, I just don't have any idea what that'd be. The only spices or the such we have ingame would be things that would have an adverse effect on me if I was the bug in question, really. I mean covering the egg in chilli powder seems like a bad idea.

With everything else I'll get on it right away, it shouldn't be too hard to do.

@Zireael07
Copy link
Contributor

In the past there was a pheromones item of some sort, so probably something bug-specific could be added.

@Karol1223
Copy link
Contributor Author

In the past there was a pheromones item of some sort, so probably something bug-specific could be added.

Possibly doable but that'd call for 6 new dissection groups and I am not entirely sure if that's not too much.

@Karol1223
Copy link
Contributor Author

Alright and looking at it now I don't really think there's a description to change. modinfo.json doesn't mention that it's just birds and mammals, so it is still accurate. The only place the mod is mentioned to only include birds and mammals is the initial PR where you added it to the game.

@Termineitor244
Copy link
Contributor

I think the same as @Zirael07, but that can always be done in another PR if you deem it too much hassle to add it in this one.

@Karol1223
Copy link
Contributor Author

Karol1223 commented Sep 15, 2022

I think the same as @Zirael07, but that can always be done in another PR if you deem it too much hassle to add it in this one.

I could try to get this done later on in a different PR, I intend to get back to this anyway once I clean up the caterpillar code. For now I gotta figure out how to get the line endings to work and this should be good to go. I'll do some double commits and check in a few hours if the tests pass on those files.

@Karol1223
Copy link
Contributor Author

Right. So unfortunately that did not work. I frankly have no idea how to go about this now, I'll need to ask around for outside help because I have no clue how fix line endings.

@Termineitor244
Copy link
Contributor

Can't you use the JSON linting tool to help with this? Either the web version or the one packaged with the game.

https://dev.narc.ro/cataclysm/format.html

This is the link to the web version.

@Karol1223
Copy link
Contributor Author

Karol1223 commented Sep 15, 2022

Can't you use the JSON linting tool to help with this? Either the web version or the one packaged with the game.

https://dev.narc.ro/cataclysm/format.html

This is the link to the web version.

I've used it in all the files, doesn't help with line endings apparently. Neither does changing the line ending style in Notepad++ and copy-pasting it back. I've asked for help on the discord server and I'll wait until tomorrow or so to see if anyone helps out there. If nobody does I'll probably have to install GitHub desktop and get the PR cleaned up out there. It's not the end of the world, it'll get there. The code works, it's just that the tests aren't happy with it.

@Termineitor244
Copy link
Contributor

Huh, weird, but well, I hope a solution can be found soon, I'm limited in mi ways to help since I'm writing this from my cellphone at work, but good luck!

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Sep 15, 2022
@Karol1223
Copy link
Contributor Author

I am in absolute awe that this fixed it. Well, removing all files and reuploading them did it. GitHub is a mysterious invention.

@Termineitor244
Copy link
Contributor

Mysterious are the ways of github...

@Theawesomeboophis
Copy link
Contributor

Great Job on the mod, it's quickly become one of my go-to mods, it's such a small thing, but being able to tame and ride more animals is awesome.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 15, 2022
@Termineitor244
Copy link
Contributor

Great Job on the mod, it's quickly become one of my go-to mods, it's such a small thing, but being able to tame and ride more animals is awesome.

Glad you like it!

@dseguin dseguin merged commit a3c6a29 into CleverRaven:master Sep 17, 2022
@pantherpusher
Copy link

I notice that there is not a larval form of bee, and yet I believe that it could be really cool to raise bees, something to consider for the future maybe?

@Karol1223
Copy link
Contributor Author

Karol1223 commented Sep 22, 2022

I notice that there is not a larval form of bee, and yet I believe that it could be really cool to raise bees, something to consider for the future maybe?

Not gonna be anything I do. Venera said they want to work on bees. I am not touching any eusocial insects because they're a mess and I couldn't do them justice if I tried doing something with them. That said if they get a larval form added I'm not against making it tamable with this mod.

@Karol1223 Karol1223 deleted the tame-the-bugs branch November 3, 2022 16:04
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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Tamable Wildlife Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants