Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Небольшое изменение бумбокса #270

Merged
merged 5 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/BoomBox/Beacon.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/CrystalsHotlineMiami.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/HydrogenHotlineMiami.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/Im_Blink.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/Rekka.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/To_fall.ogg
Binary file not shown.
53 changes: 53 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/boombox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,59 @@
- type: BoomBoxTape
soundPath: /Audio/BoomBox/IDrive.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHIFIBeacon
name: Hi-Fi Rush - The Beacon
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/Beacon.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHIFIBlink
name: Hi-Fi Rush - In a Blink
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/Im_Blink.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHIFIFail
name: Hi-Fi Rush - Too Big to Fail
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/To_fall.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHIFIRekka
name: Hi-Fi Rush - Captive Normals (A Fever Dream)
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/Rekka.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHotLineCrystals
name: M.O.O.N. - Crystals
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/CrystalsHotlineMiami.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeHotLineHydrogen
name: M.O.O.N. - Hydrogen
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/HydrogenHotlineMiami.ogg

# - type: entity
# parent: BaseBoomBoxTape
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,122 @@
- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxAsshole
id: MailBoombox
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBox

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack1
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeSpaceOddity
- id: BaseBoomBoxTapeSpaceAsshole
- id: BaseBoomBoxTapeStarman
- id: BaseBoomBoxTapeTheChain

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack2
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeCantSmile
- id: BaseBoomBoxTapeUnderStars
- id: BaseBoomBoxTapeComingHome
- id: BaseBoomBoxTapeSignals

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack3
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeDemonKittyRag
- id: BaseBoomBoxTapeKissTheSky
- id: BaseBoomBoxTapeRetrograde
- id: BaseBoomBoxTapeThisAintNoPlaceForNoHero

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack4
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeMrKittyAfterDark
- id: BaseBoomBoxTapeTobyFoxHopesAndDreams
- id: BaseBoomBoxTapeTobyFoxMegalovania
- id: BaseBoomBoxTapeTobyFoxUndertale

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack5
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeImagineDragonEnemy
- id: BaseBoomBoxTapeKDAVillian
- id: BaseBoomBoxTapeRamseyGoodbye
- id: BaseBoomBoxTapeSamuelKimGunsForHire

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack6
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeSigridEverybodyKnows
- id: BaseBoomBoxTapeTitoTarantulaAfterDark
- id: BaseBoomBoxTapeTheOffspringTheKids
- id: BaseBoomBoxTapeMichaelHolborn

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack7
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeDavidRawlings
- id: BaseBoomBoxTapeKavinskynightcall
- id: BaseBoomBoxTapeHIFIBeacon
- id: BaseBoomBoxTapeHIFIBlink

- type: entity
noSpawn: true
parent: BaseMail
id: MailBoomboxPack8
suffix: Boombox
components:
- type: Mail
isFragile: true
contents:
- id: BaseBoomBoxTapeHIFIFail
- id: BaseBoomBoxTapeHIFIRekka
- id: BaseBoomBoxTapeHotLineCrystals
- id: BaseBoomBoxTapeHotLineHydrogen
12 changes: 10 additions & 2 deletions Resources/Prototypes/Nyanotrasen/mailDeliveries.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: mailDeliveryPool
id: RandomMailDeliveryPool
everyone:
MailAlcohol: 0.5
MailAlcohol: 0.5
MailSake: 0.5
MailBible: 1
MailBikeHorn: 0.5
Expand Down Expand Up @@ -45,7 +45,15 @@
MailVagueThreat: 0.4
# This is mainly for Glacier.
MailWinterCoat: 1.5
MailBoomboxAsshole: 1.5
MailBoombox: 1.5
MailBoomboxPack1: 0.5
MailBoomboxPack2: 0.5
MailBoomboxPack3: 0.5
MailBoomboxPack4: 0.5
MailBoomboxPack5: 0.5
MailBoomboxPack6: 0.5
MailBoomboxPack7: 0.5
MailBoomboxPack8: 0.5

# Department and job-specific mail can have slightly higher weights,
# since they'll be merged with the everyone pool.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
BaseBoomBoxTapeTitoTarantulaAfterDark: 3
BaseBoomBoxTapeDavidRawlings: 3
BaseBoomBoxTapeKavinskynightcall: 3
BaseBoomBoxTapeHIFIBeacon: 3
BaseBoomBoxTapeHIFIBlink: 3
BaseBoomBoxTapeHIFIFail: 3
BaseBoomBoxTapeHIFIRekka: 3
BaseBoomBoxTapeHotLineCrystals: 3
BaseBoomBoxTapeHotLineHydrogen: 3
BaseBoomBoxTapeSpaceOddity: 3
BaseBoomBoxTapeSpaceAsshole: 3
BaseBoomBoxTapeStarman: 3
Expand Down
Loading