Adds a new, extremely rare event. #9166

Xoxeyos · 2020-07-09T07:02:45Z

This adds a new type of event, it randomly picks 1 person per ten people, so for example if you had 30 people, three would be picked, and given one of the nightmarish punishments randomly chosen from the event script.

A few punishments include, brief periods of blurred vision, faint voices, intense headaches, and nigh terminal brain damage in rare instances.

Big help from arcturus-prime.

🆑 Xoxeyos
rscadd: Adds Flutes, an event that can lead to catastrophe.
soundadd: Adds Flutes.ogg for Flute event.
/:cl:

Partheo

flutes.ogg.ogg

Xoxeyos · 2020-07-09T08:17:52Z

flutes.ogg.ogg

Fixed I believe

alexkar598 · 2020-07-24T23:25:08Z

code/modules/events/flutes.dm

+//---------
+//UTILITIES
+//---------
+/proc/list_intersection(var/list/A, var/list/B)


This needs to go in code/__HELPERS/_lists.dm

alexkar598 · 2020-07-24T23:39:47Z

code/modules/events/flutes.dm

+//--------------------
+//OBJECT DEF
+/datum/round_event/flutes
+	var/chosen_players[0]


Suggested change

var/chosen_players[0]

var/list/chosen_players = list()

Consistent syntax

alexkar598 · 2020-07-24T23:40:19Z

code/modules/events/flutes.dm

+	var/chosen_players[0]
+
+//ROUND START PROC
+//This gets executed at the start of the round


That is simply not true, it gets executed when the event starts

alexkar598 · 2020-07-24T23:40:58Z

code/modules/events/flutes.dm

+	var/list/remaining_players = list_intersection(GLOB.player_list, GLOB.alive_mob_list)
+	var/number_of_players_to_select = round((remaining_players.len / 10), 1)
+	for(var/i; i<=(number_of_players_to_select == 0 ? 1 : number_of_players_to_select); i++)
+		var/player = remaining_players[rand(1, remaining_players.len)]
+		sound_intro(player)
+		pick_flute_scene(player)
+		remaining_players.Remove(player)
+		chosen_players.Add(player)


This whole proc is a bit weird..

This optimized version does a few things:

No need to loop through the lists several times to see where it intersects

C style loops (i=start;i>=end;i++) are much less optimized than "in to" loops (i in start to end)

We can stop looping through lists once we have our target amount of players

Variables names should fit within a couple of characters.... number_of_players_to_select is wayyy too long and verbose

Also remove list_intersection() since you dont need it no more

Suggested change

var/list/remaining_players = list_intersection(GLOB.player_list, GLOB.alive_mob_list)

var/number_of_players_to_select = round((remaining_players.len / 10), 1)

for(var/i; i<=(number_of_players_to_select == 0 ? 1 : number_of_players_to_select); i++)

var/player = remaining_players[rand(1, remaining_players.len)]

sound_intro(player)

pick_flute_scene(player)

remaining_players.Remove(player)

chosen_players.Add(player)

var/target_amount = round((remaining_players.len / 10), 1)

var/list/mob/living/carbon/selected = list()

for(var/mob/living/carbon/C in GLOB.player_list)

if(C.stat)

continue //ignore unconcious/dead players

sound_intro(C)

pick_flute_scene(C)

selected.Add(C)

if(selected.len >= target_amount)

break //were done here

code/modules/events/flutes.dm

alexkar598 · 2020-07-24T23:46:44Z

code/modules/events/flutes.dm

+		M.blur_eyes(40)
+		M.adjustStaminaLoss(99)
+		to_chat(M, "<span class='Narsie'><b>Y'HAH HT'HU THRZHZU. UA'KLL GHRT AWN ZUU!</b></span>")
+		M.adjustBruteLoss(99)


Very close to the crit point

purposeful, I want an event that effects a small number of people, and can potentially really fuck them up. If you have a better idea, please tell.

alexkar598 · 2020-07-24T23:46:52Z

code/modules/events/flutes.dm

+		REMOVE_TRAIT(M, TRAIT_UNSTABLE, M)
+		M.blur_eyes(5)
+		M.adjustStaminaLoss(90)
+		M.adjustBruteLoss(90)


Very close to the crit point

alexkar598 · 2020-07-24T23:47:28Z

code/modules/events/flutes.dm

+		M.blur_eyes(5)
+		M.adjustStaminaLoss(90)
+		M.adjustBruteLoss(90)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 90)


Very close to killing someone

alexkar598 · 2020-07-24T23:47:38Z

code/modules/events/flutes.dm

+		M.adjustStaminaLoss(99)
+		to_chat(M, "<span class='Narsie'><b>Y'HAH HT'HU THRZHZU. UA'KLL GHRT AWN ZUU!</b></span>")
+		M.adjustBruteLoss(99)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 99.9)


Very close to killing someone

Xoxeyos · 2020-07-25T02:27:59Z

I'll work on these changes shortly.

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Xoxeyos · 2020-07-26T06:27:12Z

Still currently a WIP.

…station into Demon-Flutes-Wailing

Pulled both changes from my work and Xoxeyos's.

Xoxeyos · 2020-07-30T00:24:07Z

Pretty much finished

code/modules/events/flutes.dm

Xoxeyos · 2020-08-20T18:20:06Z

I'll take a look at them now.

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

fluffe9911

