Skip to content

Commit

Permalink
commit commit commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehni committed Aug 1, 2018
1 parent f93c99b commit d36f777
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
Binary file modified Assemblies/MoreFactionInteraction.dll
Binary file not shown.
1 change: 1 addition & 0 deletions Languages/English/Keyed/Keys.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<!--settings -->
<MFI_ticksToUpgrade>Time until pirates upgrade their outposts to bases</MFI_ticksToUpgrade>
<MFI_pirateBaseUpgraderModifier>Modifier to how often pirates spread</MFI_pirateBaseUpgraderModifier>
<MFI_timeModifierBetweenFactionInteraction>Time modifier between faction interaction</MFI_timeModifierBetweenFactionInteraction>
<MFI_traderWealthOffsetFromTimesTraded>Modifier to silver brought by traders (scales with interaction frequency)</MFI_traderWealthOffsetFromTimesTraded>

Expand Down
2 changes: 1 addition & 1 deletion MoreFactionInteraction/MoreFactionInteraction.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Compile Include="MoreFactionWar\CaravanArrivalAction_VisitFactionWarPeaceTalks.cs" />
<Compile Include="MoreFactionWar\Dialogue_FactionWarNegotiation.cs" />
<Compile Include="MoreFactionWar\FactionWarDialogue.cs" />
<Compile Include="MoreFactionWar\FactionWarHealthUtility.cs" />
<Compile Include="MoreFactionWar\CustomFaction_HealthUtility.cs" />
<Compile Include="MoreFactionWar\FactionWarPeaceTalks.cs" />
<Compile Include="MoreFactionWar\FactionInteractionDiplomacyTuningsBlatantlyCopiedFromPeaceTalks.cs" />
<Compile Include="MoreFactionWar\IncidentWorker_WoundedCombatants.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected override bool TryExecuteWorker(IncidentParms parms)
{
usedWeaponDef = null;
}
FactionWarHealthUtility.DamageUntilDownedWithSpecialOptions(p: woundedCombatant, allowBleedingWounds: true, damageDef: damageDef, weapon: usedWeaponDef);
CustomFaction_HealthUtility.DamageUntilDownedWithSpecialOptions(p: woundedCombatant, allowBleedingWounds: true, damageDef: damageDef, weapon: usedWeaponDef);
//todo: maybe add some storylogging.
pawnlist.Add(item: woundedCombatant);
}
Expand Down
4 changes: 2 additions & 2 deletions MoreFactionInteraction/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.0.3")]
[assembly: AssemblyFileVersion("0.1.0.3")]
[assembly: AssemblyVersion("0.1.0.4")]
[assembly: AssemblyFileVersion("0.1.0.4")]

0 comments on commit d36f777

Please sign in to comment.