Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bartelome enables Converts to be FreeColonists #135

Open
wants to merge 3 commits into
base: sf-auto-merge
Choose a base branch
from
Open

Bartelome enables Converts to be FreeColonists #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36c45e5
Bartelome enables Converts to be FreeColonists
HighwayofLife Oct 27, 2022
888d345
Change desc of Native Converts and Bartelome
HighwayofLife Oct 27, 2022
80c315c
Ability for colonists to gain experience indoors
HighwayofLife Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions data/rules/freecol/specification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,101 @@
</building-type>
</building-types>

<unit-change-types>
<unit-change-type id="model.unitChange.foundingFather">
<!-- Do not automatically convert natives to freeColonists -->
<unit-type-change id="model.unitChange.foundingFather.indianConvert"
delete="true"/>
</unit-change-type>

<unit-change-type id="model.unitChange.clearSkill" preserve="true">
<!-- Allow the indianConvert to change to freeColonist using clear skill
after the upgradeConvert ability has been applied from recruiting
Bartolome De Las Casas founding Father -->
<unit-type-change id="model.unitChange.enterColony.indianConvert"
from="model.unit.indianConvert"
to="model.unit.freeColonist" probability="100">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
</unit-change-type>

<unit-change-type id="model.unitChange.education" preserve="true">
<!-- Once Bartolome joins congress, native converts can be educated to
some outdoor work in half the time. -->
<unit-type-change id="model.unitChange.education.indianConvert.expertFarmer"
from="model.unit.indianConvert"
to="model.unit.expertFarmer"
probability="100" turns="2">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.expertFisherman"
from="model.unit.indianConvert"
to="model.unit.expertFisherman"
probability="100" turns="2">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.expertFurTrapper"
from="model.unit.indianConvert"
to="model.unit.expertFurTrapper"
probability="100" turns="2">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.masterCottonPlanter"
from="model.unit.indianConvert"
to="model.unit.masterCottonPlanter"
probability="100" turns="3">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.masterSugarPlanter"
from="model.unit.indianConvert"
to="model.unit.masterSugarPlanter"
probability="100" turns="3">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.masterTobaccoPlanter"
from="model.unit.indianConvert"
to="model.unit.masterTobaccoPlanter"
probability="100" turns="3">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
<unit-type-change id="model.unitChange.education.indianConvert.seasonedScout"
from="model.unit.indianConvert"
to="model.unit.seasonedScout"
probability="100" turns="2">
<scope ability-id="model.ability.upgradeConvert" ability-value="true"/>
</unit-type-change>
</unit-change-type>
<unit-change-type id="model.unitChange.experience" preserve="true">
<unit-type-change id="model.unitChange.experience.masterCarpenter"
from="model.unit.freeColonist"
to="model.unit.masterCarpenter" probability="4"/>
<unit-type-change id="model.unitChange.experience.firebrandPreacher"
from="model.unit.freeColonist"
to="model.unit.firebrandPreacher" probability="2"/>
<unit-type-change id="model.unitChange.experience.elderStatesman"
from="model.unit.freeColonist"
to="model.unit.elderStatesman" probability="2"/>
<unit-type-change id="model.unitChange.experience.masterDistiller"
from="model.unit.freeColonist"
to="model.unit.masterDistiller" probability="3"/>
<unit-type-change id="model.unitChange.experience.masterWeaver"
from="model.unit.freeColonist"
to="model.unit.masterWeaver" probability="3"/>
<unit-type-change id="model.unitChange.experience.masterTobacconist"
from="model.unit.freeColonist"
to="model.unit.masterTobacconist" probability="3"/>
<unit-type-change id="model.unitChange.experience.masterFurTrader"
from="model.unit.freeColonist"
to="model.unit.masterFurTrader" probability="3"/>
<unit-type-change id="model.unitChange.experience.masterBlacksmith"
from="model.unit.freeColonist"
to="model.unit.masterBlacksmith" probability="3"/>
<unit-type-change id="model.unitChange.experience.masterGunsmith"
from="model.unit.freeColonist"
to="model.unit.masterGunsmith" probability="3"/>
</unit-change-type>
</unit-change-types>

<founding-fathers>
<founding-father id="model.foundingFather.franciscoDeCoronado"
type="exploration"
Expand Down
4 changes: 2 additions & 2 deletions data/strings/FreeColMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,7 @@ model.foundingFather.juanDeSepulveda.text=A Spanish theologian who spoke out for
model.foundingFather.juanDeSepulveda.birthAndDeath=1781-1872

