Skip to content

Commit

Permalink
Fix tileset backwards compatibility
Browse files Browse the repository at this point in the history
When we decided to break out the city improvement and wonder sprites into individual files, we created a specific buildings.spec and wonders.spec files. This broke backwards compatibility, espectially for third party tilesets such as RoundSquare
  • Loading branch information
jwrober authored and lmoureaux committed Oct 31, 2024
1 parent aa9849d commit f795938
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 116 deletions.
1 change: 0 additions & 1 deletion data/amplio2.tilespec
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ files =
"amplio2/veterancy.spec",
"misc/flags-large.spec",
"misc/buildings-large.spec",
"misc/wonders-large.spec",
"misc/space.spec",
"misc/techs.spec",
"misc/treaty.spec",
Expand Down
1 change: 0 additions & 1 deletion data/hexemplio.tilespec
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ files =
"misc/specialists.spec",
"misc/events.spec",
"misc/buildings-large.spec",
"misc/wonders-large.spec",
"misc/flags-large.spec",
"misc/shields-large.spec",
"misc/cursors.spec",
Expand Down
1 change: 0 additions & 1 deletion data/isophex.tilespec
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ files =
"misc/governments.spec",
"misc/specialists.spec",
"misc/buildings.spec",
"misc/wonders.spec",
"trident/units.spec",
"trident/extra_units.spec",
"isotrident/unitextras.spec",
Expand Down
1 change: 0 additions & 1 deletion data/isotrident.tilespec
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ files =
"misc/shields.spec",
"misc/cursors.spec",
"misc/buildings.spec",
"misc/wonders.spec",
"misc/space.spec",
"misc/techs.spec",
"misc/treaty.spec",
Expand Down
49 changes: 49 additions & 0 deletions data/misc/buildings-large.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ artists = "See tilesets/buildings/*.license files"
[extra]
sprites = {
"tag", "file"

; "buildings" - aka city improvements

"b.academy", "tilesets/buildings/academy"
"b.airport", "tilesets/buildings/airport"
"b.amphitheater", "tilesets/buildings/amphitheater"
Expand Down Expand Up @@ -62,4 +65,50 @@ sprites = {
"b.temple", "tilesets/buildings/temple"
"b.university", "tilesets/buildings/university"
"b.workshop", "tilesets/buildings/workshop"

; wonders - both small and great

"b.apollo_program", "tilesets/wonders/apollo_program"
"b.asmiths_trading_co", "tilesets/wonders/asmiths_trading_co"
"b.atlantic_telegraph_company", "tilesets/wonders/atlantic_telegraph_company"
"b.baudhayana", "tilesets/wonders/baudhayana"
"b.colossus", "tilesets/wonders/colossus"
"b.copernicus_observatory", "tilesets/wonders/copernicus_observatory"
"b.cure_for_cancer", "tilesets/wonders/cure_for_cancer"
"b.darwins_voyage", "tilesets/wonders/darwins_voyage"
"b.ecclesiastical_palace", "tilesets/wonders/ecclesiastical_palace"
"b.eiffel_tower", "tilesets/wonders/eiffel_tower"
"b.guangzhou_port_facility", "tilesets/wonders/guangzhou_port_facility"
"b.great_library", "tilesets/wonders/great_library"
"b.great_wall", "tilesets/wonders/great_wall"
"b.hanging_gardens", "tilesets/wonders/hanging_gardens"
"b.hoover_dam", "tilesets/wonders/hoover_dam"
"b.hypogeum", "tilesets/wonders/hypogeum"
"b.internet", "tilesets/wonders/internet"
"b.isaac_newtons_college", "tilesets/wonders/isaac_newtons_college"
"b.js_bachs_cathedral", "tilesets/wonders/js_bachs_cathedral"
"b.king_richards_crusade", "tilesets/wonders/king_richards_crusade"
"b.leonardos_workshop", "tilesets/wonders/leonardos_workshop"
"b.lighthouse", "tilesets/wonders/lighthouse"
"b.magellans_expedition", "tilesets/wonders/magellans_expedition"
"b.manhattan_project", "tilesets/wonders/manhattan_project"
"b.marco_polos_embassy", "tilesets/wonders/marco_polos_embassy"
"b.mausoleum", "tilesets/wonders/mausoleum_of_halicarnassus"
"b.michelangelos_chapel", "tilesets/wonders/michelangelos_chapel"
"b.oracle", "tilesets/wonders/oracle"
"b.palace", "tilesets/wonders/palace"
"b.pyramids", "tilesets/wonders/pyramids"
"b.seti_program", "tilesets/wonders/seti_program"
"b.shakespeares_theatre", "tilesets/wonders/shakespeares_theatre"
"b.statue_of_liberty", "tilesets/wonders/statue_of_liberty"
"b.statue_of_zeus", "tilesets/wonders/statue_of_zeus"
"b.sun_tzus_war_academy", "tilesets/wonders/sun_tzus_war_academy"
"b.terracotta_army", "tilesets/wonders/terracotta_army"
"b.temple_of_artemis", "tilesets/wonders/temple_of_artemis"
"b.theparis", "tilesets/wonders/paris_agreement"
"b.trade_company", "tilesets/wonders/trade_company"
"b.united_nations", "tilesets/wonders/united_nations"
"b.verrocchios_workshop", "tilesets/wonders/verrocchios_workshop"
"b.whorganization", "tilesets/wonders/whorganization"
"b.womens_suffrage", "tilesets/wonders/womens_suffrage"
}
49 changes: 49 additions & 0 deletions data/misc/buildings.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ artists = "See tilesets/buildings/*.license files"
[extra]
sprites = {
"tag", "file"

; "buildings" - aka city improvements

"b.academy", "tilesets/buildings/academy-small"
"b.airport", "tilesets/buildings/airport-small"
"b.amphitheater", "tilesets/buildings/amphitheater-small"
Expand Down Expand Up @@ -61,4 +64,50 @@ sprites = {
"b.temple", "tilesets/buildings/temple-small"
"b.university", "tilesets/buildings/university-small"
"b.workshop", "tilesets/buildings/workshop-small"

; wonders - both small and great

"b.apollo_program", "tilesets/wonders/apollo_program-small"
"b.asmiths_trading_co", "tilesets/wonders/asmiths_trading_co-small"
"b.atlantic_telegraph_company", "tilesets/wonders/atlantic_telegraph_company-small"
"b.baudhayana", "tilesets/wonders/baudhayana-small"
"b.colossus", "tilesets/wonders/colossus-small"
"b.copernicus_observatory", "tilesets/wonders/copernicus_observatory-small"
"b.cure_for_cancer", "tilesets/wonders/cure_for_cancer-small"
"b.darwins_voyage", "tilesets/wonders/darwins_voyage-small"
"b.ecclesiastical_palace", "tilesets/wonders/ecclesiastical_palace-small"
"b.eiffel_tower", "tilesets/wonders/eiffel_tower-small"
"b.guangzhou_port_facility", "tilesets/wonders/guangzhou_port_facility-small"
"b.great_library", "tilesets/wonders/great_library-small"
"b.great_wall", "tilesets/wonders/great_wall-small"
"b.hanging_gardens", "tilesets/wonders/hanging_gardens-small"
"b.hoover_dam", "tilesets/wonders/hoover_dam-small"
"b.hypogeum", "tilesets/wonders/hypogeum-small"
"b.internet", "tilesets/wonders/internet-small"
"b.isaac_newtons_college", "tilesets/wonders/isaac_newtons_college-small"
"b.js_bachs_cathedral", "tilesets/wonders/js_bachs_cathedral-small"
"b.king_richards_crusade", "tilesets/wonders/king_richards_crusade-small"
"b.leonardos_workshop", "tilesets/wonders/leonardos_workshop-small"
"b.lighthouse", "tilesets/wonders/lighthouse-small"
"b.magellans_expedition", "tilesets/wonders/magellans_expedition-small"
"b.manhattan_project", "tilesets/wonders/manhattan_project-small"
"b.marco_polos_embassy", "tilesets/wonders/marco_polos_embassy-small"
"b.mausoleum", "tilesets/wonders/mausoleum_of_halicarnassus-small"
"b.michelangelos_chapel", "tilesets/wonders/michelangelos_chapel-small"
"b.oracle", "tilesets/wonders/oracle-small"
"b.palace", "tilesets/wonders/palace-small"
"b.pyramids", "tilesets/wonders/pyramids-small"
"b.seti_program", "tilesets/wonders/seti_program-small"
"b.shakespeares_theatre", "tilesets/wonders/shakespeares_theatre-small"
"b.statue_of_liberty", "tilesets/wonders/statue_of_liberty-small"
"b.statue_of_zeus", "tilesets/wonders/statue_of_zeus-small"
"b.sun_tzus_war_academy", "tilesets/wonders/sun_tzus_war_academy-small"
"b.terracotta_army", "tilesets/wonders/terracotta_army-small"
"b.temple_of_artemis", "tilesets/wonders/temple_of_artemis-small"
"b.theparis", "tilesets/wonders/paris_agreement-small"
"b.trade_company", "tilesets/wonders/trade_company-small"
"b.united_nations", "tilesets/wonders/united_nations-small"
"b.verrocchios_workshop", "tilesets/wonders/verrocchios_workshop-small"
"b.whorganization", "tilesets/wonders/whorganization-small"
"b.womens_suffrage", "tilesets/wonders/womens_suffrage-small"
}
56 changes: 0 additions & 56 deletions data/misc/wonders-large.spec

This file was deleted.

56 changes: 0 additions & 56 deletions data/misc/wonders.spec

This file was deleted.

0 comments on commit f795938

Please sign in to comment.