Eggsac carrier revival #4716

Birdtalon · 2023-10-18T19:18:35Z

About the pull request

The concept of this PR is to find a middle ground between the current eggsac carrier and the pre #4459 eggsac carrier.

This PR will make the following changes. (From this point "normal weeds" can be substituted for "off hive weeds" Placing eggs on hive weeds is unchanged.)

Eggsac carrier can once again place eggs on normal weeds.
Eggsac carrier can only place 4 eggs at once on normal weeds.
If the Eggsac places more than 4 eggs on normal weeds, their oldest placed egg will die. No hugger release.
Eggs placed on normal weeds have a maximum lifetime of 5 MINUTES after which they will die. No hugger release.
Eggs placed on normal weeds have a 1 MINUTE life whilst the carrier is further than 14 tiles away from them.
If the carrier dies, all of their sustained eggs die.

Explain why it's good for the game

Eggsac carrier at the moment is in a bit of a poor place and has gone from being very strong to quite poor. Considering the limitation of having to place only on hive weeds.
The majority of feedback I read against eggsac carrier was with the quantity of eggs able to be placed, as well as the locations they can be placed in, all across the map and with impunity.

This PR aims to address those concerns to make the eggsac both less infuriating to play against while still being satisfying to play as a frontline support or as a stealthy trapper.

Eggs can no longer be placed all over the map because of the 4 egg limit off weeds, so the carrier has to think where they want to impact the map. The carrier also has to stay within a reasonable distance to where they are impacting with their eggs which localises their impact to their immediate play area. The carrier also has to be more reactive to current events as they cannot place an egg which then becomes useful 30 minutes later.

Killing the carrier also has a small reward as in addition to removing a xeno from the game, the eggs they are sustaining are cleared. If a carrier is supporting the front and dies, the marines don't then have to clear X number of eggs AFTER the kill.

Testing Photographs and Procedure

Spawn as egg carrier.
Plant egg on normal weeds.
Move 15+ tiles away.
Wait 1 minute
OR Wait 5 minutes within 14 tiles.
Kill the carrier.

The 5 minute lifetime of the eggs will also clear the eggs in the case that the carrier is admin deleted, or some other weird stuff happens which doesn't result in a death. This will also catch carriers de-evolving

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Eggsac carrier can now place eggs on normal weeds to a maximum of 4 eggs.
add: Eggsac carrier eggs on normal weeds have an expiry date.
/:cl:

Birdtalon · 2023-10-19T05:55:06Z

Need to add: handling for eggs bursting for marines or being destroyed as I forgot this. Can't set to draft on mobile github.

github-actions · 2023-10-27T00:58:58Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

Birdtalon · 2023-10-31T19:44:51Z

Updated with further handling I missed originally.

github-actions · 2023-11-09T01:01:43Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

code/modules/cm_aliens/structures/egg.dm

…gate and owner cleanup on qdel

code/modules/cm_aliens/structures/egg.dm

Zonespace27 · 2023-11-10T22:45:37Z

code/modules/cm_aliens/structures/egg.dm

+		set_owner(planter)
+
+/obj/effect/alien/egg/carrier_egg/Destroy()
+	. = ..()


call parent at the end of destroy

code/modules/cm_aliens/structures/egg.dm

Zonespace27 · 2023-11-10T22:46:05Z

code/modules/cm_aliens/structures/egg.dm

+	var/datum/behavior_delegate/carrier_eggsac/my_delegate = planter.behavior_delegate
+	my_delegate.eggs_sustained += src
+	owner = planter
+	RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_owner))


you don't need to do this, you can just do the destroy bit i mentioned above

Zonespace27 · 2023-11-10T22:46:15Z

code/modules/cm_aliens/structures/egg.dm

+	UnregisterSignal(owner, COMSIG_PARENT_QDELETING)
+	owner = null
+
+/obj/effect/alien/egg/carrier_egg/proc/cleanup_owner()


Zonespace27 · 2023-11-10T22:46:43Z

code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm

+	var/sustain_distance = 14
+
+/datum/behavior_delegate/carrier_eggsac/append_to_stat()
+	. = "Eggs sustained: [length(eggs_sustained)] / [egg_sustain_cap]"


are you sure it's = instead of +=?

I don't think it actually matters in this case. But comparing it to the same functionality on other behavior delegates I should be consistent with them, also returning it as a list.

