pagination et autres

Helfima · Jul 10, 2016 · b95d286 · b95d286
1 parent dead221
commit b95d286
Show file tree

Hide file tree

Showing 20 changed files with 2,091 additions and 751 deletions.
diff --git a/control.lua b/control.lua
@@ -15,7 +15,7 @@ helmod = {}
 -- info=2
 -- erro=1
 -- nothing=0
-Logging:new(1)
+Logging:new(0)
 Logging.console = true
 Logging.force = true
 --===========================
@@ -25,14 +25,6 @@ function helmod:on_init(event)
 	self.loaded = false;
 
 	self.playerControllers = {}
-
-	if global.beacon == nil then
-		global.beacon = helmod_defines.beacon
-	end
-
-	if global.factory == nil then
-		global.factory = helmod_defines.factory
-	end
 
 end
 
@@ -60,7 +52,6 @@ function helmod:on_tick(event)
 		if self.loaded ~= true then
 			self:init_playerController()
 			self.loaded = true;
-			Logging:debug("global=",global)
 		end
 	end
 	if game.tick % 300 == 0 then

diff --git a/core/defines.lua b/core/defines.lua
@@ -72,8 +72,8 @@ helmod_defines.items["crude-oil"]= {
 
 -- parametre des factories
 helmod_defines.beacon = {}
-helmod_defines.beacon["basic-beacon"]={
-	name = "basic-beacon",
+helmod_defines.beacon["beacon"]={
+	name = "beacon",
 	energy_nominal = 480,
 	combo = 3,
 	factory = 2,