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

Second implementation of Sandworms

Browse Source 
Fix tabs in AttackSwallow.cs
This commit is contained in:
penev92
2014-11-02 14:17:52 +02:00
parent 5da5bce405
commit 1057f8ff3b
18 changed files with 500 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
OpenRA.Mods.D2k/AttackSwallow.cs Normal file
View File

@@ -0,0 +1,54 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
// TODO: This is a copy of AttackLeap. Maybe combine them in AttackMelee trait when the code is finalized?
[Desc("Sandworms use this attack model.")]
class AttackSwallowInfo : AttackFrontalInfo, Requires<SandwormInfo>
{
public override object Create(ActorInitializer init) { return new AttackSwallow(init.self, this); }
}
class AttackSwallow : AttackFrontal
{
readonly Sandworm sandworm;
public AttackSwallow(Actor self, AttackSwallowInfo attackSwallowInfo)
: base(self, attackSwallowInfo)
{
sandworm = self.Trait<Sandworm>();
}
public override void DoAttack(Actor self, Target target)
{
// TODO: Worm should ignore Fremen as targets unless they are firing/being fired upon (even moving fremen do not attract worms)
if (target.Type != TargetType.Actor || !CanAttack(self, target) || !sandworm.CanAttackAtLocation(self, target.Actor.Location))
// this is so that the worm does not launch an attack against a target that has reached solid rock
{
self.CancelActivity();
return;
}
var a = ChooseArmamentForTarget(target);
if (a == null)
return;
if (!target.IsInRange(self.CenterPosition, a.Weapon.Range))
return;
self.CancelActivity();
self.QueueActivity(new SwallowActor(self, target.Actor, a.Weapon));
}
}
}

12
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -68,6 +68,11 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AttackSwallow.cs" />
<Compile Include="Sandworm.cs" />
<Compile Include="SwallowActor.cs" />
<Compile Include="ThrowsShrapnel.cs" />
<Compile Include="DamagedWithoutFoundation.cs" />
<Compile Include="SpriteLoaders\R8Loader.cs" />
<Compile Include="Traits\Buildings\DamagedWithoutFoundation.cs" />
<Compile Include="Traits\Render\WithBuildingPlacedOverlay.cs" />
@@ -89,6 +94,13 @@
<Compile Include="AutoCarryall\AutoCarryall.cs" />
<Compile Include="AutoCarryall\Carryable.cs" />
<Compile Include="AutoCarryall\CarryUnit.cs" />
<Compile Include="World\ChooseBuildTabOnSelect.cs" />
<Compile Include="World\PaletteFromR8.cs" />
<Compile Include="World\FogPaletteFromR8.cs" />
<Compile Include="World\D2kResourceLayer.cs" />
<Compile Include="World\PaletteFromScaledPalette.cs" />
<Compile Include="WormManager.cs" />
<Compile Include="WormSpawner.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

70
OpenRA.Mods.D2k/Sandworm.cs Normal file
View File

@@ -0,0 +1,70 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
class SandwormInfo : Requires<RenderUnitInfo>, Requires<MobileInfo>, IOccupySpaceInfo
{
readonly public int WanderMoveRadius = 20;
readonly public string WormSignNotification = "WormSign";
public object Create(ActorInitializer init) { return new Sandworm(this); }
}
class Sandworm : INotifyIdle
{
int ticksIdle;
int effectiveMoveRadius;
readonly int maxMoveRadius;
public Sandworm(SandwormInfo info)
{
maxMoveRadius = info.WanderMoveRadius;
effectiveMoveRadius = info.WanderMoveRadius;
// TODO: Someone familiar with how the sounds work should fix this:
// TODO: This should not be here. It should be same as "Enemy unit sighted".
//Sound.PlayNotification(self.Owner, "Speech", info.WormSignNotification, self.Owner.Country.Race);
}
// TODO: This copies AttackWander and builds on top of it. AttackWander should be revised.
public void TickIdle(Actor self)
{
var globalOffset = new WVec(0, -1024 * effectiveMoveRadius, 0).Rotate(WRot.FromFacing(self.World.SharedRandom.Next(255)));
var offset = new CVec(globalOffset.X/1024, globalOffset.Y/1024);
var targetlocation = self.Location + offset;
if (!self.World.Map.Bounds.Contains(targetlocation.X, targetlocation.Y))
{
// If MoveRadius is too big there might not be a valid cell to order the attack to (if actor is on a small island and can't leave)
if (++ticksIdle % 10 == 0) // completely random number
{
effectiveMoveRadius--;
}
return; // We'll be back the next tick; better to sit idle for a few seconds than prolongue this tick indefinitely with a loop
}
self.World.IssueOrder(new Order("AttackMove", self, false) { TargetLocation = targetlocation });
ticksIdle = 0;
effectiveMoveRadius = maxMoveRadius;
}
public bool CanAttackAtLocation(Actor self, CPos targetLocation)
{
return self.Trait<Mobile>().MovementSpeedForCell(self, targetLocation) != 0;
}
}
}

136
OpenRA.Mods.D2k/SwallowActor.cs Normal file
View File

@@ -0,0 +1,136 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
public enum AttackState { Burrowed, EmergingAboveGround, ReturningUndergrown }
class SwallowActor : Activity
{
readonly Actor target;
readonly Mobile mobile;
readonly Sandworm sandworm;
readonly WeaponInfo weapon;
int countdown;
AttackState stance = AttackState.Burrowed;
// TODO: random numbers to make it look ok
[Desc("The number of ticks it takes to return underground.")]
const int ReturnTime = 60;
[Desc("The number of ticks it takes to get in place under the target to attack.")]
const int AttackTime = 30;
public SwallowActor(Actor self, Actor target, WeaponInfo weapon)
{
if (!target.HasTrait<Mobile>())
throw new InvalidOperationException("SwallowActor requires a target actor with the Mobile trait");
this.target = target;
this.weapon = weapon;
mobile = self.TraitOrDefault<Mobile>();
sandworm = self.TraitOrDefault<Sandworm>();
countdown = AttackTime;
}
bool WormAttack(Actor worm)
{
var targetLocation = target.Location;
var lunch = worm.World.ActorMap.GetUnitsAt(targetLocation)
.Except(new[] { worm })
.Where(t => weapon.IsValidAgainst(t, worm));
if (!lunch.Any())
return false;
stance = AttackState.EmergingAboveGround;
lunch.Do(t => t.World.AddFrameEndTask(_ => { t.World.Remove(t); t.Kill(t); })); // dispose of the evidence (we don't want husks)
mobile.SetPosition(worm, targetLocation);
PlayAttackAnimation(worm);
return true;
}
public bool PlayAttackAnimation(Actor self)
{
var renderUnit = self.Trait<RenderUnit>();
renderUnit.PlayCustomAnim(self, "sand");
renderUnit.PlayCustomAnim(self, "mouth");
// TODO: Someone familiar with how the sounds work should fix this:
//Sound.PlayNotification(self.Owner, "Speech", "WormAttack", self.Owner.Country.Race);
return true;
}
public override Activity Tick(Actor self)
{
if (countdown > 0)
{
countdown--;
return this;
}
if (stance == AttackState.ReturningUndergrown) // wait for the worm to get back underground
{
#region DisappearToMapEdge
// More random numbers used for min and max bounds
var rand = self.World.SharedRandom.Next(200, 400);
if (rand % 2 == 0) // there is a 50-50 chance that the worm would just go away
{
self.CancelActivity();
//self.World.WorldActor.QueueActivity(new DisappearToMapEdge(self, rand));
self.World.AddFrameEndTask(w => w.Remove(self));
var wormManager = self.World.WorldActor.TraitOrDefault<WormManager>();
if (wormManager != null)
wormManager.DecreaseWorms();
}
#endregion
// TODO: if the worm did not disappear, make the animation reappear here
return NextActivity;
}
if (stance == AttackState.Burrowed) // wait for the worm to get in position
{
// TODO: make the worm animation (currenty the lightning) disappear here
// this is so that the worm cancels an attack against a target that has reached solid rock
if (sandworm == null || !sandworm.CanAttackAtLocation(self, target.Location))
{
return NextActivity;
}
var success = WormAttack(self);
if (!success)
{
return NextActivity;
}
countdown = ReturnTime;
stance = AttackState.ReturningUndergrown;
}
return this;
}
}
}

87
OpenRA.Mods.D2k/WormManager.cs Normal file
View File

@@ -0,0 +1,87 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
[Desc("Controls the spawning of sandworms. Attach this to the world actor.")]
class WormManagerInfo : ITraitInfo
{
[Desc("Minimum number of worms")]
public readonly int Minimum = 1;
[Desc("Maximum number of worms")]
public readonly int Maximum = 5;
[Desc("Average time (seconds) between crate spawn")]
public readonly int SpawnInterval = 180;
public readonly string WormSignature = "sandworm";
public readonly string WormOwnerPlayer = "Creeps";
public object Create (ActorInitializer init) { return new WormManager(this, init.self); }
}
class WormManager : ITick
{
int countdown;
int wormsPresent;
readonly WormManagerInfo info;
readonly Lazy<Actor[]> spawnPoints;
public WormManager(WormManagerInfo info, Actor self)
{
this.info = info;
spawnPoints = Exts.Lazy(() => self.World.ActorsWithTrait<WormSpawner>().Select(x => x.Actor).ToArray());
}
public void Tick(Actor self)
{
// TODO: Add a lobby option to disable worms just like crates
if (--countdown > 0)
return;
countdown = info.SpawnInterval * 25;
if (wormsPresent < info.Maximum)
SpawnWorm(self);
}
private void SpawnWorm (Actor self)
{
var spawnLocation = GetRandomSpawnPosition(self);
self.World.AddFrameEndTask(w =>
w.CreateActor(info.WormSignature, new TypeDictionary
{
new OwnerInit(w.Players.First(x => x.PlayerName == info.WormOwnerPlayer)),
new LocationInit(spawnLocation)
}));
wormsPresent++;
}
private CPos GetRandomSpawnPosition(Actor self)
{
// TODO: This is here only for testing, while the maps don't have valid spawn points
if (!spawnPoints.Value.Any())
return self.World.Map.ChooseRandomEdgeCell(self.World.SharedRandom);
return spawnPoints.Value[self.World.SharedRandom.Next(0, spawnPoints.Value.Count() - 1)].Location;
}
public void DecreaseWorms()
{
wormsPresent--;
}
}
}

24
OpenRA.Mods.D2k/WormSpawner.cs Normal file
View File

@@ -0,0 +1,24 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
[Desc("An actor with this trait indicates a valid spawn point for sandworms.")]
class WormSpawnerInfo : ITraitInfo
{
public object Create(ActorInitializer init) { return new WormSpawner(); }
}
class WormSpawner
{
}
}

14
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -25,6 +25,8 @@ namespace OpenRA.Mods.RA
public readonly string Cursor = "attack";
public readonly string OutsideRangeCursor = "attackoutsiderange";
[Desc("Does the attack type requires the attacker to enter the target's cell?")]
public readonly bool AttackRequiresEnteringCell = false;
public abstract object Create(ActorInitializer init);
}
@@ -38,12 +40,12 @@ namespace OpenRA.Mods.RA
protected Func<IEnumerable<Armament>> GetArmaments;
readonly Actor self;
readonly AttackBaseInfo info;
public readonly AttackBaseInfo Info;
public AttackBase(Actor self, AttackBaseInfo info)
{
this.self = self;
this.info = info;
Info = info;
var armaments = Exts.Lazy(() => self.TraitsImplementing<Armament>()
.Where(a => info.Armaments.Contains(a.Info.Name)));
@@ -179,8 +181,8 @@ namespace OpenRA.Mods.RA
var a = ab.ChooseArmamentForTarget(target);
cursor = a != null && !target.IsInRange(self.CenterPosition, a.Weapon.Range)
? ab.info.OutsideRangeCursor
: ab.info.Cursor;
? ab.Info.OutsideRangeCursor
: ab.Info.Cursor;
if (target.Type == TargetType.Actor && target.Actor == self)
return false;
@@ -210,7 +212,7 @@ namespace OpenRA.Mods.RA
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
cursor = ab.info.Cursor;
cursor = ab.Info.Cursor;
if (negativeDamage)
return false;
@@ -223,7 +225,7 @@ namespace OpenRA.Mods.RA
var maxRange = ab.GetMaximumRange().Range;
var targetRange = (self.World.Map.CenterOfCell(location) - self.CenterPosition).HorizontalLengthSquared;
if (targetRange > maxRange * maxRange)
cursor = ab.info.OutsideRangeCursor;
cursor = ab.Info.OutsideRangeCursor;
return true;
}

1
OpenRA.Mods.RA/Attack/AttackWander.cs
View File

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.RA
public void TickIdle(Actor self)
{
var target = self.CenterPosition + new WVec(0, -1024*Info.MoveRadius, 0).Rotate(WRot.FromFacing(self.World.SharedRandom.Next(255)));
// TODO: This needs to be looked into again. The bigger MoveRadius is, the bigger chance that the selected coordinates will be invalid.
self.Trait<AttackMove>().ResolveOrder(self, new Order("AttackMove", self, false) { TargetLocation = self.World.Map.CellContaining(target) });
}
}

6
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -10,6 +10,7 @@
using System.Drawing;
using System.Linq;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
@@ -163,12 +164,15 @@ namespace OpenRA.Mods.RA
nextScanTime = self.World.SharedRandom.Next(info.MinimumScanTimeInterval, info.MaximumScanTimeInterval);
var inRange = self.World.FindActorsInCircle(self.CenterPosition, range);
var mobile = self.TraitOrDefault<Mobile>();
return inRange
.Where(a =>
a.AppearsHostileTo(self) &&
!a.HasTrait<AutoTargetIgnore>() &&
attack.HasAnyValidWeapons(Target.FromActor(a)) &&
self.Owner.Shroud.IsTargetable(a))
self.Owner.Shroud.IsTargetable(a) &&
(!attack.Info.AttackRequiresEnteringCell || (mobile != null && mobile.MovementSpeedForCell(self, a.Location) != 0))
)
.ClosestTo(self);
}
}

