-
Notifications
You must be signed in to change notification settings - Fork 66
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
Factory potentials & Economies of scale for factories #1892
Merged
Merged
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
e40e040
Economy of scale
SneakBug8 996f9e3
Merge branch 'main' of https://github.com/SneakBug8/Project-Alice
SneakBug8 0ae3e4d
Merge remote-tracking branch 'origin/main'
SneakBug8 98ff911
Merge remote-tracking branch 'origin/main' into devbranch2
SneakBug8 7b18b5e
Merge remote-tracking branch 'origin/main'
SneakBug8 0fa40d3
Merge remote-tracking branch 'origin/main' into devbranch3
SneakBug8 7fd1f14
Local factory limits
SneakBug8 ea24168
Factory potentials v2
SneakBug8 b8e1760
Consistent naming
SneakBug8 cc41bde
Docs
SneakBug8 892c8bc
Fix misplaced bracket
SneakBug8 2a59f16
Merge remote-tracking branch 'origin/main' into devbranch3
SneakBug8 83ac71e
Move limits to goods
SneakBug8 3cb0404
Redo checks for potentials
SneakBug8 6ee6d46
Fix
SneakBug8 51663bc
Refut rebuild
SneakBug8 a695308
Merge branch 'main' into devbranch3
SneakBug8 91b923c
UI touchups
SneakBug8 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -467,6 +467,11 @@ object { | |
type{ bitfield } | ||
tag{ scenario } | ||
} | ||
property{ | ||
name{ uses_potentials } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is this being stored in the factory type when everything else is tied to the commodity? I don't think that your syntax for this feature allows it to attach to some factory types and not others if they happen to produce the same output |
||
type{ bitfield } | ||
tag{ scenario } | ||
} | ||
property{ | ||
name{ inputs } | ||
type{ economy::commodity_set } | ||
|
@@ -1534,6 +1539,16 @@ object { | |
type{ array{commodity_id}{float} } | ||
tag{ save } | ||
} | ||
property{ | ||
name{ factory_limit_was_set_during_scenario_creation } | ||
type{ bitfield } | ||
tag{ scenario } | ||
} | ||
property{ | ||
name{ factory_max_level_per_good } | ||
type{ array{commodity_id}{uint8_t} } | ||
tag{ scenario } | ||
} | ||
property{ | ||
name{ rgo_target_employment_per_good } | ||
type{ array{commodity_id}{float} } | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SneakBug8 This is changing a very cheap check into two very expensive checks. If the expensive checks are necessary, the code should be written so that they are taken a minimal number of times (for example, it shouldn't be doing duplicate work checking for both upgrades and new construction)