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

Jsonify beehive #62608

Merged
merged 3 commits into from
Mar 2, 2023
Merged

Jsonify beehive #62608

merged 3 commits into from
Mar 2, 2023

Conversation

LovamKicsiGazsii
Copy link
Contributor

Summary

Content "Jsonify beehive"

Purpose of change

Continues regional terrain project and roof project.

Describe the solution

Moved the hardcoded beehive to JSON.

I overhauled its mapgen to be more dungeon-style. Now it's a maze full of hexagonal chambers, with a reward (royal jelly) at the end if the player manages to find/fight their way there. I also gave it a simple vax roof and increased the number of bees around its perimeter.

I removed the beekeepers and their gear from this location. The beehive should no longer be a battleground between the bees and the constantly reanimating zombies.

Describe alternatives you've considered

A more complex colony with a queen, drones, guards, workers, nurses, and larvae. I didn't feel compelled enough to add them here, but adding them becomes easier once their hive is moved to a more accessible format.

Testing

Loaded up an old save with the new changes. No errors occurred during migration.

Additional context

Screenshots:

kép
kép

This is my first time using GitHub Desktop and editing C++ so apologies for any mistakes. :)

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Map / Mapgen Overmap, Mapgen, Map extras, Map display astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 6, 2022
@Night-Pryanik
Copy link
Contributor

So, it will always be a fixed layout instead of a randomized one?

The beehive should no longer be a battleground between the bees and the constantly reanimating zombies.

I personally think it's better to extract beekeepers into their own faction and make bees and them neutral to each other.

@Venera3
Copy link
Member

Venera3 commented Dec 7, 2022

Real bees aren't even neutral to beekeepers, hence the gear. And bees magically being chill when a zombie wears a net hat but not when it's wearing a hazmat suit would make no sense.

A more complex colony with a queen, drones, guards, workers, nurses, and larvae.

I do have some plans for bees in general and a hive map sketched out, but no ETA.

@LovamKicsiGazsii
Copy link
Contributor Author

So, it will always be a fixed layout instead of a randomized one?

Yes, unfortunately that feature couldn't translate well to JSON.

I do have some plans for bees in general and a hive map sketched out, but no ETA.

Is my beehive map compatible with what you have planned or is there anything that needs to be changed?

@Venera3
Copy link
Member

Venera3 commented Dec 7, 2022

Heh, the outline is pretty much the same with some extra openings on my end - for the cells I'll do 2x1 alcoves (the cells are oriented horizontally) in an alternating pattern, like

X X X
X X X
XXXXX
 X X
 X X

and some more Z-levels. As I said with Limb Stuff coming up I'm not sure when I'll find the time, and this is a huge step in the right direction already.

@Inglonias
Copy link
Contributor

Royal jelly is no longer the panacea that it was in earlier versions of the game. Not sure the reward justifies the risk here. That said, I also don't know what else you'd put at the end of the hive.

@SirPendrak
Copy link
Contributor

Royal jelly is no longer the panacea that it was in earlier versions of the game. Not sure the reward justifies the risk here. That said, I also don't know what else you'd put at the end of the hive.

A maounatin of honey

@cathalpern
Copy link
Contributor

cathalpern commented Dec 8, 2022

Minor note - might make sense to update to use the MON_BEEHIVE, which spawns a combination of mon_bee and mon_bee_small instead of MON_BEE. The original code I updated to use place_spawn included mon_bee (AKA giant bees), so switching to only spawn mon_bee_small (only member of MON_BEE) might unintentionally make this terrain easier than intended

@Venera3
Copy link
Member

Venera3 commented Dec 8, 2022

Bees evolve (for now) so they will get bigger with time anyway.

@Xaritscin
Copy link
Contributor

about the Beekeeper dilemma, maybe instead of zeds it coul be Ferals(and even so i doubt it), or some kind of insect mutant gang that lives alongside the bugs.

Apis being the only actual mutant here is a very old design choice but i bet this will be changed at some point with the Bee rework.

@Ilysen
Copy link
Contributor

Ilysen commented Dec 11, 2022

re: the beekeepers, I feel like what this PR does is fine honestly. I feel like there's basically zero loss in just... not having them there. if giant beehives are a post-Cataclysm development, why would there be any beekeepers there at all, even feral? just pitching my two cents to the convo here, at any rate - I think removing the beekeepers and having the inhabitants only be bees and Apis is probably fine

@github-actions
Copy link
Contributor

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jan 20, 2023
@Maleclypse Maleclypse added 0.G String Freeze and removed stale Closed for lack of activity, but still valid. labels Jan 21, 2023
@ZhilkinSerg ZhilkinSerg merged commit f253bf3 into CleverRaven:master Mar 2, 2023
@LovamKicsiGazsii LovamKicsiGazsii deleted the beehive branch March 2, 2023 10:38
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 [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants