vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Browse Source
This commit is contained in:
EvilFactory
2023-03-16 12:53:53 -03:00
parent fa6b6a590f b8a8fc8c95
commit cf88aa4c5d
14 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Data/languageoptions.xml
+1 -1
View File
@@ -18,5 +18,5 @@
<option label="Español" identifier="Spanish" mapsFrom="Castilian Spanish, Latinamerican Spanish" />
<option label="Svenska" identifier="Swedish" />
<option label="Türkçe" identifier="Turkish" />
<option label="украї́нська" identifier="Ukrainian" />
<option label="Украї́нська" identifier="Ukrainian" />
</options>
Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCombat.cs
+1 -1
View File
@@ -1195,7 +1195,7 @@ namespace Barotrauma
{
target = limb.character;
}
if (target != null && (target != Enemy || HumanAIController.IsFriendly(target)))
if (target != null && target != Enemy && HumanAIController.IsFriendly(target))
{
return;
}
Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerationParams.cs
+2 -1
View File
@@ -198,6 +198,7 @@ namespace Barotrauma
{
foreach (var entry in entries)
{
if (entry == null) { continue; }
yield return entry.HumanPrefab;
}
}
@@ -330,7 +331,7 @@ namespace Barotrauma
{
foreach (var prefab in collection)
{
if (prefab.CampaignInteractionType == interactionType)
if (prefab != null && prefab.CampaignInteractionType == interactionType)
{
return true;
}
Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
+2 -2
View File
@@ -1539,7 +1539,7 @@ namespace Barotrauma
{
targetCharacter.TryAdjustHealerSkill(user, healthChange);
#if SERVER
GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, user, healthChange, 0.0f);
GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, user, -healthChange, 0.0f);
#endif
}
}
@@ -2168,7 +2168,7 @@ namespace Barotrauma
{
targetCharacter.TryAdjustHealerSkill(element.User, healthChange);
#if SERVER
GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, element.User, healthChange, 0.0f);
GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, element.User, -healthChange, 0.0f);
#endif
}
}
Barotrauma/BarotraumaShared/changelog.txt
+10
View File
@@ -1,3 +1,13 @@
---------------------------------------------------------------------------------------------------------
v1.0.8.0
---------------------------------------------------------------------------------------------------------
- Fixed loading screens sometimes getting stuck when playing in Chinese, Japanese or Korean.
- Fixed certain mods that override outpost generation parameters causing crashes due to missing outpost NPC prefabs.
- Fixed outpost NPCs never attacking you (just aiming their guns at you) if you attack them, but your reputation is not low enough to turn the outpost hostile.
- Fixed broken dialog line in the waytoascension1 event.
- Fixed healing your crewmates causing your karma to decrease.
---------------------------------------------------------------------------------------------------------
v1.0.7.0
---------------------------------------------------------------------------------------------------------