Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastructure

Author: Licho1

MissionEditor/MissionEditor2/MissionBase/LuaUI/Widgets/camera_beautyshot.lua

@@ -14,6 +14,22 @@ local defaults = {time = 0, maxCamOffset = 10, minHeading = 15, maxHeading = 165
 local MAX_TRIES = 50
 local tau = 2*math.pi
 
+-- workaround bug where negative args throw an empty interval error
+-- fixes https://github.com/ZeroK-RTS/Zero-K/issues/2906
+local function randomCustom(min, max)
+  if min == max then
+    return 0
+  end
+  if min > max then
+    min, max = max, min
+  end
+  local distFromZero = 0
+  if min < 0 then
+    distFromZero = -min
+  end
+  return math.random(min + distFromZero, max + distFromZero) - distFromZero
+end
+
 local function BeautyShot(unitID, params)
   params = params or {}
   for i,v in pairs(defaults) do
@@ -29,14 +45,14 @@ local function BeautyShot(unitID, params)
   end
   if not (x and y and z) then
     if validUnit then
-	_,_,_,x,y,z = Spring.GetUnitPosition(unitID, true)
-      else
-	Spring.Log(widget:GetInfo().name, LOG.ERROR, "No valid unit and no position, cannot make beauty shot")
+      _,_,_,x,y,z = Spring.GetUnitPosition(unitID, true)
+    else
+      Spring.Log(widget:GetInfo().name, LOG.ERROR, "No valid unit and no position, cannot make beauty shot")
       return
     end
   end
   for i=1,MAX_TRIES do
-    local camFromTargetHeading = math.random(params.minHeading, params.maxHeading)
+    local camFromTargetHeading = randomCustom(params.minHeading, params.maxHeading)
     if math.random() > 0.5 then
       camFromTargetHeading = -camFromTargetHeading
     end
@@ -45,13 +61,13 @@ local function BeautyShot(unitID, params)
       local unitHeading = Spring.GetUnitHeading(unitID)*tau/65536
       camFromTargetHeading = camFromTargetHeading + unitHeading
     end
-    local angleMod = math.random(-params.maxCamOffset, params.maxCamOffset)
+    local angleMod = randomCustom(-params.maxCamOffset, params.maxCamOffset)
     angleMod = math.rad(angleMod)
-    local dist2d = params.distance or math.random(params.minDistance,params.maxDistance)
+    local dist2d = params.distance or randomCustom(params.minDistance,params.maxDistance)
     if validUnit then
       dist2d = dist2d + Spring.GetUnitRadius(unitID)
     end
-    local camPitch = math.random(params.minPitch, params.maxPitch)
+    local camPitch = randomCustom(params.minPitch, params.maxPitch)
     camPitch = math.rad(camPitch)
     local dy = dist2d*math.tan(camPitch)
     --local dist = (dist2d^2 + dy^2)^0.5

ZkLobbyServer/SpringieInterface/StartSetup.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using PlasmaShared;
@@ -86,14 +87,14 @@ public static LobbyHostingContext GetDedicatedServerStartSetup(LobbyHostingConte
                     ret.ModOptions["planet"] = planet.Name;
                     ret.ModOptions["pw_galaxyTurn"] = galaxy.Turn.ToString();
 
-                    ret.ModOptions["pw_baseIP"] = GlobalConst.BaseInfluencePerBattle.ToString();
-                    ret.ModOptions["pw_dropshipIP"] = planet.GetEffectiveShipIpBonus(attacker).ToString();
-                    ret.ModOptions["pw_defenseIP"] = planet.GetEffectiveIpDefense().ToString();
-                    ret.ModOptions["pw_attackerIP"] = (planet.PlanetFactions.FirstOrDefault(x => x.FactionID == attacker.FactionID)?.Influence ?? 0).ToString();
-                    ret.ModOptions["pw_maxIP"] = GlobalConst.PlanetWarsMaximumIP.ToString();
-                    ret.ModOptions["pw_neededIP"] = GlobalConst.InfluenceToCapturePlanet.ToString();
-                    ret.ModOptions["pw_attackerWinLoseCC"] = GlobalConst.PlanetWarsAttackerWinLoseCcMultiplier.ToString();
-                    ret.ModOptions["pw_defenderWinKillCC"] = GlobalConst.PlanetWarsDefenderWinKillCcMultiplier.ToString();
+                    ret.ModOptions["pw_baseIP"] = GlobalConst.BaseInfluencePerBattle.ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_dropshipIP"] = planet.GetEffectiveShipIpBonus(attacker).ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_defenseIP"] = planet.GetEffectiveIpDefense().ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_attackerIP"] = (planet.PlanetFactions.FirstOrDefault(x => x.FactionID == attacker.FactionID)?.Influence ?? 0).ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_maxIP"] = GlobalConst.PlanetWarsMaximumIP.ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_neededIP"] = GlobalConst.InfluenceToCapturePlanet.ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_attackerWinLoseCC"] = GlobalConst.PlanetWarsAttackerWinLoseCcMultiplier.ToString(CultureInfo.InvariantCulture);
+                    ret.ModOptions["pw_defenderWinKillCC"] = GlobalConst.PlanetWarsDefenderWinKillCcMultiplier.ToString(CultureInfo.InvariantCulture);
                 }
 
                 // write player custom keys (level, elo, is muted, etc.)

presskit/data.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<game>	
+<game>
 	<title>Zero-K</title>
 	<founding-date>October 1, 2010</founding-date>
+	<release-date>April 27, 2018</release-date>
 	<website>zero-k.info</website>
 	<based-in>International</based-in>
-	
+	<press-can-request-copy>TRUE</press-can-request-copy>
 
 	<platforms>
 		<platform>
