Skip to content

Commit

Permalink
Gardener QOL changes (#5514)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request
Gives bigger fruit eaten/destroyed/picked texts as its currently too
small to be seen in chat because is usually always moving and being
spammed.
Makes it so you can put fruits next to eachother, but not ontop of
eachother.
Lets the player know you can use resin surge to speed up the growth of
the fruits.
eaten fruits now delete faster so you can replace them faster, the old 3
seconds made it so if you ate a fruit and instantly replaced it at max
fruits, it'd rather delete another one because the eaten fruit still
exited for a whole 3 seconds.

# Explain why it's good for the game

QOL changes good

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl:
qol: Bigger text when a gardener's fruit gets picked/destroyed/consumed
qol: Gardeners can now put their fruits next to eachother.
grammar: Adds new information to the strain buy text
code: The fruits now get deleted 1 second after they get eaten, instead
of 3 seconds.
balance: Gardener can now transfer plasma
fix: Properly gives the corresponding message when you eat a fruit from
the ground, now "consumed" instead of "destroyed"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: InsaneRed <[email protected]>
Co-authored-by: Drathek <[email protected]>
  • Loading branch information
3 people committed Feb 1, 2024
1 parent 5c189b1 commit cd90318
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
11 changes: 7 additions & 4 deletions code/modules/cm_aliens/structures/fruit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
//Notify and update the xeno count
if(!QDELETED(bound_xeno))
if(!picked)
to_chat(bound_xeno, SPAN_XENOWARNING("You sense one of your fruit has been destroyed."))
to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We sense one of our fruit has been destroyed."))
bound_xeno.current_fruits.Remove(src)
var/datum/action/xeno_action/onclick/plant_resin_fruit/prf = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/plant_resin_fruit)
prf.update_button_icon()
Expand Down Expand Up @@ -146,9 +146,12 @@
/obj/effect/alien/resin/fruit/proc/finish_consume(mob/living/carbon/xenomorph/recipient)
playsound(loc, 'sound/voice/alien_drool1.ogg', 50, 1)
mature = FALSE
picked = TRUE
icon_state = consumed_icon_state
update_icon()
QDEL_IN(src, 3 SECONDS)
if(!QDELETED(bound_xeno))
to_chat(bound_xeno, SPAN_XENOHIGHDANGER("One of our picked resin fruits has been consumed."))
QDEL_IN(src, 1 SECONDS)

/obj/effect/alien/resin/fruit/attack_alien(mob/living/carbon/xenomorph/affected_xeno)
if(picked)
Expand Down Expand Up @@ -360,7 +363,7 @@
pixel_y = 0

/obj/item/reagent_container/food/snacks/resin_fruit/proc/link_xeno(mob/living/carbon/xenomorph/X)
to_chat(X, SPAN_XENOWARNING("One of our resin fruits has been picked."))
to_chat(X, SPAN_XENOHIGHDANGER("One of our resin fruits has been picked."))
X.current_fruits.Add(src)
bound_xeno = X
RegisterSignal(X, COMSIG_PARENT_QDELETING, PROC_REF(handle_xeno_qdel))
Expand Down Expand Up @@ -431,7 +434,7 @@

//Notify the fruit's bound xeno if they exist
if(!QDELETED(bound_xeno))
to_chat(bound_xeno, SPAN_XENOWARNING("One of our picked resin fruits has been consumed."))
to_chat(bound_xeno, SPAN_XENOHIGHDANGER("One of our picked resin fruits has been consumed."))
qdel(src)
return TRUE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/xeno_mutator/gardener
name = "STRAIN: Drone - Gardener"
description = "You trade your choice of resin secretions, your corrosive acid, and your ability to transfer plasma for a tiny bit of extra health regeneration on weeds and several new abilities, including the ability to plant hardier weeds, temporarily reinforce structures with your plasma, and to plant up to six potent resin fruits for your sisters by secreting your vital fluids at the cost of a bit of your health for each fruit you shape."
description = "You trade your choice of resin secretions, your corrosive acid, and your ability to transfer plasma for a tiny bit of extra health regeneration on weeds and several new abilities, including the ability to plant hardier weeds, temporarily reinforce structures with your plasma, and to plant up to six potent resin fruits for your sisters by secreting your vital fluids at the cost of a bit of your health for each fruit you shape. You can use Resin Surge to speed up the growth of your fruits."
flavor_description = "The glory of gardening: hands in the weeds, head in the dark, heart with resin."
cost = MUTATOR_COST_EXPENSIVE
individual_only = TRUE
Expand All @@ -16,6 +16,7 @@
/datum/action/xeno_action/activable/resin_surge, // third macro
/datum/action/xeno_action/onclick/plant_resin_fruit/greater, // fourth macro
/datum/action/xeno_action/onclick/change_fruit,
/datum/action/xeno_action/activable/transfer_plasma,
)
keystone = TRUE
behavior_delegate_type = /datum/behavior_delegate/drone_gardener
Expand Down Expand Up @@ -92,7 +93,7 @@
to_chat(xeno, SPAN_XENOWARNING("This location is too close to a resin hole!"))
return

if(locate(/obj/effect/alien/resin/fruit) in range(1, target_turf))
if(locate(/obj/effect/alien/resin/fruit) in target_turf)
to_chat(xeno, SPAN_XENOWARNING("This location is too close to another fruit!"))
return

Expand Down

0 comments on commit cd90318

Please sign in to comment.