Merge branch 'release/3648'

changelog.md

@@ -1,3 +1,17 @@
+Patch 3648 (August 13, 2015)
+===========================
+
+Bugs
+----
+
+- ASF no longer have issues gaining targets when just given move orders
+- Satelite works with 'no-air' restriction again
+
+Enhancements
+------------
+
+- Remove 'no sc1 units' restriction that would make the game unplayable
+
 Patch 3646 (August 11, 2015)
 ===========================
 

loc/ES/strings_db.lua

@@ -7065,8 +7065,6 @@ tooltipui0536="Sin sistemas de espionaje"
 tooltipui0537="Los jugadores no podrán construir unidades que ofrezcan información."
 tooltipui0538="Sin comandantes de apoyo"
 tooltipui0539="Los jugadores no podrán crear comandantes de apoyo."
-tooltipui0639="Sin unidades de Supreme Commander"
-tooltipui0640="Los jugadores no podrán formar unidades de Supreme Commander."
 tooltipui0641="Sin unidades de Forged Alliance"
 tooltipui0642="Los jugadores no podrán formar unidades de Forged Alliance."
 tooltipui0643="Sin unidades descargadas"
@@ -7272,7 +7270,6 @@ opbrief_0007="Dificultad:"
 opbrief_0008="Facción:"
 pause_0001="Partida reanudada"
 pause_0002="Partida en pausa"
-restricted_units_data_0016="Sin unidades de Supreme Commander"
 restricted_units_data_0017="Sin unidades de Forged Alliance"
 restricted_units_data_0018="Sin unidades descargadas"
 restricted_units_data_0019="Sin producción de masa"
@@ -7553,3 +7550,5 @@ lobui_0426 = "Recalculates your CPU rating"
 restricted_units_data_0030 = "No T3 Air"
 tooltipui0693 = "Prevents T3 Air being built."
 tooltipui0691 = "Toggle if this drone rebuilds upon death"
+restricted_units_data_0016 = "No Hover Units"
+tooltipui0640 = "Removes units which hover"

loc/FR/strings_db.lua

@@ -7064,8 +7064,6 @@ tooltipui0536="Pas de structures de renseignement"
 tooltipui0537="Les joueurs ne pourront pas construire de radars, de sonars ou d'installations omni."
 tooltipui0538="Pas de commandeurs de soutien"
 tooltipui0539="Les joueurs ne pourront pas construire de commandeurs de soutien."
-tooltipui0639="Pas d'unités de Supreme Commander"
-tooltipui0640="Les joueurs ne pourront pas construire d'unités de Supreme Commander."
 tooltipui0641="Pas d'unités de Forged Alliance"
 tooltipui0642="Les joueurs ne pourront pas construire d'unités de Supreme Commander : Forged Alliance."
 tooltipui0643="Pas de téléchargements"
@@ -7271,7 +7269,6 @@ opbrief_0007="Difficulté :"
 opbrief_0008="Faction :"
 pause_0001="Partie reprise"
 pause_0002="Partie en pause"
-restricted_units_data_0016="Pas d'unités de Supreme Commander"
 restricted_units_data_0017="Pas d'unités de Forged Alliance"
 restricted_units_data_0018="Pas de téléchargements"
 restricted_units_data_0019="Pas de fabricateurs de masse"
@@ -7554,3 +7551,5 @@ lobui_0426 = "Recalculates your CPU rating"
 restricted_units_data_0030 = "No T3 Air"
 tooltipui0693 = "Prevents T3 Air being built."
 tooltipui0691 = "Toggle if this drone rebuilds upon death"
+restricted_units_data_0016 = "No Hover Units"
+tooltipui0640 = "Removes units which hover"

loc/IT/strings_db.lua

@@ -7066,8 +7066,6 @@ tooltipui0536="Senza strutture di intelligence"
 tooltipui0537="I giocatori non potranno costruire strutture che forniscono strumenti di intelligence"
 tooltipui0538="Senza Comandanti in seconda"
 tooltipui0539="I giocatori non potranno contare sull'aiuto dei Comandanti in seconda"
-tooltipui0639="Supreme Commander: no"
-tooltipui0640="I giocatori non potranno costruire le unità di Supreme Commander"
 tooltipui0641="Forged Alliance: no"
 tooltipui0642="I giocatori non potranno costruire le unità di Forged Alliance"
 tooltipui0643="Unità scaricate: no"
@@ -7273,7 +7271,6 @@ opbrief_0007="Difficoltà:"
 opbrief_0008="Fazione:"
 pause_0001="Gioco ripreso"
 pause_0002="Gioco in pausa"
-restricted_units_data_0016="Supreme Commander: no"
 restricted_units_data_0017="Forged Alliance: no"
 restricted_units_data_0018="Unità scaricate: no"
 restricted_units_data_0019="Fabbricazione di massa: no"
@@ -7556,3 +7553,5 @@ lobui_0426 = "Recalculates your CPU rating"
 restricted_units_data_0030 = "No T3 Air"
 tooltipui0693 = "Prevents T3 Air being built."
 tooltipui0691 = "Toggle if this drone rebuilds upon death"
+restricted_units_data_0016 = "No Hover Units"
+tooltipui0640 = "Removes units which hover"

loc/US/strings_db.lua

@@ -4545,7 +4545,6 @@ restricted_units_data_0012="No Game Enders"
 restricted_units_data_0013="No Bubbles"
 restricted_units_data_0014="No Intel Structures"
 restricted_units_data_0015="No Support Commanders"
-restricted_units_data_0016="No Supreme Commander"
 restricted_units_data_0017="No Forged Alliance"
 restricted_units_data_0018="No Downloaded"
 restricted_units_data_0019="No Mass Fabrication"
@@ -5047,8 +5046,6 @@ tooltipui0536="No Intel Structures"
 tooltipui0537="Prevents players from constructing Sonar, Radar, or Optical Sensor structures"
 tooltipui0538="No Support Commanders"
 tooltipui0539="Prevents players from summoning Support Armored Command Units"
-tooltipui0639="No Vanilla"
-tooltipui0640="Removes all units which were found in the original Supreme Commander"
 tooltipui0641="No Forged Alliance"
 tooltipui0642="Removes all units which were introduced in the Forged Alliance expansion"
 tooltipui0643="No Downloaded"
@@ -6714,3 +6711,5 @@ lobui_0426 = "Recalculates your CPU rating"
 restricted_units_data_0030 = "No T3 Air"
 tooltipui0693 = "Prevents T3 Air being built."
 tooltipui0691 = "Toggle if this drone rebuilds upon death"
+restricted_units_data_0016 = "No Hover Units"
+tooltipui0640 = "Removes units which hover"

lua/sim/Unit.lua

@@ -95,7 +95,8 @@ Unit = Class(moho.unit_methods) {
         return Sync.UnitData[self:GetEntityId()]
     end,
 
-    --The original builder of this unit, set by OnStartBeingBuilt. Used for calculating differential upgrade costs
+    --The original builder of this unit, set by OnStartBeingBuilt. Used for calculating differential
+    -- upgrade costs, and tracking the original owner of a unit (for tracking gifting and so on)
     originalBuilder = nil,
 
     -------------------------------------------------------------------------------------------
@@ -250,7 +251,6 @@ Unit = Class(moho.unit_methods) {
     -- TARGET AND ATTACKERS FUNCTIONS
     ------------------------------------------------------------------------------------------
     OnGotTarget = function(self, Weapon)
-        self:SetUnitState("Attacking", true)
     end,
 
     OnLostTarget = function(self, Weapon)
@@ -1850,8 +1850,6 @@ Unit = Class(moho.unit_methods) {
         if bp.EnhancementPresetAssigned then
             self:ForkThread(self.CreatePresetEnhancementsThread)
         end
-
-        self.originalBuilder = nil
     end,
 
     StartBeingBuiltEffects = function(self, builder, layer)

lua/sim/defaultweapons.lua

@@ -465,6 +465,8 @@ DefaultProjectileWeapon = Class(Weapon) {
         end,
 
         OnGotTarget = function(self)
+            Weapon.OnGotTarget(self)
+
             local bp = self:GetBlueprint()
 
             -- Issue 43
@@ -820,6 +822,7 @@ DefaultProjectileWeapon = Class(Weapon) {
         end,
 
         OnGotTarget = function(self)
+            Weapon.OnGotTarget(self)
 
             -- Issue 43
             if self.unit then
@@ -1051,7 +1054,7 @@ DefaultBeamWeapon = Class(DefaultProjectileWeapon) {
         while true do
             WaitSeconds(1)
             --if we're at hold fire, stop beam
-            if self.unit and (self.unit:GetFireState() == 1 or not self.unit:IsUnitState("Attacking")) then
+            if self.unit and (self.unit:GetFireState() == 1 or self.NumTargets == 0) then
                 self.BeamStarted = false
                 self:PlayFxBeamEnd(beam)
             end
@@ -1068,7 +1071,7 @@ DefaultBeamWeapon = Class(DefaultProjectileWeapon) {
     PlayFxWeaponUnpackSequence = function(self)
         local bp = self:GetBlueprint()
         -- If it's not a continuous beam, or  if it's a continuous beam that's off
-        if bp.BeamLifetime > 0 or not self.ContBeamOn then
+        if bp.BeamLifetime > 0 or (bp.BeamLifetime == 0 and not self.ContBeamOn) then
             DefaultProjectileWeapon.PlayFxWeaponUnpackSequence(self)
         end
     end,