-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Update Graphical Overmap mod to support buildings from some other mods #36247
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
183daed
Merge pull request #1 from CleverRaven/master
Kilvoctu 785ebb2
Update with cabins
Kilvoctu c941385
Add support for More_City_Locations mod
Kilvoctu adeaa84
Add support for other mods
Kilvoctu 9e7a6df
update houses to light_gray
Kilvoctu 5dd9b34
Merge pull request #2 from CleverRaven/master
Kilvoctu 96c6a7c
Revert "Add support for More_City_Locations mod"
Kilvoctu 7c65e79
revert
Kilvoctu 32b8c7d
Separate mods for graphical overmap
Kilvoctu b682b73
lint attempt
Kilvoctu e4e0d59
judicious use of copy-from
Kilvoctu 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [ | ||
| { | ||
| "type": "MOD_INFO", | ||
| "ident": "Graphical_Overmap_Fujistruct", | ||
| "name": "Graphical Overmap Fujistruct", | ||
| "authors": [ "Kilvoctu" ], | ||
| "maintainers": [ "Kilvoctu" ], | ||
| "description": "Fuji Structures mod support for Graphical Overmap.", | ||
| "category": "graphical", | ||
| "dependencies": [ "dda", "Graphical_Overmap", "FujiStruct" ] | ||
| } | ||
| ] |
254 changes: 254 additions & 0 deletions
254
data/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json
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 |
|---|---|---|
| @@ -0,0 +1,254 @@ | ||
| [ | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_electronicstore", | ||
| "copy-from": "s_electronicstore", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_electronicstore_2ndfloor", | ||
| "copy-from": "s_electronicstore" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gunstore", | ||
| "copy-from": "s_gunstore", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gunstore_2ndfloor", | ||
| "copy-from": "s_gunstore" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gunstore_roof", | ||
| "copy-from": "s_gunstore" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_diner", | ||
| "copy-from": "s_diner", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_diner_2ndfloor", | ||
| "copy-from": "s_diner" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_diner_roof", | ||
| "copy-from": "s_diner" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt", | ||
| "copy-from": "s_apt", | ||
| "sym": "Ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt_2ndfloor", | ||
| "copy-from": "s_apt" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt_roof", | ||
| "copy-from": "s_apt" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt_2", | ||
| "copy-from": "s_apt_2", | ||
| "sym": "Ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt_2_2ndfloor", | ||
| "copy-from": "s_apt_2" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_apt_2_roof", | ||
| "copy-from": "s_apt_2" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_cardealer", | ||
| "copy-from": "s_cardealer", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_cardealer_roof", | ||
| "copy-from": "s_cardealer" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_camping", | ||
| "copy-from": "s_camping", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_camping_roof", | ||
| "copy-from": "s_camping" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_games", | ||
| "copy-from": "s_games", | ||
| "sym": "ç" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_games_roof", | ||
| "copy-from": "s_games" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_term", | ||
| "copy-from": "s_air_term", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_parking", | ||
| "copy-from": "s_air_parking", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_atc", | ||
| "copy-from": "s_air_atc", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_atc_2", | ||
| "copy-from": "s_air_atc_2", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_atc_3", | ||
| "copy-from": "s_air_atc_3", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_hangars", | ||
| "copy-from": "s_air_hangars", | ||
| "sym": "ý" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_runway", | ||
| "copy-from": "s_air_runway", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_runway_hangars", | ||
| "copy-from": "s_air_runway_hangars", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_runway_l", | ||
| "copy-from": "s_air_runway_l", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_runway_r", | ||
| "copy-from": "s_air_runway_r", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_air_runway_term", | ||
| "copy-from": "s_air_runway_term", | ||
| "sym": "ô" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_road_0", | ||
| "copy-from": "s_lightindustry_road_0", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_road_1", | ||
| "copy-from": "s_lightindustry_road_1", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_00", | ||
| "copy-from": "s_lightindustry_00", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_01", | ||
| "copy-from": "s_lightindustry_01", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_10", | ||
| "copy-from": "s_lightindustry_10", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_lightindustry_11", | ||
| "copy-from": "s_lightindustry_11", | ||
| "sym": "Ö" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gas_g1", | ||
| "copy-from": "s_gas_g1", | ||
| "sym": "ú" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gas_g0", | ||
| "copy-from": "s_gas_g0", | ||
| "sym": "ú" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gas_b11", | ||
| "copy-from": "s_gas_b11", | ||
| "sym": "ú" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gas_b20", | ||
| "copy-from": "s_gas_b20", | ||
| "sym": "Õ" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_gas_b21", | ||
| "copy-from": "s_gas_b21", | ||
| "sym": "Õ" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_bunker_shop_g", | ||
| "copy-from": "s_bunker_shop_g", | ||
| "sym": "à" | ||
| }, | ||
| { | ||
| "type": "overmap_terrain", | ||
| "id": "s_bunker_shop_b", | ||
| "copy-from": "s_bunker_shop_b", | ||
| "sym": "Õ" | ||
| } | ||
| ] |
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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [ | ||
| { | ||
| "type": "MOD_INFO", | ||
| "ident": "Graphical_Overmap_More_Locations", | ||
| "name": "Graphical Overmap More Locations", | ||
| "authors": [ "Kilvoctu" ], | ||
| "maintainers": [ "Kilvoctu" ], | ||
| "description": "More Locations mod support for Graphical Overmap.", | ||
| "category": "graphical", | ||
| "dependencies": [ "dda", "Graphical_Overmap", "more_locations" ] | ||
| } | ||
| ] |
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.
I am thinking you should be using
copy-fromand change onlysym(and color if necessary), so other settings would be copied over from original mods.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.
I see, it's so I'm not unnecessarily overwriting any changes that authors would make to their respective mods? I've cleaned up the files. Thanks for the feedback.
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.
Yes, GO mods only needs symbol to be changed, so any other properties would remain intact when copying.