diff --git a/assets/localisation/ar-AR/alice.csv b/assets/localisation/ar-AR/alice.csv index 2257bd479..ee14bc11c 100644 --- a/assets/localisation/ar-AR/alice.csv +++ b/assets/localisation/ar-AR/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;محدد المقاطعة modifier_province_immigrator;مهاجر المحافظة modifier_conversion_rate;معدل التحويل modifier_attrition;الاستنزاف -chat_player_joins;انضم @$x$ $playername$ -chat_player_leaves;@$x$ $playername$ متبقي -chat_player_ban;تم حظر @$x$ $playername$ -chat_player_kick;تم طرد @$x$ $playername$ -chat_player_switch;@$x$ $playername$ اختار $country$ -chat_player_oos;تم تسجيل @$x$ $playername$! +chat_player_joins;انضم $playername$ +chat_player_leaves;$playername$ متبقي +chat_player_ban;تم حظر $playername$ +chat_player_kick;تم طرد $playername$ +chat_player_switch;$playername$ اختار $country$ +chat_player_oos;تم تسجيل $playername$! alice_status_stream;حفظ التقدم $value$ alice_play_pending_client;$playername$ ليس جاهزًا بعد alice_stockpile_button_0_0;"تعمل المخزونات الوطنية بمثابة بهار للأنشطة الاقتصادية والتجارية المعتادة، حيث يرى الناس خطوط ""Ggreen""W ترتفع، و""Rred""W خطوط تنخفض، كما هو معتاد أنا ""Ynot؟""W رسم بياني خطي لذلك أنا في الغالب تمر مرور الكرام :)" diff --git a/assets/localisation/de-DE/alice.csv b/assets/localisation/de-DE/alice.csv index aa8e3ce80..3c29d45aa 100644 --- a/assets/localisation/de-DE/alice.csv +++ b/assets/localisation/de-DE/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Provinzauswahl modifier_province_immigrator;Einwanderer aus der Provinz modifier_conversion_rate;Wechselkurs modifier_attrition;Attrition -chat_player_joins;@$x$ $playername$ ist beigetreten -chat_player_leaves;@$x$ $playername$ übrig -chat_player_ban;@$x$ $playername$ wurde gesperrt -chat_player_kick;@$x$ $playername$ wurde gekickt -chat_player_switch;@$x$ $playername$ hat $country$ ausgewählt -chat_player_oos;@$x$ $playername$ hat OOSed! +chat_player_joins;$playername$ ist beigetreten +chat_player_leaves;$playername$ übrig +chat_player_ban;$playername$ wurde gesperrt +chat_player_kick;$playername$ wurde gekickt +chat_player_switch;$playername$ hat $country$ ausgewählt +chat_player_oos;$playername$ hat OOSed! alice_status_stream;Speichern Sie den Fortschritt $value$ alice_play_pending_client;$playername$ ist noch nicht fertig alice_stockpile_button_0_0;Nationale Vorräte fungieren als Gewürz für Ihre üblichen Wirtschafts- und Geschäftsaktivitäten, bei denen die Leute sehen, dass die „Ggrünen“ W-Linien nach oben und die „RRoten“ W-Linien nach unten gehen. Wie üblich bin ich kein Liniendiagramm, also meistens unbemerkt bleiben :) diff --git a/assets/localisation/en-US/alice.csv b/assets/localisation/en-US/alice.csv index 38ded424b..b05a66515 100644 --- a/assets/localisation/en-US/alice.csv +++ b/assets/localisation/en-US/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Province selector modifier_province_immigrator;Province immigrator modifier_conversion_rate;Conversion Rate modifier_attrition;Attrition -chat_player_joins;@$x$ $playername$ joined -chat_player_leaves;@$x$ $playername$ left -chat_player_ban;@$x$ $playername$ was banned -chat_player_kick;@$x$ $playername$ was kicked -chat_player_switch;@$x$ $playername$ has choosen $country$ -chat_player_oos;@$x$ $playername$ has OOSed! +chat_player_joins;$playername$ joined +chat_player_leaves;$playername$ left +chat_player_ban;$playername$ was banned +chat_player_kick;$playername$ was kicked +chat_player_switch;$playername$ has choosen $country$ +chat_player_oos;$playername$ has OOSed! alice_status_stream;Save progress $value$ alice_play_pending_client;$playername$ is not ready yet alice_stockpile_button_0_0;National stockpiles function as a condiment to your usual economic-business activities, where people see ?Ggreen?W lines go up, and ?Rred?W lines go down, as per usual I'm ?Ynot?W a line graph so I mostly go unnoticed :) diff --git a/assets/localisation/es-ES/alice.csv b/assets/localisation/es-ES/alice.csv index 89a99603f..627db780c 100644 --- a/assets/localisation/es-ES/alice.csv +++ b/assets/localisation/es-ES/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Selector provincial modifier_province_immigrator;Inmigrador provincial modifier_conversion_rate; modifier_attrition; -chat_player_joins;@$x$ $playername$ se unio -chat_player_leaves;@$x$ $playername$ se fue -chat_player_ban;@$x$ $playername$ fue baneado -chat_player_kick;@$x$ $playername$ fue vetado -chat_player_switch;@$x$ $playername$ ahora es $country$ -chat_player_oos; +chat_player_joins;$playername$ se unio +chat_player_leaves;$playername$ se fue +chat_player_ban;$playername$ fue baneado +chat_player_kick;$playername$ fue vetado +chat_player_switch;$playername$ ahora es $country$ +chat_player_oos;$playername$ se ha OOSeado alice_status_stream;Progreso $value$ alice_play_pending_client;$playername$ no esta listo/a todavia alice_stockpile_button_0_0; diff --git a/assets/localisation/hu-HU/alice.csv b/assets/localisation/hu-HU/alice.csv index f093a6ef5..edc50de94 100644 --- a/assets/localisation/hu-HU/alice.csv +++ b/assets/localisation/hu-HU/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Tartományválasztó modifier_province_immigrator;Tartományi bevándorló modifier_conversion_rate;Konverziós arány modifier_attrition;Kopás -chat_player_joins;@$x$ $playername$ csatlakozott -chat_player_leaves;@$x$ $playername$ maradt -chat_player_ban;@$x$ $playername$ kitiltva lett -chat_player_kick;@$x$ $playername$ rúgott -chat_player_switch;@$x$ $playername$ a $country$ lehetőséget választotta -chat_player_oos;@$x$ $playername$ OOS-t kapott! +chat_player_joins;$playername$ csatlakozott +chat_player_leaves;$playername$ maradt +chat_player_ban;$playername$ kitiltva lett +chat_player_kick;$playername$ rúgott +chat_player_switch;$playername$ a $country$ lehetőséget választotta +chat_player_oos;$playername$ OOS-t kapott! alice_status_stream;A folyamat mentése $érték$ alice_play_pending_client;$playername$ még nincs kész alice_stockpile_button_0_0;"A nemzeti készletek az Ön szokásos gazdasági-üzleti tevékenységeinek fűszereként funkcionálnak, ahol az emberek azt látják, hogy a ""Ggreen"" W vonalak felfelé, a ""Rred"" W vonalak pedig lefelé haladnak, a szokásos módon én nem vagyok vonaldiagram, így többnyire észrevétlen marad :)" diff --git a/assets/localisation/it-IT/alice.csv b/assets/localisation/it-IT/alice.csv index 02807da5b..e85d0f53e 100644 --- a/assets/localisation/it-IT/alice.csv +++ b/assets/localisation/it-IT/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Selettore della provincia modifier_province_immigrator;Immigrato della provincia modifier_conversion_rate;Tasso di conversione modifier_attrition;Attrito -chat_player_joins;@$x$ $playername$ si è iscritto -chat_player_leaves;@$x$ $playername$ rimasto -chat_player_ban;@$x$ $playername$ è stato bannato -chat_player_kick;@$x$ $playername$ è stato espulso -chat_player_switch;@$x$ $playername$ ha scelto $country$ -chat_player_oos;@$x$ $playername$ è fuori servizio! +chat_player_joins;$playername$ si è iscritto +chat_player_leaves;$playername$ rimasto +chat_player_ban;$playername$ è stato bannato +chat_player_kick;$playername$ è stato espulso +chat_player_switch;$playername$ ha scelto $country$ +chat_player_oos;$playername$ è fuori servizio! alice_status_stream;Salva i progressi $value$ alice_play_pending_client;$playername$ non è ancora pronto alice_stockpile_button_0_0;Le scorte nazionali funzionano come un condimento per le vostre consuete attività economico-commerciali, in cui le persone vedono le linee ?Ggreen?W salire e le linee ?Rred?W scendere, come al solito sono ?Ynot?W un grafico a linee, quindi per lo più Andare inosservato :) diff --git a/assets/localisation/ko-SK/alice.csv b/assets/localisation/ko-SK/alice.csv index 7586a36ed..051543c4c 100644 --- a/assets/localisation/ko-SK/alice.csv +++ b/assets/localisation/ko-SK/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;지방 선택기 modifier_province_immigrator;지방 이민자 modifier_conversion_rate;전환율 modifier_attrition;마찰 -chat_player_joins;@$x$ $playername$님이 합류했습니다 -chat_player_leaves;@$x$ $playername$ 남음 -chat_player_ban;@$x$ $playername$이(가) 차단되었습니다 -chat_player_kick;@$x$ $playername$이(가) 추방되었습니다 -chat_player_switch;@$x$ $playername$님이 $country$을 선택했습니다. -chat_player_oos;@$x$ $playername$이 OOS를 받았습니다! +chat_player_joins;$playername$님이 합류했습니다 +chat_player_leaves;$playername$ 남음 +chat_player_ban;$playername$이(가) 차단되었습니다 +chat_player_kick;$playername$이(가) 추방되었습니다 +chat_player_switch;$playername$님이 $country$을 선택했습니다. +chat_player_oos;$playername$이 OOS를 받았습니다! alice_status_stream;진행 상황 $value$ 저장 alice_play_pending_client;$playername$은(는) 아직 준비되지 않았습니다. alice_stockpile_button_0_0;국가 비축량은 일반적인 경제-비즈니스 활동에 대한 조미료 역할을 합니다. 사람들은 ?Ggreen?W 선이 올라가고 ?Rred?W 선이 내려가는 것을 봅니다. 평소와 같이 나는 ?Ynot?W 선 그래프이므로 대부분 눈에 띄지 않게 가세요 :) diff --git a/assets/localisation/nl-NL/alice.csv b/assets/localisation/nl-NL/alice.csv index ab2b6ad77..74a9b87a7 100644 --- a/assets/localisation/nl-NL/alice.csv +++ b/assets/localisation/nl-NL/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Provinciekiezer modifier_province_immigrator;Immigrant uit de provincie modifier_conversion_rate;Conversiepercentage modifier_attrition;Slijtage -chat_player_joins;@$x$ $spelernaam$ is lid geworden -chat_player_leaves;@$x$ $spelernaam$ over -chat_player_ban;@$x$ $spelernaam$ is verbannen -chat_player_kick;@$x$ $spelernaam$ is geschopt -chat_player_switch;@$x$ $playername$ heeft $country$ gekozen -chat_player_oos;@$x$ $playername$ heeft OOSed! +chat_player_joins;$spelernaam$ is lid geworden +chat_player_leaves;$spelernaam$ over +chat_player_ban;$spelernaam$ is verbannen +chat_player_kick;$spelernaam$ is geschopt +chat_player_switch;$playername$ heeft $country$ gekozen +chat_player_oos;$playername$ heeft OOSed! alice_status_stream;Bewaar voortgang $value$ alice_play_pending_client;$playername$ is nog niet klaar alice_stockpile_button_0_0;Nationale voorraden fungeren als aanvulling op uw gebruikelijke economisch-zakelijke activiteiten, waar mensen 'Ggroene' W-lijnen omhoog zien gaan en 'Rred' W-lijnen omlaag gaan, zoals gewoonlijk ben ik 'Ynot'W een lijngrafiek, dus ik ben meestal onopgemerkt gaan :) diff --git a/assets/localisation/pl-PL/alice.csv b/assets/localisation/pl-PL/alice.csv index 90b8ebc32..171d2c295 100644 --- a/assets/localisation/pl-PL/alice.csv +++ b/assets/localisation/pl-PL/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;Selektor prowincji modifier_province_immigrator;Imigrant z prowincji modifier_conversion_rate;Współczynnik konwersji modifier_attrition;Ścieranie -chat_player_joins;Dołączył @$x$ $nazwa_gracza$ -chat_player_leaves;Pozostało @$x$ $nazwa_gracza$ -chat_player_ban;@$x$ $playername$ został zbanowany -chat_player_kick;@$x$ $playername$ został wyrzucony -chat_player_switch;@$x$ $playername$ wybrał $country$ -chat_player_oos;@$x$ $playername$ przeszedł OOS! +chat_player_joins;Dołączył $nazwa_gracza$ +chat_player_leaves;Pozostało $nazwa_gracza$ +chat_player_ban;$playername$ został zbanowany +chat_player_kick;$playername$ został wyrzucony +chat_player_switch;$playername$ wybrał $country$ +chat_player_oos;$playername$ przeszedł OOS! alice_status_stream;Zapisz postęp $wartość$ alice_play_pending_client;$playername$ nie jest jeszcze gotowy alice_stockpile_button_0_0;Krajowe zapasy stanowią dodatek do zwykłej działalności gospodarczo-biznesowej, gdzie ludzie widzą, jak linie „Ggreen” W rosną, a linie „Rred” W maleją, jak zwykle „Jestem” „Ynot” to wykres liniowy, więc głównie pozostać niezauważonym :) diff --git a/assets/localisation/ru-RU/alice.csv b/assets/localisation/ru-RU/alice.csv index 8e07419ef..a1e6dfa6a 100644 --- a/assets/localisation/ru-RU/alice.csv +++ b/assets/localisation/ru-RU/alice.csv @@ -907,12 +907,12 @@ modifier_province_selector;Province selector modifier_province_immigrator;Province immigrator modifier_conversion_rate;Conversion Rate modifier_attrition;Attrition -chat_player_joins;@$x$ $playername$ joined -chat_player_leaves;@$x$ $playername$ left -chat_player_ban;@$x$ $playername$ was banned -chat_player_kick;@$x$ $playername$ was kicked -chat_player_switch;@$x$ $playername$ has choosen $country$ -chat_player_oos;@$x$ $playername$ has OOSed! +chat_player_joins;$playername$ joined +chat_player_leaves;$playername$ left +chat_player_ban;$playername$ was banned +chat_player_kick;$playername$ was kicked +chat_player_switch;$playername$ has choosen $country$ +chat_player_oos;$playername$ has OOSed! alice_status_stream;Save progress $value$ alice_play_pending_client;$playername$ is not ready yet alice_stockpile_button_0_0;National stockpiles function as a condiment to your usual economic-business activities, where people see ?Ggreen?W lines go up, and ?Rred?W lines go down, as per usual I'm ?Ynot?W a line graph so I mostly go unnoticed :) diff --git a/assets/localisation/zh-CN/alice.csv b/assets/localisation/zh-CN/alice.csv index c3f68cfad..773aa9d8e 100644 --- a/assets/localisation/zh-CN/alice.csv +++ b/assets/localisation/zh-CN/alice.csv @@ -909,12 +909,12 @@ modifier_province_selector;省选区 modifier_province_immigrator;省移民 modifier_conversion_rate;传教率 modifier_attrition;损耗 -chat_player_joins;@$x$$playername$加入 -chat_player_leaves;@$x$$playername$离开 -chat_player_ban;@$x$$playername$被封禁 -chat_player_kick;@$x$$playername$被踢除 -chat_player_switch;@$x$$playername$选择了$country$ -chat_player_oos;@$x$$playername$已断开连接！ +chat_player_joins;$playername$加入 +chat_player_leaves;$playername$离开 +chat_player_ban;$playername$被封禁 +chat_player_kick;$playername$被踢除 +chat_player_switch;$playername$选择了$country$ +chat_player_oos;$playername$已断开连接！ alice_status_stream;存档处理进度：$value$ alice_play_pending_client;$playername$未准备好 alice_stockpile_button_0_0;国家仓储可以作为您日常经济商业活动的调节物，在?G绿色?W 线看到价格上涨, and ?Rred?W 红线下降, 像往常一样 我 ?Y不是?W 一个折线图所以不总是被注意到: ) @@ -1195,4 +1195,4 @@ ledger_ppp_gdp;GDP(PPP) ledger_ppp_gdp_per_capita;每100万人的GDP（PPP） an_assigned_leader;an assigned leader macro_new_template;新建 -invention;发明 \ No newline at end of file +invention;发明 diff --git a/docs/extensions.md b/docs/extensions.md index 78cb32f15..070d0c75b 100644 --- a/docs/extensions.md +++ b/docs/extensions.md @@ -72,6 +72,8 @@ Additionally, triggers such as technology triggers no longer suffer from having - `if = { ... }`: See below for if-else usage. - `else_if = { ... }`: See below. - `else = { ... }`: See below. +- `add_country_modifier = modifier`: Shorthand for `add_country_modifier = { name = modifier duration = -1 }` +- `add_province_modifier = modifier`: Shorthand for `add_province_modifier = { name = modifier duration = -1 }` As for `build_xxx_in_capital`, the game doesn't allow custom defined buildings to be used in this mode as an effect. diff --git a/src/gamestate/commands.cpp b/src/gamestate/commands.cpp index 6b6413247..2b7e29490 100644 --- a/src/gamestate/commands.cpp +++ b/src/gamestate/commands.cpp @@ -4447,8 +4447,6 @@ void execute_notify_player_joins(sys::state& state, dcon::nation_id source, sys: ui::chat_message m{}; m.source = source; text::substitution_map sub{}; - auto tag = nations::int_to_tag(state.world.national_identity_get_identifying_int(state.world.nation_get_identity_from_identity_holder(source))); - text::add_to_substitution_map(sub, text::variable_type::x, std::string_view(tag)); text::add_to_substitution_map(sub, text::variable_type::playername, name.to_string_view()); m.body = text::resolve_string_substitution(state, "chat_player_joins", sub); post_chat_message(state, m); @@ -4477,8 +4475,6 @@ void execute_notify_player_leaves(sys::state& state, dcon::nation_id source, boo ui::chat_message m{}; m.source = source; text::substitution_map sub{}; - auto tag = nations::int_to_tag(state.world.national_identity_get_identifying_int(state.world.nation_get_identity_from_identity_holder(source))); - text::add_to_substitution_map(sub, text::variable_type::x, std::string_view(tag)); text::add_to_substitution_map(sub, text::variable_type::playername, state.network_state.map_of_player_names[source.index()].to_string_view()); m.body = text::resolve_string_substitution(state, "chat_player_leaves", sub); post_chat_message(state, m); @@ -4510,8 +4506,6 @@ void execute_notify_player_ban(sys::state& state, dcon::nation_id source, dcon:: ui::chat_message m{}; m.source = source; text::substitution_map sub{}; - auto tag = nations::int_to_tag(state.world.national_identity_get_identifying_int(state.world.nation_get_identity_from_identity_holder(target))); - text::add_to_substitution_map(sub, text::variable_type::x, std::string_view(tag)); text::add_to_substitution_map(sub, text::variable_type::playername, state.network_state.map_of_player_names[target.index()].to_string_view()); m.body = text::resolve_string_substitution(state, "chat_player_ban", sub); post_chat_message(state, m); @@ -4543,8 +4537,6 @@ void execute_notify_player_kick(sys::state& state, dcon::nation_id source, dcon: ui::chat_message m{}; m.source = source; text::substitution_map sub{}; - auto tag = nations::int_to_tag(state.world.national_identity_get_identifying_int(state.world.nation_get_identity_from_identity_holder(target))); - text::add_to_substitution_map(sub, text::variable_type::x, std::string_view(tag)); text::add_to_substitution_map(sub, text::variable_type::playername, state.network_state.map_of_player_names[target.index()].to_string_view()); m.body = text::resolve_string_substitution(state, "chat_player_kick", sub); post_chat_message(state, m); @@ -4595,8 +4587,6 @@ void execute_notify_player_oos(sys::state& state, dcon::nation_id source) { ui::chat_message m{}; m.source = source; text::substitution_map sub{}; - auto tag = nations::int_to_tag(state.world.national_identity_get_identifying_int(state.world.nation_get_identity_from_identity_holder(source))); - text::add_to_substitution_map(sub, text::variable_type::x, std::string_view(tag)); text::add_to_substitution_map(sub, text::variable_type::playername, state.network_state.map_of_player_names[source.index()].to_string_view()); m.body = text::resolve_string_substitution(state, "chat_player_oos", sub); post_chat_message(state, m); diff --git a/src/parsing/cultures_parsing.cpp b/src/parsing/cultures_parsing.cpp index 533a9e511..8af38a110 100644 --- a/src/parsing/cultures_parsing.cpp +++ b/src/parsing/cultures_parsing.cpp @@ -275,7 +275,7 @@ void make_tech_folder_list(std::string_view name, token_generator& gen, error_ha cat = ::culture::tech_category::military_theory; } else if(is_fixed_token_ci(name.data(), name.data() + name.length(), "population_tech")) { cat = ::culture::tech_category::population; - } else if(is_fixed_token_ci(name.data(), name.data() + name.length(), "diplomacy")) { + } else if(is_fixed_token_ci(name.data(), name.data() + name.length(), "diplomacy_tech")) { cat = ::culture::tech_category::diplomacy; } else if(is_fixed_token_ci(name.data(), name.data() + name.length(), "flavor_tech")) { cat = ::culture::tech_category::flavor;