From 7ebe940cbb88d8a1cc9a095a8606315d8e09f0c3 Mon Sep 17 00:00:00 2001
From: Piratux <58703216+Piratux@users.noreply.github.com>
Date: Tue, 11 Oct 2022 23:11:49 +0300
Subject: [PATCH] Lumberjack buff

Changes:
- Lumberjack now gets ~4x more ore from chopping trees and ore amount scales with leagues to make it slightly more "relevant" in late game
---
 maps/pirates/balance.lua       | 1 +
 maps/pirates/commands.lua      | 5 +++--
 maps/pirates/roles/classes.lua | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/maps/pirates/balance.lua b/maps/pirates/balance.lua
index 16723214..e813094c 100644
--- a/maps/pirates/balance.lua
+++ b/maps/pirates/balance.lua
@@ -61,6 +61,7 @@ Public.scout_damage_taken_multiplier = 1.25
 Public.scout_damage_dealt_multiplier = 0.6
 Public.fisherman_reach_bonus = 10
 Public.lumberjack_coins_from_tree = 12
+Public.lumberjack_ore_base_amount = 4
 Public.master_angler_reach_bonus = 16
 Public.master_angler_fish_bonus = 2
 Public.master_angler_coin_bonus = 20
diff --git a/maps/pirates/commands.lua b/maps/pirates/commands.lua
index c867ea8f..d8e83fab 100644
--- a/maps/pirates/commands.lua
+++ b/maps/pirates/commands.lua
@@ -1171,11 +1171,12 @@ if _DEBUG then
 
 			player.insert{name='substation', count = 50}
 			player.insert{name='solar-panel', count = 50}
-			player.insert{name='submachine-gun', count = 1}
+			player.insert{name='vehicle-machine-gun', count = 1}
 			player.insert{name='uranium-rounds-magazine', count = 200}
 			player.insert{name='raw-fish', count = 100}
 			player.insert{name='coin', count = 50000}
-			player.insert{name='rail-signal', count = 300}
+			player.insert{name='grenade', count = 100}
+			player.insert{name='steel-chest', count = 50}
 		end
 	end)
 
diff --git a/maps/pirates/roles/classes.lua b/maps/pirates/roles/classes.lua
index 371bb70f..20c2c936 100644
--- a/maps/pirates/roles/classes.lua
+++ b/maps/pirates/roles/classes.lua
@@ -431,10 +431,12 @@ function Public.lumberjack_bonus_items(give_table)
 		give_table[#give_table + 1] = {name = 'coin', count = a}
 		memory.playtesting_stats.coins_gained_by_trees_and_rocks = memory.playtesting_stats.coins_gained_by_trees_and_rocks + a
 	elseif Math.random(2) == 1 then
-		if Math.random(5) == 1 then
-			give_table[#give_table + 1] = {name = 'copper-ore', count = 1}
+		local multiplier = Balance.island_richness_avg_multiplier() * Math.random_float_in_range(1, 1.5)
+		local amount = Math.ceil(Balance.lumberjack_ore_base_amount * multiplier)
+		if Math.random(4) == 1 then
+			give_table[#give_table + 1] = {name = 'copper-ore', count = amount}
 		else
-			give_table[#give_table + 1] = {name = 'iron-ore', count = 1}
+			give_table[#give_table + 1] = {name = 'iron-ore', count = amount}
 		end
 	end
 end