diff --git a/binaries/data/mods/official/art/actors/props/units/heads/head_celt_su3.xml b/binaries/data/mods/official/art/actors/props/units/heads/head_celt_su3.xml new file mode 100644 index 0000000000..6777feefaf --- /dev/null +++ b/binaries/data/mods/official/art/actors/props/units/heads/head_celt_su3.xml @@ -0,0 +1,24 @@ + + + + + + + + props/head_beard_small.pmd + + + props/head_beard_large.pmd + + + props/head_beard_wide.pmd + + + + + + props/head/celt_face_su3.dds + + + + diff --git a/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran.xml b/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran.xml index 42a971d47e..5f62902ecf 100644 --- a/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran.xml +++ b/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran.xml @@ -11,6 +11,24 @@ + + + 255 205 125 + + + 184 151 98 + + + 8 8 8 + + + 255 250 187 + + + 250 130 78 + + + objectcolor.xml diff --git a/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran_cin.xml b/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran_cin.xml index ac97200617..b0e084a125 100644 --- a/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran_cin.xml +++ b/binaries/data/mods/official/art/actors/props/units/heads/rome_head_veteran_cin.xml @@ -11,6 +11,24 @@ + + + 255 205 125 + + + 184 151 98 + + + 8 8 8 + + + 255 250 187 + + + 250 130 78 + + + objectcolor.xml diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_1.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_1.xml index bec64f87c3..63f66257cb 100644 --- a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_1.xml +++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_1.xml @@ -5,7 +5,7 @@ - props/shield/round_s_f.pmd + props/shield/round_r_f.pmd diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_2.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_2.xml index 8968f35b6b..f1e8abae80 100644 --- a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_2.xml +++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_hero_2.xml @@ -5,7 +5,7 @@ - props/shield/round_s_f.pmd + props/shield/round_b_f.pmd diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_legionnaire.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_legionnaire.xml new file mode 100644 index 0000000000..eeea9ce778 --- /dev/null +++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_legionnaire.xml @@ -0,0 +1,23 @@ + + + + + + + + props/shield/scutum_r_f.pmd + + + + + + + + + props/shield/rome_imp_scutum_a.dds + + + + player_trans.xml + + diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_su.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_su.xml index c4f024d93f..846402df52 100644 --- a/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_su.xml +++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_scutum_su.xml @@ -13,9 +13,6 @@ - - props/shield/rome_tower_h.dds - props/shield/rome_tower_k.dds diff --git a/binaries/data/mods/official/art/actors/temp/roman-legionnaire.xml b/binaries/data/mods/official/art/actors/temp/roman-legionnaire.xml index 92599905ea..cee9eddeca 100644 --- a/binaries/data/mods/official/art/actors/temp/roman-legionnaire.xml +++ b/binaries/data/mods/official/art/actors/temp/roman-legionnaire.xml @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - + skeletal/rome_su3_legion.dds diff --git a/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml b/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml index 80bf8b8bf1..b295425b3d 100644 --- a/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml +++ b/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml @@ -22,7 +22,7 @@ skeletal/m_pants_c.pmd - + diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml index d5c18e4552..8200cb979d 100644 --- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml +++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml @@ -11,7 +11,11 @@ - skeletal/elephant.pmd + test/elephaunt propped.pmd + + + + diff --git a/binaries/data/mods/official/art/actors/units/romans/super_unit_3.xml b/binaries/data/mods/official/art/actors/units/romans/super_unit_3.xml index d970704069..cee9eddeca 100644 --- a/binaries/data/mods/official/art/actors/units/romans/super_unit_3.xml +++ b/binaries/data/mods/official/art/actors/units/romans/super_unit_3.xml @@ -6,6 +6,7 @@ + @@ -14,19 +15,13 @@ - - - - - - skeletal/m_tunic_b.pmd - + skeletal/rome_su3_legion.dds diff --git a/binaries/data/mods/official/art/textures/skins/props/head/alexander.dds b/binaries/data/mods/official/art/textures/skins/props/head/alexander.dds index 4c29b14eaf..3761d3b07a 100644 --- a/binaries/data/mods/official/art/textures/skins/props/head/alexander.dds +++ b/binaries/data/mods/official/art/textures/skins/props/head/alexander.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1b344640a310c1f29d8172a7f5741cd94681796e7efc5d5a961b77eef25d2bc +oid sha256:66e845a9ce7ebd36b249d4c81c5086a999ea194d8cf4882652b49adad844a70d size 22000 diff --git a/binaries/data/mods/official/art/textures/skins/props/head/celt_face_su3.dds b/binaries/data/mods/official/art/textures/skins/props/head/celt_face_su3.dds new file mode 100644 index 0000000000..8ae545bbf7 --- /dev/null +++ b/binaries/data/mods/official/art/textures/skins/props/head/celt_face_su3.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32be5c7b51fe6edd48c0f29f1cafca3e8063f60ce887f4dbd0709aa3be13cbea +size 5616 diff --git a/binaries/data/mods/official/art/textures/skins/props/head/rome_veteran.dds b/binaries/data/mods/official/art/textures/skins/props/head/rome_veteran.dds index 212a0e839d..1acf71d2e2 100644 --- a/binaries/data/mods/official/art/textures/skins/props/head/rome_veteran.dds +++ b/binaries/data/mods/official/art/textures/skins/props/head/rome_veteran.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9408fe68b286f454afaef8201bf2a57a351b5182e456d68272389ce45fee182a +oid sha256:aaac9e02a23c73094e9ec71497e8f178481867174234ab0de9e6a9dee63190d6 size 5616 diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/mace_round_back.dds b/binaries/data/mods/official/art/textures/skins/props/shield/mace_round_back.dds index 14ae253063..23eaf5b7bc 100644 --- a/binaries/data/mods/official/art/textures/skins/props/shield/mace_round_back.dds +++ b/binaries/data/mods/official/art/textures/skins/props/shield/mace_round_back.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2c2ae0f17d6f7d365e78295744bdc296e5d57e8f0fbeed9bdae97172335274c +oid sha256:8eaaf07cfdd01b9e6bac0c8b86fa2c5dedec2b529e9722ffd4f36e57416dfa81 size 5616 diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/rome_imp_scutum_a.dds b/binaries/data/mods/official/art/textures/skins/props/shield/rome_imp_scutum_a.dds new file mode 100644 index 0000000000..a3df0c1b19 --- /dev/null +++ b/binaries/data/mods/official/art/textures/skins/props/shield/rome_imp_scutum_a.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f7470c89801bd057ac988bae0ab2db698676a095aa01f1a785d4e0f593530b0 +size 11088 diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/rome_su3_legion.dds b/binaries/data/mods/official/art/textures/skins/skeletal/rome_su3_legion.dds index c64ebbb785..f324cc5154 100644 --- a/binaries/data/mods/official/art/textures/skins/skeletal/rome_su3_legion.dds +++ b/binaries/data/mods/official/art/textures/skins/skeletal/rome_su3_legion.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceecfb519d37d761a4b8e7847776809dab041c2a4a9bc3a5cb220c94665928ce +oid sha256:1a78a3091346fbab4dfa5168dc48625ee5af5635f93031d8abb42d419120894a size 22000 diff --git a/binaries/data/mods/official/entities/template_entity_full.xml b/binaries/data/mods/official/entities/template_entity_full.xml index 21364da1e5..650b5271c8 100644 --- a/binaries/data/mods/official/entities/template_entity_full.xml +++ b/binaries/data/mods/official/entities/template_entity_full.xml @@ -1,8 +1,6 @@ - + diff --git a/binaries/data/mods/official/entities/units/celt_super_infantry.xml b/binaries/data/mods/official/entities/units/celt_super_infantry.xml index e762823578..3d1c564283 100644 --- a/binaries/data/mods/official/entities/units/celt_super_infantry.xml +++ b/binaries/data/mods/official/entities/units/celt_super_infantry.xml @@ -1,17 +1,15 @@ - + - Briton Cruthni + Soldurii Celts - The Picts were famous for their habit of covering themselves in blue war paint and fighting completely naked long after other peoples had ceased to. While there are serious questions about their origins, the Picts often fought with and against their Briton neighbors armed with primitive crossbows. Their guerilla style of fighting was seen as dishonorable in Celtic eyes but they were renowned for their tenacity. + Gaulic swordsman. diff --git a/binaries/data/mods/official/entities/units/celt_super_infantry_britons.xml b/binaries/data/mods/official/entities/units/celt_super_infantry_britons.xml index 39ed6244d6..50f9535f81 100644 --- a/binaries/data/mods/official/entities/units/celt_super_infantry_britons.xml +++ b/binaries/data/mods/official/entities/units/celt_super_infantry_britons.xml @@ -5,7 +5,7 @@ - Briton Soldurii + Delamokludda Celts diff --git a/binaries/data/mods/official/entities/units/hele_super_cavalry_m.xml b/binaries/data/mods/official/entities/units/hele_super_cavalry_m.xml index f22f822351..3339e2eda0 100644 --- a/binaries/data/mods/official/entities/units/hele_super_cavalry_m.xml +++ b/binaries/data/mods/official/entities/units/hele_super_cavalry_m.xml @@ -11,7 +11,7 @@ Hellenes - Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, whom increased their number from 600 to several thousand. The Companion Cavalry was also a preferred general stand. + Macedonian noblemen made up this elite cavalry unit, which was key to victory for Macedonian kings starting with Philip II, who increased their number from 600 to several thousand. The Companion Cavalry was also a preferred general stand. diff --git a/binaries/data/mods/official/entities/units/iber_cavalry_swordsman_b.xml b/binaries/data/mods/official/entities/units/iber_cavalry_swordsman_b.xml index 15bb16213f..531267701e 100644 --- a/binaries/data/mods/official/entities/units/iber_cavalry_swordsman_b.xml +++ b/binaries/data/mods/official/entities/units/iber_cavalry_swordsman_b.xml @@ -1,8 +1,6 @@ - + diff --git a/binaries/data/mods/official/entities/units/pers_super_cavalry.xml b/binaries/data/mods/official/entities/units/pers_super_cavalry.xml index f600c801fd..84200d9967 100644 --- a/binaries/data/mods/official/entities/units/pers_super_cavalry.xml +++ b/binaries/data/mods/official/entities/units/pers_super_cavalry.xml @@ -28,6 +28,18 @@ 500 + + 2.8 + 9.0 + + + + 3.5 + 40.0 + 20.0 + 30.0 + + diff --git a/binaries/data/mods/official/maps/random/cantabrian_highlands.js b/binaries/data/mods/official/maps/random/cantabrian_highlands.js index 06acb9cc0d..406731d06b 100644 --- a/binaries/data/mods/official/maps/random/cantabrian_highlands.js +++ b/binaries/data/mods/official/maps/random/cantabrian_highlands.js @@ -4,30 +4,30 @@ const SIZE = 208; 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|flora_tree_oak"; -const tGrassDirt75 = "sand_grass_75"; -const tGrassDirt50 = "sand_grass_50"; -const tGrassDirt25 = "sand_grass_25"; -const tDirt = "sand_path"; -const tGrassPatch = "grass1_dense"; -const tShore = "sand_path"; -const tShoreBlend = "sand_grass_50"; -const tWater = "sand_path"; +const tGrass = ["grass_temperate_pasture_a", "grass_temperate_pasture_b"]; +const tGrassForest = "grass_temperate_a"; +const tCliff = ["cliff_temperate_granite", "cliff_temperate_brown"]; +const tForest = "forestfloor_temperate_a"; +const tGrassDirt75 = "grass_temperate_dirt_2"; +const tGrassDirt50 = "grass_temperate_dirt_b"; +const tGrassDirt25 = "grass_temperate_dry_dirt"; +const tDirt = "dirt_temperate_b_dry"; +const tGrassPatch = "grass_temperate_field_wild"; +const tShore = "shoreline_temperate_rocks"; +const tShoreBlend = "shoreline_temperate_rocks_dirt"; +const tWater = "sand_temperate_vegetation"; const oTree = "flora_tree_oak"; -const oTreeLarge = "flora/trees/oak_large.xml"; +const oTreeLarge = "flora_tree_oak"; 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 oMine = "geology_stone_temperate"; +const oGrass = "props/flora/grass_temp_field.xml"; const oGrassShort = "props/flora/grass_field_lush_short.xml"; -const oReeds = "props/flora/reeds_pond_dry.xml"; +const oReeds = "props/flora/grass_temp_field_dry.xml"; const oRockLarge = "geology/stone_granite_large.xml"; -const oRockMedium = "geology/stone_granite_med.xml"; +const oRockMedium = "flora_bush_temperate"; const oBushMedium = "props/flora/bush_tempe_me.xml"; const oBushSmall = "props/flora/bush_tempe_sm.xml"; @@ -67,7 +67,7 @@ for(i=1; i<=NUM_PLAYERS; i++) { // some constants radius = 17; cliffRadius = 2; - elevation = 15; + elevation = 20; // get the x and y in tiles fx = fractionToTiles(playerX[i]);