BIN
mods/d2k/bits/wormicon.shp Normal file
View File

Binary file not shown.

9
mods/d2k/maps/shellmap/map.yaml
View File

@@ -33,13 +33,17 @@ Players:
Name: Atreides
Race: atreides
ColorRamp: 161,134,200
Allies: Neutral
Enemies: Harkonnen
PlayerReference@Harkonnen:
Name: Harkonnen
Race: harkonnen
ColorRamp: 3,255,127
Enemies: Atreides
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Race: atreides
Enemies: Atreides,Harkonnen
Actors:
Actor4: spicebloom
@@ -102,6 +106,9 @@ Actors:
Actor41: guntowera
Location: 46,39
Owner: Harkonnen
Actor42: WormSpawnLocation
Location: 46,64
Owner: Creeps
Smudges:

1
mods/d2k/mod.yaml
View File

@@ -36,6 +36,7 @@ Rules:
./mods/d2k/rules/atreides.yaml
./mods/d2k/rules/harkonnen.yaml
./mods/d2k/rules/ordos.yaml
./mods/d2k/rules/arrakis.yaml
Sequences:
./mods/d2k/sequences/aircraft.yaml

2
mods/d2k/notifications.yaml
View File

@@ -31,6 +31,8 @@ Speech:
UnitLost: ULOST
BuildingLost: BLOST
BuildingCaptured: CAPT
WormSign: WSIGN
WormAttack: WATTK
Sounds:
DefaultVariant: .WAV

63
mods/d2k/rules/arrakis.yaml Normal file
View File

@@ -0,0 +1,63 @@
SPICEBLOOM:
RenderBuilding:
Building:
Footprint: x
Dimensions: 1,1
AppearsOnRadar:
EditorAppearance:
RelativeToTopLeft: yes
ProximityCaptor:
Types: Tree
Tooltip:
Name: Spice Bloom
SeedsResource:
ResourceType: Spice
Interval: 75
WithActiveAnimation:
RadarColorFromTerrain:
Terrain: Spice
BodyOrientation:
WithMakeAnimation:
SANDWORM:
Tooltip:
Name: Sandworm
Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite.
Health:
HP: 10000
Radius: 3
Armor:
Type: None
Mobile:
Speed: 50
TerrainSpeeds:
Sand: 100
Dune: 100
Spice: 100
Rock: 100 # TEMP
TargetableUnit:
TargetTypes: Underground
RevealsShroud:
Range: 32c0
RenderUnit:
BodyOrientation:
BelowUnits:
HiddenUnderFog:
Sandworm:
WanderMoveRadius: 10
SelectionDecorations: # TEMP
Selectable: # TEMP
Voice: WormVoice # TEMP
AppearsOnRadar:
UseLocation: yes
AttackSwallow:
AttackRequiresEnteringCell: TRUE
AttackMove:
AutoTarget:
ScanRadius: 32
Armament:
Weapon: WormJaw
WormSpawnLocation:
Immobile:
WormSpawner:

21
mods/d2k/rules/misc.yaml
View File

@@ -140,27 +140,6 @@ waypoint:
RenderEditorOnly:
BodyOrientation:
SPICEBLOOM:
RenderBuilding:
Building:
Footprint: x
Dimensions: 1,1
AppearsOnRadar:
EditorAppearance:
RelativeToTopLeft: yes
ProximityCaptor:
Types: Tree
Tooltip:
Name: Spice Bloom
SeedsResource:
ResourceType: Spice
Interval: 75
WithActiveAnimation:
RadarColorFromTerrain:
Terrain: Spice
BodyOrientation:
WithMakeAnimation:
CAMERA:
Immobile:
OccupiesSpace: false

2
mods/d2k/rules/world.yaml
View File

@@ -10,6 +10,8 @@ World:
ScreenShaker:
BuildingInfluence:
ChooseBuildTabOnSelect:
WormManager:
SpawnInterval: 10
CrateSpawner:
Minimum: 0
Maximum: 2

16
mods/d2k/sequences/infantry.yaml
View File

@@ -442,3 +442,19 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8
Tick: 120
icon: grenadiericon
Start: 0 # 4281 in 1.06 DATA.R8
sandworm:
mouth: DATA
Start: 3549
Length: 15
Tick: 100
sand: DATA
Start: 3565
Length: 20
idle: DATA
Start: 3586
Length: 35
Tick: 180
BlendMode: Additive
icon: wormicon
Start: 0

6
mods/d2k/voices.yaml
View File

@@ -79,3 +79,9 @@ SaboteurVoice:
Move: O_SCONF1,O_SCONF2,O_SCONF3
Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
DisableVariants: Select, Move
WormVoice:
DefaultVariant: .WAV
Voices:
Select: WRMSIGN1
Move: WORM