From 2eaf3fc6ed844a05b8699a6aabe469c8cc967c69 Mon Sep 17 00:00:00 2001
From: LordR19 <ramun.wilder@proton.me>
Date: Sun, 17 Dec 2023 15:44:10 +0100
Subject: [PATCH] Started adding Carte Dufour JE

---
 common/history/global/mr_global.txt           |  9 +++
 .../dufour_journal_entries.txt                | 57 +++++++++++++++++++
 .../journal_entries/gaudi_journal_entries.txt |  2 +-
 .../mr_journal_groups.txt                     |  4 +-
 events/gaudi_events.txt                       |  2 +-
 localization/english/1_update_l_english.yml   |  1 +
 6 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 common/journal_entries/dufour_journal_entries.txt

diff --git a/common/history/global/mr_global.txt b/common/history/global/mr_global.txt
index 7935e85954..83c1e8e199 100644
--- a/common/history/global/mr_global.txt
+++ b/common/history/global/mr_global.txt
@@ -678,6 +678,15 @@ GLOBAL = {
 	######DUFOUR######
 
 	c:SWI = {
+		#Adds the Journal Entry for the Carte Dufour
+		add_journal_entry = {
+			type = je_dufour_carte_dufour
+		}
+		change_variable = {
+			name = dufour_carte_dufour_progress_var
+			add = 53
+		}
+
 		#Swiss Culture set up
 		add_primary_culture = cu:ticinese
 		add_primary_culture = cu:rumantsch
diff --git a/common/journal_entries/dufour_journal_entries.txt b/common/journal_entries/dufour_journal_entries.txt
new file mode 100644
index 0000000000..fc9dcdd472
--- /dev/null
+++ b/common/journal_entries/dufour_journal_entries.txt
@@ -0,0 +1,57 @@
+##########################
+# DUFOUR JOURNAL ENTRIES  #
+##########################
+
+#by Marco Dandolo and Lord R
+
+###################
+
+######Carte Dufour######
+
+je_dufour_carte_dufour = {
+
+	icon = "gfx/interface/icons/event_icons/event_map.dds"
+	
+	group = je_group_dufour_confoederatio_helvetica
+
+	immediate = {
+		set_variable = {
+			name = dufour_carte_dufour_progress_var
+			value = 0
+		}
+	}
+	
+	on_monthly_pulse = {
+		effect = {
+			change_variable = {
+				name = dufour_carte_dufour_progress_var
+				add = 1
+			}
+		}
+	}
+
+	complete = {
+		scope:journal_entry = {
+			is_goal_complete = yes
+		}
+	}
+
+	on_complete = {
+		trigger_event = { id = swiss_flavor_events.3 popup = yes }		
+	}
+	
+	current_value = {
+		value = root.var:dufour_carte_dufour_progress_var
+	}
+	
+	goal_add_value = {
+		value = 300
+	}
+
+	weight = 100
+	
+	progressbar = yes
+
+	should_be_pinned_by_default = yes
+	
+}
\ No newline at end of file
diff --git a/common/journal_entries/gaudi_journal_entries.txt b/common/journal_entries/gaudi_journal_entries.txt
index 3ca344dc12..febdffe7a9 100644
--- a/common/journal_entries/gaudi_journal_entries.txt
+++ b/common/journal_entries/gaudi_journal_entries.txt
@@ -4329,7 +4329,7 @@ je_gaudi_construction_sector_project = {
 }
 
 je_gaudi_topographic_map_project = {
-	icon = "gfx/interface/icons/event_icons/event_navigation.dds"
+	icon = "gfx/interface/icons/event_icons/event_map.dds"
 
 	scripted_button = gaudi_stop_engineering_project_button
 
diff --git a/common/journal_entry_groups/mr_journal_groups.txt b/common/journal_entry_groups/mr_journal_groups.txt
index 69cdd0ce82..2e852c2310 100644
--- a/common/journal_entry_groups/mr_journal_groups.txt
+++ b/common/journal_entry_groups/mr_journal_groups.txt
@@ -32,4 +32,6 @@ je_group_pius_religion = {}
 
 je_group_manzoni_literature = {}
 
-je_group_klimt_painting = {}
\ No newline at end of file
+je_group_klimt_painting = {}
+
+je_group_dufour_confoederatio_helvetica = {}
\ No newline at end of file
diff --git a/events/gaudi_events.txt b/events/gaudi_events.txt
index 2dca9b9b41..8434c44b5d 100644
--- a/events/gaudi_events.txt
+++ b/events/gaudi_events.txt
@@ -13683,7 +13683,7 @@ gaudi.1161 = {
 
 	on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
 
-	icon = "gfx/interface/icons/event_icons/event_navigation.dds"
+	icon = "gfx/interface/icons/event_icons/event_map.dds"
 
 	trigger = {
 	}
diff --git a/localization/english/1_update_l_english.yml b/localization/english/1_update_l_english.yml
index 0a8ac8770b..1eca0f12a2 100644
--- a/localization/english/1_update_l_english.yml
+++ b/localization/english/1_update_l_english.yml
@@ -35,6 +35,7 @@
 
  dufour_ig_landowners_patricians_loc: "Patricians"
 
+ je_group_dufour_confoederatio_helvetica: "Morgenröte: Confoederatio Helvetica"
  je_dufour_carte_dufour: "Topographic Map of Switzerland"
 
  ### Manzoni ###