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

Usable complex SMDs #1484

Merged
merged 4 commits into from
Feb 5, 2025
Merged

Usable complex SMDs #1484

merged 4 commits into from
Feb 5, 2025

Conversation

iluha168
Copy link
Contributor

@iluha168 iluha168 commented Feb 4, 2025

Made complex SMDs usable as a substitute for 4 advanced SMDs.

tomprince
tomprince reviewed Feb 4, 2025
View reviewed changes
kubejs/server_scripts/gregtech/circuits.js
}
})
)
let [newInputFluids, newOutputFluids] = [recipe.inputs.fluid, recipe.outputs?.fluid].map(items =>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there is probably a much less verbose way to implement this, using GTRecipe.copy, and modifying the resulting recipe. I think the only bit that isn't straightforward might be adding the resulting recipe to the game.

This avoids needing to know how to replicate all the details of the existing recipes.

@ThePansmith ThePansmith merged commit 0a2824d into ThePansmith:main Feb 5, 2025
1 check passed
@iluha168 iluha168 deleted the complex_smd_advanced_smd branch February 5, 2025 17:47
Xefyr0 added a commit that referenced this pull request Feb 7, 2025
@Xefyr0 @Evonne3916
@gyy0506 @hyl5942850 @forteen14desu @weblate @medsal15 @tomprince @Jollahs @WithersChat @gamma-delta @iluha168 @ThePansmith @TheDogOfChaos
Microminer rework kits and mega-merge (#1495)
8c9620e 
* Translated using Weblate (Russian)

Currently translated at 36.6% (1250 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/ru/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 96.3% (3289 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 96.3% (3289 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Switch microminers from chanced consumption to repair

* Tweaks to missions that return Neutronium

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.2% (3319 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.2% (3319 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.9% (3344 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 97.9% (3344 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.1% (3350 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.1% (3350 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3352 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3352 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.2% (3354 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.4% (3359 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.4% (3359 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.5% (3364 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.5% (3364 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.7% (3369 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 98.7% (3369 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Tweak repair probabilities

* Change Gem Sensor to be cheaper now that it's used more per ore

* Reduce dilithium returned from dilithium mission now that less is consumed as fuel

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Co-authored-by: quettalum <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (9 of 9 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (9 of 9 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (15 of 15 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (10 of 10 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (434 of 434 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 99.7% (469 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/gregtech/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/emi/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/enderio/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/extended-crafting/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/mods/laserio/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/EMI
Translation: Monifactory/EnderIO
Translation: Monifactory/Extended Crafting
Translation: Monifactory/Gregtech
Translation: Monifactory/KubeJS
Translation: Monifactory/LaserIO
Translation: Monifactory/Questbook

* Reduce quantity of Alien Scrap returned from T11 now that it's repairable

* Simplify mission definitions and fix half-tier actualization bug

* Lint

* fix projectred plate recipe conflicting with smooth stone slab (#1478)

* Allow any type of rubber in thermal recipes. (#1470)

This is particularly useful for the alchemical quiver used in the
T2.5MM (from #1477).

* Reduce repair times so that repairs are as fast as missions in higher tiers and even faster in lower tiers.

* Fluid Rig quest change (#1483)

indicates the you can now get regular oil in the void
no longer says oil in the void doesn't deplete

* Translated using Weblate (Russian)

Currently translated at 37.6% (1284 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/ru/

* Account for tick-second conversion in new repair times (Amended commit)

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Tweak repair overclock cost decreases

* Re-add Neutronium to T8MM mission for MkIII skip

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Post-tank mats frames on multiblocks (#1486)

They look good :3

* Stonecut GTCEU warning blocks into each other (#1439)

For parity with Chisel.

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translation: Monifactory/Questbook
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (3413 of 3413 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (470 of 470 strings)

Co-authored-by: forteen14desu <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/monifactory/kubejs/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/monifactory/questbook/zh_Hans/
Translation: Monifactory/KubeJS
Translation: Monifactory/Questbook

* Usable complex SMDs  (#1484)

* Craft for basic capacitor with complex smd

* Type definitions for GT JSON recipes

* Automatically generate recipes with complex SMDs

* Mention the change in QB

* Simplify naquadah energy values. (#1472)

* Added tooltip for damaged MMs

* Added proper JSDocs to my compat script for Create: Steam & Rails (#1462)

* add some comments to break up the wall of code here into manageable segments

* did proper JSDocs for my functions here, hopefully they'll be useful to future maintainers

* clarification on the cutter chanced output for narrow-gauge

---------

Signed-off-by: Becquerel <[email protected]>

* Replace repair for T1-5MMs and some higher-tier missions with consumable kits which are easier to automate

* Integral components-based programmer art for microminer kits

* Lint

---------

Signed-off-by: Becquerel <[email protected]>
Co-authored-by: Денис Денис <[email protected]>
Co-authored-by: quettalum <[email protected]>
Co-authored-by: hyl5942850 <[email protected]>
Co-authored-by: forteen14desu <[email protected]>
Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: medsal15 <[email protected]>
Co-authored-by: Tom Prince <[email protected]>
Co-authored-by: Jollahs <[email protected]>
Co-authored-by: WithersChat <[email protected]>
Co-authored-by: petrak@ <[email protected]>
Co-authored-by: iluha168 <[email protected]>
Co-authored-by: Pansmith <[email protected]>
Co-authored-by: Becquerel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomprince tomprince tomprince left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iluha168 @tomprince @ThePansmith