Merge branch 'master' into Jibauni

Author: TheGiraffe3

.codespell.exclude

@@ -1,25 +1,15 @@
 		"Ikrehpeb haslrikpeb ikpecem sara nives"      # Stop acting like a child
 		"akmac pano nives ralret umsab lravriv" # a pasta of small snakes with mice meatballs
-		"haet sunt"                     # heat shunt (mispronounced)
 		"Yoo no gud fite so gif up."      # You are no good in a fight, so give up. (mispronounced)
 		"do gud"             # [do|does] good (mispronounced)
-		"We Korath imotal!"     # We, the Korath, are immortal! (mispronounced)
 		"a's no gud"         # is no good (mispronounced)
 		"ain' gud"           # ain't good (mispronounced)
 		"do gud"             # [do|does] good (mispronounced)
 		"Korath flame stong."   # [The] Korath flame is strong. (mispronounced)
 		"Can hav" 3     # Can have (mispronounced)
 		"yoo ded mor"          # you dead more (mispronounced)
 		"'oo wil" 3     # You will (mispronounced)
-		"bomance novals"           # [romance|bromance] novels (mispronounced)
-		"cley n kiln"              # clay and kiln (mispronounced)
-		"benjos"                   # banjos (mispronounced)
-		"bokets f painte"          # buckets of paint (mispronounced)
-		"easls ith trypods"        # easels with tripods (mispronounced)
-		"recerd playrs"            # record players (mispronounced)
-		"relegos tects"            # religious texts (mispronounced)
 		"blak muusic shee's"       # blank music sheets (mispronounced)
-		"sinin boowl sets"         # singing bowl set (mispronounced)
 		"Wee taek yur"           # We take your (mispronounced)
 		"Te"                     # The (mispronounced)
 		"blong to u'."           # belong to us (mispronounced)
@@ -69,10 +59,6 @@
 			`	"I do not know vhy you sent us to that place. But I am happy to be home. So go, and maybe one day I vill not hate to see you again."`
 			`A familiar woman is waiting for you outside your ship. Although it's been more than seven years since you've last seen her, you recognize Hjlod instantly. Her eyes are brighter than when last you parted, and she has the same lopsided grin that you remember. "<first>, I saw your ship landing, and thought I vould say hello."`
 			`	She reaches into her pocket and pulls out a small wooden box, similar to the one you saw displayed at Asgard years ago. "I have been thinking," Hjlod says. "Maybe all this vas vill of Skade. Maybe you took us to Asgard to make us stronger, to make us better. It is bitter lesson, but I understand it now."`
-			`	"A data archive with the latest briefings and analyses. Heavily shielded and encrypted, of course, so no need to worry about it showing up on a scan. It has to get there by <date>. So, could you do it?" They hold out a small case with a data crystal visible through the window.`
-			`As the scan results arrive the data is relayed down to the team in the cargo hold. Your video feed shows a large hologram of the system floating in midair above one of the pallets. Nearby, terminals flash rolling readouts and analyses. As the data on the spectral ship solidifies, cones of projected courses appear on the display. Line by line the cone tightens in as additional data flows from your telemetry, closing in on a path intersecting with the nearby world.`
-			`	He gestures confidently. "A team of Remnant, for instance, could all review incoming data from an experiment, form their own analyses, and then hold what amounts to a conference where each fully presents their thoughts and ideas with supporting data and reasoning within the span of a few minutes."`
-system Nnaug
 	object "Sies Upi"
 planet "Sies Upi"
 	description `Sies Upi is one of the most recently colonized planets of the Gegno Vi. This hot, dry, and harsh world serves as more of an outpost than it does a colony, but nevertheless the Vi have found ways to create manageable living conditions for their settlers.`

.codespell.words.exclude

@@ -1,6 +1,3 @@
-aesthetic
-aesthetics
-aesthetically
 ket
 ser
 Nin

data/_ui/help.txt

@@ -27,7 +27,7 @@ help "basics 2"
 
 help "dead"
 	`Uh-oh! You just died. The universe can be a dangerous place for new captains!`
-	`Fortunately, your game is automatically saved every time you leave a planet. To load your most recent saved game, press <Show main menu> to return to the main menu, then click on "Load / Save" and "Enter Ship."`
+	`Fortunately, your game is automatically saved every time you leave a planet. To load your most recent saved game, press <Show main menu> to return to the main menu, then click on "Manage Pilots" and "Enter Ship."`
 
 help "disabled"
 	`Your ship just got disabled! Before an enemy ship finishes you off, you should find someone to help you.`

