Merge branch 'master' of https://github.com/endless-sky/endless-sky

data/transport missions.txt

@@ -1273,7 +1273,8 @@ mission "Drug Running 1"
 		attributes "paradise"
 		distance 1 100
 	cargo "illegal drugs" 5 2 .1
-		illegal 40000
+		illegal 40000 `In addition to the fine, the illegal drugs are confiscated from your cargo hold.`
+		stealth
 	to offer
 		random < 10
 		"said no to drugs" < 4
@@ -1304,7 +1305,8 @@ mission "Drug Running 2"
 		attributes "rich"
 		distance 1 100
 	cargo "illegal drugs" 5 2 .1
-		illegal 50000
+		illegal 50000 `In addition to the fine, the illegal drugs are confiscated from your cargo hold.`
+		stealth
 	to offer
 		random < 10
 		has "Drug Running 1: done"
@@ -1330,7 +1332,8 @@ mission "Drug Running 3"
 		attributes "urban"
 		distance 1 100
 	cargo "illegal drugs" 5 2 .1
-		illegal 70000
+		illegal 70000 `In addition to the fine, the illegal drugs are confiscated from your cargo hold.`
+		stealth
 	to offer
 		random < 10
 		has "Drug Running 2: done"

data/weapons.txt

@@ -161,7 +161,7 @@ outfit "Beam Laser"
 		"firing heat" 1.2
 		"shield damage" 1
 		"hull damage" 1.3
-	description "In the early part of the space era, the settlements in the region of space known as the Deep developed in relative isolation from the rest of human space. One result of that isolation is that their weapons technology mostly uses beam weapons, instead of the energy projectile weapons that are more common elsewhere. A Beam Laser has a slightly shorter range than an Energy Blaster, but is also much more energy-efficient and does a comparable amount of damage."
+	description "In the early part of the space era, the settlements in the region of space known as the Deep developed in relative isolation from the rest of human space. One result of that isolation is that their weapons technology mostly uses beam weapons, instead of the energy projectile weapons that are more common elsewhere."
 
 outfit "Laser Turret"
 	category "Turrets"
@@ -650,22 +650,22 @@ outfit "Meteor Missile Launcher"
 		"fire effect" "meteor fire"
 		"die effect" "missile death"
 		"hit effect" "missile hit"
-		"inaccuracy" 10
-		"velocity" 9
-		"lifetime" 600
-		"reload" 48
+		"inaccuracy" 5
+		"velocity" 11
+		"lifetime" 490
+		"reload" 80
 		"firing energy" 1
 		"firing heat" 20
-		"acceleration" .9
+		"acceleration" 1
 		"drag" .1
-		"turn" 2
+		"turn" 1.35
 		"homing" 3
 		"infrared tracking" .8
-		"shield damage" 130
-		"hull damage" 80
+		"shield damage" 260
+		"hull damage" 160
 		"hit force" 220
 		"missile strength" 4
-	description "The Meteor Missile is the cheapest and simplest homing weapon available in human space. Meteors are quickly destroyed by anti-missile systems, and their infrared tracking systems have trouble homing in on targets with low heat levels. Nevertheless, they can be deadly in large numbers and against poorly-defended targets."
+	description "The Meteor Missile is the cheapest and simplest homing weapon available in human space. Meteors are quickly destroyed by anti-missile systems, and their infrared tracking systems have trouble homing in on targets with low heat levels. Nevertheless, their large warheads can spell doom for poorly-defended targets when the missiles are fired in great numbers."
 
 effect "meteor fire"
 	sprite "effect/meteor fire"
@@ -677,7 +677,7 @@ effect "meteor fire"
 
 outfit "Sidewinder Missile"
 	category "Ammunition"
-	cost 800
+	cost 900
 	thumbnail "outfit/sidewinder"
 	"mass" .2
 	"sidewinder capacity" -1
@@ -713,22 +713,22 @@ outfit "Sidewinder Missile Launcher"
 		"die effect" "missile death"
 		"hit effect" "missile hit"
 		"inaccuracy" 4
-		"velocity" 11
-		"lifetime" 600
-		"reload" 40
+		"velocity" 14
+		"lifetime" 470
+		"reload" 60
 		"firing energy" 1
 		"firing heat" 15
-		"acceleration" 1.1
+		"acceleration" 1.2
 		"drag" .1
-		"turn" 3
+		"turn" 4
 		"homing" 4
 		"radar tracking" .9
-		"shield damage" 100
-		"hull damage" 70
+		"shield damage" 180
+		"hull damage" 125
 		"hit force" 170
 		"missile strength" 12
 	description "The Sidewinder Missile is designed by Lovelace Labs, which is ironically also the designer of the Anti-Missile Turret. Rumors say that the two engineering teams at Lovelace who make the missiles and the anti-missiles are locked in furious competition with each other: the result has been generation after generation of smarter missiles and then smarter turrets to fend them off."
-	description "	Although not as powerful or cheap as the popular Meteor missiles, Sidewinders have several advantages, including their better tracking systems and protective casings that make them much harder for anti-missile systems to destroy."
+	description "	Although not as powerful or cheap as the popular Meteor missiles, Sidewinders have several advantages, including their superior maneuverability, better tracking systems, and protective casings that make them much harder for anti-missile systems to destroy."
 
 effect "sidewinder fire"
 	sprite "effect/sidewinder fire"
@@ -777,8 +777,8 @@ outfit "Javelin Pod"
 		"reload" 15
 		"firing energy" .2
 		"firing heat" 12
-		"shield damage" 48
-		"hull damage" 26
+		"shield damage" 57
+		"hull damage" 36
 		"hit force" 50
 		"missile strength" 2
 	description "The Javelin Pod fires a rapid stream of unguided missiles. A Javelin Pod does far more damage than any gun of a comparable size, and has a longer range as well, but once a ship has fired off all its ammunition it must leave combat and find a planet where it can buy more, which makes Javelins less useful in protracted battles. As a result, they are very popular with pirates as a way to quickly disable a small target."
@@ -825,16 +825,16 @@ outfit "Torpedo Launcher"
 		"inaccuracy" 5
 		"velocity" 6
 		"lifetime" 600
-		"reload" 120
+		"reload" 150
 		"firing energy" 2
 		"firing heat" 45
 		"acceleration" .15
 		"drag" .025
 		"turn" 1.5
 		"homing" 3
 		"optical tracking" .8
-		"shield damage" 450
-		"hull damage" 450
+		"shield damage" 680
+		"hull damage" 680
 		"hit force" 300
 		"missile strength" 30
 	description "Torpedoes are the most powerful homing weapon, but they move slowly enough that fast ships can simply outrun them, making them most useful against large targets or against small ships at times when they are too distracted to dodge. Torpedo launchers are also much larger than other missile systems, so they are most often found in capital ships."
@@ -887,16 +887,16 @@ outfit "Typhoon Launcher"
 		"inaccuracy" 5
 		"velocity" 5
 		"lifetime" 600
-		"reload" 100
+		"reload" 120
 		"firing energy" 4
 		"firing heat" 50
 		"acceleration" .1
 		"drag" .02
-		"turn" 1.8
+		"turn" 1.5
 		"homing" 4
 		"optical tracking" .9
-		"shield damage" 610
-		"hull damage" 610
+		"shield damage" 880
+		"hull damage" 880
 		"hit force" 450
 		"missile strength" 40
 	description "Typhoon Torpedoes are an improved torpedo technology; they do considerably more damage than ordinary torpedoes. However, they are also much slower, because they are intended mostly for use against large and slow-moving capital ships. As a result, sufficiently skilled pilots can often dodge around them."
@@ -944,17 +944,17 @@ outfit "Heavy Rocket Launcher"
 		"hit effect" "heavy rocket hit"
 		"die effect" "small explosion"
 		"inaccuracy" 1
-		"velocity" 8
+		"velocity" 9
 		"lifetime" 100
-		"reload" 200
+		"reload" 240
 		"firing energy" 1
 		"firing heat" 250
 		"acceleration" .8
 		"drag" .1
 		"trigger radius" 30
 		"blast radius" 50
-		"shield damage" 700
-		"hull damage" 600
+		"shield damage" 850
+		"hull damage" 720
 		"hit force" 600
 		"missile strength" 16
 	description "Heavy Rockets are the most powerful missile weapon available, but at a price: instead of having a homing system, they simply fire straight forward and rely on a proximity trigger to set them off. Once triggered, however, they damage all ships within their blast radius, making them highly effective against clusters of fighters."

endless-sky.appdata.xml

@@ -19,6 +19,10 @@
    Endless Sky is a sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control. You start out as the captain of a tiny space ship and can choose what to do from there. The game includes a major plot line and many minor missions, but you can choose whether you want to play through the plot or strike out on your own as a merchant or bounty hunter or explorer.
   </p>
   </description>
+  <categories>
+    <category>Game</category>
+    <category>Simulation</category>
+  </categories>
   <url type="bugtracker">https://github.com/endless-sky/endless-sky/issues</url>
   <url type="help">https://github.com/endless-sky/endless-sky/wiki/PlayersManual</url>
   <url type="homepage">https://endless-sky.github.io/</url>

source/Ship.cpp

@@ -3004,7 +3004,7 @@ double Ship::MinimumHull() const
 		return 0.;
 
 	double maximumHull = attributes.Get("hull");
-	return max(.20 * maximumHull, min(.50 * maximumHull, 400.));
+	return maximumHull * max(.15, min(.45, 10. / sqrt(maximumHull)));
 }