@@ -18,12 +19,11 @@
 		</platform>
 	</platforms>
 
-	
 	<press-contact>team@zero-k.info</press-contact>
-	<phone>0</phone>
+	<phone>No</phone>
 	<address>
 		<line>The Internet</line>
-		</address>
+	</address>
 
 	<socials>
 		<social>
@@ -34,21 +34,21 @@
 			<name>facebook.com/ZeroK.RTS</name>
 			<link>facebook.com/ZeroK.RTS</link>
 		</social>
-		</socials> 
+	</socials>
 
-	<description>	
-	Zero-K is a traditional RTS focused on physics and creativity. Construct fortresses or tear down obstacles with free-form terrain manipulation. Launch jumpjet robots into the air with gravity guns and have them rain down on your opponents base. Combine over 100 units types from 12 distinct technology branches. Every unit in Zero-K is defined more by its unique combination of movement and weapon physics than it is by raw attributes, such as health and damage. Use quick nimble bots to dodge the slow projectiles of weapons better suited at hitting ponderous tanks. Conquer the galaxy in a singleplayer campaign spanning 71 missions or grab some friends to fend off waves of alien invaders. Join our online community for games ranging from 1v1 to 16v16 as well as free-for-all and regular tournaments. 
+	<description>
+		Zero-K is a traditional real time strategy game with a focus on player creativity through terrain manipulation, physics, and a large roster of unique units - all while being balanced to support competitive play. Construct fortresses or tear down obstacles with free-form terrain manipulation. Launch jumpjet robots into the air with gravity guns and have them rain down on your opponents base. Combine over 100 units types from 12 distinct technology branches. Every unit in Zero-K is defined more by its unique combination of movement and weapon physics than it is by raw attributes, such as health and damage. Use quick nimble bots to dodge the slow projectiles of weapons better suited at hitting ponderous tanks. Conquer the galaxy in a singleplayer campaign spanning 71 missions or grab some friends to fend off waves of alien invaders. Join our online community for games ranging from 1v1 to 16v16 as well as free-for-all and regular tournaments. 
 	</description>
-		
+	
 	<histories>
 		<history>
 			<text>Zero-K is managed and developed entirely by passionate volunteers. These volunteers are primarily drawn from its multiplayer community, which has existed for almost as long as the game itself. The bulk of the work is done by a handful of core developers with the occasional contribution of code or assets by members of the wider community. In Zero-K the concept of community generated content is hard to pin down as members of the community can become core developers through activity and competence. This resulted in a game which was constantly tested and optimized for multiplayer, but we wanted more. More players, specifically.
 
 			With such a focus on multiplayer Zero-K had become too daunting for many new players. The lead developers, Licho and GoogleFrog, shifted the focus of the project towards polish, singleplayer content and the new player experience. Enforcing this focus was a bit like herding (volunteer) cats as a developers default behaviour is to add cool new features. Despite this, progress was made, interfaces polished, campaigns designed. Luckily Zero-K has an active AI development sub-community which enjoys internal competition to make the strongest non-cheating AI. Now, at the end of this process, Zero-K boasts plenty of singleplayer content while retaining its strong multiplayer roots, alongside new ease-of-use multiplayer features such as matchmaking. </text>
 		</history>
 	</histories>
-		
-		
+	
+	
 	<features>
 		<feature>Physically simulated units, projectiles and terrain.</feature>
 		<feature>Terrain manipulation - Explosions leave craters. Constructors dig trenches, erect walls and ramps.</feature>
@@ -63,7 +63,7 @@
 		<feature>Regular tournaments.</feature>
 		<feature>Really free, no in-game currency, no unfair multiplayer.</feature>
 	</features>
-		
+	
 	<trailers>
 		<trailer>
 			<name>Zero-K Launch Trailer</name>
@@ -84,7 +84,6 @@
 			<description>One of PC Gamers best free games of 2017</description>
 			<info>PC Gamer</info>
 		</award>
-		
 	</awards>
 
 	<quotes>
@@ -104,7 +103,7 @@
 	<additionals>
 		<additional>
 			<title>Steam page</title>
-			<description>Zero-K will be released on Steam, check it out at </description>
+			<description>Zero-K releases on Steam on the 27th of April 2018 </description>
 			<link>http://store.steampowered.com/app/334920/ZeroK/</link>
 		</additional>
 		<additional>

presskit/index.php

@@ -76,6 +76,9 @@
 		case("founding-date"):
 			define("COMPANY_DATE", $child);
 			break;
+		case("release-date"):
+			define("GAME_DATE", $child);
+			break;
 		case("website"):
 			define("COMPANY_WEBSITE", $child);
 			break;
@@ -265,6 +268,10 @@ function parseLink($uri)
 								<a href="">'. COMPANY_TITLE .'</a><br/>
 								'. tl('Based in %s', COMPANY_BASED) .'
 							</p>
+							<p>
+								<strong>'. tl('Release date:'). '</strong><br/>
+								'. GAME_DATE .'
+							</p>
 							<p>
 								<strong>'. tl('Founding date:') .'</strong><br/>
 								'. COMPANY_DATE .'
@@ -292,9 +299,7 @@ function parseLink($uri)
 	echo( '<a href="http://'.parseLink($link).'">'.$name.'</a><br/>' );
 }
 
-echo '							</p>
-							<p>
-							<strong>'. tl('Releases:') .'</strong><br />';
+echo '							</p>';
 
 if ($handle = opendir('.')) {
 	while (false !== ($entry = readdir($handle))) {
@@ -305,8 +310,7 @@ function parseLink($uri)
 }
 closedir($handle);
 
-echo '							</p>
-							<p>';
+echo '							<p>';
 
 if( count($address) > 0 )
 {