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.

Sign up for GitHub

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

Jump to bottom

Add magnet pickup system from Frontier #949

Merged
merged 5 commits into from
Mar 17, 2024
Merged

Add magnet pickup system from Frontier #949

merged 5 commits into from
Mar 17, 2024

Conversation

IamVelcroboy
Copy link
Member

@IamVelcroboy IamVelcroboy commented Mar 10, 2024 •
edited
Loading

About the PR

  • Title: Machines will automatically pull in tagged items for processing, allowing to set them up on conveyor belts.
  • Adds to Ore Processors
  • Adds to Material Reclaimer

Why / Balance

Better gameplay and Factorio mapping

Technical details

n/a

Media

2024-03-10.15-09-33.mp4
2024-03-10.15-44-36.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

n/a

Changelog
🆑 Velcroboy

  • add: Added magnet pickup to Ore Processors and Material Reclaimer

@IamVelcroboy IamVelcroboy requested a review from DebugOk as a code owner March 10, 2024 20:17
@github-actions github-actions bot added S: Needs Review Changes: C# Changes any cs files Changes: YML Changes any yml files labels Mar 10, 2024
@Bonktrauma
Copy link
Contributor

I can't wait

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Mar 10, 2024
@IamVelcroboy
Copy link
Member Author

Changed it so you don't need to toggle it on.

@deltanedas
Copy link
Member

shouldnt be on reclaimer since it invalidates the dynamic of recycler being automatic and inefficient but reclaimer being manual and efficient

@VMSolidus
Copy link
Contributor

I did a bunch of code optimization, then some testing to verify that it works after doing said optimization. I also caught that the Industrial Ore Processor was missing this feature, so I added it to that as well. It wouldn't have made sense if cargo upgraded the ore processor, but then lost the ability to automate ore smelting. Otherwise, this is good to merge if the tests pass.

@IamVelcroboy
Copy link
Member Author

I also caught that the Industrial Ore Processor was missing this feature, so I added it to that as well.

I think it inherited it, no?

@VMSolidus
Copy link
Contributor

Guh, you're right.

DebugOk
DebugOk reviewed Mar 11, 2024
View reviewed changes
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

I'm also going to want to review this due to it adding a new namespace

@dvir001
Copy link
Contributor

dvir001 commented Mar 11, 2024 •
edited
Loading

I did a bunch of code optimization, then some testing to verify that it works after doing said optimization. I also caught that the Industrial Ore Processor was missing this feature, so I added it to that as well. It wouldn't have made sense if cargo upgraded the ore processor, but then lost the ability to automate ore smelting. Otherwise, this is good to merge if the tests pass.

Ill love to know what changes done as I was the last person to work on this code in frontier, can help a bit with updating it on frontier also.

Looking good hope to see this merged here.

@DebugOk DebugOk merged commit 5acb90a into DeltaV-Station:master Mar 17, 2024
10 checks passed
VMSolidus pushed a commit to Simple-Station/Einstein-Engines that referenced this pull request Apr 8, 2024
@SimpleStation14 @IamVelcroboy
Add magnet pickup system from Frontier (#57)
c1646d8 
## Mirror of PR #949: [Add magnet pickup system from
Frontier](DeltaV-Station/Delta-v#949) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-10 20:17:18 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-17 13:38:11 UTC</aside>
<sup>

`5acb90a4eb6b8e8436d06cffe92169d07e38d140`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Status: Needs Review
- Changes: C#
- Changes: Localization


---

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

> ## About the PR
> - Title: Machines will automatically pull in tagged items for
processing, allowing to set them up on conveyor belts.
> - Adds to Ore Processors
> - Adds to Material Reclaimer
> 
> ## Why / Balance
> Better gameplay and Factorio mapping
> 
> ## Technical details
> n/a
> 
> ## Media
>
https://github.com/DeltaV-Station/Delta-v/assets/107660393/defb8724-acaf-4897-9d5a-4edb5ba17edd
> 
>
https://github.com/DeltaV-Station/Delta-v/assets/107660393/725a74a3-3978-4097-bdf4-d84ff2f55f38
> 
> 
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> n/a
> 
> **Changelog**
> 🆑 Velcroboy
> - add: Added magnet pickup to Ore Processors and Material Reclaimer


</details>

Co-authored-by: Velcroboy <[email protected]>
@dvir001 dvir001 mentioned this pull request Jun 17, 2024
Closed
1 task
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@VMSolidus
Fix HealingWord & Revivify Bugs (DeltaV-Station#949)
99ee312 
# Description

Playtesting uncovered a few bugs with the HealOtherSystem, these are
luckily pretty simple to fix. I also made a few of the functions in this
system nullable as a performance optimization.

# Changelog

:cl:
- fix: Fixed a bug where Breath of Life and Healing Word would set
living people to crit, which would knock them down.
- fix: Fixed a bug where Breath of Life could revive people who were
rotten(It will still heal them and reduce the rot timer as intended, but
will not revive unless said rot timer reduction brings them below the 10
minute threshold).
- add: The Do-After bar for Breath of Life and Healing Word is now
hidden if glimmer is low enough. The threshold for which scales with
your Dampening stat. More Dampening = stealthier casting.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@SimpleStation14
Automatic Changelog Update (DeltaV-Station#949)
5b9f28c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DangerRevolution DangerRevolution DangerRevolution left review comments

@DebugOk DebugOk DebugOk left review comments

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@IamVelcroboy @Bonktrauma @deltanedas @VMSolidus @dvir001 @DebugOk @DangerRevolution