data/_ui/interfaces.txt

@@ -266,7 +266,7 @@ interface "main menu"
 		dimensions 90 30
 
 	visible
-	button l "_Load / Save..."
+	button m "_Manage Pilots..."
 		center 300 155
 		dimensions 120 30
 

data/globals.txt

@@ -34,5 +34,5 @@ mission "Hai Start Unlocked"
 		conversation
 			scene "scene/hai start"
 			`By completing the <campaign> campaign and discovering the conflict between the Hai and Unfettered Hai, you have unlocked the "Hai Origins" start for future playthroughs.`
-			`	(To begin a new game with this start, open the "Load/Save" panel on the main menu and select "New Pilot.")`
+			`	(To begin a new game with this start, open the "Manage Pilots" panel on the main menu and select "New Pilot.")`
 				decline

data/governments.txt

@@ -1345,6 +1345,7 @@ government "New Houses"
 		"House Seineq" 1
 		"House Aqrabe" 1
 		"People's Houses (Hostile)" -0.01
+	"bribe" 0
 	"penalty for"
 		assist 0
 	"friendly hail" "new houses friendly hail"
@@ -1365,6 +1366,7 @@ government "Old Houses"
 		"House Myurej" 1
 		"House Sioeora" 1
 		"People's Houses (Hostile)" -0.01
+	"bribe" 0
 	"penalty for"
 		assist 0
 	"friendly hail" "old houses friendly hail"

data/human/free worlds 4 epilogue.txt

@@ -144,6 +144,51 @@ mission "FW Epilogue: Freya"
 				`	"You sound frustrated."`
 				`	"You know, the war is over, you can relax if you want to."`
 			`	"I know, I know," she says. "I complain, but really there's nowhere else I would rather be. Even if everything we're discovering here is nothing more than what they intended for us to discover, it's still the most interesting work I could possibly be doing right now. So, don't feel sorry for me. Really."`
+			branch surname
+				has "last name: Winters"
+			`	You talk for a while longer, and she tells you she'll be sure to be in touch if they ever get to the root of the Pug's motivation. "Until then," she says, "good luck in your travels. I hope the galaxy never runs out of ways to surprise you."`
+				decline
+
+			label surname
+			`	"By the way, can I ask you something, <first>? About you? Sorry if this is rather abrupt. I've been too busy to talk during the war."`
+			choice
+				`	"Sure. What is it?"`
+					goto permitted
+				`	"Sorry, I'd prefer if you didn't."`
+					goto conclusion
+			
+			label permitted
+			`	"Do you happen to know anyone named Lavinia? Married to someone named Marcus?"`
+			`	Both names sound oddly familiar, but you can't remember where you heard them.`
+			choice
+				`	"I think so, but I need a minute to remember exactly who."`
+					goto heritage
+				`	"No, I don't."`
+				
+			label denial
+			`	"Oh, okay. I think I've been mistaken, then. Never mind."`
+				goto conclusion
+			label heritage
+			`	You try to recall exactly where you've heard those names before, racking your brain for any information on these vaguely familiar names, then all of a sudden, it hits you. Marcus and Lavinia were two of your great-grandparents. You wonder why someone you've never met until around the time you joined the Free Worlds is suddenly asking about your ancestors. Maybe she was thinking of a different Marcus and Lavinia.`
+			`	"Yeah, I do know a Marcus and Lavinia, but they're my great-grandparents. Are you sure you're asking the right person?" you ask.`
+			`	"Oh my God," Freya says. "I can't believe it."`
+			`	"What?"`
+			`	"I think we're related. Second cousins. Marcus and Lavinia Winters are also my great-grandparents."`
+			choice
+				`	"Really?"`
+					goto disbelief
+				`	"Well, then, hello, cousin. Nice to meet you."`
+					goto joke
+			label disbelief
+			`	"Yeah, I can hardly believe it myself. I think it's nice, though. A pleasant surprise." You agree.`
+				goto conclusion
+
+			label joke
+			`	"Heh. Nice to meet you, too. Looks like we brought some prestige to the Winters family name, haven't we, cousin?"`
+			`	You both laugh at her reply.`
+			`	"Never thought I'd go about saving the galaxy with a second cousin I'd never met," she continues, "but in a war where some previously-unknown hyperlane-manipulating aliens intervene to try and make both sides unite, I guess anything's possible."`
+
+			label conclusion
 			`	You talk for a while longer, and she tells you she'll be sure to be in touch if they ever get to the root of the Pug's motivation. "Until then," she says, "good luck in your travels. I hope the galaxy never runs out of ways to surprise you."`
 				decline
 

