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

Safe restock #25

Merged
merged 39 commits into from
Jul 16, 2023
Merged

Safe restock #25

merged 39 commits into from
Jul 16, 2023

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jul 11, 2023

About the PR

Added new restock type, secured.
When attempted to open by force it will destroy the refill content.

Right now its assigned to 3 new refill crates.
Astro - 1000
Circuit - 3000
Ammo - 4000

This is all still subject to change and update, the prices, labels and crate types are not final.

Changelog
🆑

  • add: New type of refill, secured.
  • add: 3 new crates.

@dvir001
Copy link
Contributor Author

dvir001 commented Jul 11, 2023

If its not working ill probably have to update VendingMachineRestockTest.cs for a bigger change.

@Cheackraze
Copy link
Member

didnt get a chance to test yet but a quick glance looked good so far. see if i get some time tomorrow and do an in-game test just to confirm.

@Cheackraze
Copy link
Member

lgtm but theres some merge conflicts now, just gotta resolve and submit for review we can get it in

@dvir001
Copy link
Contributor Author

dvir001 commented Jul 13, 2023

Done, its working as intended for now.

@Cheackraze
Copy link
Member

since we are doing it, we really should just replace them all and make them all worth only 100 because they are all kind of just broken

@dvir001
Copy link
Contributor Author

dvir001 commented Jul 14, 2023

since we are doing it, we really should just replace them all and make them all worth only 100 because they are all kind of just broken

Here

@dvir001 dvir001 marked this pull request as ready for review July 14, 2023 10:45
@@ -31,9 +31,15 @@ ent-CrateVendingMachineRestockRobustSoftdrinks = { ent-CrateVendingMachineRestoc
ent-CrateVendingMachineRestockSalvageEquipment = { ent-CrateVendingMachineRestockSalvageEquipmentFilled }
.desc = { ent-CrateVendingMachineRestockSalvageEquipmentFilled.desc }

ent-CrateVendingMachineRestockAstroVend = { ent-CrateVendingMachineRestockAstroVendFilled }
Copy link
Member

Choose a reason for hiding this comment

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

lets keep all of our localization stuff separate, it makes it easier for translation and also avoids merge conflicts when we update.

Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

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

everything looks fine, but lets keep our custom yml and ftl stuff separated in the file structure so its easier to maintain/translate. Will be good to get this in and we can lower the vending stocks a bit on some of them safely

@@ -126,6 +126,16 @@
category: Engineering
group: market

- type: cargoProduct
Copy link
Member

Choose a reason for hiding this comment

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

Same here with our own custom product entries, lets keep them separate in a new file in the _nf folder

@Cheackraze Cheackraze merged commit 28a80e4 into new-frontiers-14:master Jul 16, 2023
@dvir001 dvir001 deleted the Safe-Restock branch July 16, 2023 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants