-
-
Notifications
You must be signed in to change notification settings - Fork 398
Add context-based station economic industries #6199
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
Merged
+2,538
−542
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
083df03
Lua: add path value to FS.ReadDirectory
sturnclaw 5e6fda9
Lua: properly document Rand intervals
sturnclaw 4fd3161
ui: fix ui.Number not displaying sign on thousands-place numbers
sturnclaw 90e499a
Document SystemBody TODO
sturnclaw 3ec4a77
Expose StarSystem.seed to Lua
sturnclaw c2787d8
economy: tweak commodity prices
sturnclaw a995f57
economy: add Conditions, data-driven named boolean tags
sturnclaw 77b5f63
economy: add Industries, starport economic producers
sturnclaw ce6ab2b
economy: add condition and industry definitions
sturnclaw efbc97e
economy: add industry-based starport economies
sturnclaw c4e93b2
economy: add economic simulation using random walks
sturnclaw 0e2efa1
economy: replace old economy implementation
sturnclaw c67a2d3
Update commodity price debug tab
sturnclaw 707edd3
Update NewsEventCommodity for new Economy code
sturnclaw df960c8
economy: remove remaining old-econ code
sturnclaw 4e5657e
CommodityMarket: remove demand, get pricemod from Economy
sturnclaw c510d35
economy: add industries to produce medicines/precious_metals
sturnclaw 98ab5b5
Remove SpaceStation:GetCommodityDemand
sturnclaw 2f2e66c
economy: rename ConditionDef.conditions -> required
sturnclaw f36dd9c
Update NaturalDocs options to 2.3.1
sturnclaw 1f203c7
Document FileSystem:ReadDirectory return values
sturnclaw 8778cf2
economy: Document Conditions.lua
sturnclaw 150ce76
utils: to_array, keys_to_array
sturnclaw 88a6438
Economy: document C++-side commodity and economy datastructures
sturnclaw f2e811f
Economy: document Economy.lua
sturnclaw b67de8c
Update copyright headers for new year
sturnclaw db7e048
Economy: add the Chemicals commodity
sturnclaw 608b63e
Fix condition file path missing data:// prefix
sturnclaw 0eafcb9
Rebalance and expand station industries to include chemical production
sturnclaw bf78fe6
Document Industry.lua
sturnclaw ef9a631
Minor spelling fixes
sturnclaw f80e254
Economy: remove unused industry workforce value
sturnclaw c52556e
Economy: add follow-on industry construction
sturnclaw 06714f6
Commodity: add GetProperName() accessor for capitalized commodity names
sturnclaw 012f185
PiGui: remove useless forwarding wrapper around sameLine()
sturnclaw 62029ec
ui: improve bookmark sidebar
sturnclaw 0c023a8
Economy: apply system-wide price modifier to station prices
sturnclaw b43833c
ui: update system-econ-view for new economy
sturnclaw 578b0d5
Economy: rebalance commodity prices slightly
sturnclaw 9973999
Apply documentation review feedback
sturnclaw fa32310
Add lui.VIEW_DESTINATION
sturnclaw 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| "l10n_key": "RUBBISH", | ||
| "inputs": [], | ||
| "producer": "ALL", | ||
| "price": -0.7 | ||
| "price": -16 | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| { | ||
| "lawless": { | ||
| "context": "system", | ||
| "required": [ "lawlessness > 0.8" ] | ||
| }, | ||
| "zero_g" : { | ||
| "context": "planet", | ||
| "required": [ "gravity <= 3.3" ] | ||
| }, | ||
| "low_gravity": { | ||
| "context": "planet", | ||
| "required": [ "gravity > 3.3" ] | ||
| }, | ||
| "norm_gravity": { | ||
| "context": "planet", | ||
| "required": [ "gravity > 6.0" ] | ||
| }, | ||
| "atmos_airless": { | ||
| "context": "planet", | ||
| "required": [ "atmosDensity < 0.1" ] | ||
| }, | ||
| "atmos_tenuous": { | ||
| "context": "planet", | ||
| "required": [ "atmosDensity >= 0.1", "atmosDensity < 1.0" ] | ||
| }, | ||
| "atmos_unbreathable": { | ||
| "context": "planet", | ||
| "required": [ "atmosDensity >= 1.0", "atmosOxidizing <= 0.7" ] | ||
| }, | ||
| "atmos_breathable": { | ||
| "context": "planet", | ||
| "required": [ "atmosDensity >= 1.0", "atmosOxidizing > 0.7" ] | ||
| }, | ||
mwerle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "gas_giant_o2": { | ||
| "context": "planet", | ||
| "required": [ "type = PLANET_GAS_GIANT", "atmosOxidizing > 0.1" ] | ||
| }, | ||
| "ice_abundant": { | ||
| "context": "planet", | ||
| "required": [ "volatileIces > 0.6" ] | ||
| }, | ||
| "ice_moderate": { | ||
| "context": "planet", | ||
| "required": [ "volatileIces > 0.3" ] | ||
| }, | ||
| "carbon_ores": { | ||
| "context": "planet", | ||
| "required": [ "metallicity < 0.7", "volatileIces < 0.3" ] | ||
| }, | ||
| "carbon_ores_rich": { | ||
| "context": "planet", | ||
| "required": [ "metallicity < 0.4", "volatileIces < 0.3", "random > 0.3" ] | ||
| }, | ||
| "metal_abundant": { | ||
| "context": "planet", | ||
| "required": [ "metallicity > 0.7" ] | ||
| }, | ||
| "metal_moderate": { | ||
| "context": "planet", | ||
| "required": [ "metallicity > 0.4" ] | ||
| }, | ||
| "rare_metals": { | ||
| "context": "planet", | ||
| "required": [ "metallicity > 0.4", "random > 0.6" ] | ||
| }, | ||
| "biosphere_basic": { | ||
| "context": "planet", | ||
| "required": [ "life > 0.3", "atmosDensity > 0.7" ] | ||
| }, | ||
| "biosphere_rich": { | ||
| "context": "planet", | ||
| "required": [ "life > 0.6", "atmosDensity > 0.7" ] | ||
| }, | ||
| "rare_microbial_life": { | ||
| "context": "planet", | ||
| "required": [ "life > 0.1", "atmosDensity > 0.1", "random > 0.7" ] | ||
| } | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "station_aquaponics": { | ||
| "l10n_key": "ZERO_G_AQUAPONICS", | ||
| "conditions_any": [ "starport_orbital", "zero_g" ], | ||
| "inputs": { | ||
| "farm_machinery": 1, | ||
| "fertilizer": 2, | ||
| "air_processors": 1, | ||
| "water": 4 | ||
| }, | ||
| "outputs": { | ||
| "fruit_and_veg": 3, | ||
| "grain": 3 | ||
| }, | ||
| "modifiers": { | ||
| "rare_microbial_life": [ "i:fertilizer-1", "o:*+1" ] | ||
sturnclaw marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| "build_next": [ | ||
| { "id": "drug_lab", "chance": 0.8 }, | ||
| { "id": "distillery", "chance": "0.4" } | ||
| ] | ||
| }, | ||
| "surface_aquaponics": { | ||
| "l10n_key": "TERRESTRIAL_AQUAPONICS", | ||
| "context": "surface", | ||
| "conditions": [ "planet_terrestrial", "!atmos_breathable" ], | ||
| "inputs": { | ||
| "farm_machinery": 2, | ||
| "fertilizer": 3, | ||
| "air_processors": 1, | ||
| "water": 5 | ||
| }, | ||
| "outputs": { | ||
| "fruit_and_veg": 4, | ||
| "grain": 5 | ||
| }, | ||
| "modifiers": { | ||
| "rare_microbial_life": [ "i:fertilizer-1", "o:*+1" ] | ||
| }, | ||
| "build_next": [ | ||
| { "id": "distillery", "chance": 0.3 }, | ||
| { "id": "chemical_refinery" }, | ||
| { "id": "drug_lab" } | ||
| ] | ||
| }, | ||
| "outdoor_farm": { | ||
| "l10n_key": "FARMING", | ||
| "context": "surface", | ||
| "conditions": [ "planet_terrestrial", "biosphere_basic", "norm_gravity" ], | ||
| "inputs": { | ||
| "farm_machinery": 3, | ||
| "air_processors": 3, | ||
| "consumer_goods": 4 | ||
| }, | ||
| "outputs": { | ||
| "fruit_and_veg": 5, | ||
| "grain": 6, | ||
| "animal_meat": 4, | ||
| "fertilizer": 3, | ||
| "live_animals": 3 | ||
| }, | ||
| "modifiers": { | ||
| "lawless": [ "o:slaves+3" ], | ||
| "biosphere_rich": [ "o:*+1", "i:farm_machinery+1" ], | ||
| "atmos_breathable": [ "i:air_processors-3" ] | ||
| }, | ||
| "build_next": [ | ||
| { "id": "textile_mill" }, | ||
| { "id": "civil_industry" }, | ||
| { "id": "distillery", "chance": 0.8 } | ||
| ] | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.