pretty sure he dealt with most of em

re

Xoxeyos added 11 commits July 1, 2020 01:44

Create flutes

046e077

Update flutes

e7d1de4

Update flutes

26c508c

Update flutes

aed6fcb

Update flutes

dd2651d

Adds flute sound effects for flute event

f28b49b

Delete flutes

0f9d161

readds flute.dm with the proper file

be0048b

Update flutes.dm

dee8e54

Update flutes.dm

43f97dc

Update flutes.dm

5eac9bc

Xoxeyos requested a review from Partheo as a code owner July 9, 2020 07:02

Yogbot-13 added Feature This adds new content to the game Sound This PR changes audio files labels Jul 9, 2020

Weight now one

d41acd7

Partheo suggested changes Jul 9, 2020

View reviewed changes

Xoxeyos added 4 commits July 9, 2020 01:05

Delete flutes.ogg.ogg

38451ff

Fixes flutes.ogg I think

f2a20c4

Delete flutes.ogg.ogg

42e86f4

fixes flutes.ogg

0fda679

Xoxeyos requested a review from Partheo July 9, 2020 08:10

Partheo approved these changes Jul 9, 2020

View reviewed changes

Partheo added the Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer label Jul 22, 2020

alexkar598 requested changes Jul 24, 2020

View reviewed changes

arcturus-prime and others added 4 commits July 25, 2020 15:24

Update flutes.dm

7a430e7

Update code/modules/events/flutes.dm

0ec80c9

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Update code/modules/events/flutes.dm

1f8659c

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Update code/modules/events/flutes.dm

fb4207c

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Xoxeyos and others added 6 commits July 25, 2020 17:29

Update code/modules/events/flutes.dm

2e49bd9

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Update code/modules/events/flutes.dm

947a120

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Update code/modules/events/flutes.dm

8baa03b

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Update code/modules/events/flutes.dm

a516fc3

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

A bonk on the head has less of a chance to kill you

27cf94d

proper name

5b09f1a

arcturus-prime and others added 4 commits July 28, 2020 18:05

Added a random blackout feature, which adds a new trait

81f8421

Merge branch 'Demon-Flutes-Wailing' of https://github.com/Xoxeyos/Yog…

2799edd

…station into Demon-Flutes-Wailing

Fixed a merge conflict

79fd743

Pulled both changes from my work and Xoxeyos's.

Update flutes.dm

4457825

Xoxeyos requested a review from alexkar598 July 29, 2020 03:34

alexkar598 previously requested changes Aug 11, 2020

View reviewed changes

code/modules/events/flutes.dm Show resolved Hide resolved

code/modules/events/flutes.dm Show resolved Hide resolved

Update code/modules/events/flutes.dm

e37cc16

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Xoxeyos requested a review from a team as a code owner August 20, 2020 18:56

fluffe9911 approved these changes Aug 29, 2020

View reviewed changes

fluffe9911 merged commit 1696d27 into yogstation13:master Aug 29, 2020

Yogbot-13 added the DME Edit This PR affects the yogstation.DME file label Aug 29, 2020

Yogbot-13 added a commit that referenced this pull request Aug 29, 2020

Automatic changelog generation #9166 [ci skip]

ffc6074

ColonyBot mentioned this pull request Aug 29, 2020

[MIRROR] Adds a new, extremely rare event. SolCorporation/ColonyStation#21

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds a new, extremely rare event. #9166

Adds a new, extremely rare event. #9166

Xoxeyos commented Jul 9, 2020 •

edited

Partheo left a comment

Xoxeyos commented Jul 9, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

Xoxeyos Jul 25, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

alexkar598 Jul 24, 2020

Xoxeyos commented Jul 25, 2020

Xoxeyos commented Jul 26, 2020

Xoxeyos commented Jul 30, 2020

Xoxeyos commented Aug 20, 2020

fluffe9911 left a comment

-	var/list/remaining_players = list_intersection(GLOB.player_list, GLOB.alive_mob_list)
-	var/number_of_players_to_select = round((remaining_players.len / 10), 1)
-	for(var/i; i<=(number_of_players_to_select == 0 ? 1 : number_of_players_to_select); i++)
-		var/player = remaining_players[rand(1, remaining_players.len)]
-		sound_intro(player)
-		pick_flute_scene(player)
-		remaining_players.Remove(player)
-		chosen_players.Add(player)
+	var/target_amount = round((remaining_players.len / 10), 1)
+	var/list/mob/living/carbon/selected = list()
+	for(var/mob/living/carbon/C in GLOB.player_list)
+		if(C.stat)
+			continue //ignore unconcious/dead players
+		sound_intro(C)
+		pick_flute_scene(C)
+		selected.Add(C)
+		if(selected.len >= target_amount)
+			break //were done here

Adds a new, extremely rare event. #9166

Adds a new, extremely rare event. #9166

Conversation

Xoxeyos commented Jul 9, 2020 • edited

Partheo left a comment

Choose a reason for hiding this comment

Xoxeyos commented Jul 9, 2020

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Xoxeyos commented Jul 25, 2020

Xoxeyos commented Jul 26, 2020

Xoxeyos commented Jul 30, 2020

Xoxeyos commented Aug 20, 2020

fluffe9911 left a comment

Choose a reason for hiding this comment

Xoxeyos commented Jul 9, 2020 •

edited