data/human/human missions.txt

@@ -4353,8 +4353,8 @@ mission "Spaceport Reminder Setter"
 		"spaceport reminder month" = "month"
 		fail
 
-# Use of "00" at the start of the mission name is to make it offer only if no other missions have.
-mission "00 Spaceport Reminder Resetter"
+# Use of "aa" at the start of the mission name is to make it offer only if no other missions have.
+mission "aa Spaceport Reminder Resetter"
 	minor
 	invisible
 	repeat

data/human/ships.txt

@@ -500,7 +500,7 @@ ship "Behemoth"
 		"required crew" 12
 		"bunks" 30
 		"mass" 1120
-		"drag" 18.2
+		"drag" 14.6
 		"heat dissipation" .26
 		"fuel capacity" 600
 		"cargo space" 490
@@ -752,7 +752,7 @@ ship "Bulk Freighter"
 		"required crew" 12
 		"bunks" 21
 		"mass" 1510
-		"drag" 21
+		"drag" 16.8
 		"heat dissipation" .27
 		"fuel capacity" 900
 		"cargo space" 640
@@ -972,7 +972,7 @@ ship "Class C Freighter"
 		"required crew" 18
 		"bunks" 43
 		"mass" 1525
-		"drag" 21
+		"drag" 16.8
 		"heat dissipation" .27
 		"fuel capacity" 900
 		"cargo space" 20
@@ -1154,7 +1154,7 @@ ship "Container Transport"
 		"required crew" 6
 		"bunks" 18
 		"mass" 1525
-		"drag" 26.4
+		"drag" 21.1
 		"heat dissipation" .4
 		"fuel capacity" 600
 		"cargo space" 550
@@ -2074,7 +2074,7 @@ ship "Hauler"
 		"required crew" 3
 		"bunks" 12
 		"mass" 490
-		"drag" 14.7
+		"drag" 9.8
 		"heat dissipation" .43
 		"fuel capacity" 400
 		"cargo space" 130
@@ -2133,7 +2133,7 @@ ship "Hauler II"
 		"required crew" 3
 		"bunks" 12
 		"mass" 640
-		"drag" 16.1
+		"drag" 10.7
 		"heat dissipation" .43
 		"fuel capacity" 400
 		"cargo space" 260
@@ -2194,7 +2194,7 @@ ship "Hauler III"
 		"required crew" 3
 		"bunks" 12
 		"mass" 790
-		"drag" 17.5
+		"drag" 11.6
 		"heat dissipation" .43
 		"fuel capacity" 400
 		"cargo space" 390
@@ -2855,7 +2855,7 @@ ship "Nest"
 		"required crew" 5
 		"bunks" 14
 		"mass" 510
-		"drag" 14.7
+		"drag" 9.8
 		"heat dissipation" .48
 		"fuel capacity" 500
 		"cargo space" 40
@@ -3262,7 +3262,7 @@ ship "Roost"
 		"required crew" 7
 		"bunks" 16
 		"mass" 680
-		"drag" 16.1
+		"drag" 10.7
 		"heat dissipation" .48
 		"fuel capacity" 600
 		"cargo space" 80
@@ -3530,7 +3530,7 @@ ship "Skein"
 		"required crew" 7
 		"bunks" 18
 		"mass" 850
-		"drag" 17.5
+		"drag" 11.6
 		"heat dissipation" .51
 		"fuel capacity" 700
 		"cargo space" 120

data/map planets.txt

@@ -5535,7 +5535,7 @@ planet Tuur-Aasa-Kaska
 	government "Old Houses"
 	shipyard "Successor Basics"
 	outfitter "High Houses Light"
-	"required reputation" 15
+	"required reputation" 1
 
 planet Tuur-Oa-Sola
 	attributes "bold tourism" successor uninhabited

source/AI.cpp

