Merge pull request #2013 from SneakBug8/feature/religion

Religions to give national bonuses

Author: schombert

assets/alice.gui

@@ -6001,6 +6001,14 @@ guiTypes = {
 		extends="factory_info"
 	}
 
+	iconType = {
+			name = "nation_icon_religion"
+			spriteType = "GFX_icon_religion"
+			position = { x = 300 y = 195 }
+			Orientation = "UPPER_LEFT"
+			extends = "diplomacy_country_facts"
+	}
+
 	iconType = {
         name = "industry_size_icon"
         spriteType = "GFX_budget_ind_sup_icon"

assets/localisation/en-US/alice.csv

@@ -14,30 +14,31 @@ no_effect;No effect
 move_capital_to;Move capital to
 add_x_core;Add $adj$ core
 add_core_to;Add core to
-remove_x_core;Remove $adj$ core
+remove_x_core;Remove ?Y$adj$?W core
 remove_core_from;Remove core from
-change_name_to;Change name to $text$
-change_terrain_to;Change terrain to $text$
-change_rgo_production_to;Change RGO production to $text$
+change_name_to;Change name to ?Y$text$?W
+change_terrain_to;Change terrain to ?Y$text$?W
+change_rgo_production_to;Change RGO production to ?Y$text$??W
 make_accepted_culture;$text$ becomes an accepted culture
-primary_culture_changes_to;Primary culture changes to $text$
+primary_culture_changes_to;Primary culture changes to ?Y$text$?W
 union_culture_accepted;All cultures in the nation's primary culture group become accepted
 remove_accepted_culture;$text$ stops being an accepted culture
-increase_national_variable_by;Increase national variable $text$ by $value$
-decrease_national_variable_by;Decrease national variable $text$ by $value$
+increase_national_variable_by;Increase nation's ?Y$text$?W by ?Y$value$?W
+decrease_national_variable_by;Decrease nation's ?Y$text$?W by ?Y$value$?W
 life_rating;Life rating
-make_national_religion;$text$ becomes the national religion
-make_province_religion;province population converts to $text$
-make_pop_religion;Converts to $text$
-make_pop_culture;Converts to $text$
-make_slave_state;Becomes a slave state
-make_slave_pop;Becomes a slave
+make_national_religion;?Y$text$?W becomes the national religion
+giving_modifier;This will give the following modifier:
+make_province_religion;province population converts to ?Y$text$?W
+make_pop_religion;Converts to ?Y$text$?W
+make_pop_culture;Converts to ?Y$text$?W
+make_slave_state;Becomes a ?Yslave state?W
+make_slave_pop;Becomes a ?Yslave?W
 research_points;Research points
-change_tech_school;Technology school changes to $text$
-change_government_to;Government changes to $text$
+change_tech_school;Technology school changes to ?Y$text$?W
+change_government_to;Government changes to ?Y$text$?W
 add_to_treasury;Added to treasury
 war_exhaustion;War exhaustion
-become_blank;Becomes $text$
+become_blank;Becomes ?Y$text$?W
 player_control_change;Player control changes to $text$
 set_national_flag;$text$ is set for this nation
 remove_national_flag;$text$ is unset for this nation
@@ -110,7 +111,7 @@ add_cb_reversed_months;$text$ gets a $name$ casus belli against the nation in sc
 add_cb_reversed_no_months;$text$ gets a $name$ casus belli against the nation in scope
 remove_cb_reversed;Loses any $name$ casus bellis against $text$
 remove_cb;$text$ loses any $name$ casus bellis against the nation in scope
-set_national_variable_to;Set national variable $text$ to $value$
+set_national_variable_to;Set nation ?Y$text$?W to ?Y$value$?W
 event_fires;Event $text$ is triggered
 event_fires_in_days;Event $text$ is triggered in $value$ days
 railroad_in_capital;?G+1?! railroad level in capital
@@ -1164,6 +1165,8 @@ alice_warn_war_ends_for_us;?RThis will end the war for everyone on our side?!.
 alice_invention_chance;The chance of discovering this ?Yinvention?! are as follows:
 is_primary_culture;?Y$NAME$?! is the primary culture.
 is_primary_religion;?Y$NAME$?! is the primary religion.
+religion_nation_modifier;Majority of the population professes ?Y$NAME$?!
+when;When:
 tt_can_use_nation;The conditions needed to allow the use of this wargoal:
 et_on_add;The effects executed from adding this wargoal to a war:
 et_on_po_accepted;The effects executed from accepting a peace offer with this wargoal:

docs/extensions.md

@@ -787,3 +787,19 @@ change_factory_limit = {
     value = 15
 }
 ```
+
+
+## Religion
+
+State Religion can give a national modifier like this:
+
+```
+shinto = {
+		color = { 0.8 0 0 }
+		icon = 12
+
+		nation_modifier = {
+			education_efficiency = 0.05
+		}
+	}
+```

src/gamestate/commands.cpp

@@ -2719,15 +2719,16 @@ bool can_switch_embargo_status(sys::state& state, dcon::nation_id asker, dcon::n
 
 	return true;
 }
+
 void execute_switch_embargo_status(sys::state& state, dcon::nation_id from, dcon::nation_id to) {
 	if (state.world.nation_get_is_player_controlled(from)) {
-    	auto& current_diplo = state.world.nation_get_diplomatic_points(from);
+		auto& current_diplo = state.world.nation_get_diplomatic_points(from);
 		state.world.nation_set_diplomatic_points(from, current_diplo - state.defines.askmilaccess_diplomatic_cost);
 	}
 
-	auto rel_1 = state.world.get_unilateral_relationship_by_unilateral_pair(to, from);
+	auto rel_1 = state.world.get_unilateral_relationship_by_unilateral_pair(from, to);
 	if(!rel_1) {
-		rel_1 = state.world.force_create_unilateral_relationship(to, from);
+		rel_1 = state.world.force_create_unilateral_relationship(from, to);
 	}
 
 	auto new_status = !state.world.unilateral_relationship_get_embargo(rel_1);

src/gamestate/dcon_generated.txt

@@ -219,6 +219,11 @@ object{
 		type{ bitfield }
 		tag{ scenario }
 	}
+	property{
+		name{ nation_modifier }
+		type{ modifier_id }
+		tag{ scenario }
+	}
 }
 
 object {

src/gamestate/modifiers.cpp

@@ -253,8 +253,6 @@ void bulk_apply_scaled_modifier_to_provinces(sys::state& state, dcon::modifier_i
 }
 
 void recreate_national_modifiers(sys::state& state) {
-
-
 	concurrency::parallel_for(uint32_t(0), sys::national_mod_offsets::count, [&](uint32_t i) {
 		dcon::national_modifier_value mid{dcon::national_modifier_value::value_base_t(i)};
 		state.world.execute_serial_over_nation([&](auto ids) { state.world.nation_set_modifier_values(ids, mid, ve::fp_vector{}); });
@@ -268,6 +266,14 @@ void recreate_national_modifiers(sys::state& state) {
 		if(auto nv = n.get_national_value(); nv)
 			apply_modifier_values_to_nation(state, n, nv);
 	}
+	for(auto n : state.world.in_nation) {
+		if(auto rgmd = n.get_religion().get_nation_modifier(); rgmd) {
+			// Apply only when state religion is majority religion. The function is called once per month
+			if(state.world.nation_get_dominant_religion(n) == state.world.nation_get_religion(n)) {
+				apply_modifier_values_to_nation(state, n, rgmd);
+			}
+		}
+	}
 	for(auto n : state.world.in_nation) {
 		for(auto mpr : state.world.nation_get_current_modifiers(n)) {
 			apply_modifier_values_to_nation(state, n, mpr.mod_id);

src/gamestate/system_state.cpp

@@ -2436,6 +2436,7 @@ void state::load_scenario_data(parsers::error_handler& err, sys::year_month_day
 		// If it does not find any pop files there, it defaults to looking through 1836.1.1
 		// This is to deal with mods that have their start date defined as something else, but have pop history within 1836.1.1 (converters).
 		auto directory_file_count = list_files(date_directory, NATIVE(".txt")).size();
+		assert(directory_file_count > 0); // Since we expect to test on vanilla and proper mods - this is a useful test.
 		if(directory_file_count == 0)
 			date_directory = open_directory(pop_history, simple_fs::utf8_to_native("1836.1.1"));
 		for(auto pop_file : list_files(date_directory, NATIVE(".txt"))) {

src/gui/gui_effect_tooltips.cpp

@@ -1975,11 +1975,21 @@ uint32_t ef_life_rating(EFFECT_DISPLAY_PARAMS) {
 }
 uint32_t ef_religion(EFFECT_DISPLAY_PARAMS) {
 	{
+		auto rel = trigger::payload(tval[1]).rel_id;
 		auto box = text::open_layout_box(layout, indentation);
 		text::substitution_map m;
-		text::add_to_substitution_map(m, text::variable_type::text, ws.world.religion_get_name(trigger::payload(tval[1]).rel_id));
+		text::add_to_substitution_map(m, text::variable_type::text, ws.world.religion_get_name(rel));
 		text::localised_format_box(ws, layout, box, "make_national_religion", m);
 		text::close_layout_box(layout, box);
+		auto mod_id = ws.world.religion_get_nation_modifier(rel);
+		auto n = trigger::to_nation(primary_slot);
+		auto dr = ws.world.nation_get_dominant_religion(n);
+		if(bool(mod_id)) {
+			text::add_line(ws, layout, "when", 15);
+			text::add_line_with_condition(ws, layout, "religion_nation_modifier", dr == rel, text::variable_type::name, ws.world.religion_get_name(rel), 30);
+			text::add_line(ws, layout, "giving_modifier",15);
+			modifier_description(ws, layout, mod_id, 30);
+		}
 	}
 	return 0;
 }

src/gui/topbar_subwindows/gui_diplomacy_window.hpp

@@ -1093,10 +1093,7 @@ class nation_primary_culture : public simple_text_element_base {
 public:
 	void on_update(sys::state& state) noexcept override {
 		auto pc = state.world.nation_get_primary_culture(retrieve<dcon::nation_id>(state, parent));
-		auto pr = state.world.nation_get_religion(retrieve<dcon::nation_id>(state, parent));
 		std::string t = text::produce_simple_string(state, pc.get_name());
-		t += ", ";
-		t += text::produce_simple_string(state, pr.get_name());
 		set_text(state, t);
 	}
 	tooltip_behavior has_tooltip(sys::state& state) noexcept override {
@@ -1105,7 +1102,31 @@ class nation_primary_culture : public simple_text_element_base {
 	void update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept override {
 		auto content = retrieve<dcon::nation_id>(state, parent);
 		text::add_line(state, contents, "is_primary_culture", text::variable_type::name, state.world.culture_get_name(state.world.nation_get_primary_culture(content)));
-		text::add_line(state, contents, "is_primary_religion", text::variable_type::name, state.world.religion_get_name(state.world.nation_get_religion(content)));
+	}
+};
+
+class nation_state_religion : public religion_type_icon {
+public:
+	void on_update(sys::state& state) noexcept override {
+		auto pr = state.world.nation_get_religion(retrieve<dcon::nation_id>(state, parent));
+		frame = int32_t(state.world.religion_get_icon(pr) - 1);
+	}
+	tooltip_behavior has_tooltip(sys::state& state) noexcept override {
+		return tooltip_behavior::variable_tooltip;
+	}
+	void update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept override {
+		auto content = retrieve<dcon::nation_id>(state, parent);
+		auto rel = state.world.nation_get_religion(content);
+		auto dr = state.world.nation_get_dominant_religion(content);
+
+		text::add_line(state, contents, "is_primary_religion", text::variable_type::name, state.world.religion_get_name(rel));
+		text::add_line(state, contents, "when");
+		text::add_line_with_condition(state, contents, "religion_nation_modifier", dr == rel, text::variable_type::name, state.world.religion_get_name(rel));
+		text::add_line(state, contents, "giving_modifier");
+		auto mod_id = state.world.religion_get_nation_modifier(rel);
+		if(bool(mod_id)) {
+			modifier_description(state, contents, mod_id, 15);
+		}
 	}
 };
 
@@ -1407,6 +1428,8 @@ class diplomacy_country_facts : public window_element_base {
 			return make_element_by_type<nation_population_text>(state, id);
 		} else if(name == "country_primary_cultures") {
 			return make_element_by_type<nation_primary_culture>(state, id);
+		} else if(name == "nation_icon_religion") {
+			return make_element_by_type<nation_state_religion>(state, id);
 		} else if(name == "country_accepted_cultures") {
 			return make_element_by_type<nation_accepted_cultures>(state, id);
 		} else if(name == "war_extra_info_bg") {

src/parsing/parser_defs.txt

@@ -5,17 +5,6 @@ national_identity_file
 color_from_3f
 	#free          value      float      member_fn
 
-religion_def
-	icon           value      int              member_fn
-	color          group      color_from_3f    member_fn
-	pagan          value      bool             member_fn
-
-religion_group
-	#any           extern     make_religion    discard
-
-religion_file
-	#any           group      religion_group   member_fn
-
 color_from_3i
 	#free          value      int              member_fn
 
@@ -258,6 +247,17 @@ modifier_base
 	disallow_naval_trade              value      float            member_fn
 	disallow_land_trade              value      float            member_fn
 
+religion_def
+	nation_modifier group     modifier_base    member_fn
+	icon           value      int              member_fn
+	color          group      color_from_3f    member_fn
+	pagan          value      bool             member_fn
+
+religion_group
+	#any           extern     make_religion    discard
+
+religion_file
+	#any           group      religion_group   member_fn
 
 int_vector
 	#free          value      int              member_fn