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

Jump to bottom

Small fixes #164

Merged
merged 9 commits into from
Feb 6, 2018
Merged

Small fixes #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8270bf
cleaning the Silk Road "hot-spot" trigger of duplicates
IhateTrains Dec 28, 2017
961cc4e
Validator fixes
IhateTrains Dec 28, 2017
0b3b28a
Merge branch 'develop' into IhT-fixes
IhateTrains Dec 30, 2017
13957c6
Merge branch 'develop' into IhT-fixes
IhateTrains Jan 11, 2018
b3f96fe
Merge branch 'develop' into IhT-fixes
IhateTrains Feb 3, 2018
5f42cc3
parse failures fix
IhateTrains Feb 3, 2018
a4f931b
added missing localisation
IhateTrains Feb 3, 2018
fb25992
minor fixes
IhateTrains Feb 3, 2018
22fe8aa
minor fix + disabled localisation duplicate with vanilla
IhateTrains Feb 3, 2018
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
6 changes: 3 additions & 3 deletions AncientReligions/decisions/ACR_other_decisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ decisions = {
has_character_modifier = ancrel_oilworks
}
}
allowed = {
allow = {
wealth = 200
}
effect = {
Expand Down Expand Up @@ -80,7 +80,7 @@ decisions = {
is_high_prio = yes
potential = {
OR = {
has_focus = seduction
has_focus = focus_seduction
trait = hedonist
trait = lustful
society_member_of = shezmu_cult
Expand All @@ -90,7 +90,7 @@ decisions = {
has_character_modifier = ancrel_oilworks
}
}
allowed = {
allow = {
wealth = 200
}
effect = {
Expand Down
9 changes: 6 additions & 3 deletions AncientReligions/events/rip_eternal_life_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ narrative_event = {
is_female = yes
}
give_nickname = nick_the_youthfull
} else {
}
else = {
give_nickname = nick_the_wise
}
random_list = {
Expand Down Expand Up @@ -863,7 +864,8 @@ narrative_event = {
if = {
limit = { culture = greek }
give_nickname = nick_the_spartan
} else {
}
else = {
give_nickname = nick_the_fearless
}

Expand Down Expand Up @@ -962,7 +964,8 @@ narrative_event = {
if = {
limit = { is_female = no }
give_nickname = nick_the_younger
} else {
}
else = {
give_nickname = nick_the_gentle
}
change_diplomacy = 2
Expand Down
2 changes: 1 addition & 1 deletion AncientReligions/localisation/ACR_hellenic.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ coa_plain_hellenic;Hellenic Coat of Arms;;;;;;;;;;;;;x
###### Religion/titles definitions;;;;;;;;;;;;;;x
GOD_PLUTO;Pluto;Pluton;Pluto;;Pluto;;;;;;;;;x
GOD_JUNO;Hera;H�ra;Hera;;Hera;;;;;;;;;x
GOD_VESTA;Vesta;Vesta;Vesta;;Vesta;;;;;;;;;x
#GOD_VESTA;Vesta;Vesta;Vesta;;Vesta;;;;;;;;;x
GOD_MINERVA;Athena;Ath�na;Athene;;Atenea;;;;;;;;;x
GOD_CERES;Demeter;D�m�ter;Demeter;;Dem�ter;;;;;;;;;x
GOD_DIANA;Artemis;Art�mis;Artemis;;Artemisa;;;;;;;;;x
Expand Down
1 change: 1 addition & 0 deletions AncientReligions/localisation/ACR_other.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ancrel_honored_me;Honored Me;;;;;;;;;;;;;x
ancrel_dissapointed;Dissapointed;;;;;;;;;;;;;x
ancrel_jealous;Jealous;;;;;;;;;;;;;x
ancrel_pleased;Pleased;;;;;;;;;;;;;x
ancrel_shared_religious_experience;Shared religious experience;;;;;;;;;;;;;x
paganify_the_world;Lets. Get. PAGAN!;;;;;;;;;;;;;x
paganify_the_world_desc;Convert all characters to a not Christian and not Muslim religion, based on culture. Does not affect religious heads, so the Caliphate remains. May bring older machines to their knees.;;;;;;;;;;;;;x
ancrel.paganify.tooltip;Turn the world pagan by culture. This is mostly for development.;;;;;;;;;;;;;x
Expand Down