Introducing "COOLDOWN_LIST", and some botany changes #9324

EvilDragonfiend · 2023-06-30T14:22:59Z

About The Pull Request

Introduces "COOLDOWN_LIST" mecros
- This is list type cooldown declare as you can see, and mob will be used as list assoc key
- This is useful when you want to set cooldown time to individual mobs.
- In this PR, botany Hypodermic prickles gene has this feature
Some botany changes
- plants' bite size mod is now saner than before. It no longer adds weird +1 extra bite. If bite size mod is 2, it means you'll eat a plant for 2u.
- Omage weed bite size is now 1u
- Hypodermic Prickles gene is nerfed. Its mechanism is changed
  - (The examples are said when it has 100 Potency)
  - It will only inject 2u from normal plants
    - If a plant has Liquid Contents, it will inject 1u.
      This is more dominant than below, so do not mix this with deathnettle unless you have a strong purpose.
    - else If a plant is Deathnettle, it will inject 6u
    - else If a plant has force (damage), it will inject 4u. (Nettle, pineapple, etc)
  - If you throw a plant to the same victim within 10 seconds, the injection will be halved. (6u to 3u)
    i.e.) Deathnettle has 100u of Water. If you throw it to a person, they get 6u water.
    If you throw it again to the same person within 10 seconds, they get 3u water.
    If you throw a tomato with Hypodermic prickles and 100u water within 10 seconds again, they only get 0.5u water
- Electrical Activity will no longer shock a target twice when they're slipt on a squashable plant.
- Plant desc length is now 1024

Why It's Good For The Game

new code feature (cooldown list)
Adjusting balancing about botany

I really don't see any issue with Richer Juice, but the actual issue is Hypodermic Prickles. It's better to be nerfed already.

20u is too much. even 10u (half of 20u) is too much still. so I made it quite reduced.

Testing Photographs and Procedure

Changelog

🆑
code: COOLDOWN_LIST macros are newly added.
balance: Electrical Activity will not shock the same victim within 2 seconds.
balance: Hypodermic Prickles will inject half units of the original effectiveness into the same victim within 10 seconds. (i.e. 10u, 5u, 5u in 3 rows)
balance: Hypodermic Prickles maximum injection is 2u. Liquid Content trait makes it 1u. Deathnattle makes it 6u. Damaging plants (pineapple or nettle) makes it 4u. Priority is said here, so you'll want to avoid Liquid Content.
tweak: Omega weed (can hold 420u) bite size is now 1u. I hope your jaw is strong enough.
tweak: Botany plants' bite size no longer adds one extra bite size, so 2u bite size means you'll eat a plant as 2u size.
tweak: Plant desc length is now 1024
/:cl:

PowerfulBacon · 2023-06-30T14:38:48Z

code/__DEFINES/cooldowns.dm

+/// IMPORTANT: "cd_target" should be individual because it's assoc key
+#define COOLDOWN_LIST_START(cd_target, cd_source, cd_index, cd_time) (cd_source.cd_index[cd_target] = world.time + (cd_time))
+
+#define COOLDOWN_LIST_FINISHED(cd_target, cd_source, cd_index) (cd_source.cd_index[cd_target] < world.time)


These macro param names are confusing considering the index is actually the name of the cooldown and the target is the index.
The order of arguments should be:
object, cooldown name, index (cd_target), value (time/length)

I changed macro param names. would that work?

Crossedfall · 2023-06-30T15:33:30Z

Provide actual testing evidence.

Fronsis · 2023-06-30T16:30:30Z

Does this affect the pneumatic cannon death neetle cheese? Or this nerf is not enough and even with halved injection you can get insta crit by a good plant mix?

EvilDragonfiend · 2023-07-01T07:52:52Z

Does this affect the pneumatic cannon death neetle cheese? Or this nerf is not enough and even with halved injection you can get insta crit by a good plant mix?

This primarily prevents deathnettle to have Liquid Content trait. Deathnettle will be still used as cheese, and it's still possible to give fuckton of reagents, but you won't do the multiple things with a single plant throwing.

Before: Deathnettle with Liquid Content Acid, and a lot of toxins - Fucks up your victim with a single throw. (You get a lot of toxins, and your gear gets acid)
Now: You can still do that, but only 5u will be injected. If you do not put Liquid Content, 20u will be injected. Multiple throwing will make it half.

Maybe the default value might need to be lowered more than the suggested PR

EvilDragonfiend · 2023-07-03T14:38:07Z

todo:

test evidence
ooc filter in the name / desc
renaming / redesc log in investigation

EvilDragonfiend · 2023-07-10T03:58:51Z

test evidence is uploaded
injection amount is now 2u/1u/6u/4u (default / liquid / deathnettle / blunt plant)
20u is too much to be honest

code/modules/hydroponics/seeds.dm

PowerfulBacon · 2023-08-12T22:18:39Z

Otherwise seems fine

