diff --git a/maps/pirates/crew.lua b/maps/pirates/crew.lua index e287f8b67..433334deb 100644 --- a/maps/pirates/crew.lua +++ b/maps/pirates/crew.lua @@ -1052,12 +1052,12 @@ function Public.reset_crew_and_enemy_force(id) -- crew_force.technologies['productivity-module-3'].enabled = false -- crew_force.technologies['speed-module'].enabled = true - -- crew_force.technologies['speed-module-2'].enabled = false - -- crew_force.technologies['speed-module-3'].enabled = false + crew_force.technologies['speed-module-2'].enabled = false + crew_force.technologies['speed-module-3'].enabled = false -- crew_force.technologies['efficiency-module'].enabled = true -- crew_force.technologies['efficiency-module-2'].enabled = false -- crew_force.technologies['efficiency-module-3'].enabled = false - -- crew_force.technologies['automation-3'].enabled = false + crew_force.technologies['automation-3'].enabled = false -- crew_force.technologies['rocket-silo'].enabled = false --Probably need to disable this tech if we're playing on space age -- crew_force.technologies['space-scienkce-pack'].enabled = false -- crew_force.technologies['mining-productivity-3'].enabled = false @@ -1128,6 +1128,7 @@ function Public.disable_recipes(crew_force) crew_force.recipes['speed-module-2'].enabled = false crew_force.recipes['speed-module-3'].enabled = false + crew_force.recipes['assembling-machine-3'].enabled = false end return Public diff --git a/maps/pirates/roles/tick_functions.lua b/maps/pirates/roles/tick_functions.lua index 8b98ffc96..a1c26d091 100644 --- a/maps/pirates/roles/tick_functions.lua +++ b/maps/pirates/roles/tick_functions.lua @@ -11,6 +11,7 @@ local Common = require('maps.pirates.common') local CoreData = require('maps.pirates.coredata') local Math = require('maps.pirates.math') local _inspect = require('utils.inspect').inspect +local PlayerModifiers = require('utils.player_modifiers') local Public = {} @@ -314,13 +315,13 @@ function Public.update_character_properties(tick_interval) -- end if class == Classes.enum.FISHERMAN then - character.character_reach_distance_bonus = Balance.fisherman_reach_bonus + PlayerModifiers.update_single_modifier(player, 'character_reach_distance_bonus', 'pirates', Balance.fisherman_reach_bonus) elseif class == Classes.enum.MASTER_ANGLER then - character.character_reach_distance_bonus = Balance.master_angler_reach_bonus + PlayerModifiers.update_single_modifier(player, 'character_reach_distance_bonus', 'pirates', Balance.master_angler_reach_bonus) elseif class == Classes.enum.DREDGER then - character.character_reach_distance_bonus = Balance.dredger_reach_bonus + PlayerModifiers.update_single_modifier(player, 'character_reach_distance_bonus', 'pirates', Balance.dredger_reach_bonus) else - character.character_reach_distance_bonus = 0 + PlayerModifiers.update_single_modifier(player, 'character_reach_distance_bonus', 'pirates', 0) end if class == Classes.enum.SCOUT then @@ -357,7 +358,7 @@ function Public.update_character_properties(tick_interval) end end - character.character_running_speed_modifier = speed_boost - 1 + PlayerModifiers.update_single_modifier(player, 'character_running_speed_modifier', 'pirates', speed_boost - 1) -- If they're a SAMURAI or HATAMOTO, and have a weapon equipped, unequip it: if class == Classes.enum.SAMURAI or class == Classes.enum.HATAMOTO then