Zonespace27 · 2023-11-10T22:47:51Z

Willing to give this a shot.

…ments to append_to_stat()

Birdtalon · 2023-11-11T00:39:28Z

Think I've addressed all your comments.

Remove the signal handler
null owner on destroy
Added code doc where requested
Returning list and += on append_to_stat()

Zonespace27

a few nits left

Zonespace27 · 2023-11-12T18:31:13Z

code/modules/cm_aliens/structures/egg.dm

+	var/mob/living/carbon/xenomorph/carrier/owner = null
+	var/last_refreshed = null
+	var/life_timer = null


code doc these

Zonespace27 · 2023-11-12T18:31:20Z

code/modules/cm_aliens/structures/egg.dm

+	if(life_timer)
+		deltimer(life_timer)
+	owner = null
+	. = ..()


Suggested change

. = ..()

return ..()

Zonespace27 · 2023-11-12T18:31:36Z

code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm

+	var/list/eggs_sustained = list()
+	var/egg_sustain_cap = EGGSAC_OFF_WEED_EGGCAP
+	var/sustain_distance = 14


Birdtalon · 2023-11-12T21:07:24Z

Addressed your comments.

github-actions · 2023-11-24T01:01:32Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

Zonespace27 · 2023-11-27T18:42:45Z

Sorry for letting this sit for so long! Looks good to go.

HeresKozmos · 2023-11-27T19:15:32Z

nice!

# About the pull request In #4716 I forgot about hardy weeds. This allows carrier to plant the fragile eggs on standard and hardy weeds which are basically standard weeds +. # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: fix: Eggsac fragile eggs can be placed on hardy weeds. /:cl:

# About the pull request So in one of various refactors of #4716 I removed some important code from `Burst()` for the new egg type which removes it from the carrier's sustained eggs. This is bad because we keep trying to call procs on eggs which have already burst etc. This removes the egg from the carrier's sustain list properly on Burst(). I also added a check in Life() on the carrier to remove it from their sustained eggs. If something funky happens we don't want to impact the player from playing # Explain why it's good for the game # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog 🆑 fix: Eggsack carrier eggs get properly removed from sustained list upon bursting. /🆑

# About the pull request Now that #4716 's been merged, here's the changes I've wanted to make for eggs for a bit now. - Eggs can no longer be planted in vehicles - Eggs can no longer be planted on tiles that would obstruct the egg. # Explain why it's good for the game - In the vast majority of cases, you cannot tell that a vehicle you're entering is infested with you-instantly-lose eggs. While normally getting hit with an egg is reasonably predictable (there are weeds == possibility of eggs), having no indication of it until you go inside and get hugged isn't fun or balanced. - Eggs being able to layer under things like grass is technically a "feature", but not one I would like to keep. Traps serve the exact same purpose, but are much harder to mass produce (as intended). Eggs should be cheaper but more detectable, which doesn't align them being able to be near-fully hidden. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> ![image](https://github.com/cmss13-devs/cmss13/assets/41448081/7151c503-72fa-4b1e-acba-576f556420c1) </details> # Changelog :cl: balance: You cannot plant eggs inside vehicles. balance: Eggs can no longer be planted on tiles with objects that would obscure them. /:cl:

implements new egg type and egg handling for eggsac carrier

0c6ed3d

github-actions bot added the Feature Feature coder badge label Oct 18, 2023

Birdtalon force-pushed the eggsacc branch from af07923 to 0c6ed3d Compare October 18, 2023 19:22

make add timer null

ed5bda1

Birdtalon marked this pull request as draft October 19, 2023 06:53

github-actions bot added the Stale beg a maintainer to review your PR label Oct 27, 2023

Birdtalon closed this Oct 27, 2023

adds further egg handling to bursting + fixes planting eggs

3fa2ce2

Birdtalon reopened this Oct 31, 2023

Birdtalon marked this pull request as ready for review October 31, 2023 19:45

github-actions bot removed the Stale beg a maintainer to review your PR label Nov 1, 2023

github-actions bot added the Stale beg a maintainer to review your PR label Nov 9, 2023

fira added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Nov 9, 2023

fira requested changes Nov 9, 2023

View reviewed changes

code/modules/cm_aliens/structures/egg.dm Outdated Show resolved Hide resolved