Co-authored-by: PowerfulBacon <[email protected]>

EvilDragonfiend · 2023-08-14T05:46:04Z

btw, should I use mob as weak_ref for that assoc list key? or textified mob ref?

Absolucy · 2023-08-21T23:17:33Z

btw, should I use mob as weak_ref for that assoc list key? or textified mob ref?

@EvilDragonfiend In theory, weakrefs would be more optimized? As all of a mob's weakrefs are in fact a single /datum/weakref wrapping a text ref, so if a mobs have multiple cooldowns, you'd just have a bunch of pointers to the same weakref, instead of duplicate strings everywhere?

although I don't know how BYOND handles string deduplication, so uh, I might be incorrect here.

github-actions · 2023-09-17T16:36:07Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

PowerfulBacon · 2023-10-22T09:18:13Z

code/modules/hydroponics/seeds.dm

+	src.investigate_log("[key_name(user)] has changed [src] ([type]) into '[input]'", INVESTIGATE_BOTANY)
+	// log_game() might fit, but I wanted botany logs contained in a specific log file.


This needs to be logged to permanent storage if we are logging it

It is permanent logging. It's just categorised rather than all-in-one log_game()

PowerfulBacon · 2023-10-22T09:19:04Z

code/modules/hydroponics/plant_genes.dm

+	COOLDOWN_STATIC_LIST_DECLARE(recent_victims)

 /datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
+	if(!COOLDOWN_LIST_FINISHED(src, recent_victims, C)) // if you were a victim recently, you won't get it again
+		return
 	var/power = round(G.seed.potency*rate)
 	if(prob(power))
+		COOLDOWN_LIST_START(src, recent_victims, C, 2 SECONDS)
 		C.electrocute_act(power, G, 1, 1)
 		var/turf/T = get_turf(C)
 		if(C.ckey != G.fingerprintslast)
 			C.investigate_log("[C] has slipped on an electric plant at [AREACOORD(T)]. Last fingerprint: [G.fingerprintslast].", INVESTIGATE_BOTANY)
 			log_combat(C, G, "slipped on and got electrocuted by", null, "with the power of 10. Last fingerprint: [G.fingerprintslast]")

 /datum/plant_gene/trait/cell_charge/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+	if(!COOLDOWN_LIST_FINISHED(src, recent_victims, target)) // if you were a victim recently, you won't get it again
+		return
 	if(iscarbon(target))
 		var/mob/living/carbon/C = target
 		var/power = G.seed.potency*rate
 		if(prob(power))
+			COOLDOWN_LIST_START(src, recent_victims, C, 2 SECONDS)


These don't make a lot of sense to have cooldowns on, they execute only on slip and squash which are discrete and non-repeatable events

It can happen when multiple items are thrown to a person, or when you step on a squashable slip plant. That's why CD check exists here

PowerfulBacon · 2023-10-22T09:20:52Z

code/modules/hydroponics/plant_genes.dm

+	// Mechanism: It will always inject the amount as "injecting_amount" variable no matter the total size is
+	var/prick_efficiency = 0.02 // default (maximum: 2u)
+	if(locate(/datum/plant_gene/trait/squash) in G.seed.genes)
+		prick_efficiency = 0.01 // how can a smooth plant be deadly? (maximum: 1u)
+	else if(istype(G, /obj/item/seeds/nettle/death)) // as long as it has not Liquid Content
+		prick_efficiency = 0.06 // bonus to "death" nettle (maximum: 6u)
+	else if(G.force)
+		prick_efficiency = 0.04 // bonus to blunt plants (miaxmum: 4u)
+	if(!COOLDOWN_LIST_FINISHED(src, recent_victims, L)) // until 10s cooldown time from a victim is finished, the effective becomes half
+		prick_efficiency = round(prick_efficiency/2, 0.01) // i.e) 4u to 2u


A maximum of 2 units is just ridiculously low to the point where it isn't doing anything. The cooldown on this one doesn't make a lot of sense either since on throw/slip isn't highly repeated events like attacking.

Sadly it should be so. It's already horrible source of force-injection of toxins. 6u even does powerful enough.

PowerfulBacon

This is also a horrible source of hard deletes if atoms are passed into it instead of strings. If the target index is a number it also won't work. The system just isn't very robust as it is.

EvilDragonfiend · 2023-11-02T02:56:17Z

This is also a horrible source of hard deletes if atoms are passed into it instead of strings. If the target index is a number it also won't work. The system just isn't very robust as it is.

It's a stringified atom reference, not a direct atom reference. Would it be still horrible?
also, if target index is a number, that's ultimately a wrong usage because a number doesn't have any information about any target. It shouldn't be number index. Should I throw a runtime when it takes a number?

(I will work on this after I get answers)

EvilDragonfiend · 2023-11-12T18:14:38Z

Changed the real reference to textified reference.

EvilDragonfiend · 2023-11-16T10:32:15Z

