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

Some fixes + localisation #167

Merged
merged 14 commits into from
Apr 29, 2018
Merged

Some fixes + localisation #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 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
4d3abbd
Merge branch 'develop' into IhT-fixes
IhateTrains Feb 16, 2018
97dbb0d
Merge branch 'develop' into IhT-fixes
IhateTrains Mar 18, 2018
43a8a60
some localisation
IhateTrains Mar 31, 2018
5abdb8a
Localised not_already_holding_tristeria
IhateTrains Apr 12, 2018
af4eda5
"is_occupied = no" fixes
IhateTrains Apr 29, 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
1 change: 1 addition & 0 deletions AncientReligions/decisions/ACR_druidic_decisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,7 @@ decisions = {
allow = {
war = no
any_demesne_title = {
NOT = { higher_tier_than = count }
is_occupied = no
}
prisoner = no
Expand Down
1 change: 1 addition & 0 deletions AncientReligions/decisions/ACR_egyptian_decisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ decisions = {
war = no
in_command = no
any_demesne_title = {
NOT = { higher_tier_than = count }
is_occupied = no
}
has_regent = no
Expand Down
1 change: 1 addition & 0 deletions AncientReligions/decisions/ACR_hellenic_decisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ decisions = {
NOT = { has_character_flag = do_not_disturb }
war = no
any_demesne_title = {
NOT = { higher_tier_than = count }
is_occupied = no
}
}
Expand Down
4 changes: 4 additions & 0 deletions AncientReligions/localisation/ACR_hellenic_events.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,7 @@ EVTOPTBancrel.2240;Am I next?;;;;;;;;;;;;;x
EVTDESCancrel.2241;While watching the latest play from a local philosopher, you notice that some of the actors are completely drunk. This is an insult to your honor and to the art of the Theatre, though the man in charge assures you they will be taken care of, it is your duty to take charge.;;;;;;;;;;;;;x
EVTOPTAancrel.2241;Kick them out!;;;;;;;;;;;;;x
EVTOPTBancrel.2241;Actually, this strengthens the play;;;;;;;;;;;;;x
# Wines, Oils, & Dionysus;;;;;;;;;;;;;;x
ancrel_winery;Owns a Winery;;;;;;;;;;;;;x
ancrel_oilworks:Owns Oilworks;;;;;;;;;;;;;x
ancrel_held_dionysia;Held Dionysia;;;;;;;;;;;;;x
2 changes: 2 additions & 0 deletions AncientReligions/localisation/ACR_societies.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ mysteries_dionysus_rank_3_male;Boukolos;;;;;;;;;;;;;x
mysteries_dionysus_rank_3_female;Boukolos;;;;;;;;;;;;;x
mysteries_dionysus_rank_4_male;Archiboukolos;;;;;;;;;;;;;x
mysteries_dionysus_rank_4_female;Archiboukolos;;;;;;;;;;;;;x
############### Tristeria ;;;;;;;;;;;;;x
not_already_holding_tristeria;Is not already holding Tristeria;;;;;;;;;;;;;x
############### Strings ;;;;;;;;;;;;;x
String_ker;Ker;;;;;;;;;;;;;x
String_keres;Keres;;;;;;;;;;;;;x
Expand Down