From 3dc4d7d1840146592f7b2fceefd7d8bcea86b084 Mon Sep 17 00:00:00 2001 From: Acumen Date: Fri, 16 Dec 2005 05:37:27 +0000 Subject: [PATCH] Removed the gaia_ designation from gaia entities, at Jason's request. This was SVN commit r3254. --- .../actors/units/hellenes/themistocles.xml | 32 +++++++++++++++++++ .../portraits/ui_portrait_sheet_civ_cart.dds | 3 ++ .../{gaia_fauna_deer.xml => fauna_deer.xml} | 0 .../{gaia_fauna_pig.xml => fauna_pig.xml} | 0 ...gaia_fauna_rabbit.xml => fauna_rabbit.xml} | 0 .../{gaia_fauna_sheep.xml => fauna_sheep.xml} | 0 ...ra_bush_berry.xml => flora_bush_berry.xml} | 0 ...a_flora_carob.xml => flora_tree_carob.xml} | 0 ...{gaia_flora_oak.xml => flora_tree_oak.xml} | 0 ...aia_flora_pine.xml => flora_tree_pine.xml} | 0 ...flora_poplar.xml => flora_tree_poplar.xml} | 0 ...rdy.xml => flora_tree_poplar_lombardy.xml} | 0 ...rock_light.xml => geology_stone_light.xml} | 0 ..._settlement.xml => special_settlement.xml} | 0 .../maps/random/cantabrian_highlands.js | 12 +++---- .../maps/random/neareastern_badlands.js | 8 ++--- .../maps/scenarios/cantabrian_generated.pmp | 2 +- .../maps/scenarios/cantabrian_generated.xml | 4 +-- .../maps/scenarios/neareastern_generated.pmp | 2 +- .../maps/scenarios/neareastern_generated.xml | 4 +-- 20 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 binaries/data/mods/official/art/actors/units/hellenes/themistocles.xml create mode 100644 binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_cart.dds rename binaries/data/mods/official/entities/gaia/{gaia_fauna_deer.xml => fauna_deer.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_fauna_pig.xml => fauna_pig.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_fauna_rabbit.xml => fauna_rabbit.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_fauna_sheep.xml => fauna_sheep.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_bush_berry.xml => flora_bush_berry.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_carob.xml => flora_tree_carob.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_oak.xml => flora_tree_oak.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_pine.xml => flora_tree_pine.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_poplar.xml => flora_tree_poplar.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_flora_poplar_lombardy.xml => flora_tree_poplar_lombardy.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_rock_light.xml => geology_stone_light.xml} (100%) rename binaries/data/mods/official/entities/gaia/{gaia_special_settlement.xml => special_settlement.xml} (100%) diff --git a/binaries/data/mods/official/art/actors/units/hellenes/themistocles.xml b/binaries/data/mods/official/art/actors/units/hellenes/themistocles.xml new file mode 100644 index 0000000000..35cbefc692 --- /dev/null +++ b/binaries/data/mods/official/art/actors/units/hellenes/themistocles.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + skeletal/m_tunic_b.pmd + + + + + + + skeletal/hele_themistocles.dds + + + + player_trans.xml + + diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_cart.dds b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_cart.dds new file mode 100644 index 0000000000..65d52cae03 --- /dev/null +++ b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_cart.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:292f6dda827447040c2ce99d3014f958ff43f8dca756b4bd2e1d1562afdb430a +size 131200 diff --git a/binaries/data/mods/official/entities/gaia/gaia_fauna_deer.xml b/binaries/data/mods/official/entities/gaia/fauna_deer.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_fauna_deer.xml rename to binaries/data/mods/official/entities/gaia/fauna_deer.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_fauna_pig.xml b/binaries/data/mods/official/entities/gaia/fauna_pig.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_fauna_pig.xml rename to binaries/data/mods/official/entities/gaia/fauna_pig.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_fauna_rabbit.xml b/binaries/data/mods/official/entities/gaia/fauna_rabbit.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_fauna_rabbit.xml rename to binaries/data/mods/official/entities/gaia/fauna_rabbit.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_fauna_sheep.xml b/binaries/data/mods/official/entities/gaia/fauna_sheep.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_fauna_sheep.xml rename to binaries/data/mods/official/entities/gaia/fauna_sheep.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_bush_berry.xml b/binaries/data/mods/official/entities/gaia/flora_bush_berry.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_bush_berry.xml rename to binaries/data/mods/official/entities/gaia/flora_bush_berry.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_carob.xml b/binaries/data/mods/official/entities/gaia/flora_tree_carob.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_carob.xml rename to binaries/data/mods/official/entities/gaia/flora_tree_carob.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_oak.xml b/binaries/data/mods/official/entities/gaia/flora_tree_oak.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_oak.xml rename to binaries/data/mods/official/entities/gaia/flora_tree_oak.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_pine.xml b/binaries/data/mods/official/entities/gaia/flora_tree_pine.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_pine.xml rename to binaries/data/mods/official/entities/gaia/flora_tree_pine.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_poplar.xml b/binaries/data/mods/official/entities/gaia/flora_tree_poplar.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_poplar.xml rename to binaries/data/mods/official/entities/gaia/flora_tree_poplar.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_flora_poplar_lombardy.xml b/binaries/data/mods/official/entities/gaia/flora_tree_poplar_lombardy.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_flora_poplar_lombardy.xml rename to binaries/data/mods/official/entities/gaia/flora_tree_poplar_lombardy.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_rock_light.xml b/binaries/data/mods/official/entities/gaia/geology_stone_light.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_rock_light.xml rename to binaries/data/mods/official/entities/gaia/geology_stone_light.xml diff --git a/binaries/data/mods/official/entities/gaia/gaia_special_settlement.xml b/binaries/data/mods/official/entities/gaia/special_settlement.xml similarity index 100% rename from binaries/data/mods/official/entities/gaia/gaia_special_settlement.xml rename to binaries/data/mods/official/entities/gaia/special_settlement.xml diff --git a/binaries/data/mods/official/maps/random/cantabrian_highlands.js b/binaries/data/mods/official/maps/random/cantabrian_highlands.js index 08355b6045..0fc4077442 100644 --- a/binaries/data/mods/official/maps/random/cantabrian_highlands.js +++ b/binaries/data/mods/official/maps/random/cantabrian_highlands.js @@ -7,7 +7,7 @@ const NUM_PLAYERS = 4; const tGrass = ["grass1_a", "grass_highlands_a", "grass1_a"]; const tGrassForest = "grass_forest_floor_oak"; const tCliff = ["cliff_greekb", "cliff_greekb", "cliff_greekb_moss"]; -const tForest = "forrestfloor|gaia_flora_oak"; +const tForest = "forrestfloor|flora_tree_oak"; const tGrassDirt75 = "sand_grass_75"; const tGrassDirt50 = "sand_grass_50"; const tGrassDirt25 = "sand_grass_25"; @@ -17,12 +17,12 @@ const tShore = "sand_path"; const tShoreBlend = "sand_grass_50"; const tWater = "sand_path"; -const oTree = "gaia_flora_oak"; +const oTree = "flora_tree_oak"; const oTreeLarge = "flora/trees/oak_large.xml"; -const oBerryBush = "gaia_flora_bush_berry"; -const oSheep = "gaia_fauna_sheep"; -const oDeer = "gaia_fauna_deer"; -const oMine = "gaia_rock_light"; +const oBerryBush = "flora_bush_berry"; +const oSheep = "fauna_sheep"; +const oDeer = "fauna_deer"; +const oMine = "geology_stone_light"; const oGrass = "props/flora/grass_field_lush_tall.xml"; const oGrassShort = "props/flora/grass_field_lush_short.xml"; const oReeds = "props/flora/reeds_pond_dry.xml"; diff --git a/binaries/data/mods/official/maps/random/neareastern_badlands.js b/binaries/data/mods/official/maps/random/neareastern_badlands.js index 0bf6f0a9a9..87b9e46011 100644 --- a/binaries/data/mods/official/maps/random/neareastern_badlands.js +++ b/binaries/data/mods/official/maps/random/neareastern_badlands.js @@ -18,11 +18,11 @@ const tWater = "water_2"; const tWaterDeep = "water_3"; const oTree = "flora/trees/palm_b.xml"; -const oBerryBush = "gaia_flora_bush_berry"; +const oBerryBush = "flora_bush_berry"; const oBush = "props/flora/bush_dry_a.xml"; -const oSheep = "gaia_fauna_sheep"; -const oDeer = "gaia_fauna_deer"; -const oMine = "gaia_rock_light"; +const oSheep = "fauna_sheep"; +const oDeer = "fauna_deer"; +const oMine = "geology_stone_light"; const oDecorativeRock = "geology/gray1.xml"; // some utility functions to save typing diff --git a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp index 67031d07a5..a219db5d37 100644 --- a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp +++ b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0195d23bbfe04daf35884e73180d3dfb82f1e9ff2a351348d0db059d3f6ce2ff +oid sha256:61823c2bc92a1fa01f51e0ba70632bedcf5238af1e6545be5a118f6c812dfc38 size 433730 diff --git a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml index 6f7de7e699..9c7983f635 100644 --- a/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml +++ b/binaries/data/mods/official/maps/scenarios/cantabrian_generated.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff4379492fdfa4a9e79cd86f0617e60f2df0d93f0fd8f4bbf7d0c254e7f211bd -size 1146449 +oid sha256:a0e1aeb711c64dd2dd5daaa92c9f248e786d3284776a9f0de9b820bf3708ebef +size 1170683 diff --git a/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp b/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp index 0a19227ab1..d109aee276 100644 --- a/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp +++ b/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f287faf9e0f58e27b1eebd914b1a73eac5f072d1ba2a8968f59016f489f9405e +oid sha256:02cda1596f8d6b5675cd8c9730302ceecc311fc59494d064b174dbfe3d26160f size 433620 diff --git a/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml b/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml index c5612e5816..70261413e5 100644 --- a/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml +++ b/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6544af8f164e2f46bd0e0ace92109fa27253f5847176c907233a62e05eb5de14 -size 236510 +oid sha256:87678a34d56d54afac16b3395ba204fdbd8bf08f0120d86f7946160662ee67d6 +size 247080