more skill adjustments

loc/en.txt

@@ -72,9 +72,9 @@
 
 
 	"menu_defense_up_beta": "Transporter",
-	"menu_defense_up_beta_desc": "BASIC: ##$basic##\nW.I.P\n\nACE: ##$pro##\nYou can throw bags ##$multipro## further.",
+	"menu_defense_up_beta_desc": "BASIC: ##$basic##\nYou can pack and interact with loot bags ##$multibasic## faster.\n\nACE: ##$pro##\nYou can throw bags ##$multipro## further.",
 	"menu_sentry_targeting_package_beta": "Daredevil",
-	"menu_sentry_targeting_package_beta_desc": "BASIC: ##$basic##\nYou take ##$multibasic## less damage while interacting with objects.\n\nACE: ##$pro##\nYou can now reload your weapons while sprinting.",
+	"menu_sentry_targeting_package_beta_desc": "BASIC: ##$basic##\nYou interact with objects ##$multibasic## faster.\n\nACE: ##$pro##\nYou take ##$multipro## less damage while interacting with objects.",
 	"menu_engineering_beta": "Defense Package",
 	"menu_engineering_beta_desc": "BASIC: ##$basic##\nYour sentry guns gain ##$multibasic## increased health.\n\nACE: ##$pro##\nYour sentry guns gain a protective shield.",
 	"menu_tower_defense_beta": "Sentry Nest",
@@ -112,8 +112,8 @@
 	"menu_jail_workout_beta_desc": "BASIC: ##$basic##\nIncreases the time before you start getting detected by ##$multibasic## while in casing mode.\n\nYou are ##$multibasic## less likely to be targeted when you are close to your crew members in loud.\n\nACE: ##$pro##\nYour concealment is increased by ##$multipro##.",
 	"menu_cleaner_beta": "Eagle Eye",
 	"menu_cleaner_beta_desc": "BASIC: ##$basic##\nYou deal ##$multibasic## more damage against special enemies.\n\nACE: ##$pro##\nYou can now mark specials by aiming down at them with any weapon.\n\nThe range at which you can manually mark enemies is ##$multipro## times longer.",
-	"menu_second_chances_beta": "Logistician",
-	"menu_second_chances_beta_desc": "BASIC: ##$basic##\nYou can pack and interact with loot bags ##$multibasic## faster.\n\nACE: ##$pro##\nYou lockpick ##$multipro## faster.\n\nYou can now silently crack safes by hand.",
+	"menu_second_chances_beta": "Winstone Wolfe",
+	"menu_second_chances_beta_desc": "BASIC: ##$basic##\nYou gain ##$multibasic## additional body bag in your inventory.\nAlso increases the body bag inventory space to ##$multibasic2##.\n\nACE: ##$pro##\nYou lockpick ##$multipro## faster.\n\nYou can now silently crack safes by hand.",
 	"menu_chameleon_beta": "Blackout",
 	"menu_chameleon_beta_desc": "BASIC: ##$basic##\nYou gain the ability to disable ##1## camera from detecting you and your crew. Effect lasts for ##25## seconds.\n\nACE: ##$pro##\nYour ECM jammer can now also be used to open certain electronic doors. Pagers are delayed by the ECM jammers.",
 	"menu_ecm_booster_beta": "ECM Feedback",

lua/interactionext.lua

@@ -1,3 +1,31 @@
+function BaseInteractionExt:_get_timer()
+	local modified_timer = self:_get_modified_timer()
+
+	if modified_timer then
+		return modified_timer
+	end
+
+	local multiplier = 1
+
+	if self.tweak_data ~= "corpse_alarm_pager" then
+		multiplier = multiplier * managers.player:crew_ability_upgrade_value("crew_interact", 1)
+	end
+
+	if self._tweak_data.upgrade_timer_multiplier then
+		multiplier = multiplier * managers.player:upgrade_value(self._tweak_data.upgrade_timer_multiplier.category, self._tweak_data.upgrade_timer_multiplier.upgrade, 1)
+	end
+
+	if self._tweak_data.upgrade_timer_multipliers then
+		for _, upgrade_timer_multiplier in pairs(self._tweak_data.upgrade_timer_multipliers) do
+			multiplier = multiplier * managers.player:upgrade_value(upgrade_timer_multiplier.category, upgrade_timer_multiplier.upgrade, 1)
+		end
+	end
+
+	multiplier = multiplier * managers.player:upgrade_value("player", "total_interaction_timer_multiplier", 1)
+
+	return self:_timer_value() * multiplier * managers.player:toolset_value()
+end
+
 function IntimitateInteractionExt:_interact_blocked(player)
 	if self.tweak_data == "corpse_dispose" then
 		if managers.player:is_carrying() then

lua/skilltreetweakdata.lua

