Have Tanya not shoot her pistols at buildings, and have her shoot pistols at barrels instead of using C4 on them

This commit is contained in:
Scott_NZ
2013-02-27 17:57:53 +13:00
parent 81c8f0360f
commit 817e6f1ec1
8 changed files with 22 additions and 8 deletions

View File

@@ -10,8 +10,8 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Orders;
using OpenRA.Traits;
@@ -35,12 +35,12 @@ namespace OpenRA.Mods.RA
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new UnitTraitOrderTargeter<Building>( "C4", 6, "c4", true, false ); }
get { yield return new UnitTraitOrderTargeter<C4Demolishable>("C4", 6, "c4", true, false); }
}
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
{
if( order.OrderID == "C4" )
if (order.OrderID == "C4")
return new Order("C4", self, queued) { TargetActor = target.Actor };
return null;
@@ -65,4 +65,7 @@ namespace OpenRA.Mods.RA
return (order.OrderString == "C4") ? "Attack" : null;
}
}
class C4DemolishableInfo : TraitInfo<C4Demolishable> { }
class C4Demolishable { }
}

View File

@@ -249,6 +249,7 @@
Sellable:
Capturable:
CapturableBar:
C4Demolishable:
^CivBuilding:
Inherits: ^Building
@@ -336,6 +337,7 @@
RelativeToTopLeft: yes
AutoTargetIgnore:
Sellable:
C4Demolishable:
^Tree:
Tooltip:

View File

@@ -256,4 +256,5 @@
ProximityCaptor:
Types:Building
Sellable:
GivesBounty:
GivesBounty:
C4Demolishable:

View File

@@ -359,7 +359,7 @@ Rules:
Range: 0
E7:
AutoTarget:
InitialStance: ReturnFire
InitialStance: Defend
Passenger:
Weight: 0
EINSTEIN:

View File

@@ -2875,7 +2875,7 @@ Rules:
Damage: 0
E7:
AutoTarget:
InitialStance: ReturnFire
InitialStance: Defend
Passenger:
Weight: 0
Buildable:

View File

@@ -241,6 +241,9 @@ BARL:
Tooltip:
Name: Explosive Barrel
AutoTargetIgnore:
Armor:
Type: Light
-C4Demolishable:
BRL3:
Inherits: ^TechBuilding
@@ -253,6 +256,9 @@ BRL3:
Tooltip:
Name: Explosive Barrel
AutoTargetIgnore:
Armor:
Type: Light
-C4Demolishable:
MISS:
Inherits: ^TechBuilding

View File

@@ -217,6 +217,7 @@
AcceptsSupplies:
GivesBounty:
UpdatesPlayerStatistics:
C4Demolishable:
^Wall:
AppearsOnRadar:
@@ -250,6 +251,7 @@
Types:Wall
Sellable:
UpdatesPlayerStatistics:
C4Demolishable:
^TechBuilding:
Inherits: ^Building

View File

@@ -7,11 +7,11 @@ Colt45:
Warhead:
Spread: 1
Versus:
Wood: 5%
Wood: 0%
Light: 5%
Heavy: 5%
Cybernetic: 5%
Concrete: 5%
Concrete: 0%
Explosion: piff
InfDeath: 2
Damage: 50