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

Commit

Permalink
[Port] Plushie (#11)
Browse files Browse the repository at this point in the history
* Plushie Update! (#654)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

By multiple requests i bring my PR from Frontier The [PLUSHIE
UPDATE!](new-frontiers-14/frontier-station-14#886)

This PR add a prize vendor machine where you can trade prize ticket for
a toy/plushie, to get ticket you win those in arcade machines.

This PR will give a chance for everyone to get the toys they need in a
special machine and will make plushies in general more random and fun,
in term of random spawns.

WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE
MAPPED.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Prize Vendor
- [x] Prize Tickets
- [x] New Toys/Plushies
- [x] Prizes

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/643e6c65-bba0-4eef-8e8e-d3510922e51e)

</p>
</details>

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: A ton of new plushies has arrived
- add: Prize counter are here, get your prizes by winning games and
getting prize tickets! and find prize balls!!

* prize counter to spawner

* Arachne Plushie (#531)

Added everyone's favorite Arachne as an adorable soft toy

---

- [x] Place plushie in spawn location(s)

---

<details><summary><h1>Media</h1></summary>
<p>

![ArchnePlush](https://github.com/Simple-Station/Einstein-Engines/assets/114866135/1ec47181-4827-49f9-8605-9a16764dba89)

</p>
</details>

---

:cl:
- add: Plushie

* ooopsie

---------

Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: CodedCrow <[email protected]>
  • Loading branch information
3 people committed Sep 1, 2024
1 parent a996bf3 commit 0f702d0
Show file tree
Hide file tree
Showing 69 changed files with 2,412 additions and 473 deletions.
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

0 comments on commit 0f702d0

Please sign in to comment.