Changeset 9662 for ps

Timestamp:

06/25/11 22:57:06 (14 years ago)

Author:

michael

Message:

New aeroplane stuff.

Polishing up the Persian cataphract.

More edits to Peloponnese map.

Location:

ps/trunk/binaries/data/mods/public

Files:

• art/actors/flora/trees/carob_top.xml (modified) (2 diffs)
• art/actors/props/units/heads/head_pers_b.xml (added)
• art/actors/props/units/heads/pers_conical_plume.xml (added)
• art/actors/props/units/heads/pers_neckguard.xml (added)
• art/actors/units/global/plane.xml (added)
• art/actors/units/persians/super_unit_2_r.xml (modified) (1 diff)
• art/actors/units/persians/war_elephant.xml (modified) (1 diff)
• art/meshes/props/helmet/pers_conical_plume_a.dae (added)
• art/meshes/props/helmet/pers_neckguard.dae (added)
• art/meshes/structural/aeroplane.dae (added)
• art/textures/skins/gaia/tree_carob_d.dds (added)
• art/textures/skins/props/helmet/pers_f1.dds (modified) ( previous)
• art/textures/skins/structural/aeroplane.dds (added)
• maps/scenarios/Peloponnese.pmp (modified) ( previous)
• maps/scenarios/Peloponnese.xml (modified) (10 diffs)
• simulation/templates/other/plane.xml (modified) (1 diff)

ps/trunk/binaries/data/mods/public/art/actors/flora/trees/carob_top.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="canopy-mesh-a">
@@ -24 +22 @@
     </variant>
   </group>
-
   <group>
-    <variant frequency="1" name="leaf-texture-a">
+    <variant frequency="3" name="leaf-texture-a">
       <texture>gaia/tree_carob_a.dds</texture>
     </variant>
-    <variant frequency="1" name="leaf-texture-b">
+    <variant frequency="3" name="leaf-texture-b">
       <texture>gaia/tree_carob_b.dds</texture>
     </variant>
-    <variant frequency="1" name="leaf-texture-c">
+    <variant frequency="3" name="leaf-texture-c">
       <texture>gaia/tree_carob_c.dds</texture>
     </variant>
+    <variant frequency="1" name="leaf-texture-d">
+      <texture>gaia/tree_carob_d.dds</texture>
+    </variant>
   </group>
-
   <material>basic_trans.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/persians/super_unit_2_r.xml

@@ -14 +14 @@
       <mesh>skeletal/m_pants_armor.dae</mesh>
       <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_pers_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/pers_conical_plume.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
         <prop actor="props/units/cape_olivegreen.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/heads/pers_neckguard.xml" attachpoint="shoulders"/>
       </props>
     </variant>

ps/trunk/binaries/data/mods/public/art/actors/units/persians/war_elephant.xml

@@ -5 +5 @@
     <variant frequency="100" name="Mesh">
       <animations>
-        <animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="200"/>
-        <animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="200"/>
-        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="200"/>
-        <animation file="quadraped/elephant_run_01.dae" name="run " speed="300"/>
-        <animation event="0.5" file="quadraped/elephant_attack_03.dae" name="melee" speed="200"/>
-        <animation event="0.5" file="quadraped/elephant_attack_02.dae" name="melee" speed="200"/>
-        <animation event="0.5" file="quadraped/elephant_attack_01.dae" name="melee" speed="200"/>
-        <animation file="quadraped/elephant_death_01.dae" name="death" speed="500"/>
+        <animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="50"/>
+        <animation file="quadraped/elephant_run_01.dae" name="run " speed="50"/>
+        <animation event="0.5" file="quadraped/elephant_attack_03.dae" name="melee" speed="50"/>
+        <animation event="0.5" file="quadraped/elephant_attack_02.dae" name="melee" speed="50"/>
+        <animation event="0.5" file="quadraped/elephant_attack_01.dae" name="melee" speed="50"/>
+        <animation file="quadraped/elephant_death_01.dae" name="death" speed="100"/>
       </animations>
       <mesh>skeletal/elephant_asian.dae</mesh>

ps/trunk/binaries/data/mods/public/maps/scenarios/Peloponnese.xml

@@ -5 +5 @@
         <LightingModel>standard</LightingModel>
         <SkySet>cloudless</SkySet>
-        <SunColour r="0.737255" g="0.721569" b="0.639216"/>
+        <SunColour r="0.816452" g="0.794853" b="0.708456"/>
         <SunElevation angle="0.874369"/>
         <SunRotation angle="-0.785396"/>
@@ -25 +25 @@
     </Environment>
     <Camera>
