Version 63

Merge pull request #266 from Nomads-Project/develop
FAForever · Apr 1, 2017 · f0724f9 · f0724f9
2 parents 54f4a01 + 47bf3d7
commit f0724f9
Show file tree

Hide file tree

Showing 77 changed files with 431 additions and 225 deletions.
diff --git a/init_nomads.lua b/init_nomads.lua
@@ -48,6 +48,7 @@ mount_dir(InitFileDir..'\\..\\gamedata\\lua.nmd', '/')
 mount_dir(InitFileDir..'\\..\\gamedata\\projectiles.nmd', '/')
 mount_dir(InitFileDir..'\\..\\gamedata\\nomads.nmd', '/')
 mount_dir(InitFileDir..'\\..\\gamedata\\loc.nmd', '/')
+mount_dir(InitFileDir..'\\..\\gamedata\\meshes.nmd', '/')
 
 for k, v in oldPath do
     table.insert(path, v)

diff --git a/loc/US/nomads_strings_core.lua b/loc/US/nomads_strings_core.lua
@@ -345,7 +345,7 @@ inu1007_name = "Asator"
 -- T1 medium tank
 inu1004_desc = "Medium tank"
 inu1004_help = "Armored hover tank. Armed with a single cannon, useful against lower tier units."
-inu1004_name = "Bandit"
+inu1004_name = "Orbis"
 
 -- T1 AA gun / artillery
 inu1006_desc = "Mobile Anti-Air Gun / Artillery"
@@ -667,8 +667,8 @@ inu2001_help = "Tech 3 amphibious construction, repair, capture and reclamation
 inu2001_name = "Engineer"
 
 -- T3 tank
-inu3002_desc = "Heavy Hover Tank"
-inu3002_help = "Heavy hover tank. Equipped with heavy armor, a rocket launcher and a single siege cannon. Designed to deal with any surface threat. Additionally, it can pin-point targets for artillery units."
+inu3002_desc = "Heavy Amphibious Tank"
+inu3002_help = "Heavy amphibious tank. Equipped with heavy armor, a rocket launcher and a single siege cannon. Designed to deal with any surface threat."
 inu3002_name = "Nova"
 
 -- T3 artillery
@@ -917,3 +917,12 @@ NTaunts_MP1_010_017 = '[{i Nicols}]: You can\'t hope to contain the vastness of
 NTaunts_MP1_010_018 = '[{i Nicols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?'
 NTaunts_MP1_010_019 = '[{i Nicols}]: It is amazing that you made it this far without hurting yourself.'
 
+Benson = "Benson"
+NTaunts_MP1_011_010 = '[{i Benson}]: Even my ships docking sensors have better aim than your gun.'
+NTaunts_MP1_011_011 = '[{i Benson}]: When we came back to the earth empire space we expected an advanced civilization, but you merely progressed beyond bow and arrow.'
+NTaunts_MP1_011_012 = '[{i Benson}]: A 5 year old kid would design more sophisticated war machines than those you call \'experimentals\'.'
+NTaunts_MP1_011_013 = '[{i Benson}]: You had 1000 years to develop a war machine and THIS is what you\'ve come up with?'
+NTaunts_MP1_011_014 = '[{i Benson}]: How many mountainsides have you managed to gate into so far?'
+NTaunts_MP1_011_015 = '[{i Benson}]: You really need to leave the air superiority to those who are actually superior.'
+NTaunts_MP1_011_016 = '[{i Benson}]: I would encourage you to broaden your horizon - except that you won\'t live to see another one.'
+NTaunts_MP1_011_017 = '[{i Benson}]: Your strategy is as primitive as your tech.'
diff --git a/lua/sim/tasks/NomadsAreaBombardment.lua b/lua/sim/tasks/NomadsAreaBombardment.lua
@@ -20,7 +20,7 @@ NomadsAreaBombardment = Class(ScriptTask) {
         self:SetAIResult(AIRESULT.Success)
         self.ScriptIsDone = true
     end,
-	  
+
     TaskTick = function(self)
         if self.ScriptIsDone then
             return TASKSTATUS.Done

diff --git a/meshes/game/map-border_hor_nomads_Albedo.dds b/meshes/game/map-border_hor_nomads_Albedo.dds
diff --git a/meshes/game/map-border_hor_nomads_SpecTeam.dds b/meshes/game/map-border_hor_nomads_SpecTeam.dds
diff --git a/meshes/game/map-border_hor_nomads_lod0.scm b/meshes/game/map-border_hor_nomads_lod0.scm
diff --git a/meshes/game/map-border_hor_nomads_mesh.bp b/meshes/game/map-border_hor_nomads_mesh.bp
@@ -0,0 +1,10 @@
+MeshBlueprint {
+    LODs = {
+        {
+            ShaderName = 'MapImager',
+            LODCutoff = 100000,
+        },
+    },
+    IconFadeInZoom = 10000,
+    UniformScale = 0.001953125,
+}
diff --git a/meshes/game/map-border_hor_nomads_normalsTS.dds b/meshes/game/map-border_hor_nomads_normalsTS.dds
diff --git a/meshes/game/map-border_squ_nomads_Albedo.dds b/meshes/game/map-border_squ_nomads_Albedo.dds
diff --git a/meshes/game/map-border_squ_nomads_SpecTeam.dds b/meshes/game/map-border_squ_nomads_SpecTeam.dds
diff --git a/meshes/game/map-border_squ_nomads_detail_mesh.bp b/meshes/game/map-border_squ_nomads_detail_mesh.bp
@@ -0,0 +1,10 @@
+MeshBlueprint {
+    LODs = {
+        {
+            ShaderName = 'MapImager',
+            LODCutoff = 100000,
+        },
+    },
+    IconFadeInZoom = 10000,
+    UniformScale = 0.001953125,
+}
diff --git a/meshes/game/map-border_squ_nomads_lod0.scm b/meshes/game/map-border_squ_nomads_lod0.scm
diff --git a/meshes/game/map-border_squ_nomads_mesh.bp b/meshes/game/map-border_squ_nomads_mesh.bp
@@ -0,0 +1,10 @@
+MeshBlueprint {
+    LODs = {
+        {
+            ShaderName = 'MapImager',
+            LODCutoff = 100000,
+        },
+    },
+    IconFadeInZoom = 10000,
+    UniformScale = 0.001953125,
+}
diff --git a/meshes/game/map-border_squ_nomads_normalsTS.dds b/meshes/game/map-border_squ_nomads_normalsTS.dds
diff --git a/mod_info.lua b/mod_info.lua
@@ -1,9 +1,9 @@
 name = "nomads"
-version = 62
+version = 63
 copyright = "brute51"
 description = "adds a new faction to the game"
 author = "CookieNoob, Exotic_Retard, Brute51, original nomads team"
-uid = "50423624-1e83-4fc2-85b3-nomadsv00061"
+uid = "50423624-1e83-4fc2-85b3-nomadsv00063"
 url = ""
 icon = ""
 identifier = ""

diff --git a/nomadhook/lua/abilitydefinition.lua b/nomadhook/lua/abilitydefinition.lua
@@ -140,7 +140,6 @@ abilities = table.merged( abilities, {
         cursor = 'RULEUCC_SpecialAction',
         enabled = true,
         ExtraInfo = {
-            CoolDownTime = 60,
             DoRangeCheck = true,
             NumReticules = 10,
         },
@@ -160,8 +159,8 @@ abilities = table.merged( abilities, {
             UseSelected = false,
         },
 
-        SoundReady = 'OrbitalStrikeReady',
-        SoundLaunched = 'OrbitalStrikeLaunched',
+--        SoundReady = 'OrbitalStrikeReady',
+--        SoundLaunched = 'OrbitalStrikeLaunched',
 
         GetAllUnitsFile = '/lua/user/tasks/Tasks.lua',
         GetRangeCheckUnitsFile = '/lua/user/tasks/Tasks.lua',

diff --git a/nomadhook/lua/aibrain.lua b/nomadhook/lua/aibrain.lua
@@ -583,6 +583,9 @@ AIBrain = Class(oldAIBrain) {
     OrbitalStrikeTarget = function(self, targetPosition)
         if self.NomadsMothership then
             self.NomadsMothership:OnGivenNewTarget(targetPosition)
+            if self.OrbitalBombardmentInitiator:GetTacticalSiloAmmoCount() > 0 then
+                self.OrbitalBombardmentInitiator:RemoveTacticalSiloAmmo(1)
+            end
         end
     end,
 

diff --git a/nomadhook/lua/sim/Unit.lua b/nomadhook/lua/sim/Unit.lua
@@ -44,8 +44,8 @@ Unit = Class(oldUnit) {
                         end
                         if vTypeGroup.Recolour then
                             --WARN('Trying to recolour emitter (make sure it has a ramp compatible with this feature): '..vEffect)
-                            emit:SetEmitterCurveParam('RAMPSELECTION_CURVE', 1-((self.ColourIndex)*(1/32)), 0)
-                            --WARN('recolouring emitter'..(self.ColourIndex)*(1/32)..' with index of: '..self.ColourIndex)
+                            emit:SetEmitterCurveParam('RAMPSELECTION_CURVE', 1-((self.ColourIndex)*(1/18))+1/36, 0)
+                            --WARN('recolouring emitter'..(self.ColourIndex)*(1/18)..' with index of: '..self.ColourIndex)
                         end
                         if EffectBag then
                             table.insert( EffectBag, emit )
@@ -62,7 +62,6 @@ Unit = Class(oldUnit) {
         local tblArmy = ListArmies()
         local army = self:GetArmy()
         self.ColourIndex = ScenarioInfo.ArmySetup[tblArmy[army]].ArmyColor
-        --WARN('colour index: '..self.ColourIndex)
     end,
 
 

diff --git a/nomadhook/lua/skins/skins.lua b/nomadhook/lua/skins/skins.lua
@@ -5,8 +5,8 @@ skins = table.merged( skins, {
     nomads = {
         default = "default",
         texturesPath = "/textures/ui/nomads",
-        imagerMesh = "/meshes/game/map-border_squ_uef_mesh",
-        imagerMeshHorz = "/meshes/game/map-border_hor_uef_mesh",
+        imagerMesh = "/meshes/game/map-border_squ_nomads_mesh",
+        imagerMeshHorz = "/meshes/game/map-border_hor_nomads_mesh",
         buttonFont = "Zeroes Three",
         factionFont = "Zeroes Three",
         bodyFont = "Arial",

diff --git a/nomadhook/lua/ui/game/layouts/unitview_left.lua b/nomadhook/lua/ui/game/layouts/unitview_left.lua
@@ -20,42 +20,51 @@ function SetBG(controls)
     controls.abilityBG.TL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ul.dds'))
     controls.abilityBG.TL.Right:Set(controls.abilities.Left)
     controls.abilityBG.TL.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TL, controls.abilities)
 
     controls.abilityBG.TM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_horz_um.dds'))
     controls.abilityBG.TM.Right:Set(controls.abilityBG.TL.Right)
     controls.abilityBG.TM.Bottom:Set(function() return controls.abilities.Top() end)
     controls.abilityBG.TM.Left:Set(controls.abilityBG.TR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TM, controls.abilities)
 
     controls.abilityBG.TR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ur.dds'))
     controls.abilityBG.TR.Left:Set(controls.abilities.Right)
     controls.abilityBG.TR.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TR, controls.abilities)
 
     controls.abilityBG.ML:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_l.dds'))
     controls.abilityBG.ML.Right:Set(controls.abilities.Left)
     controls.abilityBG.ML.Top:Set(controls.abilityBG.TL.Bottom)
     controls.abilityBG.ML.Bottom:Set(controls.abilityBG.BL.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.ML, controls.abilities)
 
     controls.abilityBG.M:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_m.dds'))
     controls.abilityBG.M.Top:Set(controls.abilityBG.TM.Bottom)
     controls.abilityBG.M.Left:Set(controls.abilityBG.ML.Right)
     controls.abilityBG.M.Right:Set(controls.abilityBG.MR.Left)
     controls.abilityBG.M.Bottom:Set(controls.abilityBG.BM.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.M, controls.abilities)
 
     controls.abilityBG.MR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_r.dds'))
     controls.abilityBG.MR.Left:Set(controls.abilities.Right)
     controls.abilityBG.MR.Top:Set(controls.abilityBG.TR.Bottom)
     controls.abilityBG.MR.Bottom:Set(controls.abilityBG.BR.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.MR, controls.abilities)
 
     controls.abilityBG.BL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ll.dds'))
     controls.abilityBG.BL.Right:Set(controls.abilities.Left)
     controls.abilityBG.BL.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BL, controls.abilities)
 
     controls.abilityBG.BM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lm.dds'))
     controls.abilityBG.BM.Right:Set(controls.abilityBG.BL.Right)
     controls.abilityBG.BM.Top:Set(function() return controls.abilities.Bottom() end)
     controls.abilityBG.BM.Left:Set(controls.abilityBG.BR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BM, controls.abilities)
 
     controls.abilityBG.BR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lr.dds'))
     controls.abilityBG.BR.Left:Set(controls.abilities.Right)
     controls.abilityBG.BR.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BR, controls.abilities)
 end
diff --git a/nomadhook/lua/ui/game/layouts/unitview_mini.lua b/nomadhook/lua/ui/game/layouts/unitview_mini.lua
@@ -1,7 +1,7 @@
 local UIUtil = import('/lua/ui/uiutil.lua')
 local LayoutHelpers = import('/lua/maui/layouthelpers.lua')
 
-table.insert(iconPositions, {Left = 130, Top = 80}) -- position capacitor icon at shield position
+table.insert(iconPositions, {Left = 188, Top = 80}) -- position capacitor icon at shield position
 table.insert(iconTextures, UIUtil.UIFile('/game/unit_view_icons/capacitor.dds'))
 
 local oldSetLayout = SetLayout
@@ -20,42 +20,52 @@ function SetBG(controls)
     controls.abilityBG.TL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ul.dds'))
     controls.abilityBG.TL.Right:Set(controls.abilities.Left)
     controls.abilityBG.TL.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TL, controls.abilities)
 
     controls.abilityBG.TM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_horz_um.dds'))
     controls.abilityBG.TM.Right:Set(controls.abilityBG.TL.Right)
     controls.abilityBG.TM.Bottom:Set(function() return controls.abilities.Top() end)
     controls.abilityBG.TM.Left:Set(controls.abilityBG.TR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TM, controls.abilities)
 
     controls.abilityBG.TR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ur.dds'))
     controls.abilityBG.TR.Left:Set(controls.abilities.Right)
     controls.abilityBG.TR.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TR, controls.abilities)
 
     controls.abilityBG.ML:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_l.dds'))
     controls.abilityBG.ML.Right:Set(controls.abilities.Left)
     controls.abilityBG.ML.Top:Set(controls.abilityBG.TL.Bottom)
     controls.abilityBG.ML.Bottom:Set(controls.abilityBG.BL.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.ML, controls.abilities)
 
     controls.abilityBG.M:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_m.dds'))
     controls.abilityBG.M.Top:Set(controls.abilityBG.TM.Bottom)
     controls.abilityBG.M.Left:Set(controls.abilityBG.ML.Right)
     controls.abilityBG.M.Right:Set(controls.abilityBG.MR.Left)
     controls.abilityBG.M.Bottom:Set(controls.abilityBG.BM.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.M, controls.abilities)
 
     controls.abilityBG.MR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_r.dds'))
     controls.abilityBG.MR.Left:Set(controls.abilities.Right)
     controls.abilityBG.MR.Top:Set(controls.abilityBG.TR.Bottom)
     controls.abilityBG.MR.Bottom:Set(controls.abilityBG.BR.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.MR, controls.abilities)
 
     controls.abilityBG.BL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ll.dds'))
     controls.abilityBG.BL.Right:Set(controls.abilities.Left)
     controls.abilityBG.BL.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BL, controls.abilities)
 
     controls.abilityBG.BM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lm.dds'))
     controls.abilityBG.BM.Right:Set(controls.abilityBG.BL.Right)
     controls.abilityBG.BM.Top:Set(function() return controls.abilities.Bottom() end)
     controls.abilityBG.BM.Left:Set(controls.abilityBG.BR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BM, controls.abilities)
 
     controls.abilityBG.BR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lr.dds'))
     controls.abilityBG.BR.Left:Set(controls.abilities.Right)
     controls.abilityBG.BR.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BR, controls.abilities)
+
 end
diff --git a/nomadhook/lua/ui/game/layouts/unitview_right.lua b/nomadhook/lua/ui/game/layouts/unitview_right.lua
@@ -20,42 +20,51 @@ function SetBG(controls)
     controls.abilityBG.TL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ul.dds'))
     controls.abilityBG.TL.Right:Set(controls.abilities.Left)
     controls.abilityBG.TL.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TL, controls.abilities)
 
     controls.abilityBG.TM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_horz_um.dds'))
     controls.abilityBG.TM.Right:Set(controls.abilityBG.TL.Right)
     controls.abilityBG.TM.Bottom:Set(function() return controls.abilities.Top() end)
     controls.abilityBG.TM.Left:Set(controls.abilityBG.TR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TM, controls.abilities)
 
     controls.abilityBG.TR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ur.dds'))
     controls.abilityBG.TR.Left:Set(controls.abilities.Right)
     controls.abilityBG.TR.Bottom:Set(controls.abilities.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.TR, controls.abilities)
 
     controls.abilityBG.ML:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_l.dds'))
     controls.abilityBG.ML.Right:Set(controls.abilities.Left)
     controls.abilityBG.ML.Top:Set(controls.abilityBG.TL.Bottom)
     controls.abilityBG.ML.Bottom:Set(controls.abilityBG.BL.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.ML, controls.abilities)
 
     controls.abilityBG.M:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_m.dds'))
     controls.abilityBG.M.Top:Set(controls.abilityBG.TM.Bottom)
     controls.abilityBG.M.Left:Set(controls.abilityBG.ML.Right)
     controls.abilityBG.M.Right:Set(controls.abilityBG.MR.Left)
     controls.abilityBG.M.Bottom:Set(controls.abilityBG.BM.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.M, controls.abilities)
 
     controls.abilityBG.MR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_vert_r.dds'))
     controls.abilityBG.MR.Left:Set(controls.abilities.Right)
     controls.abilityBG.MR.Top:Set(controls.abilityBG.TR.Bottom)
     controls.abilityBG.MR.Bottom:Set(controls.abilityBG.BR.Top)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.MR, controls.abilities)
 
     controls.abilityBG.BL:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_ll.dds'))
     controls.abilityBG.BL.Right:Set(controls.abilities.Left)
     controls.abilityBG.BL.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BL, controls.abilities)
 
     controls.abilityBG.BM:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lm.dds'))
     controls.abilityBG.BM.Right:Set(controls.abilityBG.BL.Right)
     controls.abilityBG.BM.Top:Set(function() return controls.abilities.Bottom() end)
     controls.abilityBG.BM.Left:Set(controls.abilityBG.BR.Left)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BM, controls.abilities)
 
     controls.abilityBG.BR:SetTexture(UIUtil.UIFile('/game/filter-ping-list-panel/panel_brd_lr.dds'))
     controls.abilityBG.BR.Left:Set(controls.abilities.Right)
     controls.abilityBG.BR.Top:Set(controls.abilities.Bottom)
