Skip to content

Commit b3aa5a0

Browse files
committed
Update to 0.8.8
1 parent 1fc63f8 commit b3aa5a0

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

addons/adrenaline.lua

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--[[
2-
Copyright (c) 2019-2020 ZwerOxotnik <[email protected]>
2+
Copyright (c) 2019-2021 ZwerOxotnik <[email protected]>
33
Licensed under the MIT licence;
44
55
You can write and receive any information on the links below.
@@ -9,15 +9,23 @@ Homepage: https://forums.factorio.com/viewtopic.php?f=190&t=64617&p=395994
99
1010
]]--
1111

12+
-- TODO: optimize!
13+
1214
local bonus_modifier = settings.global["adrenaline_bonus_modifier"].value or 2
1315
local module = {}
1416

1517
local function reset_player_data(player)
16-
local player_modifier = global.adrenaline.players_modifiers[player.index]
18+
local player_modifiers_data = global.adrenaline.players_modifiers[player.index]
1719
if player_modifier == nil then return end
1820

19-
player.character_mining_speed_modifier = player_modifier.character_mining_speed_modifier
20-
player.character_running_speed_modifier = player_modifier.character_running_speed_modifier
21+
local value1 = player_modifiers_data.character_mining_speed_modifier
22+
if value1 then
23+
player.character_mining_speed_modifier = value1
24+
end
25+
local value = player_modifiers_data.character_running_speed_modifier
26+
if value then
27+
player.character_running_speed_modifier = value
28+
end
2129
player_modifier = nil
2230
end
2331

@@ -40,15 +48,15 @@ end
4048
-- TODO: refactor
4149
local function check_health(player)
4250
local character = player.character
43-
local health = character.get_health_ratio()
44-
if health > 0.1 then
51+
local health_ratio = character.get_health_ratio()
52+
if health_ratio > 0.1 then
4553
reset_player_data(player)
4654
return
4755
end
4856

49-
local force = character.force
50-
local adrenaline = global.adrenaline
51-
if adrenaline.players_modifiers[player.index] == nil then
57+
local player_index = player.index
58+
local players_modifiers = global.adrenaline.players_modifiers
59+
if players_modifiers[player_index] == nil then
5260
-- if #game.connected_players == 1 then
5361
-- adrenaline.forces_modifiers[force.name] = {}
5462
-- adrenaline.forces_modifiers[force.name].guns_speed = {}
@@ -58,16 +66,16 @@ local function check_health(player)
5866
-- end
5967
-- end
6068

61-
adrenaline.players_modifiers[player.index] = {}
62-
local player_modifier = adrenaline.players_modifiers[player.index]
63-
player_modifier.character_mining_speed_modifier = player.character_mining_speed_modifier
64-
player_modifier.character_running_speed_modifier = player.character_running_speed_modifier
69+
players_modifiers[player_index] = {}
70+
local player_modifiers_data = players_modifiers[player_index]
71+
player_modifiers_data.character_mining_speed_modifier = player.character_mining_speed_modifier
72+
player_modifiers_data.character_running_speed_modifier = player.character_running_speed_modifier
6573
end
6674

67-
local init_player_modifier = adrenaline.players_modifiers[player.index]
68-
local modifier = (1 - health * 10) * bonus_modifier
69-
character.character_running_speed_modifier = init_player_modifier.character_mining_speed_modifier + modifier
70-
character.character_mining_speed_modifier = init_player_modifier.character_running_speed_modifier + modifier
75+
local init_player_modifiers = players_modifiers[player_index]
76+
local modifier = (1 - health_ratio * 10) * bonus_modifier
77+
character.character_running_speed_modifier = init_player_modifiers.character_mining_speed_modifier + modifier
78+
character.character_mining_speed_modifier = init_player_modifiers.character_running_speed_modifier + modifier
7179

7280
-- local force_modifier = adrenaline.forces_modifiers[force.name]
7381
-- if force_modifier then
@@ -117,12 +125,6 @@ local function on_player_left_game(event)
117125
-- Validation of data
118126
local player = game.get_player(event.player_index)
119127
if not (player and player.valid) then return end
120-
local player_modifier = global.adrenaline.players_modifiers[event.player_index]
121-
if not player_modifier then return end
122-
123-
-- if #player.force.connected_players == 0 then
124-
-- reset_force_data(player.force.name)
125-
-- end
126128
reset_player_data(player)
127129
end
128130

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 0.8.8
3+
Date: 2021-08-23
4+
Bugfixes:
5+
- Improved stability of "Adrenaline"
6+
---------------------------------------------------------------------------------------------------
27
Version: 0.8.6
38
Date: 2021-08-02
49
Features:

info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zk-lib",
3-
"version": "0.8.6",
3+
"version": "0.8.8",
44
"factorio_version": "1.0",
55
"title": "ZwerOxotnik's extendable mod with 11 addons [WIP]",
66
"author": "ZwerOxotnik",

0 commit comments

Comments
 (0)