Fixed bugs

changelog.txt

@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------
+Version: 0.8.2
+Date: 13.10.2020
+  Bugfixes:
+    - Fixed on_load() crash due to global manipulation
+    - Made constants only load as local
+
 ---------------------------------------------------------------------------------------------------
 Version: 0.8.1
 Date: 12.10.2020

scripts/config.lua

@@ -4,4 +4,5 @@ config.SPICE_COOLDOWN = config.SPICE_DURATION
 config.OVERLAY_REFRESH = 30
 config.OVERLAY_TIMER = config.OVERLAY_REFRESH + 1
 config.ZOOM_FACTOR = 3.0
+config.VICTORY_SPICE_AMOUNT = 10000
 return config

scripts/control/forces.lua

@@ -1,5 +1,6 @@
 local forces_table, competitor_spice_table
-local VICTORY_SPICE_AMOUNT = 10000
+local config = require('scripts.config')
+local VICTORY_SPICE_AMOUNT = config.VICTORY_SPICE_AMOUNT
 
 function force_created(event)
 	local force_index = event.force.index
@@ -57,19 +58,16 @@ lib.on_nth_tick = {
 lib.on_init = function()
 	forces_table = global.forces
 	competitor_spice_table = global.competitor_spice
-	global.VICTORY_SPICE_AMOUNT = VICTORY_SPICE_AMOUNT
 end
 
 lib.on_configuration_changed = function()
 	forces_table = global.forces
 	competitor_spice_table = global.competitor_spice
-	global.VICTORY_SPICE_AMOUNT = VICTORY_SPICE_AMOUNT
 end
 
 lib.on_load = function ()
 	forces_table = global.forces
 	competitor_spice_table = global.competitor_spice
-	global.VICTORY_SPICE_AMOUNT = VICTORY_SPICE_AMOUNT
 end
 
 return lib

scripts/control/players.lua

@@ -4,7 +4,6 @@ local SPICE_DURATION = config.SPICE_DURATION
 local SPICE_COOLDOWN = config.SPICE_COOLDOWN
 local OVERLAY_REFRESH = config.OVERLAY_REFRESH
 local OVERLAY_TIMER = config.OVERLAY_TIMER
-local ZOOM_FACTOR = config.ZOOM_FACTOR
 
 function apply_spice_to_vehicle(player)
 	if (player.vehicle) then
@@ -236,30 +235,12 @@ function overlay_refresh()
 			tint = {r = 0.04, g = 0.18, b = 0.66},
 			target = player.character,
 			surface = player.surface,
-			time_to_live = OVERLAY_REFRESH + 1,
+			time_to_live = OVERLAY_TIMER,
 			player = {player}
 		})
 	end
 end
 
-function load()
-	players_table = global.players
-	spice_effects_blacklist = global.spice_effects_blacklist
-	render_table = global.render_table
-
-	global.SPICE_COOLDOWN = SPICE_COOLDOWN
-	global.SPICE_DURATION = SPICE_DURATION
-	global.OVERLAY_REFRESH = OVERLAY_REFRESH
-	global.OVERLAY_TIMER = OVERLAY_TIMER
-	global.ZOOM_FACTOR = ZOOM_FACTOR
-
-	if script.active_mods['Kux-Zooming'] then
-		if remote.interfaces['Kux-Zooming'] and remote.interfaces['Kux-Zooming']['onZoomFactorChanged'] then
-			remote.call('Kux-Zooming', 'onZoomFactorChanged_add', 'nauvis_melange_player', 'onZoomFactorChanged')
-		end
-	end
-end
-
 -- lib
 local lib = {}
 
@@ -274,15 +255,39 @@ lib.events = {
 }
 
 lib.on_init = function()
-	load()
+	players_table = global.players
+	spice_effects_blacklist = global.spice_effects_blacklist
+	render_table = global.render_table
+
+	if script.active_mods['Kux-Zooming'] then
+		if remote.interfaces['Kux-Zooming'] and remote.interfaces['Kux-Zooming']['onZoomFactorChanged'] then
+			remote.call('Kux-Zooming', 'onZoomFactorChanged_add', 'nauvis_melange_player', 'onZoomFactorChanged')
+		end
+	end
 end
 
 lib.on_configuration_changed = function()
-	load()
+	players_table = global.players
+	spice_effects_blacklist = global.spice_effects_blacklist
+	render_table = global.render_table
+
+	if script.active_mods['Kux-Zooming'] then
+		if remote.interfaces['Kux-Zooming'] and remote.interfaces['Kux-Zooming']['onZoomFactorChanged'] then
+			remote.call('Kux-Zooming', 'onZoomFactorChanged_add', 'nauvis_melange_player', 'onZoomFactorChanged')
+		end
+	end
 end
 
 lib.on_load = function ()
-	load()
+	players_table = global.players
+	spice_effects_blacklist = global.spice_effects_blacklist
+	render_table = global.render_table
+
+	if script.active_mods['Kux-Zooming'] then
+		if remote.interfaces['Kux-Zooming'] and remote.interfaces['Kux-Zooming']['onZoomFactorChanged'] then
+			remote.call('Kux-Zooming', 'onZoomFactorChanged_add', 'nauvis_melange_player', 'onZoomFactorChanged')
+		end
+	end
 end
 
 lib.on_nth_tick = {

scripts/control/setup.lua

@@ -1,3 +1,5 @@
+local config = require('scripts.config')
+
 remote.add_interface('nauvis_melange_table_defaults', {
 	players_default = function()
 		return {
@@ -42,22 +44,22 @@ remote.add_interface('nauvis_melange_table_defaults', {
 
 remote.add_interface('nauvis_melange_constants', {
 	VICTORY_SPICE_AMOUNT = function()
-		return global.VICTORY_SPICE_AMOUNT
+		return config.VICTORY_SPICE_AMOUNT
 	end,
 	SPICE_COOLDOWN = function()
-		return global.SPICE_COOLDOWN
+		return config.SPICE_COOLDOWN
 	end,
 	SPICE_DURATION = function()
-		return global.SPICE_DURATION
+		return config.SPICE_DURATION
 	end,
 	OVERLAY_REFRESH = function()
-		return global.OVERLAY_REFRESH
+		return config.OVERLAY_REFRESH
 	end,
 	ZOOM_FACTOR = function()
-		return global.ZOOM_FACTOR
+		return config.ZOOM_FACTOR
 	end,
 	OVERLAY_TIMER = function()
-		return global.OVERLAY_TIMER
+		return config.OVERLAY_TIMER
 	end
 })