@@ -4544,7 +4544,7 @@ void AI::MovePlayer(Ship &ship, Command &activeCommands)
 		AutoFire(ship, firingCommands, false, true);
 
 	const bool mouseTurning = activeCommands.Has(Command::MOUSE_TURNING_HOLD);
-	if(mouseTurning && !ship.IsBoarding() && !ship.IsReversing())
+	if(mouseTurning && !ship.IsBoarding() && (!ship.IsReversing() || ship.Attributes().Get("reverse thrust")))
 		command.SetTurn(TurnToward(ship, mousePosition));
 
 	if(activeCommands)

source/ConditionSet.cpp

@@ -364,17 +364,17 @@ void ConditionSet::Add(const DataNode &node)
 bool ConditionSet::Add(const string &firstToken, const string &secondToken)
 {
 	// Each "unary" operator can be mapped to an equivalent binary expression.
-	if(firstToken == "not")
+	if(firstToken == "not" && DataNode::IsConditionName(secondToken))
 		expressions.emplace_back(secondToken, "==", "0");
-	else if(firstToken == "has")
+	else if(firstToken == "has" && DataNode::IsConditionName(secondToken))
 		expressions.emplace_back(secondToken, "!=", "0");
-	else if(firstToken == "set")
+	else if(firstToken == "set" && DataNode::IsConditionName(secondToken))
 		expressions.emplace_back(secondToken, "=", "1");
-	else if(firstToken == "clear")
+	else if(firstToken == "clear" && DataNode::IsConditionName(secondToken))
 		expressions.emplace_back(secondToken, "=", "0");
-	else if(secondToken == "++")
+	else if(secondToken == "++" && DataNode::IsConditionName(firstToken))
 		expressions.emplace_back(firstToken, "+=", "1");
-	else if(secondToken == "--")
+	else if(secondToken == "--" && DataNode::IsConditionName(firstToken))
 		expressions.emplace_back(firstToken, "-=", "1");
 	else
 		return false;
@@ -390,7 +390,11 @@ bool ConditionSet::Add(const string &name, const string &op, const string &value
 {
 	// If the operator is recognized, map it to a binary function.
 	BinFun fun = Op(op);
-	if(!fun)
+	// For assignments we only allow condition-names on the left side.
+	// For all others we allow numbers and condition-names on both sides.
+	if(!fun || (!DataNode::IsConditionName(name) && !DataNode::IsNumber(name)) ||
+			(DataNode::IsNumber(name) && IsAssignment(op)) ||
+			(!DataNode::IsConditionName(value) && !DataNode::IsNumber(value)))
 		return false;
 
 	hasAssign |= !IsComparison(op);

source/ConditionsStore.cpp

@@ -164,7 +164,11 @@ ConditionsStore::ConditionsStore(const map<string, int64_t> &initialConditions)
 void ConditionsStore::Load(const DataNode &node)
 {
 	for(const DataNode &child : node)
+	{
+		if(!DataNode::IsConditionName(child.Token(0)))
+			child.PrintTrace("Invalid condition during savegame-load:");
 		Set(child.Token(0), (child.Size() >= 2) ? child.Value(1) : 1);
+	}
 }
 
 

source/DataNode.cpp

@@ -271,6 +271,23 @@ bool DataNode::IsBool(const string &token)
 
 
 
+bool DataNode::IsConditionName(const string &token)
+{
+	// For now check if condition names start with an alphabetic character, and that is all we check for now.
+	// Token "'" is required for backwards compatibility (used for illegal tokens).
+	// Boolean keywords are not valid conditionNames, so we also check for that.
+	return
+		!token.empty() &&
+		!IsBool(token) &&
+		(
+			(token == "'") ||
+			(token[0] >= 'a' && token[0] <= 'z') ||
+			(token[0] >= 'A' && token[0] <= 'Z')
+		);
+}
+
+
+
 // Add a new child. The child's parent must be this node.
 void DataNode::AddChild(const DataNode &child)
 {

source/DataNode.h

@@ -64,6 +64,8 @@ class DataNode {
 	// as a string.
 	bool IsBool(int index) const;
 	static bool IsBool(const std::string &token);
+	// Check if the token can be used as name for a condition.
+	static bool IsConditionName(const std::string &token);
 
 	// Add a new child. The child's parent must be this node.
 	void AddChild(const DataNode &child);