@@ -63,10 +63,14 @@ BriefingState::BriefingState(Craft *craft, Base *base)
 
 	std::string mission = _game->getSavedGame()->getSavedBattle()->getMissionType();
 	AlienDeployment *deployment = _game->getRuleset()->getDeployment(mission);
-	Ufo * ufo = dynamic_cast <Ufo*> (craft->getDestination());
-	if (!deployment && ufo) // landing site or crash site.
+	Ufo * ufo = 0;
+	if (!deployment && craft)
 	{
+		ufo = dynamic_cast <Ufo*> (craft->getDestination());
+		if (ufo) // landing site or crash site.
+		{
 			deployment = _game->getRuleset()->getDeployment(ufo->getRules()->getType());
+		}
 	}
 
 	if (!deployment) // none defined - should never happen, but better safe than sorry i guess.
@@ -138,17 +142,11 @@ BriefingState::BriefingState(Craft *craft, Base *base)
 	_txtBriefing->setText(tr(briefingtext.str()));
 
 	// if this UFO has a specific briefing, use that instead
-	if (ufo)
+	if (ufo && ufo->getRules()->getBriefingString() != "")
 	{
 		briefingtext.str("");
-		briefingtext << ufo->getRules()->getType() << "_BRIEFING";
-		// this is not a great check, if the string isn't defined
-		// for the selected language, it will revert to the default
-		// briefing text instead. this will make it harder to notice missing strings in mods.
-		if (tr(briefingtext.str()).asUTF8() != briefingtext.str())
-		{
-			_txtBriefing->setText(tr(briefingtext.str()));
-		}
+		briefingtext << ufo->getRules()->getBriefingString();
+		_txtBriefing->setText(tr(briefingtext.str()));
 	}
 
 	if (mission == "STR_BASE_DEFENSE")
 
@@ -59,6 +59,7 @@ void RuleUfo::load(const YAML::Node &node, Ruleset *ruleset)
 	_reload = node["reload"].as<int>(_reload);
 	_breakOffTime = node["breakOffTime"].as<int>(_breakOffTime);
 	_sightRange = node["sightRange"].as<int>(_sightRange);
+	_briefingString = node["briefingString"].as<std::string>(_briefingString);
 	if (const YAML::Node &terrain = node["battlescapeTerrainData"])
 	{
 		RuleTerrain *rule = new RuleTerrain(terrain["name"].as<std::string>());
@@ -241,4 +242,13 @@ int RuleUfo::getSightRange() const
 {
 	return _sightRange;
 }
+
+/**
+ * Gets the UFO's custom briefing string
+ * @return The string name.
+ */
+std::string RuleUfo::getBriefingString() const
+{
+	return _briefingString;
+}
 }
@@ -41,7 +41,7 @@ class RuleUfo
 	int _sprite, _marker;
 	int _damageMax, _speedMax, _accel, _power, _range, _score, _reload, _breakOffTime, _sightRange;
 	RuleTerrain *_battlescapeTerrainData;
-	std::string _modSprite;
+	std::string _modSprite, _breifingString;
 public:
 	/// Creates a blank UFO ruleset.
 	RuleUfo(const std::string &type);
@@ -81,6 +81,8 @@ class RuleUfo
 	std::string getModSprite() const;
 	/// Gets the UFO's radar range.
 	int getSightRange() const;
+	/// gets the name of the briefing string.
+	std::string getBriefingString() const;
 };
 
 }
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ void RuleUfo::load(const YAML::Node &node, Ruleset *ruleset)`
`59`	`59`	`_reload = node["reload"].as<int>(_reload);`
`60`	`60`	`_breakOffTime = node["breakOffTime"].as<int>(_breakOffTime);`
`61`	`61`	`_sightRange = node["sightRange"].as<int>(_sightRange);`
	`62`	`+ _briefingString = node["briefingString"].as<std::string>(_briefingString);`
`62`	`63`	`if (const YAML::Node &terrain = node["battlescapeTerrainData"])`
`63`	`64`	`{`
`64`	`65`	`RuleTerrain *rule = new RuleTerrain(terrain["name"].as<std::string>());`
`@@ -241,4 +242,13 @@ int RuleUfo::getSightRange() const`
`241`	`242`	`{`
`242`	`243`	`return _sightRange;`
`243`	`244`	`}`
	`245`	`+`
	`246`	`+/**`
	`247`	`+ * Gets the UFO's custom briefing string`
	`248`	`+ * @return The string name.`
	`249`	`+ */`
	`250`	`+std::string RuleUfo::getBriefingString() const`
	`251`	`+{`
	`252`	`+ return _briefingString;`
	`253`	`+}`
`244`	`254`	`}`