Faction Test 100.13.0.0

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/ConversationAction.cs

@@ -200,7 +200,7 @@ namespace Barotrauma
             }
         }
 
-        private int[] GetEndingOptions()
+        public int[] GetEndingOptions()
         {
             List<int> endings = Options.Where(group => !group.Actions.Any() || group.EndConversation).Select(group => Options.IndexOf(group)).ToList();
             if (!ContinueConversation) { endings.Add(-1); }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MissionAction.cs

@@ -68,7 +68,7 @@ namespace Barotrauma
                     var emptyLocation = FindUnlockLocation(Math.Max(MinLocationDistance, 3), unlockFurtherOnMap: true, "none".ToIdentifier().ToEnumerable());
                     if (emptyLocation != null)
                     {
-                        emptyLocation.ChangeType(campaign, Barotrauma.LocationType.Prefabs[LocationTypes[0]]);
+                        emptyLocation.ChangeType(campaign, LocationType.Prefabs[LocationTypes[0]]);
                         unlockLocation = emptyLocation;
                     }
                 }
@@ -77,7 +77,7 @@ namespace Barotrauma
                 {
                     if (!MissionIdentifier.IsEmpty)
                     {
-                        unlockedMission = unlockLocation.UnlockMissionByIdentifier(MissionIdentifier);                    
+                        unlockedMission = unlockLocation.UnlockMissionByIdentifier(MissionIdentifier);
                     }
                     else if (!MissionTag.IsEmpty)
                     {
@@ -89,8 +89,9 @@ namespace Barotrauma
                     }
                     if (unlockedMission != null)
                     {
+                        unlockedMission.OriginLocation = campaign.Map.CurrentLocation;
                         campaign.Map.Discover(unlockLocation, checkTalents: false);
-                        if (unlockedMission.Locations[0] == unlockedMission.Locations[1] || unlockedMission.Locations[1] ==null)
+                        if (unlockedMission.Locations[0] == unlockedMission.Locations[1] || unlockedMission.Locations[1] == null)
                         {
                             DebugConsole.NewMessage($"Unlocked mission \"{unlockedMission.Name}\" in the location \"{unlockLocation.Name}\".");
                         }

Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs

@@ -12,6 +12,7 @@ namespace Barotrauma
         public enum NetworkEventType
         {
             CONVERSATION,
+            CONVERSATION_SELECTED_OPTION,
             STATUSEFFECT,
             MISSION,
             UNLOCKPATH

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs

@@ -229,9 +229,8 @@ namespace Barotrauma
             }
 
             bool requiresRescue = element.GetAttributeBool("requirerescue", false);
-
             var teamId = element.GetAttributeEnum("teamid", requiresRescue ? CharacterTeamType.FriendlyNPC : CharacterTeamType.None);
-            Character spawnedCharacter = CreateHuman(humanPrefab, characters, characterItems, submarine, teamId, spawnPos, giveTags: true);
+            Character spawnedCharacter = CreateHuman(humanPrefab, characters, characterItems, submarine, teamId, spawnPos);
             if (Level.Loaded?.StartOutpost?.Info is { } outPostInfo)
             {
                 outPostInfo.AddOutpostNPCIdentifierOrTag(spawnedCharacter, humanPrefab.Identifier);
@@ -240,6 +239,7 @@ namespace Barotrauma
                     outPostInfo.AddOutpostNPCIdentifierOrTag(spawnedCharacter, tag);
                 }
             }
+
             if (spawnPos is WayPoint wp)
             {
                 spawnedCharacter.GiveIdCardTags(wp);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/BeaconMission.cs

@@ -94,7 +94,7 @@ namespace Barotrauma
                 List<Submarine> connectedSubs = level.BeaconStation.GetConnectedSubs();
                 foreach (Item item in Item.ItemList)
                 {
-                    if (!connectedSubs.Contains(item.Submarine)) { continue; }
+                    if (!connectedSubs.Contains(item.Submarine) || item.Submarine?.Info is { IsPlayer: true  }) { continue; }
                     if (item.GetComponent<PowerTransfer>() != null ||
                         item.GetComponent<PowerContainer>() != null ||
                         item.GetComponent<Reactor>() != null ||

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -125,6 +125,12 @@ namespace Barotrauma
 
         public Identifier SonarIconIdentifier => Prefab.SonarIconIdentifier;
 
+        /// <summary>
+        /// Where was this mission received from? Affects which faction we give reputation for if the mission is configured to give reputation for the faction that gave the mission.
+        /// Defaults to Locations[0]
+        /// </summary>
+        public Location OriginLocation;
+
         public readonly Location[] Locations;
 
         public int? Difficulty
@@ -144,7 +150,7 @@ namespace Barotrauma
             }
         }
 
-        private List<DelayedTriggerEvent> delayedTriggerEvents = new List<DelayedTriggerEvent>();
+        private readonly List<DelayedTriggerEvent> delayedTriggerEvents = new List<DelayedTriggerEvent>();
 
         public Action<Mission> OnMissionStateChanged;
 
@@ -160,12 +166,13 @@ namespace Barotrauma
             Headers = prefab.Headers;
             var messages = prefab.Messages.ToArray();
 
+            OriginLocation = locations[0];
             Locations = locations;
 
             var endConditionElement = prefab.ConfigElement.GetChildElement(nameof(completeCheckDataAction));
             if (endConditionElement != null)
             {
-                completeCheckDataAction = new CheckDataAction(endConditionElement, $"Mission ({prefab.Identifier.ToString()})");
+                completeCheckDataAction = new CheckDataAction(endConditionElement, $"Mission ({prefab.Identifier})");
             }
 
             for (int n = 0; n < 2; n++)
@@ -407,7 +414,7 @@ namespace Barotrauma
             {
                 var experienceGainMultiplierIndividual = new AbilityMissionExperienceGainMultiplier(this, 1f);
                 info?.Character?.CheckTalents(AbilityEffectType.OnGainMissionExperience, experienceGainMultiplierIndividual);
-                info?.GiveExperience((int)(experienceGain * experienceGainMultiplier.Value));
+                info?.GiveExperience((int)((experienceGain * experienceGainMultiplier.Value) * experienceGainMultiplierIndividual.Value));
             }
 
             // apply money gains afterwards to prevent them from affecting XP gains
@@ -436,7 +443,7 @@ namespace Barotrauma
             {
                 if (reputationReward.Key == "location")
                 {
-                    Locations[0].Reputation?.AddReputation(reputationReward.Value);
+                    OriginLocation.Reputation?.AddReputation(reputationReward.Value);
                 }
                 else
                 {
@@ -546,17 +553,14 @@ namespace Barotrauma
             return humanPrefab;
         }
 
-        protected Character CreateHuman(HumanPrefab humanPrefab, List<Character> characters, Dictionary<Character, List<Item>> characterItems, Submarine submarine, CharacterTeamType teamType, ISpatialEntity positionToStayIn = null, Rand.RandSync humanPrefabRandSync = Rand.RandSync.ServerAndClient, bool giveTags = true)
+        protected static Character CreateHuman(HumanPrefab humanPrefab, List<Character> characters, Dictionary<Character, List<Item>> characterItems, Submarine submarine, CharacterTeamType teamType, ISpatialEntity positionToStayIn = null, Rand.RandSync humanPrefabRandSync = Rand.RandSync.ServerAndClient)
         {
             var characterInfo = humanPrefab.CreateCharacterInfo(Rand.RandSync.ServerAndClient);
             characterInfo.TeamID = teamType;
 
-            if (positionToStayIn == null) 
-            {
-                positionToStayIn = 
+            positionToStayIn ??= 
                     WayPoint.GetRandom(SpawnType.Human, characterInfo.Job?.Prefab, submarine) ??
                     WayPoint.GetRandom(SpawnType.Human, null, submarine);
-            }
 
             Character spawnedCharacter = Character.Create(characterInfo.SpeciesName, positionToStayIn.WorldPosition, ToolBox.RandomSeed(8), characterInfo, createNetworkEvent: false);
             spawnedCharacter.HumanPrefab = humanPrefab;

Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs

@@ -201,7 +201,7 @@ namespace Barotrauma
                 { 
                     continue; 
                 }
-                if (Level.Loaded.ExtraWalls.Any(w => w.IsPointInside(position.Position.ToVector2())))
+                if (Level.Loaded.IsPositionInsideWall(position.Position.ToVector2()))
                 {
                     removals.Add(position);
                 }