epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated sequences, and some small fixes

Browse Source
This commit is contained in:
Bob
2009-10-09 18:09:30 +13:00
parent 88a2fb50b4
commit 382ff42397
3 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRa.Game/Controller.cs
View File

@@ -17,12 +17,16 @@ namespace OpenRa.Game
this.game = game; this.game = game;
} }
public void WorldClicked(object sender, MouseEventArgs e) public void WorldClicked( object sender, MouseEventArgs e )
{ {
var xy = (1 / 24.0f) * (new float2(e.Location) + game.viewport.Location);
if (orderGenerator != null)
orderGenerator.Order(game, new int2((int)xy.X, (int)xy.Y)).Apply(game);
// todo: route all orders through netcode // todo: route all orders through netcode
var xy = ( 1 / 24.0f ) * ( new float2( e.Location ) + game.viewport.Location );
if( orderGenerator != null )
{
var order = orderGenerator.Order( game, new int2( (int)xy.X, (int)xy.Y ) );
if( order != null )
order.Apply( game );
}
} }
} }
} }

2
OpenRa.Game/Graphics/Sequence.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRa.Game.Graphics
public Sprite GetSprite(int frame) public Sprite GetSprite(int frame)
{ {
return UnitSheetBuilder.sprites[frame + start]; return UnitSheetBuilder.sprites[ ( frame % length ) + start ];
} }
} }
} }

73
sequences.xml
View File

@@ -13,7 +13,7 @@
also, <sequence length="*"> creates a sequence that includes all frames also, <sequence length="*"> creates a sequence that includes all frames
after `start`. after `start`.
one day, we might support inheritance here too. one day, we might support inheritance here too.
standard sequence names: standard sequence names:
@@ -104,6 +104,14 @@
<sequence name="make" start="0" length="*" src="weapmake" /> <sequence name="make" start="0" length="*" src="weapmake" />
</unit> </unit>
<!-- allied gun turret -->
<unit name="gun">
<sequence name="idle" start="0" length="32"/>
<sequence name="damaged-idle" start="1" length="32"/>
<sequence name="make" start="0" length="*" src="gunmake" />
</unit>
<!-- mcv --> <!-- mcv -->
<unit name="mcv"> <unit name="mcv">
@@ -128,8 +136,23 @@
<sequence name="harvest5" start="72" length="8"/> <sequence name="harvest5" start="72" length="8"/>
<sequence name="harvest6" start="80" length="8"/> <sequence name="harvest6" start="80" length="8"/>
<sequence name="harvest7" start="88" length="8"/> <sequence name="harvest7" start="88" length="8"/>
<sequence name="empty" start="96" length="15"/>
</unit> </unit>
<!-- light tank -->
<unit name="1tnk">
<sequence name="idle" start="0" length="32"/>
<sequence name="turret" start="32" length="32"/>
</unit>
<!-- medium tank -->
<unit name="2tnk">
<sequence name="idle" start="0" length="32"/>
<sequence name="turret" start="32" length="32"/>
</unit>
<!-- heavy tank --> <!-- heavy tank -->
<unit name="3tnk"> <unit name="3tnk">
@@ -137,6 +160,27 @@
<sequence name="turret" start="32" length="32"/> <sequence name="turret" start="32" length="32"/>
</unit> </unit>
<!-- mammoth tank -->
<unit name="4tnk">
<sequence name="idle" start="0" length="32"/>
<sequence name="turret" start="32" length="32"/>
</unit>
<!-- v2 rocket launcher -->
<unit name="v2rl">
<sequence name="idle" start="0" length="32"/>
<sequence name="reloading" start="32" length="32"/>
<sequence name="aiming" start="64" length="16"/>
</unit>
<!-- artillery -->
<unit name="arty">
<sequence name="idle" start="0" length="32"/>
</unit>
<!-- jeep --> <!-- jeep -->
<unit name="jeep"> <unit name="jeep">
@@ -144,6 +188,33 @@
<sequence name="turret" start="32" length="32"/> <sequence name="turret" start="32" length="32"/>
</unit> </unit>
<!-- apc -->
<unit name="apc">
<sequence name="idle" start="0" length="32"/>
</unit>
<!-- mine layer -->
<unit name="mnly">
<sequence name="idle" start="0" length="32"/>
<!-- and 16 "lay mine" sprites, not used in real-ra -->
</unit>
<!-- radar jammer -->
<unit name="mrj">
<sequence name="idle" start="0" length="32"/>
<sequence name="turret" start="32" length="32"/>
</unit>
<!-- mobile gap generator -->
<unit name="mgg">
<sequence name="idle" start="0" length="32"/>
<sequence name="turret" start="32" length="8"/>
</unit>
<!-- build clock - hacked in --> <!-- build clock - hacked in -->
<unit name="clock"> <unit name="clock">