Merge pull request #4682 from ScottNZ/beacon

closes #2320 closes #3767 closes #3810
2014-02-23 09:55:23 +01:00
parent 38eeb42ff8 b469351f8f
commit d7b891d995
32 changed files with 432 additions and 42 deletions
--- a/mods/d2k/notifications.yaml
+++ b/mods/d2k/notifications.yaml
@@ -47,4 +47,5 @@ Sounds:
 		BuildPaletteClose: BUTTON1
 		TabClick: SIDEBAR1
 		ClickSound: BUTTON1
-		ClickDisabledSound: ENDLIST1
+		ClickDisabledSound: ENDLIST1
+		Beacon: CHAT1
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -96,6 +96,8 @@ PALACEH:
 		IncomingSound:
 		MissileWeapon: atomic
 		SpawnOffset: -512,1c171,0
+		DisplayBeacon: True
+		DisplayRadarPing: True
 	CanPowerDown:
 	RequiresPower:
 	SupportPowerChargeBar:
--- a/mods/d2k/rules/system-player.yaml
+++ b/mods/d2k/rules/system-player.yaml
@@ -51,4 +51,4 @@ Player:
 	FrozenActorLayer:
 	HarvesterAttackNotifier:
 	PlayerStatistics:
-
+	PlaceBeacon:
--- a/mods/d2k/rules/system-world.yaml
+++ b/mods/d2k/rules/system-world.yaml
@@ -126,4 +126,4 @@ World:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
-
+	RadarPings:
--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -130,6 +130,14 @@ rallypoint:
 		Start: 0
 		Length: *

+beacon:
+	arrow: mouse
+		Start: 148
+		Offset: -24,-24
+	circles: fpls
+		Start: 0
+		Length: *
+
 rpg:
 	idle: DATA
 		Start: 3015