Merge branch 'Azgaar:master' into master

This commit is contained in:
Dr. Gergely Mészáros, PhD 2021-08-17 01:11:04 +02:00 committed by GitHub
commit 63e3a177be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View file

@ -2545,6 +2545,7 @@
<optgroup label="Monarchy">
<option value="Beylik">Beylik</option>
<option value="Despotate">Despotate</option>
<option value="Dominion">Dominion</option>
<option value="Duchy">Duchy</option>
<option value="Emirate">Emirate</option>
<option value="Empire">Empire</option>
@ -2718,6 +2719,7 @@
<select id="provinceNameEditorSelectForm" style="display: inline-block; width: 11em; height: 1.645em">
<option value="">blank</option>
<option value="Area">Area</option>
<option value="Autonomy">Autonomy</option>
<option value="Barony">Barony</option>
<option value="Canton">Canton</option>
<option value="Clan">Clan</option>
@ -2734,13 +2736,15 @@
<option value="Islands">Islands</option>
<option value="Land">Land</option>
<option value="Landgrave">Landgrave</option>
<option value="Mandate">Mandate</option>
<option value="Margrave">Margrave</option>
<option value="Occupation zone">Occupation zone</option>
<option value="Parish">Parish</option>
<option value="Prefecture">Prefecture</option>
<option value="Province">Province</option>
<option value="Region">Region</option>
<option value="Republic">Republic</option>
<option value="reservation">Reservation</option>
<option value="Reservation">Reservation</option>
<option value="Shire">Shire</option>
<option value="State">State</option>
<option value="Territory">Territory</option>

View file

@ -975,6 +975,7 @@ window.BurgsAndStates = (function () {
// Default name depends on exponent tier, some culture bases have special names for tiers
if (s.diplomacy) {
if (form === "Duchy" && s.neighbors.length > 1 && rand(6) < s.neighbors.length && s.diplomacy.includes("Vassal")) return "Marches"; // some vassal dutchies on borderland
if (base === 1 && P(0.3) && s.diplomacy.includes("Vassal")) return "Dominion"; // English vassals
if (P(0.3) && s.diplomacy.includes("Vassal")) return "Protectorate"; // some vassals
}