Skip to content

Commit

Permalink
Merge pull request #271 from DiplomacyTeam/dev
Browse files Browse the repository at this point in the history
v1.2.13 release
  • Loading branch information
artifixer authored Jun 22, 2024
2 parents da8f3e1 + 81ea777 commit baad3cb
Show file tree
Hide file tree
Showing 21 changed files with 1,384 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
artifact_name: Bannerlord.Diplomacy
secrets:
NEXUSMODS_APIKEY: ${{ secrets.NEXUSMODS_APIKEY }}
NEXUSMODS_COOKIES: ${{ secrets.NEXUSMODS_COOKIES }}
NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }}

###########################
# STEAM #
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/verify-nexusmods-credentials.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Verify NexusMods Credentials

on:
schedule:
- cron: "0 */24 * * *"
workflow_dispatch:

env:
# Disable the .NET logo in the console output.
DOTNET_NOLOGO: true
# Disable the .NET first time experience to skip caching NuGet packages and speed up the build.
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# Disable sending .NET CLI telemetry to Microsoft.
DOTNET_CLI_TELEMETRY_OPTOUT: true

jobs:
unex-verify-nexusmods:
uses: BUTR/workflows/.github/workflows/verify-unex-nexusmods.yml@master
secrets:
NEXUSMODS_API_KEY: ${{ secrets.NEXUSMODS_APIKEY }}
NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }}
8 changes: 4 additions & 4 deletions build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--Module Version-->
<PropertyGroup>
<Version>1.2.12</Version>
<Version>1.2.13</Version>
<GameVersion>1.0.0</GameVersion>
</PropertyGroup>

