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

[Port] Plushie #11

Merged
merged 7 commits into from
Sep 1, 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/Effects/silence.ogg
Binary file not shown.
20 changes: 0 additions & 20 deletions Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,6 @@
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunPlushies
icon:
sprite: Objects/Fun/toys.rsi
state: plushie_h
product: CrateFunPlushie
cost: 1000
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunLizardPlushies
icon:
sprite: Objects/Fun/toys.rsi
state: plushie_lizard
product: CrateFunLizardPlushieBulk
cost: 500
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunBoardGames
icon:
Expand Down
30 changes: 1 addition & 29 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,35 +40,7 @@
- id: PlushieArachind
- id: PlushiePenguin

- type: entity
id: CrateFunPlushie
parent: CrateGenericSteel
name: plushie crate
description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:NestedSelector
tableId: AllPlushiesTable
rolls: !type:ConstantNumberSelector
value: 10

- type: entity
id: CrateFunLizardPlushieBulk
parent: CrateGenericSteel
name: bulk lizard plushie crate
description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- id: PlushieLizard
amount: !type:ConstantNumberSelector
value: 3
- id: PlushieSpaceLizard
amount: !type:ConstantNumberSelector
value: 3
# Removed crates with toys because EE toys

- type: entity
id: CrateFunInstrumentsVariety
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
rarePrototypes:
- FoamBlade
- PlushieGhost
- PlushieAbductorAgent
rareChance: 0.03
prototypes:
- PlushieBee
Expand All @@ -34,6 +35,38 @@
- ToyMouse
- PlushieDiona
- PlushieArachind
- PlushieArachne # EE toys START
- PlushieAbductor
- PlushieGnome
- PlushieLoveable
- PlushieDeer
- PlushieIpc
- PlushieGrey
- PlushieRedFox
- PlushiePurpleFox
- PlushiePinkFox
- PlushieOrangeFox
- PlushieMarbleFox
- PlushieCrimsonFox
- PlushieCoffeeFox
- PlushieBlueFox
- PlushieBlackFox
- PlushieVulp
- PlushieCorgi
- PlushieGirlyCorgi
- PlushieRobotCorgi
- PlushieCatBlack
- PlushieCatGrey
- PlushieCatOrange
- PlushieCatSiames
- PlushieCatTabby
- PlushieCatTuxedo
- PlushieCatWhite
- PlushieRatvar
- PlushieNar
- PlushieTrystan
- PlushieSlips
- PlushieJester # EE toys END
chance: 0.5
offset: 0.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
- VendingMachineSoda
- VendingMachineStarkist
- VendingMachineSpaceUp
- PrizeCounter # Ataraxia
chance: 1
Loading
Loading