damimani/N3OW
1
2
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'current-patch-bugfixing-dev' into next-version-dev

Browse source
This commit is contained in:
Damimani 2026-03-13 19:09:42 +01:00
commit 97e80d2ba2
8 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/defines/00_defines.txt
View file

@ -129,7 +129,7 @@ NCharacter = {
MAX_PROVISIONS = 2500 # maximum provisions value a character can have
PROVISIONS_LOW_WARNING = 500 # when travel planner should warn about provisions running low
BASE_HERD_CONVERSION_RATE = 0.1 # base herd conversion rate
BASE_HERD_CONVERSION_RATE = 0.08 # base herd conversion rate
BASE_HERD_CAPACITY = { # base herd capacity for different title tiers
0 # Unlanded
500 # Barony

4
gfx/map/map_object_data/activities.txt
View file

@ -12751,7 +12751,7 @@
}
{
id=2533
position={ 1529.751099 0.000000 2732.711182 }
position={ 1516.819702 0.000000 2711.761719 }
rotation={ -0.000000 -0.393849 -0.000000 0.919175 }
scale={ 1.000000 1.000000 1.000000 }
}
@ -52141,7 +52141,7 @@
}
{
id=9773
position={ 6404.000000 0.000000 2404.000000 }
position={ 1673.694458 0.000000 3337.175781 }
rotation={ 0.000000 0.994552 0.000000 0.104239 }
scale={ 1.000000 1.000000 1.000000 }
}

4
gfx/map/map_object_data/building_locators.txt
View file

@ -12709,7 +12709,7 @@
}
{
id=2533
position={ 1531.077637 0.000000 2727.085449 }
position={ 1518.146240 0.000000 2706.135986 }
rotation={ -0.000000 -0.643420 -0.000000 0.765513 }
scale={ 1.000000 1.000000 1.000000 }
}
@ -52075,7 +52075,7 @@
}
{
id=9773
position={ 6268.937500 0.000000 2215.756836 }
position={ 1674.379028 0.000000 3344.573242 }
rotation={ 0.000000 0.994552 0.000000 0.104239 }
scale={ 1.000000 1.000000 1.000000 }
}

4
gfx/map/map_object_data/combat_locators.txt
View file

@ -14431,7 +14431,7 @@
}
{
id=2533
position={ 1532.734863 0.000000 2723.841309 }
position={ 1519.803467 0.000000 2702.891846 }
rotation={ -0.000000 0.676115 -0.000000 0.736796 }
scale={ 1.000000 1.000000 1.000000 }
}
@ -56287,7 +56287,7 @@
}
{
id=9773
position={ 6419.000000 0.000000 2394.000000 }
position={ 1679.180908 0.000000 3347.038574 }
rotation={ 0.000000 -0.894427 0.000000 0.447214 }
scale={ 1.000000 1.000000 1.000000 }
}

4
gfx/map/map_object_data/player_stack_locators.txt
View file

@ -14431,7 +14431,7 @@
}
{
id=2533
position={ 1539.000000 0.000000 2728.000000 }
position={ 1526.068604 0.000000 2707.050537 }
rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
scale={ 1.000000 1.000000 1.000000 }
}
@ -56287,7 +56287,7 @@
}
{
id=9773
position={ 6410.000000 0.000000 2405.000000 }
position={ 1677.752319 0.000000 3346.013428 }
rotation={ 0.000000 0.994552 0.000000 0.104239 }
scale={ 1.000000 1.000000 1.000000 }
}

4
gfx/map/map_object_data/siege_locators.txt
View file

@ -12757,7 +12757,7 @@
}
{
id=2533
position={ 1537.000000 0.000000 2721.000000 }
position={ 1524.068604 0.000000 2700.050537 }
rotation={ 0.000000 0.923880 0.000000 -0.382684 }
scale={ 1.000000 1.000000 1.000000 }
}
@ -53317,7 +53317,7 @@
}
{
id=9773
position={ 6412.000000 0.000000 2410.000000 }
position={ 1674.646240 0.000000 3354.322754 }
rotation={ 0.000000 -0.049814 0.000000 0.998759 }
scale={ 1.000000 1.000000 1.000000 }
}

2
gfx/map/map_object_data/special_building_locators.txt
View file

@ -52003,7 +52003,7 @@
}
{
id=9769
position={ 6419.000000 0.000000 2452.000000 }
position={ 1656.496582 0.000000 3322.191162 }
rotation={ -0.000000 -0.822384 -0.000000 -0.568933 }
scale={ 1.000000 1.000000 1.000000 }
}

2
localization/english/replace/titles_l_english.yml
View file

@ -7015,6 +7015,7 @@
b_licata:0 "Licata"
b_lice:0 "Lice"
b_lichtberg:0 "Rohrbach"
b_lichtenberg:0 "Lichtenberg"
b_lichtenfels:0 "Lichtenfels"
b_lichtensteig:0 "Lichtensteig"
b_lida:0 "Lida"
@ -8637,6 +8638,7 @@
b_panjway:0 "Panjway"
b_pankak:0 "Pankak"
b_pankot:0 "Pankot"
b_pankow:0 "Pankow"
b_panna:0 "Panna"
b_pannagallu:0 "Pannagallu"
b_panticapea:0 "Panticapea"