Expand All @@ -13,13 +13,13 @@
<!--Harmony Version-->
<HarmonyVersion>2.3.3</HarmonyVersion>
<!--ButterLib Version-->
<ButterLibVersion>2.9.7</ButterLibVersion>
<ButterLibVersion>2.9.9</ButterLibVersion>
<!--MCM Version-->
<MCMVersion>5.9.2</MCMVersion>
<MCMVersion>5.10.1</MCMVersion>
<!--UIExtenderEx Version-->
<UIExtenderExVersion>2.11.0</UIExtenderExVersion>
<!--BUTRShared Version-->
<BUTRSharedVersion>3.0.0.139</BUTRSharedVersion>
<BUTRSharedVersion>3.0.0.142</BUTRSharedVersion>
<!--BUTRModuleManager Version-->
<BUTRModuleManagerVersion>5.0.222</BUTRModuleManagerVersion>
<!--ModuleLoader Version-->
Expand Down
15 changes: 10 additions & 5 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 1.2.13
Game Versions: v1.0.x, v1.1.x, v1.2.x
* Adapted for v1.2.10.
* Updated translations from Ccrowdin.
---------------------------------------------------------------------------------------------------
Version: 1.2.12
Game Versions: v1.0.x, v1.1.x, v1.2.x
* Added Xbox support
* Restored version support
* Added Xbox support.
* Restored version support.
---------------------------------------------------------------------------------------------------
Version: 1.2.11
Game Versions: v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4,v1.2.5,v1.2.6,v1.2.7,v1.2.8,1.2.9
Expand All @@ -19,15 +24,15 @@ Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1
---------------------------------------------------------------------------------------------------
Version: 1.2.9
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4,v1.2.5
* Add support for v1.2.5
* Add support for v1.2.5.
---------------------------------------------------------------------------------------------------
Version: 1.2.8
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4
* Add support for v1.2.4
* Add support for v1.2.4.
---------------------------------------------------------------------------------------------------
Version: 1.2.7
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3
* Add support for v1.1.6
* Add support for v1.1.6.
---------------------------------------------------------------------------------------------------
Version: 1.2.6
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1,v1.2.2,v1.2.3
Expand Down
1 change: 1 addition & 0 deletions src/Bannerlord.Diplomacy.sln
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
..\.github\workflows\dotnet-format-daily.yml = ..\.github\workflows\dotnet-format-daily.yml
..\.github\workflows\Publish.yml = ..\.github\workflows\Publish.yml
..\.github\workflows\TestBuild.yml = ..\.github\workflows\TestBuild.yml
..\.github\workflows\verify-nexusmods-credentials.yml = ..\.github\workflows\verify-nexusmods-credentials.yml
EndProjectSection
EndProject
Global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal sealed class CivilWarBehavior : CampaignBehaviorBase
public override void RegisterEvents()
{
CampaignEvents.DailyTickClanEvent.AddNonSerializedListener(this, DailyTickClan);
#if v124 || v125 || v126 || v127 || v128 || v129
#if v124 || v125 || v126 || v127 || v128 || v129 || v1210
CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z));
#elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z));
Expand Down
2 changes: 1 addition & 1 deletion src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void OnCreateFaction()
inquiryElements,
true,
1,
#if v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129
#if v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210
1,
#endif
GameTexts.FindText("str_ok").ToString(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public WarExhaustionMapIndicatorVM()
_kingdomsAtWar = new MBBindingList<WarExhaustionMapIndicatorItemVM>();
RefreshValues();
DiplomacyEvents.WarExhaustionInitialized.AddNonSerializedListener(this, HandleStanceChange);
#if v124 || v125 || v126 || v127 || v128 || v129
#if v124 || v125 || v126 || v127 || v128 || v129 || v1210
CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x));
#elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x));
Expand Down Expand Up @@ -51,7 +51,7 @@ public override void OnFinalize()
{
base.OnFinalize();

#if v124 || v125 || v126 || v127 || v128 || v129
#if v124 || v125 || v126 || v127 || v128 || v129 || v1210
CampaignEvents.OnClanChangedKingdomEvent.ClearListeners(this);
#elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
CampaignEvents.ClanChangedKingdom.ClearListeners(this);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
<?xml version="1.0" encoding="utf-8"?>
<base xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" type="string">
<tags>
<tag language="Português (BR)"/>
</tags>
<strings>
<!-- Faction Titles -->
<string id="MXAsjFdI" text="{CLAN_NAME} Conspiraçao"/>
<string id="LUzfk4tb" text="{CLAN_NAME} Liga"/>

<!-- Aserai Titles -->
<string id="iLMqCvmk" text="Sultanate de {CLAN_NAME}"/>
<string id="EnpnMNRH" text="Emirate de {CLAN_NAME}"/>
<string id="uzd9mxIC" text="Banu {CLAN_NAME}"/>
<string id="NTFz3B56" text="Sharifate de {CLAN_NAME}"/>

<!-- Battania Titles -->
<string id="kaU24WXu" text="Confederaçao de {CLAN_NAME}"/>

<!-- Khuzait Titles -->
<string id="mEHufuep" text="Khaganate de {CLAN_NAME}"/>
<string id="DTBaowBi" text="{CLAN_NAME} Khaganate"/>
<string id="pRgQF4WY" text="{CLAN_NAME} Dinastia"/>

<!-- Sturgia Titles -->
<string id="z5VPFrfh" text="Condado de {CLAN_NAME}"/>

<!-- Vlandia Titles -->
<string id="A4zT7H5g" text="Grão Ducato {CLAN_NAME}"/>


<!-- Generic Titles -->
<string id="kToqhmHh" text="Principado de {CLAN_NAME}"/>
<string id="WjB3SM1f" text="Reino de {CLAN_NAME}"/>
<string id="E63n30UM" text="{CLAN_NAME} Imperio"/>
<string id="lSQeaVfw" text="Imperio de {CLAN_NAME}"/>



<!-- Aserai -->
<string id="j3bEr6n5" text="Ahmerrad"/>
<string id="QBJk3ymm" text="Bariyye"/>
<string id="qWmWT0xA" text="Durquba"/>
<string id="X75ITMUL" text="Shariz"/>
<string id="K7udl5FQ" text="Bardaq"/>
<string id="OGwXFmDB" text="Caraf"/>
<string id="I7c8WNxV" text="Durrin"/>
<string id="M4UquaBO" text="Jameyyed"/>
<string id="NndCJIzP" text="Samarra"/>
<string id="tDQzTgry" text="Sharwa"/>
<string id="FSWiNAyj" text="Teramma"/>
<string id="PEd8JgL2" text="Weyyah"/>
<string id="ma2FmIjQ" text="Aab"/>
<string id="1lNXlUvm" text="Ayn Assuadi"/>
<string id="i8y3UunL" text="Dhibbain"/>
<string id="uOld11Db" text="Fishara"/>
<string id="FZQG8HZ0" text="Habba"/>
<string id="cD8ZseSp" text="Hawaha"/>
<string id="rvsefzHq" text="Iqbayl"/>
<string id="OOGTpFKw" text="Mawiti"/>
<string id="wSlwO5jG" text="Mazigh"/>
<string id="TU4Itb6v" text="Mijayet"/>
<string id="SmIIc4YA" text="Mit Nun"/>
<string id="mAT6Zajm" text="Qalyut"/>
<string id="7C8DXcNT" text="Rushdigh"/>
<string id="T9VemCVx" text="Sekhtem"/>
<string id="zTJ3Oaki" text="Shibal Zumr"/>
<string id="seBpcqnW" text="Tamnuh"/>
<string id="U6enpew6" text="Tazjunat"/>
<string id="AB8kd1kQ" text="Tilimsal"/>
<string id="Ug4D9NN0" text="Unriya"/>
<string id="lsMTtqa4" text="Uzgha"/>

<!-- Battania -->
<string id="qAuhdK0v" text="Crovia"/>
<string id="o1ORogYL" text="Hacia"/>
<string id="rfgjbrvw" text="Uveagia"/>
<string id="STzd8avo" text="Theoles"/>
<string id="22NuLUbK" text="Achiane"/>
<string id="AFlVSUFu" text="Rolastien"/>
<string id="AIKEX745" text="Fraynak"/>
<string id="RJczxlW4" text="Dorcard"/>
<string id="wGO3G6yy" text="Wynistyr"/>
<string id="q7wUF854" text="Uradal"/>
<string id="aAZMAMx6" text="Dunerrice"/>
<string id="qe9NrPHL" text="Bartoryntham"/>
<string id="x67QSESS" text="Laniyrick"/>
<string id="YzLeuoSR" text="Imeannel"/>
<string id="OoVKShKC" text="Bircenan"/>

<!-- Khuzait -->
<string id="59uhOyuZ" text="Kunait"/>
<string id="KKgoCDJZ" text="Evrukha"/>
<string id="Z141AJ5X" text="Bulan"/>
<string id="wOrNq16t" text="Halmar"/>
<string id="HtX8KdgW" text="Ichamur"/>
<string id="zpmMniuA" text="Narra"/>
<string id="xDWNd4sN" text="Tulga"/>
<string id="DLfwRFh1" text="Asugan"/>
<string id="UxASxuob" text="Distar"/>
<string id="4stgAKam" text="Malayurg"/>
<string id="04dkhDAi" text="Sungetche"/>
<string id="ZOIt9Lb6" text="Tulbuk"/>
<string id="MzHLDXdO" text="Uhhun"/>
<string id="XjbYmG6p" text="Unuzdaq"/>
<string id="vY8f12Qd" text="Ada Kulun"/>
<string id="Blar1tNW" text="Amashke"/>
<string id="k3pz8N53" text="Bhulaban"/>
<string id="K7WMsExR" text="Bulugur"/>
<string id="6xB2dREA" text="Dashbigha"/>
<string id="cEL50k9K" text="Dirigh Aban"/>
<string id="AJyY3SwF" text="Dugan"/>
<string id="54CFY7Y7" text="Dusturil"/>
<string id="XExpkOg8" text="Kedelke"/>
<string id="sp4R5ttP" text="Peshmi"/>
<string id="OSSt9yPb" text="Tash Kulun"/>
<string id="uAySGYSA" text="Tismirr"/>
<string id="0Ex3esLT" text="Tulbuk"/>
<string id="7h6VTRli" text="Uhhun"/>
<string id="n0GNLDVS" text="Zagush"/>

<!-- Sturgia -->
<string id="78HmDOmh" text="Tragalla"/>
<string id="2gxRtC4M" text="Tihr"/>
<string id="1QRisNZ8" text="Wercheg"/>
<string id="mciKWCXz" text="Alburq"/>
<string id="wquHRX1a" text="Chalbek"/>
<string id="uOnd5NOi" text="Curin"/>
<string id="eb1lTxcg" text="Hrus"/>
<string id="Dvs5IlpE" text="Jelbegi"/>
<string id="C0Lxqtaa" text="Knudarr"/>
<string id="LwGSxemg" text="Tehlrog"/>
<string id="QniO32gk" text="Aldelen"/>
<string id="SPWVORXL" text="Ambean"/>
<string id="ggpOsqyQ" text="Buillin"/>
<string id="HVMKm9TL" text="Fearichen"/>
<string id="vAsQx5yo" text="Fenada"/>
<string id="XUmidhIJ" text="Gisim"/>
<string id="IkMHxdfH" text="Haen"/>
<string id="nGAYbe0Z" text="Jayek"/>
<string id="i3QpFo60" text="Jelbegi"/>
<string id="cckFsFjh" text="Kulum"/>
<string id="0sU6mK84" text="Kwynn"/>
<string id="5hFwgLgJ" text="Mechin"/>
<string id="aMbbajXx" text="Odasan"/>
<string id="SeEJ2zuw" text="Rizi"/>
<string id="MLvw1Pxt" text="Ruvar"/>
<string id="IrIFkrHZ" text="Udiniad"/>
<string id="LHE0xjg1" text="Vayejeg"/>

<!-- Vlandia -->
<string id="FD8sniLW" text="Echenad"/>
<string id="8NkMfWHn" text="Raedia"/>
<string id="piyHeKyM" text="Dhirim"/>
<string id="8Y3wgpLi" text="Praven"/>
<string id="yQlAJYuA" text="Suno"/>
<string id="HUUOh35g" text="Uxkhal"/>
<string id="e7h8mCpf" text="Derchios"/>
<string id="V9wYAqHZ" text="Haringoth"/>
<string id="5CVj9I06" text="Kelredan"/>
<string id="uLOFze6g" text="Reindi"/>
<string id="QQA4T9vg" text="Rindyar"/>
<string id="xpLcu6bR" text="Ryibelet"/>
<string id="I0FOtfwt" text="Senuzgda"/>
<string id="BKyLwpjT" text="Tevarin"/>
<string id="t1flBIrH" text="Tilbaut"/>
<string id="udQOxzOj" text="Vyincourd"/>
<string id="JNVa1azk" text="Amere"/>
<string id="rFJC0mXH" text="Azgad"/>
<string id="1zlQk8RB" text="Balanli"/>
<string id="V5T0fzsG" text="Burglen"/>
<string id="bVjU79Tn" text="Chide"/>
<string id="dFxvU13H" text="Elberl"/>
<string id="7kLsltIf" text="Ehlerdah"/>
<string id="XJJ3nxkF" text="Emirin"/>
<string id="9fgZRhiC" text="Gisim"/>
<string id="WPnVGzk8" text="Ibiran"/>
<string id="WKyofVcP" text="Iyindah"/>
<string id="lz5Xr4F1" text="Nemeja"/>
<string id="ZkXPCZUE" text="Nomar"/>
<string id="9jAc6grT" text="Rduna"/>
<string id="94L2s8cH" text="Ruluns"/>
<string id="kX4NIQxU" text="Ryibelet"/>
<string id="h2SaSr4e" text="Tadsamesh"/>
<string id="SZLdfWI9" text="Tahlberl"/>
<string id="GiWgcvib" text="Tosdhar"/>
<string id="BzUpDzL0" text="Tshibtin"/>
<string id="qDzxntWH" text="Ushkuru"/>
<string id="6OPt8ox0" text="Veidar"/>
<string id="nZqhwdTJ" text="Yalibe"/>
<string id="8xTh5udH" text="Yaragar"/>


<!-- Empire -->
<string id="LGqYPQQD" text="Lamonnos"/>
<string id="KJPW3yb4" text="Nasus"/>
<string id="OyLkibYo" text="Tylamahos"/>
<string id="gNbGiI9p" text="Iasessos"/>
<string id="ty1393cd" text="Zakrios"/>
<string id="xJPv0Tzj" text="Samissos"/>
<string id="AiHcQH4G" text="Thorosse"/>
<string id="VuShnNy1" text="Olympale"/>
<string id="WLGUwy9g" text="Diosconia"/>
<string id="XQzaMWsl" text="Zanclaca"/>
<string id="s5p2LcPn" text="Lissada"/>
<string id="htjATdi1" text="Artylos"/>
<string id="1cBpuRVl" text="Vasiri"/>
<string id="YC1VI5Vs" text="Kamestias"/>
<string id="6dTpjXIG" text="Erosthena"/>
<string id="pzHthnN3" text="Kamaraza"/>
<string id="ITwLbhNa" text="Pydnippia"/>
<string id="qnRyyhx6" text="Abdocaea"/>
<string id="cIGCqXYr" text="Aytanes"/>
<string id="G375MfCN" text="Thermedon"/>
<string id="I4LbIJpd" text="Byzamahos"/>
<string id="6QtcERL6" text="Assapolis"/>
<string id="eYehtDrU" text="Knossaphos"/>
<string id="ax8cYBtr" text="Epidicyon"/>
<string id="V3K7oVtB" text="Solastro"/>
<string id="KYas1WAV" text="Piserna"/>
<string id="opwrHv6z" text="Corconia"/>
<string id="zPkDoxkU" text="Kerkos"/>
<string id="mpnSLYUt" text="Assikon"/>
<string id="PiblnoTV" text="Gournaphos"/>
</strings>
</base>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<base xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" type="string">
<tags>
<tag language="Português (BR)"/>
</tags>
<strings>
<string id="bAkTqxmf" text="Uma facção é um grupo de clãs em um reino com um objetivo comum. Se uma facção ganhar apoio suficiente, eles começarão uma guerra civil. Se os rebeldes vencerem a guerra, sua demanda será mantida. Se os legalistas vencerem, os clãs rebeldes retornarão ao reino. Clãs vitoriosos ganharão influência e relações com seus companheiros vitoriosos. Os clãs derrotados perderão influência. Os clãs podem iniciar uma facção gastando influência."/>

<string id="XXUwW6TM" text="Exaustão de Guerra rastreia quão perto um reino está para se render. Depois que a exaustão da guerra atingir 100%, o reino se rendeu. As casualidades, os feudos, as aldeias que são atacadas e a duração da guerra contribuem para o esgotamento da guerra. Quando um reino perde seu último feudo, não pode mais sustentar seu esforço de guerra de forma eficaz, o que não só aumenta imediatamente o seu actual esgotamento da guerra, mas também aumenta drasticamente a quantidade diária de exaustão de guerra que recebe - até que o reino se renda, ou recupere pelo menos um feudo."/>

<string id="dh2NE8Of" text="A taxa de exaustão da guerra é a taxa na qual a exaustão da guerra se acumula na guerra. A exaustão da guerra se acumula mais lentamente em guerras entre reinos maiores."/>
</strings>
</base>
Loading

0 comments on commit baad3cb

Please sign in to comment.