Okay, after some researches, I found using text reference works enough instead of using strong reference. It won't be any horrible source of hardelete.

github-actions · 2023-12-19T13:19:08Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Rukofamicom · 2024-02-16T12:30:55Z

Merge conflicts for over a month.

EvilDragonfiend added 3 commits June 30, 2023 22:47

botany change

91947a7

omega

c01ef4d

final

cf94267

solid-octo-guacamole bot added Balance/Rebalance Code Improvement Feature Tweak labels Jun 30, 2023

PowerfulBacon reviewed Jun 30, 2023

View reviewed changes

review

87a2b78

EvilDragonfiend added 2 commits July 10, 2023 11:38

Merge branch 'master' into omegano

a78bdd1

change

6f57bfb

PowerfulBacon reviewed Aug 12, 2023

View reviewed changes

code/modules/hydroponics/seeds.dm Outdated Show resolved Hide resolved

PowerfulBacon requested changes Aug 12, 2023

View reviewed changes

code/modules/hydroponics/seeds.dm Outdated Show resolved Hide resolved

code/modules/hydroponics/seeds.dm Outdated Show resolved Hide resolved

code/modules/hydroponics/seeds.dm Outdated Show resolved Hide resolved

EvilDragonfiend and others added 2 commits August 14, 2023 14:43

Update code/modules/hydroponics/seeds.dm

0c065c0

Co-authored-by: PowerfulBacon <[email protected]>

filter change

9a945ce

github-actions bot added the Merge Conflict label Sep 17, 2023

Merge branch 'master' into omegano

e5cab66

github-actions bot removed the Merge Conflict label Sep 21, 2023

PowerfulBacon requested changes Oct 22, 2023

View reviewed changes

real ref to text ref

3025d1e

fastref

8aafa2d

fixes typo

03e5660

github-actions bot added the Merge Conflict label Dec 19, 2023

Rukofamicom added the Stale label Feb 16, 2024

github-actions bot closed this Feb 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introducing "COOLDOWN_LIST", and some botany changes #9324

Introducing "COOLDOWN_LIST", and some botany changes #9324

EvilDragonfiend commented Jun 30, 2023 •

edited

Loading

PowerfulBacon Jun 30, 2023

EvilDragonfiend Jun 30, 2023

Crossedfall commented Jun 30, 2023

Fronsis commented Jun 30, 2023

EvilDragonfiend commented Jul 1, 2023

EvilDragonfiend commented Jul 3, 2023

EvilDragonfiend commented Jul 10, 2023

PowerfulBacon commented Aug 12, 2023

EvilDragonfiend commented Aug 14, 2023 •

edited

Loading

Absolucy commented Aug 21, 2023 •

edited

Loading

github-actions bot commented Sep 17, 2023

PowerfulBacon Oct 22, 2023

EvilDragonfiend Nov 12, 2023

PowerfulBacon Oct 22, 2023

EvilDragonfiend Nov 12, 2023

PowerfulBacon Oct 22, 2023

EvilDragonfiend Nov 12, 2023

PowerfulBacon left a comment

EvilDragonfiend commented Nov 2, 2023 •

edited

Loading

EvilDragonfiend commented Nov 12, 2023

EvilDragonfiend commented Nov 16, 2023

github-actions bot commented Dec 19, 2023

Rukofamicom commented Feb 16, 2024

		src.investigate_log("[key_name(user)] has changed [src] ([type]) into '[input]'", INVESTIGATE_BOTANY)
		// log_game() might fit, but I wanted botany logs contained in a specific log file.

Introducing "COOLDOWN_LIST", and some botany changes #9324

Introducing "COOLDOWN_LIST", and some botany changes #9324

Conversation

EvilDragonfiend commented Jun 30, 2023 • edited Loading

About The Pull Request

Why It's Good For The Game

Testing Photographs and Procedure

Changelog

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Crossedfall commented Jun 30, 2023

Fronsis commented Jun 30, 2023

EvilDragonfiend commented Jul 1, 2023

EvilDragonfiend commented Jul 3, 2023

EvilDragonfiend commented Jul 10, 2023

PowerfulBacon commented Aug 12, 2023

EvilDragonfiend commented Aug 14, 2023 • edited Loading

Absolucy commented Aug 21, 2023 • edited Loading

github-actions bot commented Sep 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PowerfulBacon left a comment

Choose a reason for hiding this comment

EvilDragonfiend commented Nov 2, 2023 • edited Loading

EvilDragonfiend commented Nov 12, 2023

EvilDragonfiend commented Nov 16, 2023

github-actions bot commented Dec 19, 2023

Rukofamicom commented Feb 16, 2024

EvilDragonfiend commented Jun 30, 2023 •

edited

Loading

EvilDragonfiend commented Aug 14, 2023 •

edited

Loading

Absolucy commented Aug 21, 2023 •

edited

Loading

EvilDragonfiend commented Nov 2, 2023 •

edited

Loading