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

Merge pull request #9746 from matija-hustic/missile_submarine

Browse Source 
Revert missile explosion condition to strictly less than zero
This commit is contained in:
Oliver Brakmann
2015-10-24 20:11:50 +02:00
parent bf7aace592 8f4543c1e1
commit 63c687cdce
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -788,7 +788,7 @@ namespace OpenRA.Mods.Common.Effects
// NOTE: High speeds might cause the missile to miss the target or fly through obstacles // NOTE: High speeds might cause the missile to miss the target or fly through obstacles
// In that case, big moves should probably be decomposed into multiple smaller ones with hit checks // In that case, big moves should probably be decomposed into multiple smaller ones with hit checks
var height = world.Map.DistanceAboveTerrain(pos); var height = world.Map.DistanceAboveTerrain(pos);
var shouldExplode = (height.Length <= 0) // Hit the ground var shouldExplode = (height.Length < 0) // Hit the ground
|| (relTarDist < info.CloseEnough.Length) // Within range || (relTarDist < info.CloseEnough.Length) // Within range
|| (info.ExplodeWhenEmpty && info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel || (info.ExplodeWhenEmpty && info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel
|| (info.Blockable && BlocksProjectiles.AnyBlockingActorAt(world, pos)) // Hit a wall or other blocking obstacle || (info.Blockable && BlocksProjectiles.AnyBlockingActorAt(world, pos)) // Hit a wall or other blocking obstacle

2
mods/cnc/rules/structures.yaml
View File

@@ -818,7 +818,7 @@ ATWR:
HasMinibib: Yes HasMinibib: Yes
Turreted: Turreted:
ROT: 255 ROT: 255
Offset: 128,128,-85 Offset: 128,128,0
Armament@PRIMARY: Armament@PRIMARY:
Weapon: TowerMissle Weapon: TowerMissle
LocalOffset: 256,128,0, 256,-128,0 LocalOffset: 256,128,0, 256,-128,0