+    LayoutHelpers.DepthUnderParent(controls.abilityBG.BR, controls.abilities)
 end
diff --git a/nomadhook/lua/ui/game/taunt.lua b/nomadhook/lua/ui/game/taunt.lua
@@ -15,6 +15,15 @@ taunts = table.cat( taunts, {
     {text = '<LOC NTaunts_MP1_010_018>[{i Nicols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?', bank = 'NTaunts', cue = 'NTaunt_Nicols_009'},
     {text = '<LOC NTaunts_MP1_010_019>[{i Nicols}]: It is amazing that you made it this far without hurting yourself.', bank = 'NTaunts', cue = 'NTaunt_Nicols_010'},
 
+    {text = '<LOC NTaunts_MP1_011_010>[{i Benson}]: Even my ships docking sensors have better aim than your gun.', bank = 'NTaunts', cue = 'NTaunt_Benson_001'},
+    {text = '<LOC NTaunts_MP1_011_011>[{i Benson}]: When we came back to the earth empire space we expected an advanced civilization, but you merely progressed beyond bow and arrow.', bank = 'NTaunts', cue = 'NTaunt_Benson_002'},
+    {text = '<LOC NTaunts_MP1_011_012>[{i Benson}]: A 5 year old kid would design more sophisticated war machines than those you call \'experimentals\'.', bank = 'NTaunts', cue = 'NTaunt_Benson_003'},
+    {text = '<LOC NTaunts_MP1_011_013>[{i Benson}]: You had 1000 years to develop a war machine and THIS is what you\'ve come up with?', bank = 'NTaunts', cue = 'NTaunt_Benson_004'},
+    {text = '<LOC NTaunts_MP1_011_014>[{i Benson}]: How many mountainsides have you managed to gate into so far?', bank = 'NTaunts', cue = 'NTaunt_Benson_005'},
+    {text = '<LOC NTaunts_MP1_011_015>[{i Benson}]: You really need to leave the air superiority to those who are actually superior.', bank = 'NTaunts', cue = 'NTaunt_Benson_006'},
+    {text = '<LOC NTaunts_MP1_011_016>[{i Benson}]: I would encourage you to broaden your horizon - except that you won\'t live to see another one.', bank = 'NTaunts', cue = 'NTaunt_Benson_007'},
+    {text = '<LOC NTaunts_MP1_011_017>[{i Benson}]: Your strategy is as primitive as your tech.', bank = 'NTaunts', cue = 'NTaunt_Benson_008'},
+
 } )
 
 end
