From a9417be8998f90ade1cc8490b797d330ef42356c Mon Sep 17 00:00:00 2001 From: Enrique Date: Mon, 8 Oct 2012 00:51:24 +0000 Subject: [PATCH] Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles. This was SVN commit r12742. --- .../props/structures/decals/destruct_2x2.xml | 12 ++ .../props/structures/decals/destruct_6x6.xml | 2 +- .../structures/decals/destruct_wall_long.xml | 12 ++ .../decals/destruct_wall_medium.xml | 12 ++ .../structures/decals/destruct_wall_short.xml | 12 ++ .../actors/structures/destruct_stone_2x2.xml | 17 ++ .../structures/destruct_stone_wall_long.xml | 2 +- .../structures/destruct_stone_wall_medium.xml | 2 +- .../structures/destruct_stone_wall_short.xml | 2 +- .../structures/destruct_stone_wall_tower.xml | 2 +- .../art/meshes/props/rubble_stone_2x2.dae | 3 + .../templates/rubble/rubble_stone_2x2.xml | 6 + .../templates/structures/cart_wall_tower.xml | 64 +++--- .../templates/structures/celt_house.xml | 52 ++--- .../structures/iber_defense_tower.xml | 90 ++++---- .../templates/structures/iber_house.xml | 52 ++--- ...mplate_structure_defense_defense_tower.xml | 202 +++++++++--------- 17 files changed, 309 insertions(+), 235 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/destruct_2x2.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_long.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_medium.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_short.xml create mode 100644 binaries/data/mods/public/art/actors/structures/destruct_stone_2x2.xml create mode 100644 binaries/data/mods/public/art/meshes/props/rubble_stone_2x2.dae create mode 100644 binaries/data/mods/public/simulation/templates/rubble/rubble_stone_2x2.xml diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_2x2.xml b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_2x2.xml new file mode 100644 index 0000000000..26bd4f4d0f --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_2x2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + terrain_base.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_6x6.xml b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_6x6.xml index c1ac529981..b4be792167 100644 --- a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_6x6.xml +++ b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_6x6.xml @@ -1,7 +1,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_long.xml b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_long.xml new file mode 100644 index 0000000000..e58f607144 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_long.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + terrain_base.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_medium.xml b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_medium.xml new file mode 100644 index 0000000000..1c8eacf2ad --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_medium.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + terrain_base.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_short.xml b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_short.xml new file mode 100644 index 0000000000..8f984954ea --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/destruct_wall_short.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + terrain_base.xml + diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_2x2.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_2x2.xml new file mode 100644 index 0000000000..79e58586cf --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_2x2.xml @@ -0,0 +1,17 @@ + + + + + + props/rubble_stone_2x2.dae + + + + + + + + + + basic_trans_ao.xml + diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml index dea4acf831..98120fd042 100644 --- a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml +++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_long.xml @@ -5,7 +5,7 @@ props/rubble_stone_wall_long.dae - + diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml index aaabdf6844..c83139a2b0 100644 --- a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml +++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_medium.xml @@ -5,7 +5,7 @@ props/rubble_stone_wall_medium.dae - + diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml index 6247b3b93c..b98e59dddf 100644 --- a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml +++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_short.xml @@ -5,7 +5,7 @@ props/rubble_stone_wall_short.dae - + diff --git a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml index 446e675909..8fc312577b 100644 --- a/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml +++ b/binaries/data/mods/public/art/actors/structures/destruct_stone_wall_tower.xml @@ -5,7 +5,7 @@ props/rubble_stone_wall_tower.dae - + diff --git a/binaries/data/mods/public/art/meshes/props/rubble_stone_2x2.dae b/binaries/data/mods/public/art/meshes/props/rubble_stone_2x2.dae new file mode 100644 index 0000000000..8d0ff3259d --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/rubble_stone_2x2.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6acd78ce92661ae054d48b451b3625b185969dbdf61dbb8574db307fa40ac499 +size 178113 diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_2x2.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_2x2.xml new file mode 100644 index 0000000000..246d8cd867 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_stone_2x2.xml @@ -0,0 +1,6 @@ + + + + structures/destruct_stone_2x2.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml index 7729a2688b..c046eded2f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml @@ -1,32 +1,32 @@ - - - - 120 - - 90 - - - - - 18.0 - - - 12000 - rubble/rubble_3x3 - - - cart - Mijdil - The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders. - - - - - - structures/carthaginians/wall_tower.xml - structures/fndn_3x3.xml - - - 11.0 - - + + + + 120 + + 90 + + + + + 18.0 + + + 12000 + rubble/rubble_stone_2x2 + + + cart + Mijdil + The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders. + + + + + + structures/carthaginians/wall_tower.xml + structures/fndn_3x3.xml + + + 11.0 + + diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_house.xml b/binaries/data/mods/public/simulation/templates/structures/celt_house.xml index c816489525..2b613537c9 100644 --- a/binaries/data/mods/public/simulation/templates/structures/celt_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/celt_house.xml @@ -1,26 +1,26 @@ - - - - - 5.0 - - - rubble/rubble_2x2 - - - celt - Annedd - Celts generally lived in round stone or wattle and daub walled structures with thatched roof. - - - - - - 16 - 65536 - - - structures/celts/house.xml - structures/fndn_2x2.xml - - + + + + + 5.0 + + + rubble/rubble_stone_2x2 + + + celt + Annedd + Celts generally lived in round stone or wattle and daub walled structures with thatched roof. + + + + + + 16 + 65536 + + + structures/celts/house.xml + structures/fndn_2x2.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml index 382672f93f..108b55be21 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml @@ -1,45 +1,45 @@ - - - - 2 - - - 5 - 200 - - 0 - 300 - - - - - 12.0 - - - 10 - - - 2400 - rubble/rubble_3x3 - - - iber - Torre Iberica - These towers were quite large, high and monolithic stonework; being cylindrical lent them added strength. They were initially built at mountain passes to control access through them or on high places to provide overview and defense of surrounding terrain. They may have also been used as 'toll stations' along trading routes. Sometimes they were even built 'right out in the middle of nowhere' on the flatlands, but always with the idea of defensively controlling terrain. - - - - - - 6.0 - 0.6 - 17.0 - - - 38 - - - structures/iberians/scout_tower.xml - structures/fndn_3x3.xml - - + + + + 2 + + + 5 + 200 + + 0 + 300 + + + + + 12.0 + + + 10 + + + 2400 + rubble/rubble_stone_3x3 + + + iber + Torre Iberica + These towers were quite large, high and monolithic stonework; being cylindrical lent them added strength. They were initially built at mountain passes to control access through them or on high places to provide overview and defense of surrounding terrain. They may have also been used as 'toll stations' along trading routes. Sometimes they were even built 'right out in the middle of nowhere' on the flatlands, but always with the idea of defensively controlling terrain. + + + + + + 6.0 + 0.6 + 17.0 + + + 38 + + + structures/iberians/scout_tower.xml + structures/fndn_3x3.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_house.xml b/binaries/data/mods/public/simulation/templates/structures/iber_house.xml index 7602d9fb09..d8ac3a26bf 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_house.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_house.xml @@ -1,26 +1,26 @@ - - - - - 5.0 - - - rubble/rubble_2x2 - - - iber - Casa - Iberian structures of the time were typically built either entirely of stone or with stone stub walls with 'adobe' up to the roof lines above them. Roofs were then, depending on the economic status of individuals, covered with a composite of mud and binding vegetable and waterproofing asphaltic materials, or slate stone, or in many cases in the region, with so-called Spanish roofing tiles. - - - - - - 16 - 65536 - - - structures/iberians/house.xml - structures/fndn_2x2.xml - - + + + + + 5.0 + + + rubble/rubble_stone_2x2 + + + iber + Casa + Iberian structures of the time were typically built either entirely of stone or with stone stub walls with 'adobe' up to the roof lines above them. Roofs were then, depending on the economic status of individuals, covered with a composite of mud and binding vegetable and waterproofing asphaltic materials, or slate stone, or in many cases in the region, with so-called Spanish roofing tiles. + + + + + + 16 + 65536 + + + structures/iberians/house.xml + structures/fndn_2x2.xml + + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml index 28fdbc204b..1846439a04 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml @@ -1,101 +1,101 @@ - - - - 15.0 - 40.0 - 15.0 - - 4.0 - 8.0 - 4.0 - - - - - 0.0 - 25.0 - 0.0 - 80.0 - 16.0 - 75.0 - 1200 - 2000 - 1.5 - - - - 1 - 1 - - - DefenseTower - - - 120 - - 100 - 100 - - - - - 15.0 - - - 5 - 0.1 - Support Infantry - 0 - 2 - - - 1200 - rubble/rubble_2x2 - - - Defense Tower - Shoots arrows. Garrison to provide extra defense. - Town Defensive Tower GarrisonTower -ConquestCritical - structures/defense_tower.png - phase_town - - - 100 - 0 - 10 - 10 - 0 - - - - - - - pair_tower_01 - - - - - - interface/complete/building/complete_tower.xml - attack/weapon/arrowfly.xml - attack/destruction/building_collapse_large.xml - - - - 6.0 - 0.6 - 21.0 - - - false - 32 - 65536 - - - 80 - - - structures/fndn_2x2.xml - - + + + + 15.0 + 40.0 + 15.0 + + 4.0 + 8.0 + 4.0 + + + + + 0.0 + 25.0 + 0.0 + 80.0 + 16.0 + 75.0 + 1200 + 2000 + 1.5 + + + + 1 + 1 + + + DefenseTower + + + 120 + + 100 + 100 + + + + + 15.0 + + + 5 + 0.1 + Support Infantry + 0 + 2 + + + 1200 + rubble/rubble_stone_2x2 + + + Defense Tower + Shoots arrows. Garrison to provide extra defense. + Town Defensive Tower GarrisonTower -ConquestCritical + structures/defense_tower.png + phase_town + + + 100 + 0 + 10 + 10 + 0 + + + + + + + pair_tower_01 + + + + + + interface/complete/building/complete_tower.xml + attack/weapon/arrowfly.xml + attack/destruction/building_collapse_large.xml + + + + 6.0 + 0.6 + 21.0 + + + false + 32 + 65536 + + + 80 + + + structures/fndn_2x2.xml + +