-
Notifications
You must be signed in to change notification settings - Fork 31
feat: add new vent hordes & sounds, vent breaking #899
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
Open
Psymbiote
wants to merge
16
commits into
teamstarcup:main
Choose a base branch
from
Psymbiote:feat-add-vent-hordes-&-sounds
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,328
−200
Open
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
dccdd47
Added vent breaking and replacement, new sounds, new prototypes.
120c5d5
Reorganized files, xeno vent hordes, destructable broken vents
39f5af8
Added flesh, hivelord and tick vent events, new sounds
f33a33e
Added sounds, prototypes, sprites
e26c687
Added sounds and prototypes
a68cb11
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 559231b
Added dragonfly spawn, deleted old DV prototypes
9b1f9b6
Fixed attribution error
354f5e2
Merge branch 'feat-add-vent-hordes-&-sounds' of https://github.com/Ps…
96f06c4
Fixed another attribution error.
19ca905
Removed obsolete cs thingy.
c8c206f
Added new special vent
aed7dcc
Fixed spelling mistake.
939caf1
Added vent hive ambience sound
fef1e2f
Optimized sounds.
3f8cf67
Merge branch 'main' of https://github.com/teamstarcup/starcup into fe…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # SPDX-FileCopyrightText: 2025 Jakumba | ||
| # | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| - files: ["vent_xeno.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by MajorMoth, samples taken from freesound.org at ID's 800277, 803044, 795432, 806647, 806649" | ||
| source: "https://freesound.org" | ||
|
|
||
| - files: ["vent_carp.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by MajorMoth, modified bite.ogg and metal_break4.ogg. Modified by Psymbiote for use with VentHordeRuleComponent." | ||
| source: "https://github.com/TheDenSS14/TheDen" | ||
|
|
||
| - files: ["vent_harmless_critter.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by MajorMoth, samples taken from freesound.org at ID's 244015, 528191" | ||
| source: "https://freesound.org" | ||
|
|
||
| - files: ["vent_slime.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by MajorMoth, samples taken from https://www.youtube.com/watch?v=hX5S4KC0hx0, https://www.youtube.com/watch?v=REOeff9WJ2o, | ||
| https://www.youtube.com/watch?v=9XIDm_sZhx4, | ||
| https://www.youtube.com/watch?v=jiTV8MwgL3c" | ||
| source: "https://www.youtube.com" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 15 additions & 0 deletions
15
Resources/Audio/_starcup/Ambience/Objects/attributions.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| - files: | ||
| - vent_den.ogg | ||
| license: "CC-BY-NC-4.0" | ||
| copyright: "Modified by Psymbiote from MOUSE - MICE - RAT - TERRARIUM - SQUEAK.wav by tjandrasounds" | ||
| source: "https://freesound.org/s/251949/" | ||
| - files: | ||
| - vent_infested.ogg | ||
| license: "CC-BY-4.0" | ||
| copyright: "Modified by Psymbiote from Ambience_AlienHive_00.wav by LittleRobotSoundFactory" | ||
| source: "https://freesound.org/s/270520/" | ||
| - files: | ||
| - vent_pulsating.ogg | ||
| license: "CC-BY-4.0" | ||
| copyright: "Modified by Psymbiote from Guts - Spooky - HORROR by bolkmar." | ||
| source: "https://freesound.org/s/393783/" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| - files: ["vent_carp.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Modified by Psymbiote from the original file edited and composited by MajorMoth, modified bite.ogg and metal_break4.ogg" | ||
| source: "https://github.com/TheDenSS14/TheDen" | ||
|
|
||
| - files: ["vent_mosquitoes.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by Psymbiote, samples taken from freesound.org at ID's 827925, 315908" | ||
| source: "https://freesound.org" | ||
|
|
||
| - files: ["vent_leeches.ogg"] | ||
| license: "CC-BY-4.0" | ||
| copyright: "Edited and composited by Psymbiote, samples taken from freesound.org at ID's 616199, 616200 and 207930" | ||
| source: "https://freesound.org" | ||
|
|
||
| - files: ["vent_snakes.ogg"] | ||
| license: "CC0-1.0" | ||
| copyright: "Edited and composited by Psymbiote, samples taken from freesound.org at ID's 706981 and 712920" | ||
| source: "https://freesound.org" | ||
|
|
||
| - files: ["vent_spiders.ogg"] | ||
| license: "CC-BY-4.0" | ||
| copyright: "Edited and composited by Psymbiote from Metal Rattles by IENBA and arachnid_scream.ogg" | ||
| source: "https://freesound.org/s/849797" | ||
|
|
||
| - files: ["vent_generic1.ogg", "vent_generic2.ogg", "vent_generic3.ogg"] | ||
| license: "CC-BY-4.0" | ||
| copyright: "Edited and composited by Psymbiote from Vent Crawling by ME_Studios_Official" | ||
| source: "https://freesound.org/s/652449/" | ||
|
|
||
| - files: ["vent_flesh.ogg"] | ||
| license: "CC-BY-3.0" | ||
| copyright: "Edited and composited by Psymbiote from Crawling Through a Vent by Ultra-Edward on freesound.org ID 795872, small pest alien/creature by Brandon Morris on OpenGameArt, metal_scrape1.ogg and metal_slam2.ogg." | ||
| source: "https://freesound.org/s/849797" | ||
|
|
||
| - files: ["vent_bugs.ogg"] | ||
| license: "CC-BY-SA-3.0" | ||
| copyright: "Edited and composited by Psymbiote, includes metal_thud1.ogg and metal_thud3.ogg." | ||
| source: "https://github.com/cmss13-devs/cmss13" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should move this random check to
StartHordeSpawnand use it to set a data field onVentHordeSpawnerComponent. The advantage of that is to better handle a situation when events overlap on the same vent, similar to what's being done on lines 72 through 80.If mice and goliaths are coming out at the same time, the vent should break on account of the goliaths, rather than not break on account of the mice coming slightly afterward.
Here's how we can accomplish that. Assignment works like this:
variableToAssign = valueToBeAssigned, with the right-hand side being what we want to assign to a variable or field. Compound assignment is shorthand forvariableToAssign = variableToAssign + someValue, orvariableToAssign += someValue. The result of the boolean OR operation istrueif and only if one of the values istrue.Suppose we add a new data field in
VentHordeSpawnerComponent,bool ShouldBreakVent.Then, later in
EndHordeSpawn...