Skip to content
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

Mirror: Trading Outpost now has half buy-only and half sell-only pallets #191

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #25955: Trading Outpost now has half buy-only and half sell-only pallets from space-wizards space-wizards/space-station-14

c0bbbc33c19eafcc8defaa7f1ec2df42e485b435

PR opened by wafehling at 2024-03-10 02:47:02 UTC


PR changed 8 files with 226 additions and 123 deletions.

The PR had the following labels:

  • Changes: Sprites
  • Status: Needs Review

Original Body

About the PR

I added two new entity types, a buy and sell only cargo pallet, and added them to the trading outpost in place of the old pallets.

Why / Balance

Since the day this was added, every single shift, at some point I'll hear someone in cargo yelling about how "You sold stuff I just bought!"

This seemed like the easiest way to fix the problem.

Technical details

Added a variable to the cargo pallet component for labeling which type it is, added two new varieties of the cargo pallet to the yml, and adjusted all the calls for GetCargoPallets() to have boolean variables for buyOnly and sellOnly to tell the function what kind of call you're looking for.

If you don't give it any specifics it'll still treat any pallet as a two-way one, but this function is only called 2 or 3 times and I've adjusted them all and commented the function itself for anyone looking to change/add it in the future.

The old pallet is still in the game and is set to "both" by default, so it should work just fine for backwards compatibility.

Media

image
image
image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Shouldn't break anything, I've left the old pallets fully in, and updated them to work with the new GetCargoPallets() function just like they used to. Not sure if/where you'd still need them, but better safe than sorry.

Changelog
🆑

  • tweak: The trading outpost now has dedicated buy-only and sell-only pallets. No more accidentally selling orders you just bought. Cargonians rejoice!

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 22, 2024
Copy link
Contributor

RSI Diff Bot; head commit 84750db merging into 3bf08c7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/cargo_pallets.rsi

State Old New Status
cargo_pallet_buy Added
cargo_pallet_sell Added

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be tested to work on Delta trade station

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

The C# side of things is fine, and it does also modify the tradepost grid to add these new pallets.

@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:13
@DangerRevolution DangerRevolution marked this pull request as ready for review June 14, 2024 13:52
@DangerRevolution
Copy link
Contributor

Will be merged if tests pass

@DangerRevolution DangerRevolution added Changes: Map Changes any yml file in the Maps directories Priority: 4-Low Should be resolved at some point Size: 4-Small For small issues/PRs Type: Feature Creation of or significant changes to a feature Changes: C# Changes any cs files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jun 14, 2024
@VMSolidus VMSolidus merged commit 825ca87 into Simple-Station:master Jun 16, 2024
22 checks passed
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
…ets (Simple-Station#191)

## Mirror of PR #25955: [Trading Outpost now has half buy-only and half
sell-only
pallets](space-wizards/space-station-14#25955)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435`

PR opened by <img
src="https://avatars.githubusercontent.com/u/1471082?v=4" width="16"/><a
href="https://github.com/wafehling"> wafehling</a> at 2024-03-10
02:47:02 UTC

---

PR changed 8 files with 226 additions and 123 deletions.

The PR had the following labels:
- Changes: Sprites
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> I added two new entity types, a buy and sell only cargo pallet, and
added them to the trading outpost in place of the old pallets.
> 
> ## Why / Balance
> Since the day this was added, every single shift, at some point I'll
hear someone in cargo yelling about how **"You sold stuff I just
bought!"**
> 
> This seemed like the easiest way to fix the problem.
> 
> ## Technical details
> Added a variable to the cargo pallet component for labeling which type
it is, added two new varieties of the cargo pallet to the yml, and
adjusted all the calls for GetCargoPallets() to have boolean variables
for buyOnly and sellOnly to tell the function what kind of call you're
looking for.
> 
> If you don't give it any specifics it'll still treat any pallet as a
two-way one, but this function is only called 2 or 3 times and I've
adjusted them all and commented the function itself for anyone looking
to change/add it in the future.
> 
> The old pallet is still in the game and is set to "both" by default,
so it should work just fine for backwards compatibility.
> 
> ## Media
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/38cdf849-3e05-4f98-957f-65a719c2280d)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/56e471e9-b45e-4332-bd55-7220566542ab)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/a5e8e651-d301-420a-b2d7-cc4cf07a50af)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/fdf2cf4c-fba8-46c9-9a30-7313a2204b5e)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/3811edd0-bb32-44cf-b884-e0a9f4bf16fa)
> 
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> 
> Shouldn't break anything, I've left the old pallets fully in, and
updated them to work with the new GetCargoPallets() function just like
they used to. Not sure if/where you'd still need them, but better safe
than sorry.
> 
> **Changelog**
> 🆑
> - tweak: The trading outpost now has dedicated buy-only and sell-only
pallets. No more accidentally selling orders you just bought. Cargonians
rejoice!
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Size: 4-Small For small issues/PRs Type: Feature Creation of or significant changes to a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants