diff --git a/binaries/data/mods/public/art/actors/flora/trees/apple_top_a.xml b/binaries/data/mods/public/art/actors/flora/trees/apple_top_a.xml index 13aa2a4b0d..4ce4171c9f 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/apple_top_a.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/apple_top_a.xml @@ -13,6 +13,9 @@ gaia/tree_apple_a.dds + + gaia/orchard_apple_a.dds + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/apple_top_b.xml b/binaries/data/mods/public/art/actors/flora/trees/apple_top_b.xml index a1c1809fdb..41bea4254e 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/apple_top_b.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/apple_top_b.xml @@ -13,6 +13,9 @@ gaia/tree_apple_a.dds + + gaia/orchard_apple_a.dds + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/apple_top_c.xml b/binaries/data/mods/public/art/actors/flora/trees/apple_top_c.xml index d481f5a922..89d31c9586 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/apple_top_c.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/apple_top_c.xml @@ -13,6 +13,9 @@ gaia/tree_apple_a.dds + + gaia/orchard_apple_a.dds + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/apple_top_d.xml b/binaries/data/mods/public/art/actors/flora/trees/apple_top_d.xml index 4a9d674fce..e30f87879f 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/apple_top_d.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/apple_top_d.xml @@ -13,6 +13,9 @@ gaia/tree_apple_a.dds + + gaia/orchard_apple_a.dds + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/cypress_test.xml b/binaries/data/mods/public/art/actors/flora/trees/cypress_test.xml new file mode 100644 index 0000000000..d9d1cfeff7 --- /dev/null +++ b/binaries/data/mods/public/art/actors/flora/trees/cypress_test.xml @@ -0,0 +1,11 @@ + + + + + + gaia/cypress_test.dae + gaia/tree_cypress_b.png + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/flora/trees/pine.xml b/binaries/data/mods/public/art/actors/flora/trees/pine.xml index 744f95ec77..820658aa98 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/pine.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/pine.xml @@ -7,51 +7,57 @@ - + gaia/pine1.pmd - + gaia/pine2.pmd - + gaia/pine3.pmd - + gaia/pine4.pmd - + gaia/pine5.pmd - + gaia/pine6.pmd - + gaia/pine7.pmd - + gaia/pine8.pmd - + gaia/pine9.pmd - + gaia/pine10.pmd - + gaia/pine11.pmd - + gaia/pine12.pmd - + gaia/pine13.pmd - + gaia/pine14.pmd - + gaia/pine15.pmd + + gaia/tree_pine_02.dae + + + gaia/tree_pine_03.dae + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/pine_w.xml b/binaries/data/mods/public/art/actors/flora/trees/pine_w.xml index 8e7863421d..c3e0b9e6c3 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/pine_w.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/pine_w.xml @@ -1,14 +1,11 @@ - + - - gaia/pine_w.dds - gaia/pine1.pmd @@ -55,8 +52,12 @@ gaia/pine15.pmd + + gaia/tree_pine_02.dae + + + gaia/tree_pine_03.dae + - basic_trans.xml - diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml new file mode 100644 index 0000000000..be914fc205 --- /dev/null +++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_quarry.xml @@ -0,0 +1,10 @@ + + + + + + gaia/geo_stonemine_large.dae + gaia/stonequarry_desert.png + + + diff --git a/binaries/data/mods/public/art/actors/props/flora/grass.xml b/binaries/data/mods/public/art/actors/props/flora/grass.xml deleted file mode 100644 index 113213a26d..0000000000 --- a/binaries/data/mods/public/art/actors/props/flora/grass.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - gaia/wrld_fol_sprite.pmd - - - - - - gaia/wrld_fol_grass1.dds - - - gaia/wrld_fol_grass2.dds - - - gaia/wrld_fol_grass3.dds - - - gaia/wrld_fol_grass4.dds - - - gaia/wrld_fol_grass5.dds - - - gaia/wrld_fol_grass6.dds - - - gaia/wrld_fol_grass7.dds - - - gaia/wrld_fol_grass8.dds - - - gaia/wrld_fol_grass9.dds - - - gaia/wrld_fol_grass10.dds - - - gaia/wrld_fol_grass11.dds - - - gaia/wrld_fol_grass12.dds - - - gaia/wrld_fol_grass13.dds - - - gaia/wrld_fol_grass14.dds - - - gaia/wrld_fol_grass15.dds - - - gaia/wrld_fol_grass16.dds - - - - basic_trans.xml - - diff --git a/binaries/data/mods/public/art/actors/props/flora/grass_tall.xml b/binaries/data/mods/public/art/actors/props/flora/grass_tall.xml deleted file mode 100644 index 3302c18ba3..0000000000 --- a/binaries/data/mods/public/art/actors/props/flora/grass_tall.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - gaia/wrld_plant_grass_tall_a.dds - - - - - - gaia/wrld_fol_grass_tall1.pmd - - - gaia/wrld_fol_grass_tall2.pmd - - - gaia/wrld_fol_grass_tall3.pmd - - - gaia/wrld_fol_grass_tall4.pmd - - - - basic_trans.xml - - diff --git a/binaries/data/mods/public/art/actors/structures/celts/market_new.xml b/binaries/data/mods/public/art/actors/structures/celts/market_new.xml index 57b6447216..f8a1ef9a23 100644 --- a/binaries/data/mods/public/art/actors/structures/celts/market_new.xml +++ b/binaries/data/mods/public/art/actors/structures/celts/market_new.xml @@ -7,7 +7,7 @@ - + structural/celt_struct_1.dds diff --git a/binaries/data/mods/public/art/meshes/gaia/cypress_test.dae b/binaries/data/mods/public/art/meshes/gaia/cypress_test.dae new file mode 100644 index 0000000000..bc2197707c --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/cypress_test.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab553fab24ca1417f8efab652e0750ff8e1adbcdba410db33943db3661bff8be +size 8165 diff --git a/binaries/data/mods/public/art/meshes/gaia/geo_stonemine_large.dae b/binaries/data/mods/public/art/meshes/gaia/geo_stonemine_large.dae new file mode 100644 index 0000000000..89665e2c33 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/geo_stonemine_large.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84c5f46cdc632d310787e8b4b99f996b9fbe048ca5580e5c0aa3dbb654dec657 +size 69540 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_pine_02.dae b/binaries/data/mods/public/art/meshes/gaia/tree_pine_02.dae new file mode 100644 index 0000000000..4a97b1f286 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_pine_02.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6899aecb72cb52d424226907cf2e1836a1898409284f9ab06aaa367063f8c90 +size 19231 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_pine_03.dae b/binaries/data/mods/public/art/meshes/gaia/tree_pine_03.dae new file mode 100644 index 0000000000..ec2e9d4776 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_pine_03.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7ef1375ec1ac9f488b7d06dcafc7a1991abd4c84a13aacf473170e380e3c094 +size 18353 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/pine_w.dds b/binaries/data/mods/public/art/textures/skins/gaia/pine_w.dds index cbacb190e4..96e2944df4 100644 --- a/binaries/data/mods/public/art/textures/skins/gaia/pine_w.dds +++ b/binaries/data/mods/public/art/textures/skins/gaia/pine_w.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6563035be077ecad0408752a63a84f07de1e6aa52d39cb4bbcc089840d0cfb0 +oid sha256:9fddea623519fef49a5c65e264609f846988ef539634f3793995ce0e68a50e36 size 349680 diff --git a/binaries/data/mods/public/art/textures/skins/structural/field_01.dds b/binaries/data/mods/public/art/textures/skins/structural/field_01.dds index 697bf72373..b4c91b4e09 100644 --- a/binaries/data/mods/public/art/textures/skins/structural/field_01.dds +++ b/binaries/data/mods/public/art/textures/skins/structural/field_01.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6a99dbb63b640b146d524212193bc9668c27657659494096e7d042217fb36ae +oid sha256:f58f585bf6f1fc36dfc67030ec670b8ff1de51daa26cb07074d6f8f50dda2b1b size 349680 diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_grass_wild.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_grass_wild.dds index 09308faf30..73f0028a16 100644 --- a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_grass_wild.dds +++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_grass_wild.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b33b865fc1afbdb21b35ae6be8d9ac06786c8750646f1021f5719188e176d3 -size 349680 +oid sha256:bc1c117c8a85170cf9be6018451e2633b03f10d70c0125aee4f43f1b0624c031 +size 174904 diff --git a/binaries/data/mods/public/art/textures/terrain/types/special/farmland_a.png b/binaries/data/mods/public/art/textures/terrain/types/special/farmland_a.png new file mode 100644 index 0000000000..84a8620358 --- /dev/null +++ b/binaries/data/mods/public/art/textures/terrain/types/special/farmland_a.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d57d4c79bd739b0578e45bb5f55fcd4fe1af5da9a69f4b6563a680d366ef404 +size 666307 diff --git a/binaries/data/mods/public/maps/scenarios/Gold_Rush.pmp b/binaries/data/mods/public/maps/scenarios/Gold_Rush.pmp index ea401c5534..2088860cd4 100644 --- a/binaries/data/mods/public/maps/scenarios/Gold_Rush.pmp +++ b/binaries/data/mods/public/maps/scenarios/Gold_Rush.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d231aa8878cc6ea9b78868d637c528f6f9683e2bf0e9533c131a90840b9598a -size 370027 +oid sha256:6753c61f05dc78b71443a1ab3a90246e649c66c4d0e014b85a295f44cf639f23 +size 370047 diff --git a/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml b/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml index 51c3715417..a45868d4be 100644 --- a/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml +++ b/binaries/data/mods/public/maps/scenarios/Gold_Rush.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ebdd6f1c81abc289a304508fa282ba3c08efe8c816132e69e30a87adda2efda -size 169298 +oid sha256:1317a759ed47efba32787c324ce66728596413493c6b669286d9798b9e3f7b74 +size 168952 diff --git a/binaries/data/mods/public/maps/scenarios/Macedonian Highlands.xml b/binaries/data/mods/public/maps/scenarios/Macedonian Highlands.xml index 62e9f943b4..41549fb54b 100644 --- a/binaries/data/mods/public/maps/scenarios/Macedonian Highlands.xml +++ b/binaries/data/mods/public/maps/scenarios/Macedonian Highlands.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:256c8409fe5df4ae5a6b47645e7b6d38e25b9b0f91324be5e2d1d07c4ff3bcc6 -size 507590 +oid sha256:28b3bd23c4f0e99c79d629ba6d0f50b47adeedd1763f8dc66d2030eeee2cc9fd +size 507591 diff --git a/binaries/data/mods/public/maps/scenarios/Serengeti.xml b/binaries/data/mods/public/maps/scenarios/Serengeti.xml index 27c0a0d873..aed4a24594 100644 --- a/binaries/data/mods/public/maps/scenarios/Serengeti.xml +++ b/binaries/data/mods/public/maps/scenarios/Serengeti.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41fc7a3ba3f2ba01833f09e49b97bd2adb6454f1459d3f180dc6120a1b898e0b -size 494529 +oid sha256:1d5851918e35ba05562c6c627b69be4e459c50b20fa22ff9346b4a1e499e1772 +size 496412 diff --git a/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.pmp b/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.pmp new file mode 100644 index 0000000000..183736abed --- /dev/null +++ b/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.pmp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44b87753a0f29f8108097e2e8d82b276f2136dc1d65584c8ae264acf0a4cff94 +size 370103 diff --git a/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.xml b/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.xml new file mode 100644 index 0000000000..7141c3c90a --- /dev/null +++ b/binaries/data/mods/public/maps/scenarios/The Massacre of Delphi.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2741b71bd620ddc1966a305ac6bc2a399e8e698c99010817942908c0a434a48a +size 510905 diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml index 7999581738..edf3c3a487 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml @@ -3,7 +3,7 @@ Baobab 3 - The baobab is the giant African tree that dots the landscape of the African savannah. + The baobab is the giant African tree that dots the landscape of the African savanna. 400 diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml new file mode 100644 index 0000000000..4e477a3a1c --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml @@ -0,0 +1,19 @@ + + + + Fig + 3 + The Common Fig is widely grown for its edible fruit throughout its natural range in the Mediterranean region, North Africa, Persia, and northern India. + + + 500 + food.fruit + + + flora/trees/fig.xml + + + + 10.0 + + diff --git a/binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml b/binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml new file mode 100644 index 0000000000..eb7b4e1161 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/gaia/geology_stonemine_desert_quarry.xml @@ -0,0 +1,6 @@ + + + + geology/stonemine_desert_quarry.xml + + diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml new file mode 100644 index 0000000000..79f415faca --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml @@ -0,0 +1,21 @@ + + + + pitch-roll + + + 5000 + + + 6.0 + 0.6 + 8.0 + + + + 3.5 + + + + +