-        <Position x="1545.52" y="406.391" z="-191.35"/>
+        <Position x="864.308" y="150.268" z="130.094"/>
         <Rotation angle="0"/>
         <Declination angle="0.523599"/>
@@ -526 +526 @@
             <Template>gaia/flora_tree_carob</Template>
             <Player>0</Player>
-            <Position x="862.0694" z="501.27186"/>
-            <Orientation y="-2.37362"/>
+            <Position x="867.73755" z="506.43702"/>
+            <Orientation y="0.07825"/>
         </Entity>
         <Entity uid="102">
@@ -10793 +10793 @@
             <Player>0</Player>
             <Position x="1222.34717" z="1308.24683"/>
-            <Orientation y="2.35621"/>
+            <Orientation y="2.97352"/>
         </Entity>
         <Entity uid="1816">
@@ -15834 +15834 @@
         <Entity uid="2679">
             <Template>actor|props/flora/bush_medit_underbrush.xml</Template>
-            <Position x="861.30036" z="436.93097"/>
+            <Position x="866.10718" z="428.68085"/>
             <Orientation y="-2.60366"/>
         </Entity>
@@ -17889 +17889 @@
         <Entity uid="3090">
             <Template>actor|props/flora/bush_medit_underbrush.xml</Template>
-            <Position x="1155.46973" z="1418.16334"/>
+            <Position x="1153.79371" z="1412.11963"/>
             <Orientation y="1.17127"/>
         </Entity>
@@ -19449 +19449 @@
         <Entity uid="3402">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1083.65418" z="1396.86487"/>
+            <Position x="1083.65833" z="1397.0359"/>
             <Orientation y="-2.05365"/>
         </Entity>
         <Entity uid="3403">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1067.08509" z="1393.36866"/>
+            <Position x="1186.49561" z="1436.1753"/>
             <Orientation y="2.35621"/>
         </Entity>
         <Entity uid="3404">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1089.98853" z="1394.01893"/>
+            <Position x="1099.74354" z="1401.72718"/>
             <Orientation y="0.35589"/>
         </Entity>
         <Entity uid="3405">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1093.89625" z="1402.69678"/>
+            <Position x="1149.08692" z="1439.78846"/>
             <Orientation y="1.6835"/>
         </Entity>
@@ -19489 +19489 @@
         <Entity uid="3410">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1077.82044" z="1408.52991"/>
+            <Position x="1074.20069" z="1397.6709"/>
             <Orientation y="2.35621"/>
         </Entity>
@@ -19499 +19499 @@
         <Entity uid="3412">
             <Template>actor|props/flora/bush_medit_sm_dry.xml</Template>
-            <Position x="1067.97681" z="1410.06434"/>
-            <Orientation y="-1.99079"/>
+            <Position x="1071.98682" z="1406.45667"/>
+            <Orientation y="0.3875"/>
         </Entity>
         <Entity uid="3413">
@@ -32320 +32320 @@
             <Template>other/special_treasure_shipwreck</Template>
             <Player>0</Player>
-            <Position x="1240.51331" z="1742.07618"/>
-            <Orientation y="2.35621"/>
+            <Position x="1315.60706" z="1778.92591"/>
+            <Orientation y="-1.99614"/>
         </Entity>
         <Entity uid="5974">

ps/trunk/binaries/data/mods/public/simulation/templates/other/plane.xml

@@ -7 +7 @@
   </Identity>
   <VisualActor>
-    <Actor>units/hellenes/siege_rock.xml</Actor> <!-- only using this because its flaming projectiles look nice -->
+    <Actor>units/global/plane.xml</Actor> <!-- only using this because its flaming projectiles look nice -->
   </VisualActor>
+    <Vision>
+    <Range>80</Range>
+  </Vision>
   <Obstruction disable=""/>
   <UnitMotion disable=""/>
   <Position>
-    <TurnRate>1.57</TurnRate>
+    <TurnRate>1.0</TurnRate>
   </Position>
   <UnitMotionFlying>
-    <MaxSpeed>24.0</MaxSpeed>
+    <MaxSpeed>30.0</MaxSpeed>
     <AccelRate>8.0</AccelRate>
-    <TurnRate>1.57</TurnRate>
+    <TurnRate>1.0</TurnRate>
     <OvershootTime>2.0</OvershootTime>
-    <FlyingHeight>16.0</FlyingHeight>
-    <ClimbRate>3.0</ClimbRate>
+    <FlyingHeight>30.0</FlyingHeight>
+    <ClimbRate>6.0</ClimbRate>
   </UnitMotionFlying>
   <Attack>