model.foundingFather.bartolomeDeLasCasas.name=Bartolome de las Casas
model.foundingFather.bartolomeDeLasCasas.description=All existing Indian converts are converted to free colonists.
model.foundingFather.bartolomeDeLasCasas.description=All existing Indian converts can be converted to free colonists or educated in some outdoor work.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the text also when playing with the classic ruleset ... and that would be wrong. The new text should be placed in a new file called "ModMessages.properties" in the "data/rules/freecol" directory.

I have noticed that we do not have support for including mod translatable messages to the "FreeColMessages.properties". This will be necessary in order to utilize translatewiki for getting the strings translated. We can, for example, automatically add/update the strings using the prefix "mod.MODID." as a part of our build process.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will send an email about supporting translations of rules/mods/maps/scenarios on the developer's mailing list.

model.foundingFather.bartolomeDeLasCasas.text=A Catholic Priest who traveled the Indies converting Indians and chastising Spain for their treatment of the Natives.
model.foundingFather.bartolomeDeLasCasas.birthAndDeath=1474-1566

Expand Down Expand Up @@ -2203,7 +2203,7 @@ model.unit.hardyPioneer.description=The Hardy Pioneer excels at clearing forests
model.unit.indenturedServant.name={{plural:%number%|one=Indentured Servant|other=Indentured Servants|default=Indentured Servant}}
model.unit.indenturedServant.description=The Indentured Servant is well suited for outdoor work, but less suited for indoor work. He may become a Free Colonist through promotion or education.
model.unit.indianConvert.name={{plural:%number%|one=Indian Convert|other=Indian Converts|default=Indian Convert}}
model.unit.indianConvert.description=The Indian Convert is a native who has joined one of your colonies. He is skilled at all kinds of outdoor work, but unskilled at indoor work. As soon as Bartolome de las Casas joins the Continental Congress, all Indian Converts become Free Colonists.
model.unit.indianConvert.description=The Indian Convert is a native who has joined one of your colonies. He is skilled at all kinds of outdoor work, but unskilled at indoor work. As soon as Bartolome de las Casas joins the Continental Congress, all Indian Converts can become Free Colonists or educated in certain outdoor work.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same comment as above.

model.unit.jesuitMissionary.name={{plural:%number%|one=Jesuit Missionary|other=Jesuit Missionaries|default=Jesuit Missionary}}
model.unit.jesuitMissionary.description=The Jesuit Missionary is able to establish a mission in an Indian settlement and is especially skilled at converting Indians.
model.unit.masterBlacksmith.name={{plural:%number%|one=Master Blacksmith|other=Master Blacksmiths|default=Master Blacksmith}}
Expand Down
3 changes: 1 addition & 2 deletions data/strings/FreeColMessages_af.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,6 @@ model.foundingFather.juanDeSepulveda.description=Verhoog die kans dat die bevolk
model.foundingFather.juanDeSepulveda.text='n Spaanse teoloog wat hom uitgespreek het vir die verowering van die Indiese lande en gedwonge evangelisasie van die inheemse bevolking.
model.foundingFather.juanDeSepulveda.birthAndDeath=1781-1872
model.foundingFather.bartolomeDeLasCasas.name=Bartolome de las Casas
model.foundingFather.bartolomeDeLasCasas.description=Alle bestaande Inboorling bekeerlinge word omgeskakel na vrye koloniste.
model.foundingFather.bartolomeDeLasCasas.text='n Katolieke priester wat deur die Indiese areas gereis het, Indiane bekeer het en Spanje gekasty het oor hul behandeling van die inboorlinge.
model.foundingFather.trade=Handel
model.foundingFather.exploration=Verkenning
Expand Down Expand Up @@ -1317,7 +1316,7 @@ model.unit.indenturedServant.name=Vrygekoopte Dienskneg
model.unit.indenturedServant.description=Die Vrygekoopte Dienskneg is by uitstek geskik vir buitewerk, maar minder geskik vir binnewerk. Hy mag dalk 'n Vrye Kolonis word deur middel van bevordering of onderwys.
# Fuzzy
model.unit.indianConvert.name=Bekeerde inboorling
model.unit.indianConvert.description=Die Inheemse beerling is 'n inboorling wat hom by een van u kolonies aangesluit het. Hy is vaardig om alle vorme van buitewerk te doen, maar is ongeskoold op binnewerk. So gou as Bartolomé de las Casas aansluit by die Kontinentale Kongres, word alle Inheemse Bekeerlinge Vrye Koloniste.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should never remove translated strings just because they are outdated. The string is marked as "Outdated" on translatewiki when the original string gets modified. Please do take a look at the interface our translators are presented with:

https://translatewiki.net/w/i.php?title=Special:Translate&group=out-freecol&language=nb&filter=%21translated&action=translate


# Fuzzy
model.unit.jesuitMissionary.name=Jesuïtiese Sendeling
model.unit.jesuitMissionary.description=Die Jesuïete Sendeling is in staat om 'n sendingstasie in 'n Inheemse nedersetting te stig en is veral kundig om die Inboorlinge oor te wen.
Expand Down
3 changes: 1 addition & 2 deletions data/strings/FreeColMessages_ang.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,6 @@ model.foundingFather.thomasJefferson.description=Ēacnaþ Frēodōmbella forþb
model.foundingFather.fatherJeanDeBrebeuf.description=Ealle bodan sind sƿā cræftiȝe.
model.foundingFather.juanDeSepulveda.description=Ēacnaþ þā ƿēne þæt sēo lēodrǣden oferdrifenes inlendisces setlēs sceall aƿendan and þēodan ƿiþ þīna landbūnessa mid 20%.
model.foundingFather.juanDeSepulveda.text=Spēonisc dryhtƿeorþ þe fæstode þā oferdrīfunȝe þāra inlendiscena and þā fornȳdedan aƿendunȝe heora.
model.foundingFather.bartolomeDeLasCasas.description=Ealle andƿearde inlendisce aƿendede sind aƿendede tō ceorlum.
model.foundingFather.bartolomeDeLasCasas.text=Caþþolisc prēost þe fōr þurh þā Caribbiscan īeȝa aƿendende þā inlendiscan and cīdende Ispania ymb hƿæt hīe dydon þǣm inlendiscum.
model.foundingFather.trade=Manȝunȝ
model.foundingFather.exploration=Fandunȝ
Expand Down Expand Up @@ -1156,7 +1155,7 @@ model.unit.hardyPioneer.description=Se hearda forþȝanȝend betraþ on þǣre f
model.unit.indenturedServant.name={{plural:%number%|one=Fēged þegn|other=Fēgedra þegna|default=Fēged þegn}}
model.unit.indenturedServant.description=Se fēȝda þeȝn is ȝerād on ƿeorce on ūthealfe, ac læs ȝerād on ƿeorce inne. Hē cann ƿeorðan ceorl þurh fyrðrunȝe oþþe lǣrunȝe.
model.unit.indianConvert.name={{plural:%number%|one=Inlendisc aƿended|other=Inlendiscra aƿendedra|default=Inlendisc aƿended}}
model.unit.indianConvert.description=Se inlendisca āƿendeda is inlendisc se þe þēode selfne tō ānre þīnra landbūnessa. Hē is cræftiȝ on eallum ūthealfe ƿeorces cynnum, ac nis cræftiȝ on ƿeorce on inhealfe. Sōna Bartolome de las Casas þēot selfne tō þǣm Ƿitenaȝemōt, ealle inlendisce āƿendede ƿeorðaþ ceorlas.

model.unit.jesuitMissionary.name={{plural:%number%|one=JIesusfērscipisc boda|other=Iesusfērscipiscra bodena|default=Iesusfērscipisc boda}}
model.unit.jesuitMissionary.description=Se Iesusferscipisca boda cann staðolian ǣrendhūs on inlendiscum setle and is ānlīce cræftiȝ on þǣre aƿendunȝe inlendiscra.
model.unit.masterBlacksmith.name={{plural:%number%|one=Cræftig īsensmiþ|other=Cræftigra īsensmiþa|default=Cræftig īsensmiþ}}
Expand Down
3 changes: 1 addition & 2 deletions data/strings/FreeColMessages_ar.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,6 @@ model.foundingFather.juanDeSepulveda.name=جوان دي سيبولفيدا
model.foundingFather.juanDeSepulveda.description=يزيد الفرصة أن سكان مستوطنة هندية سبججاتد سوف "تتحول" وتنضم إلى مستعمراتك ب20%.
model.foundingFather.juanDeSepulveda.text=عالم دين أسباني تحدث مؤيدا غزو أراضي الهنود وفرض الإيفاجيليزاشن للسكان الأصليين.
model.foundingFather.bartolomeDeLasCasas.name=بارتولوم دي لا كازاس
model.foundingFather.bartolomeDeLasCasas.description=كل المتحولين الهنود الموجودين حولوا إلى مستعمرين أحرار.
model.foundingFather.bartolomeDeLasCasas.text=قس كاثوليكي سافر للإنديز محولا الهنود ومعارضا أسبانيا لمعاهدتها للسكان الأصليين.
model.foundingFather.trade=تجارة
model.foundingFather.exploration=استكشاف
Expand Down Expand Up @@ -1920,7 +1919,7 @@ model.unit.hardyPioneer.description=الرائد الهاردي يتميز في
model.unit.indenturedServant.name={{plural:%number%|one=خادم بدون أجر|other=خدم بدون أجر|default=خادم بدون أجر}}
model.unit.indenturedServant.description=الخادم بلا أجر مهيأ جيدا للعمل بالخارج، لكن مهيأ بدرجة أقل للعمل بالداخل. يمكن أن يصبح مستعمرا حرا من خلال الترقية أو التعليم.
model.unit.indianConvert.name={{plural:%number%|one=تحول هندي|other=تحولات هندية|default=تحول هندي}}
model.unit.indianConvert.description=المتحول الهندي هو ساكن أصلي انضم إلى واحدة من مستعمراتك. هو ماهر في كل أنواع العمل بالخارج، لكن غير مهيأ للعمل بالداخل. متى انضم بارتولوم دي لاس كازاس إلى الكونجرس القاري، كل المتحولين الهنود يصبحون مستعمرين أحرار.