code/modules/cm_aliens/structures/egg.dm Show resolved Hide resolved

code/modules/cm_aliens/structures/egg.dm Outdated Show resolved Hide resolved

Birdtalon added 2 commits November 9, 2023 18:36

added description documentation, moved remove owner to behaviour dele…

9ea31d9

…gate and owner cleanup on qdel

unregisters the signal if we burst and already set owner to null

c7e8ff4

Zonespace27 removed the Stale beg a maintainer to review your PR label Nov 10, 2023

Zonespace27 requested changes Nov 10, 2023

View reviewed changes

Zonespace27 added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Nov 10, 2023

additional doc, nulls the owner on destroy instead of signal, improve…

140fadb

…ments to append_to_stat()

Zonespace27 requested changes Nov 12, 2023

View reviewed changes

addressed further review

928154b

adds some Destroy() stuff I thought was needed

c2e15cd

github-actions bot added the Stale beg a maintainer to review your PR label Nov 24, 2023

destroy parent

32deb02

Zonespace27 added this pull request to the merge queue Nov 27, 2023

Zonespace27 approved these changes Nov 27, 2023

View reviewed changes

Zonespace27 removed the Stale beg a maintainer to review your PR label Nov 27, 2023

Merged via the queue into cmss13-devs:master with commit f367771 Nov 27, 2023
26 checks passed

cm13-github added a commit that referenced this pull request Nov 27, 2023

Automatic changelog for PR #4716 [ci skip]

52d5b54

Birdtalon mentioned this pull request Nov 27, 2023

Eggsac Carrier Hardy weed fix. #5053

Merged

Zonespace27 mentioned this pull request Nov 28, 2023

Egg Changes #5054

Merged

Birdtalon mentioned this pull request Nov 28, 2023

Eggsac carrier bugfix #5059

Merged

Birdtalon deleted the eggsacc branch December 21, 2023 13:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Eggsac carrier revival #4716

Eggsac carrier revival #4716

Birdtalon commented Oct 18, 2023 •

edited

Loading

Birdtalon commented Oct 19, 2023

github-actions bot commented Oct 27, 2023

Birdtalon commented Oct 31, 2023

github-actions bot commented Nov 9, 2023

Zonespace27 Nov 10, 2023

Zonespace27 Nov 10, 2023

Zonespace27 Nov 10, 2023

Zonespace27 Nov 10, 2023

Birdtalon Nov 11, 2023 •

edited

Loading

Zonespace27 commented Nov 10, 2023

Birdtalon commented Nov 11, 2023

Zonespace27 left a comment

Zonespace27 Nov 12, 2023

Zonespace27 Nov 12, 2023

Zonespace27 Nov 12, 2023

Birdtalon commented Nov 12, 2023

github-actions bot commented Nov 24, 2023

Zonespace27 commented Nov 27, 2023

HeresKozmos commented Nov 27, 2023

Eggsac carrier revival #4716

Eggsac carrier revival #4716

Conversation

Birdtalon commented Oct 18, 2023 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

Birdtalon commented Oct 19, 2023

github-actions bot commented Oct 27, 2023

Birdtalon commented Oct 31, 2023

github-actions bot commented Nov 9, 2023

Zonespace27 Nov 10, 2023

Choose a reason for hiding this comment

Zonespace27 Nov 10, 2023

Choose a reason for hiding this comment

Zonespace27 Nov 10, 2023

Choose a reason for hiding this comment

Zonespace27 Nov 10, 2023

Choose a reason for hiding this comment

Birdtalon Nov 11, 2023 • edited Loading

Choose a reason for hiding this comment

Zonespace27 commented Nov 10, 2023

Birdtalon commented Nov 11, 2023

Zonespace27 left a comment

Choose a reason for hiding this comment

Zonespace27 Nov 12, 2023

Choose a reason for hiding this comment

Zonespace27 Nov 12, 2023

Choose a reason for hiding this comment

Zonespace27 Nov 12, 2023

Choose a reason for hiding this comment

Birdtalon commented Nov 12, 2023

github-actions bot commented Nov 24, 2023

Zonespace27 commented Nov 27, 2023

HeresKozmos commented Nov 27, 2023

Birdtalon commented Oct 18, 2023 •

edited

Loading

Birdtalon Nov 11, 2023 •

edited

Loading