diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index d188a035c1..4fc02caee2 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -465,6 +465,7 @@
+
diff --git a/OpenRA.Mods.RA/Tooltip.cs b/OpenRA.Mods.RA/Tooltip.cs
new file mode 100644
index 0000000000..c7f5788e69
--- /dev/null
+++ b/OpenRA.Mods.RA/Tooltip.cs
@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 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.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+ [Desc("Shown in the build palette widget.")]
+ public class TooltipInfo : ITraitInfo
+ {
+ public readonly string Description = "";
+ public readonly string Name = "";
+ [Desc("Defaults to actor name + icon suffix.")]
+ public readonly string Icon = null;
+
+ public virtual object Create(ActorInitializer init) { return new Tooltip(init.self, this); }
+ }
+
+ public class Tooltip : IToolTip
+ {
+ Actor self;
+ TooltipInfo Info;
+
+ public string Name() { return Info.Name; }
+ public Player Owner() { return self.Owner; }
+
+ public Tooltip(Actor self, TooltipInfo info)
+ {
+ this.self = self;
+ Info = info;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/Valued.cs b/OpenRA.Mods.RA/Valued.cs
index 483c6cc23b..50fab488d9 100755
--- a/OpenRA.Mods.RA/Valued.cs
+++ b/OpenRA.Mods.RA/Valued.cs
@@ -21,30 +21,4 @@ namespace OpenRA.Mods.RA
}
public class Valued { }
-
- [Desc("Shown in the build palette widget.")]
- public class TooltipInfo : ITraitInfo
- {
- public readonly string Description = "";
- public readonly string Name = "";
- [Desc("Defaults to actor name + icon suffix.")]
- public readonly string Icon = null;
-
- public virtual object Create(ActorInitializer init) { return new Tooltip(init.self, this); }
- }
-
- public class Tooltip : IToolTip
- {
- Actor self;
- TooltipInfo Info;
-
- public string Name() { return Info.Name; }
- public Player Owner() { return self.Owner; }
-
- public Tooltip(Actor self, TooltipInfo info)
- {
- this.self = self;
- Info = info;
- }
- }
}
diff --git a/mods/d2k/chrome/ingame.yaml b/mods/d2k/chrome/ingame.yaml
new file mode 100644
index 0000000000..aa23ebd289
--- /dev/null
+++ b/mods/d2k/chrome/ingame.yaml
@@ -0,0 +1,216 @@
+Container@INGAME_ROOT:
+ Logic:IngameChromeLogic
+ Children:
+ WorldInteractionController@INTERACTION_CONTROLLER:
+ X:0
+ Y:0
+ Width:WINDOW_RIGHT
+ Height:WINDOW_BOTTOM
+ ViewportController:
+ X:0
+ Y:0
+ Width:WINDOW_RIGHT
+ Height:WINDOW_BOTTOM
+ TooltipContainer:TOOLTIP_CONTAINER
+ WorldCommand:
+ X:0
+ Y:0
+ Width:WINDOW_RIGHT
+ Height:WINDOW_BOTTOM
+ Timer@GAME_TIMER:
+ X: WINDOW_RIGHT/2
+ Y: 0
+ StrategicProgress@STRATEGIC_PROGRESS:
+ X: WINDOW_RIGHT/2
+ Y: 40
+ SupportPowerTimer@SUPPORT_POWER_TIMER:
+ X:80
+ Y:34
+ Order:Descending
+ Container@PLAYER_ROOT:
+ Button@INGAME_OPTIONS_BUTTON:
+ X:0
+ Y:0
+ Width:160
+ Height:25
+ Text:Options (ESC)
+ Font:Bold
+ Key: escape
+ Container@PERFORMANCE_INFO:
+ Logic:PerfDebugLogic
+ Children:
+ Label@PERF_TEXT:
+ X:WINDOW_RIGHT - 200
+ Y:WINDOW_BOTTOM - 70
+ Width:170
+ Height:40
+ Contrast:true
+ Background@GRAPH_BG:
+ ClickThrough:true
+ Background:dialog4
+ X:30
+ Y:WINDOW_BOTTOM - 240
+ Width:210
+ Height:210
+ Children:
+ PerfGraph@GRAPH:
+ X:5
+ Y:5
+ Width:200
+ Height:200
+ TooltipContainer@TOOLTIP_CONTAINER:
+
+Container@PLAYER_WIDGETS:
+ Children:
+ LogicTicker@SIDEBAR_TICKER:
+ Button@INGAME_DIPLOMACY_BUTTON:
+ X:162
+ Y:0
+ Width:160
+ Height:25
+ Text:Diplomacy (F1)
+ Font:Bold
+ Key: f1
+ Button@CHEATS_BUTTON:
+ X:324
+ Y:0
+ Width:160
+ Height:25
+ Text:Cheats (F2)
+ Visible:false
+ Font:Bold
+ Key: f2
+ Button@OBJECTIVES_BUTTON:
+ X:486
+ Y:0
+ Width:160
+ Height:25
+ Text:Objectives (F3)
+ Visible:false
+ Font:Bold
+ Key: f3
+ SlidingContainer@INGAME_RADAR_BIN:
+ X:WINDOW_RIGHT-215
+ Y:0
+ OpenOffset:0,29
+ ClosedOffset:0,-166
+ AnimationLength:15
+ Children:
+ Image@RADAR_BIN_BG:
+ ImageName:radar
+ Radar@RADAR_MINIMAP:
+ WorldInteractionController:INTERACTION_CONTROLLER
+ X:9
+ Width:192
+ Height:192
+ ResourceBar@POWERBAR:
+ X:42
+ Y:205
+ Width:138
+ Height:5
+ TooltipContainer:TOOLTIP_CONTAINER
+ IndicatorImage:power-indicator
+ Orientation:Horizontal
+ Style:Bevelled
+ MoneyBin@INGAME_MONEY_BIN:
+ X:WINDOW_RIGHT - WIDTH
+ Y:0
+ Width:320
+ Height: 32
+ Children:
+ OrderButton@SELL:
+ Logic:OrderButtonsChromeLogic
+ X:3
+ Y:0
+ Width:30
+ Height:30
+ Image:sell
+ Description:Sell
+ LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
+ OrderButton@POWER_DOWN:
+ Logic:OrderButtonsChromeLogic
+ X:39
+ Y:0
+ Width:30
+ Height:30
+ Image:power
+ Description:Powerdown
+ LongDesc:Disable unneeded structures so their \npower can be used elsewhere
+ OrderButton@REPAIR:
+ Logic:OrderButtonsChromeLogic
+ X:75
+ Y:0
+ Width:30
+ Height:30
+ Image:repair
+ Description:Repair
+ LongDesc:Repair damaged buildings
+ SupportPowerBin@INGAME_POWERS_BIN:
+ X:0
+ Y:25
+ ReadyText: READY
+ HoldText: ON HOLD
+ BuildPalette@INGAME_BUILD_PALETTE:
+ X:WINDOW_RIGHT - 250
+ Y:280
+ Width:238 # TODO: why is this ignored?
+ Height:500
+ ReadyText: READY
+ HoldText: ON HOLD
+ RequiresText: Requires
+ IconWidth: 60
+ IconHeight: 48
+ Background@DIPLOMACY_BG:
+ Logic:DiplomacyLogic
+ X:(WINDOW_RIGHT - WIDTH)/2
+ Y:(WINDOW_BOTTOM - HEIGHT)/2
+ Width:450
+ Height:400
+ Visible:false
+ Children:
+ Label@LABEL_TITLE:
+ X:(PARENT_RIGHT - WIDTH)/2
+ Y:20
+ Width:250
+ Height:25
+ Text:Diplomacy
+ Align:Center
+ Font:Bold
+ Button@CLOSE_DIPLOMACY:
+ X:(PARENT_RIGHT - WIDTH)/2
+ Y:350
+ Width:160
+ Height:25
+ Text:Close
+ Font:Bold
+ Key:escape
+
+Container@OBSERVER_WIDGETS:
+ Children:
+ Button@INGAME_STATS_BUTTON:
+ X:162
+ Y:0
+ Width:160
+ Height:25
+ Text:Statistics (F1)
+ Font:Bold
+ Key:f1
+ Background@RADAR_BG:
+ X:WINDOW_RIGHT-255
+ Y:5
+ Width:250
+ Height:250
+ Children:
+ Radar@INGAME_RADAR:
+ X:10
+ Y:10
+ Width:PARENT_RIGHT-19
+ Height:PARENT_BOTTOM-19
+ WorldInteractionController:INTERACTION_CONTROLLER
+ DropDownButton@SHROUD_SELECTOR:
+ Logic:ObserverShroudSelectorLogic
+ X:WINDOW_RIGHT-250
+ Y:260
+ Width:240
+ Height:25
+ Font:Bold
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 09f3df8d33..e94aaaa4cf 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -54,7 +54,7 @@ Assemblies:
ChromeLayout:
mods/d2k/chrome/gameinit.yaml
- mods/ra/chrome/ingame.yaml
+ mods/d2k/chrome/ingame.yaml
mods/ra/chrome/ingame-chat.yaml
mods/ra/chrome/ingame-fmvplayer.yaml
mods/ra/chrome/ingame-menu.yaml
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index bf20b23870..b4bac470bb 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -668,54 +668,6 @@ HEAVYC:
RenderBuildingWarFactory:
Image: HEAVYC
-#4PLATES:
-# Inherits: ^WALL
-# Buildable:
-# BuildPaletteOrder: 2000
-# Owner: atreides, harkonnen, ordos
-# Tooltip:
-# Name: Fundament
-# Description: Pretty useless at the moment.
-# Icon: 4plateicon
-# Building:
-# TerrainTypes: Rock
-# Footprint: =
-# LineBuild:
-# Range: 4
-# RenderBuildingWall:
-# HasMakeAnimation: false
-# Image: PLATES
-# Wall:
-# CrushClasses: plates
-# -SelectionDecorations:
-# -Selectable:
-
-#6PLATES:
-# Inherits: ^WALL
-# Buildable:
-# BuildPaletteOrder: 3000
-# Owner: atreides, harkonnen, ordos
-# Valued:
-# Cost: 120
-# Tooltip:
-# Name: Fundament
-# Description: Pretty useless at the moment.
-# Icon: 6plateicon
-# Building:
-# TerrainTypes: Rock
-# Footprint: =
-# LineBuild:
-# Range: 6
-# RenderBuildingWall:
-# HasMakeAnimation: false
-# Image: PLATES
-# Wall:
-# CrushClasses: plates
-# -SelectionDecorations:
-# -Selectable:
-
-
-
# custom prerequisites:
CONYARD:
Tooltip:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 23da9915c6..2341f94806 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -512,38 +512,3 @@ SPICEBLOOM:
RadarColorFromTerrain:
Terrain: Spice
BodyOrientation:
-
-#SANDWORM:
-# Buildable:
-# Owner: Creep
-# Valued:
-# Cost: 1000
-# Tooltip:
-# Name: Sandworm
-# Description: Attracted by vibrations in the sand. Will eat units whole and has a large appetite.
-# Icon: black
-# Health:
-# HP: 10000
-# Radius: 3
-# Armor:
-# Type: None
-# Mobile:
-# Speed: 5
-# TerrainSpeeds:
-# Sand: 100
-# Dune: 100
-# Spice: 100
-# TargetableUnit:
-# TargetTypes: Ground
-# AutoTarget:
-# AttackMove:
-# JustMove: true
-# AttackWander:
-# Armament:
-# Weapon: WormJaw
-# AttackLeap:
-# CanAttackGround: no
-# RenderInfantry:
-# GivesExperience:
-# GivesBounty:
-# DrawLineToTarget:
diff --git a/mods/d2k/uibits/alternate-loadscreen.png b/mods/d2k/uibits/alternate-loadscreen.png
deleted file mode 100644
index 1b5a154290..0000000000
Binary files a/mods/d2k/uibits/alternate-loadscreen.png and /dev/null differ
diff --git a/mods/d2k/uibits/dune2000-loadscreen.png b/mods/d2k/uibits/dune2000-loadscreen.png
deleted file mode 100644
index d208752ef7..0000000000
Binary files a/mods/d2k/uibits/dune2000-loadscreen.png and /dev/null differ
diff --git a/mods/d2k/uibits/misc.png b/mods/d2k/uibits/misc.png
deleted file mode 100644
index f9ed86a580..0000000000
Binary files a/mods/d2k/uibits/misc.png and /dev/null differ
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index d98c80d914..bb480fd96c 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -226,7 +226,7 @@ TowerMissile:
ValidTargets: Ground, Air
Burst: 2
BurstDelay: 15
- Projectile: Missile
+ Projectile: Bullet
Arm: 0
High: yes
Shadow: yes
@@ -234,11 +234,12 @@ TowerMissile:
Inaccuracy: 12
Image: MISSILE2
ROT: 10
- Speed: 45
+ Speed: 20
RangeLimit: 50
+ Angle: 0.2
Warhead:
Spread: 12
- Versus:
+ Versus:
None: 50%
Wood: 45%
Light: 100%