model.unit.jesuitMissionary.name={{plural:%number%|one=مبشر يسوعي|other==مبشرون يسوعيون|default=مبشر يسوعي}}
model.unit.jesuitMissionary.description=مهمة الجوسيت قادر على بدء مهمة في مستوطنة هندية ويتميز خصوصا في تحويل الهنود.
model.unit.masterBlacksmith.name={{plural:%number%|one=رئيس حدادين|other=رؤساء حدادين|default=رئيس حدادين}}
Expand Down
3 changes: 1 addition & 2 deletions data/strings/FreeColMessages_arz.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ model.foundingFather.juanDeSepulveda.name=جوان دى سيبولفيدا
model.foundingFather.juanDeSepulveda.description=يزيد الفرصه أن سكان مستوطنه هنديه سبججاتد سوف "تتحول" وتنضم إلى مستعمراتك ب20%.
model.foundingFather.juanDeSepulveda.text=عالم دين أسبانى تحدث مؤيدا غزو أراضى الهنود وفرض الإيفاجيليزاشن للسكان الأصليين.
model.foundingFather.bartolomeDeLasCasas.name=بارتولوم دى لا كازاس
model.foundingFather.bartolomeDeLasCasas.description=كل المتحولين الهنود الموجودين حولوا إلى مستعمرين أحرار.
model.foundingFather.bartolomeDeLasCasas.text=قس كاثوليكى سافر للإنديز محولا الهنود ومعارضا أسبانيا لمعاهدتها للسكان الأصليين.
model.foundingFather.trade=تجارة
model.foundingFather.exploration=استكشاف
Expand Down Expand Up @@ -876,7 +875,7 @@ model.unit.hardyPioneer.description=الرائد الهاردى يتميز فى
model.unit.indenturedServant.name={{plural:%number%|one=خادم بدون أجر|other=خدم بدون أجر|default=خادم بدون أجر}}
model.unit.indenturedServant.description=الخادم بلا أجر مهيأ جيدا للعمل بالخارج، لكن مهيأ بدرجه أقل للعمل بالداخل. يمكن أن يصبح مستعمرا حرا من خلال الترقيه أو التعليم.
model.unit.indianConvert.name={{plural:%number%|one=تحول هندي|other=تحولات هندية|default=تحول هندي}}
model.unit.indianConvert.description=المتحول الهندى هو ساكن أصلى انضم إلى واحده من مستعمراتك. هو ماهر فى كل أنواع العمل بالخارج، لكن غير مهيأ للعمل بالداخل. متى انضم بارتولوم دى لاس كازاس إلى الكونجرس القارى، كل المتحولين الهنود يصبحون مستعمرين أحرار.

model.unit.jesuitMissionary.name={{plural:%number%|one=مبشر يسوعي|other==مبشرون يسوعيون|default=مبشر يسوعي}}
model.unit.jesuitMissionary.description=مهمه الجوسيت قادر على بدء مهمه فى مستوطنه هنديه ويتميز خصوصا فى تحويل الهنود.
model.unit.masterBlacksmith.name={{plural:%number%|one=رئيس حدادين|other=رؤساء حدادين|default=رئيس حدادين}}
Expand Down
Loading