diff --git a/packagedate.txt b/packagedate.txt
diff --git a/projectiles/NOrbitalMissile1/NOrbitalMissile1_proj.bp b/projectiles/NOrbitalMissile1/NOrbitalMissile1_proj.bp
@@ -21,7 +21,7 @@ ProjectileBlueprint {
         'PROJECTILE',
         'TACTICAL',
         'MISSILE',
-	'DIRECTFIRE',
+        'DIRECTFIRE',
         'NOSPLASHDAMAGE',
     },
     Defense = {
@@ -50,6 +50,11 @@ ProjectileBlueprint {
         },
         UniformScale = 0.8,
     },
+    Economy = {
+        BuildCostEnergy = 3600,
+        BuildCostMass = 180,
+        BuildTime = 300,
+    },
     General = {
         Category = 'Direct Fire',
         EntityCategory = {

diff --git a/sounds/Voice/US/NTaunts.xsb b/sounds/Voice/US/NTaunts.xsb
diff --git a/sounds/Voice/US/NTaunts.xwb b/sounds/Voice/US/NTaunts.xwb
diff --git a/textures/particles/ramp_gate_01.dds b/textures/particles/ramp_gate_01.dds
diff --git a/textures/ui/common/game/cursors/eye-01.dds b/textures/ui/common/game/cursors/eye-01.dds
diff --git a/textures/ui/common/game/cursors/eye-02.dds b/textures/ui/common/game/cursors/eye-02.dds
diff --git a/textures/ui/common/game/cursors/eye-03.dds b/textures/ui/common/game/cursors/eye-03.dds
diff --git a/textures/ui/common/game/cursors/eye-04.dds b/textures/ui/common/game/cursors/eye-04.dds
diff --git a/textures/ui/common/game/cursors/eye-05.dds b/textures/ui/common/game/cursors/eye-05.dds
diff --git a/textures/ui/common/game/cursors/eye-06.dds b/textures/ui/common/game/cursors/eye-06.dds
diff --git a/textures/ui/common/game/cursors/eye-07.dds b/textures/ui/common/game/cursors/eye-07.dds
diff --git a/textures/ui/common/game/cursors/eye-08.dds b/textures/ui/common/game/cursors/eye-08.dds
diff --git a/textures/ui/common/game/cursors/eye-09.dds b/textures/ui/common/game/cursors/eye-09.dds
diff --git a/textures/ui/common/game/cursors/eye-10.dds b/textures/ui/common/game/cursors/eye-10.dds
diff --git a/textures/ui/common/game/cursors/eye-11.dds b/textures/ui/common/game/cursors/eye-11.dds
diff --git a/textures/ui/common/game/cursors/eye.dds b/textures/ui/common/game/cursors/eye.dds
diff --git a/textures/ui/common/icons/units/INB3102_icon.dds b/textures/ui/common/icons/units/INB3102_icon.dds
diff --git a/textures/ui/common/icons/units/INB3202_icon.dds b/textures/ui/common/icons/units/INB3202_icon.dds
diff --git a/textures/ui/common/icons/units/INB3302_icon.dds b/textures/ui/common/icons/units/INB3302_icon.dds