@@ -165,14 +165,14 @@ function SkillTreeTweakData:init(tweak_data)
 	-- TECHNICIAN --
 
 	-- Transporter
-	self.skills.defense_up[1].upgrades = {}
+	self.skills.defense_up[1].upgrades = { "carry_interact_speed_multiplier_2" }
 	self.skills.defense_up[2].upgrades = { "carry_throw_distance_multiplier" }
-	self.skills.defense_up.icon_xy = { 0, 0 }
+	self.skills.defense_up.icon_xy = { 8, 8 }
 
 	-- Daredevil
-	self.skills.sentry_targeting_package[1].upgrades = { "player_interacting_damage_multiplier" }
-	self.skills.sentry_targeting_package[2].upgrades = { "player_run_and_reload" }
-	self.skills.sentry_targeting_package.icon_xy = { 10, 6 }
+	self.skills.sentry_targeting_package[1].upgrades = { "player_total_interaction_timer_multiplier" }
+	self.skills.sentry_targeting_package[2].upgrades = { "player_interacting_damage_multiplier" }
+	self.skills.sentry_targeting_package.icon_xy = { 1, 7 }
 
 	-- Defense Package
 	self.skills.engineering[1].upgrades = { "sentry_gun_armor_multiplier" }
@@ -228,8 +228,8 @@ function SkillTreeTweakData:init(tweak_data)
 	self.skills.cleaner.name_id = "menu_thick_skin_beta"
 	self.skills.cleaner.desc_id = "menu_thick_skin_beta_desc"
 
-	-- Logistician
-	self.skills.second_chances[1].upgrades = { "carry_interact_speed_multiplier_2" }
+	-- Winstone Wolfe
+	self.skills.second_chances[1].upgrades = { "player_corpse_dispose_amount_2", "player_extra_corpse_dispose_amount" }
 	self.skills.second_chances[2].upgrades = { "player_pick_lock_easy_speed_multiplier", "player_pick_lock_hard" }
 	self.skills.second_chances.icon_xy = { 5, 4 }
 
@@ -563,6 +563,7 @@ function SkillTreeTweakData:init(tweak_data)
 	table.insert(self.default_upgrades, "sentry_gun_rot_speed_multiplier")
 	table.insert(self.default_upgrades, "passive_player_xp_multiplier")
 	table.insert(self.default_upgrades, "player_first_aid_health_regen")
+	table.insert(self.default_upgrades, "bodybags_bag_quantity")
 	table.delete(self.default_upgrades, "player_steelsight_when_downed")
 	table.delete(self.default_upgrades, "carry_movement_speed_multiplier")
 	table.delete(self.default_upgrades, "carry_interact_speed_multiplier_2")

lua/upgradestweakdata.lua

@@ -462,13 +462,28 @@ function UpgradesTweakData:init(tweak_data)
 
 	-- Technician --
 
+	-- Transporter
+	self.values.carry.interact_speed_multiplier[1] = 0.75
+	self.skill_descs.defense_up.multibasic = "25%"
+
 	-- Rifleman
 	self.skill_descs.defense_up.multibasic = "50%"
 	self.skill_descs.defense_up.multipro = "50%"
 
-	-- Die Hard
-	self.values.player.interacting_damage_multiplier[1] = 0.75
-	self.skill_descs.sentry_targeting_package.multibasic = "25%"
+	-- Daredevil
+	self.values.player.total_interaction_timer_multiplier = { 0.9 }
+	self.definitions.player_total_interaction_timer_multiplier = {
+		name_id = "menu_player_total_interaction_timer_multiplier",
+		category = "feature",
+		upgrade = {
+			value = 1,
+			upgrade = "total_interaction_timer_multiplier",
+			category = "player",
+		},
+	}
+	self.values.player.interacting_damage_multiplier[1] = 0.65
+	self.skill_descs.sentry_targeting_package.multibasic = "10%"
+	self.skill_descs.sentry_targeting_package.multipro = "35%"
 
 	-- Defense Package
 	self.skill_descs.engineering.multibasic = "150%"
@@ -644,10 +659,10 @@ function UpgradesTweakData:init(tweak_data)
 	self.skill_descs.cleaner.multibasic2 = "1"
 	self.skill_descs.cleaner.multipro2 = "3"
 
-	-- Logistician
-	self.values.carry.interact_speed_multiplier = { 0.5, 0.25 }
+	-- Winstone Wolfe
 	self.values.player.pick_lock_easy_speed_multiplier[1] = 0.5
-	self.skill_descs.second_chances.multibasic = "50%"
+	self.skill_descs.second_chances.multibasic = "1"
+	self.skill_descs.second_chances.multibasic2 = "3"
 	self.skill_descs.second_chances.multipro = "50%"
 	self.skill_descs.second_chances.multipro2 = "50%"