diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml index d6b34f7f87..a700544ca9 100644 --- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml +++ b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_01_prop.xml @@ -1,15 +1,11 @@ - + - - - + props/pers_alt_build_01_prop.dae structural/pers_struct.dds - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml index e7cc3e78fc..2fa379ad81 100644 --- a/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml +++ b/binaries/data/mods/public/art/actors/props/structures/persians/alt_building_03.xml @@ -1,11 +1,14 @@ - + props/pers_alt_build_03.dae - structural/pers_struct.dds + + + + structural/pers_struct.dds diff --git a/binaries/data/mods/public/art/actors/units/hellenes/thespian.xml b/binaries/data/mods/public/art/actors/units/hellenes/thespian.xml index 11aea859af..6ab9960e17 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/thespian.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/thespian.xml @@ -30,15 +30,18 @@ - + skeletal/thespian_a.dds - + skeletal/thespian_b.dds - + skeletal/thespian_c.dds + + skeletal/hele_isp_a_1.dds + player_trans.xml diff --git a/binaries/data/mods/public/maps/scenarios/Oasis IX.pmp b/binaries/data/mods/public/maps/scenarios/Oasis IX.pmp index 9bf851232e..1261c4cf6c 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis IX.pmp +++ b/binaries/data/mods/public/maps/scenarios/Oasis IX.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bedfbc9558bd0d8b398eaa12b072855401e31065fe3a7618d1896cb9ae357ea9 -size 657017 +oid sha256:dd0ccbe03615e029a16e3e4a64a97f4c24c7e1472b20cd5866be6d08a7d1a08c +size 657069 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis IX.xml b/binaries/data/mods/public/maps/scenarios/Oasis IX.xml index c729fa0a26..bd74e7bb75 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis IX.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis IX.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91f5034a8fa617a93997a52685183558943b94658a7c1c02c44ec3b1537ffac4 -size 233752 +oid sha256:189c483120e77f211a9e257547c06555e724d5face6f337633acf7702f2999d3 +size 241582 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis X.pmp b/binaries/data/mods/public/maps/scenarios/Oasis X.pmp index 9bf851232e..0e5bbd0b40 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis X.pmp +++ b/binaries/data/mods/public/maps/scenarios/Oasis X.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bedfbc9558bd0d8b398eaa12b072855401e31065fe3a7618d1896cb9ae357ea9 +oid sha256:d23ed2378c3750d8aefeff3653cafbd5829f348de2ad5c04c42064dd549041e2 size 657017 diff --git a/binaries/data/mods/public/maps/scenarios/Oasis X.xml b/binaries/data/mods/public/maps/scenarios/Oasis X.xml index ed922b13b5..701fe36667 100644 --- a/binaries/data/mods/public/maps/scenarios/Oasis X.xml +++ b/binaries/data/mods/public/maps/scenarios/Oasis X.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1585ae6dd7d8749766265dc381f29fc04012b23e396ae9d5f752c96509ea205e -size 235692 +oid sha256:83a8cffd8189c0041d8216d681b8833e6f05c25fd6adcd20abccb367ec3b4a8f +size 235868 diff --git a/binaries/data/mods/public/simulation/components/Formation.js b/binaries/data/mods/public/simulation/components/Formation.js index 28314285ab..3a1d8f29e5 100644 --- a/binaries/data/mods/public/simulation/components/Formation.js +++ b/binaries/data/mods/public/simulation/components/Formation.js @@ -3,7 +3,7 @@ function Formation() {} Formation.prototype.Schema = ""; -var g_ColumnDistanceThreshold = 96; // distance at which we'll switch between column/box formations +var g_ColumnDistanceThreshold = 128; // distance at which we'll switch between column/box formations Formation.prototype.Init = function() { diff --git a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml index 27fab1701c..aa00c1c1c6 100644 --- a/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml +++ b/binaries/data/mods/public/simulation/templates/other/unfinished_greek_temple.xml @@ -18,6 +18,9 @@ + + 2000 + 6.0 0.6 diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_sb1.xml b/binaries/data/mods/public/simulation/templates/structures/iber_sb1.xml index a54578ea65..b0376710cf 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_sb1.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_sb1.xml @@ -35,6 +35,9 @@ attack/destruction/building_collapse_large.xml + + true + structures/iberians/sb_1.xml structures/fndn_2x2.xml