Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

- Use @Lordgood's new obelisks for the Ptol civic center, and the military_colony

Browse Source 
- Rename and move the current ptolemy military_colony settlement obelisk
- Update the Egypt (3v3) map

This was SVN commit r23530.
This commit is contained in:
Stan 2020-03-15 16:01:44 +00:00
parent 8bfb449375
commit a251e6cf8c
9 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/mods/public/art/actors/props/special/eyecandy/obelisk_03.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Obelisk 03">
<mesh>props/obelisk_03.dae</mesh>
<textures>
<texture file="structural/kush_struct_2.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="props/ao/obelisk_03.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>

32
binaries/data/mods/public/art/actors/props/structures/ptolemies/ptol_military_settlement_obelisk.xml → binaries/data/mods/public/art/actors/props/special/eyecandy/obelisk_04.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="flowers">
<mesh>props/ptol_military_settlement_obelisk.dae</mesh>
<textures>
<texture file="structural/ptol_edfu_paintings.png" name="baseTex"/>
<texture file="structural/ptol_edfu_paintings_norm.png" name="normTex"/>
<texture file="structural/ptol_edfu_paintings_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_military_colony_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Obelisk 04">
<mesh>props/obelisk_04.dae</mesh>
<textures>
<texture file="structural/ptol_edfu_paintings.png" name="baseTex"/>
<texture file="structural/ptol_edfu_paintings_norm.png" name="normTex"/>
<texture file="structural/ptol_edfu_paintings_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_military_colony_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>

4
binaries/data/mods/public/art/actors/structures/ptolemies/civic_centre.xml
View File

@ -17,8 +17,8 @@
<prop actor="particle/flame_firepit_1.xml" attachpoint="fire2"/>
<prop actor="particle/flame_firepit_2.xml" attachpoint="fire2"/>
<prop actor="particle/smoke_small_light.xml" attachpoint="fire2"/>
<prop actor="props/special/eyecandy/obelisk.xml" attachpoint="obelisk1" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/obelisk.xml" attachpoint="obelisk2" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/obelisk_b.xml" attachpoint="obelisk1" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/obelisk_b.xml" attachpoint="obelisk2" maxheight="20" minheight="-20"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>

15
binaries/data/mods/public/art/actors/structures/ptolemies/military_colony.xml
View File

@ -8,13 +8,12 @@
</animations>
<mesh>structural/ptol_military_settlement_struct_ptolemaic.dae</mesh>
<props>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_seleucid.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_helenistic.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_seleucid.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_helenistic.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_leaves.xml" attachpoint="root" />
<prop actor="props/structures/ptolemies/ptol_military_settlement_trunks.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_obelisk.xml" attachpoint="root"/>
<prop actor="props/special/eyecandy/obelisk_03.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_flowers.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_trunks.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_door.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
@ -35,7 +34,6 @@
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned2"/>
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned3"/>
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned4"/>
</props>
</variant>
</group>
@ -50,6 +48,13 @@
<prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_seleucid.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_struct_helenistic.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_leaves.xml" attachpoint="root" />
<prop actor="props/structures/ptolemies/ptol_military_settlement_trunks.xml" attachpoint="root"/>
<prop actor="props/special/eyecandy/obelisk_03.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_flowers.xml" attachpoint="root"/>
<prop actor="props/structures/ptolemies/ptol_military_settlement_door.xml" attachpoint="root"/>
</props>
</variant>
</group>

4
binaries/data/mods/public/art/actors/structures/ptolemies/temple.xml
View File

@ -4,6 +4,7 @@
<group>
<variant frequency="1" name="base">
<textures>
<texture file="structural/kush_struct_2.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
</textures>
@ -18,8 +19,6 @@
<prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kush_struct_2.png" name="baseTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_temple.png" name="aoTex"/>
</textures>
</variant>
@ -31,7 +30,6 @@
<prop actor="props/structures/decals/spart_temple.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kush_struct_2.png" name="baseTex"/>
<texture file="structural/ao/ptol_temple_helle_2_AO.png" name="aoTex"/>
</textures>
</variant>

BIN
binaries/data/mods/public/art/meshes/props/obelisk_03.dae (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
binaries/data/mods/public/art/meshes/props/ptol_military_settlement_obelisk.dae → binaries/data/mods/public/art/meshes/props/obelisk_04.dae
View File

BIN
binaries/data/mods/public/art/textures/skins/props/ao/obelisk_03.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml (Stored with Git LFS)
View File

Binary file not shown.