From 84e98435d3bed7d19e31946c28bf4aedca8487b0 Mon Sep 17 00:00:00 2001
From: danielmartin0 <danielmartin111@gmail.com>
Date: Thu, 2 Jun 2022 16:11:45 +0100
Subject: [PATCH] more specific 'Granted' messages

---
 locale/en/pirates.cfg                | 11 ++++++++---
 maps/pirates/api_events.lua          |  2 +-
 maps/pirates/api_on_tick.lua         |  2 +-
 maps/pirates/quest.lua               |  2 +-
 maps/pirates/surfaces/sea/kraken.lua |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/locale/en/pirates.cfg b/locale/en/pirates.cfg
index 711dbe17..3e4e6e10 100644
--- a/locale/en/pirates.cfg
+++ b/locale/en/pirates.cfg
@@ -122,9 +122,14 @@ recover_offline_player_items=Offline player's items recovered to cabin.
 death_froze=__1__ froze to death.
 death_pushed_into_water_by_cannon=__1__ was pushed into water by a cannon.
 
-granted_1=Granted: __1__.
-granted_2=Granted: __1__, __2__.
-granted_3=Granted: __1__, __2__, __3__.
+granted_rocket_launch=Rocket launched.
+granted_kraken_kill=Kraken killed.
+granted_periodic_barrel=
+granted_quest_complete=Quest completed.
+
+granted_1=__1__ Granted: __2__.
+granted_2=__1__ Granted: __2__, __3__.
+granted_3=__1__ Granted: __2__, __3__, __4__.
 
 approaching_destination=Approaching destination __1__, __2__.
 loading_destination=Loading destination __1__, __2__.
diff --git a/maps/pirates/api_events.lua b/maps/pirates/api_events.lua
index 70256e68..b2043c38 100644
--- a/maps/pirates/api_events.lua
+++ b/maps/pirates/api_events.lua
@@ -1613,7 +1613,7 @@ local function event_on_rocket_launched(event)
 	end
 
 	local force = memory.force
-	local message = {'pirates.granted_2',  Math.floor(Balance.rocket_launch_coin_reward/100)/10 .. 'k [item=coin]', Math.floor(destination.dynamic_data.rocketcoalreward/100)/10 .. 'k [item=coal]'}
+	local message = {'pirates.granted_2', {'pirates.granted_rocket_launch'}, Math.floor(Balance.rocket_launch_coin_reward/100)/10 .. 'k [item=coin]', Math.floor(destination.dynamic_data.rocketcoalreward/100)/10 .. 'k [item=coal]'}
 	Common.notify_force_light(force,message)
 
 	if destination.dynamic_data.quest_type == Quest.enum.TIME and (not destination.dynamic_data.quest_complete) then
diff --git a/maps/pirates/api_on_tick.lua b/maps/pirates/api_on_tick.lua
index fb188417..64328007 100644
--- a/maps/pirates/api_on_tick.lua
+++ b/maps/pirates/api_on_tick.lua
@@ -286,7 +286,7 @@ function Public.periodic_free_resources(tickinterval)
 		Common.give_items_to_crew{{name = 'sulfuric-acid-barrel', count = count}}
 		local force = memory.force
 		if not (force and force.valid) then return end
-		local message = {'pirates.granted_1', count .. ' [item=sulfuric-acid-barrel]'}
+		local message = {'pirates.granted_1', {'pirates.granted_periodic_barrel'}, count .. ' [item=sulfuric-acid-barrel]'}
 		Common.notify_force_light(force, message)
 	end
 end
diff --git a/maps/pirates/quest.lua b/maps/pirates/quest.lua
index aee0f7bd..208de105 100644
--- a/maps/pirates/quest.lua
+++ b/maps/pirates/quest.lua
@@ -241,7 +241,7 @@ function Public.try_resolve_quest()
 
 		local force = memory.force
 		if not (force and force.valid) then return end
-		Common.notify_force_light(force, {'pirates.granted_1', destination.dynamic_data.quest_reward.display_amount .. destination.dynamic_data.quest_reward.chat_name})
+		Common.notify_force_light(force, {'pirates.granted_1', {'pirates.granted_quest_complete'}, destination.dynamic_data.quest_reward.display_amount .. destination.dynamic_data.quest_reward.chat_name})
 
 		local name = destination.dynamic_data.quest_reward.name
 		local count = destination.dynamic_data.quest_reward.count
diff --git a/maps/pirates/surfaces/sea/kraken.lua b/maps/pirates/surfaces/sea/kraken.lua
index 6c360f05..0a7d2e2e 100644
--- a/maps/pirates/surfaces/sea/kraken.lua
+++ b/maps/pirates/surfaces/sea/kraken.lua
@@ -303,7 +303,7 @@ function Public.kraken_die(kraken_id)
 	local reward_fuel = Balance.kraken_kill_reward_fuel()
 	memory.stored_fuel = memory.stored_fuel + reward_fuel
 
-	local message = {'pirates.granted_3', Math.floor(reward_items[2].count/100)/10 .. 'k [item=coin]', reward_fuel .. ' [item=coal]', reward_items[1].count .. ' [item=sulfuric-acid-barrel]'}
+	local message = {'pirates.granted_3', {'pirates.granted_kraken_kill'}, Math.floor(reward_items[2].count/100)/10 .. 'k [item=coin]', reward_fuel .. ' [item=coal]', reward_items[1].count .. ' [item=sulfuric-acid-barrel]'}
 	Common.notify_force_light(memory.force,message)
 
 	memory.playtesting_stats.coins_gained_by_krakens = memory.playtesting_stats.coins_gained_by_krakens + reward_items[2].count