minor changes

maps/mountain_fortress_v3/locomotive.lua

@@ -1374,7 +1374,7 @@ local function add_random_loot_to_main_market(rarity)
             tooltip = types[v.offer.item].localised_name,
             upgrade = false
         }
-        if ticker >= 27 then
+        if ticker >= 28 then
             return
         end
     end
@@ -1933,8 +1933,8 @@ function Public.get_items()
     main_market_items['tank-cannon'] = {
         stack = 1,
         value = 'coin',
-        price = 20000,
-        tooltip = 'Portable Tank Machine\nAvailable after wave 700.',
+        price = 25000,
+        tooltip = 'Tank Cannon\nAvailable after wave 650.',
         upgrade = false,
         static = true,
         enabled = false
@@ -1943,17 +1943,30 @@ function Public.get_items()
         stack = 1,
         value = 'coin',
         price = 7000,
-        tooltip = 'Portable Tank Pewpew\nAvailable after wave 700.',
+        tooltip = 'Tank Machine Gun\nAvailable after wave 400.',
+        upgrade = false,
+        static = true,
+        enabled = false
+    }
+    main_market_items['vehicle-machine-gun'] = {
+        stack = 1,
+        value = 'coin',
+        price = 2000,
+        tooltip = 'Car Machine Gun\nAvailable after wave 200.',
         upgrade = false,
         static = true,
         enabled = false
     }
     local wave_number = WD.get_wave()
-    if wave_number >= 700 then
-        main_market_items['tank-cannon'].enabled = true
-        main_market_items['tank-cannon'].tooltip = 'Portable Tank Machine'
+    if wave_number == 200 then
+        main_market_items['vehicle-machine-gun'].enabled = true
+        main_market_items['vehicle-machine-gun'].tooltip = 'Car Machine Gun'
+    elseif wave_number == 400 then
         main_market_items['tank-machine-gun'].enabled = true
-        main_market_items['tank-machine-gun'].tooltip = 'Portable Tank Pewpew'
+        main_market_items['tank-machine-gun'].tooltip = 'Tank Machine Gune'
+    elseif wave_number == 650 then
+        main_market_items['tank-cannon'].enabled = true
+        main_market_items['tank-cannon'].tooltip = 'Tank Cannon'
     end
 
     return main_market_items
@@ -2022,6 +2035,7 @@ local function tick()
     if ticker % 1200 == 0 then
         set_player_spawn()
         refill_fish()
+        Public.get_items()
     end
 
     if ticker % 2500 == 0 then

utils/datastore/color_data.lua

@@ -82,6 +82,12 @@ Event.add(
             return
         end
 
+        local secs = Server.get_current_time()
+        if not secs then
+            raw_print(error_offline)
+            return
+        end
+
         local param = event.parameters
         local color = player.color
         local chat = player.chat_color

utils/datastore/message_on_join_data.lua

@@ -52,9 +52,15 @@ commands.add_command(
             return
         end
 
+        local secs = Server.get_current_time()
+        if not secs then
+            raw_print(error_offline)
+            return
+        end
+
         local param = cmd.parameter
         if param then
-            if param == '' and param == 'Name' then
+            if param == '' or param == 'Name' then
                 return player.print('You did not specify a message.', Color.warning)
             end
             if string.len(param) > 64 then

utils/datastore/player_tag_data.lua

@@ -37,10 +37,6 @@ end
 function Public.fetch(key)
     local secs = Server.get_current_time()
     if not secs then
-        local player = game.players[key]
-        if not player or not player.valid then
-            return
-        end
         raw_print(error_offline)
         return
     else
@@ -57,21 +53,31 @@ commands.add_command(
             return
         end
 
+        local secs = Server.get_current_time()
+        if not secs then
+            raw_print(error_offline)
+            return
+        end
+
         local param = cmd.parameter
 
         if param then
-            if param ~= '' and param ~= 'Name' then
-                if alphanumeric(param) then
-                    player.print('Tag is not valid.', {r = 0.90, g = 0.0, b = 0.0})
-                    return
-                end
+            if alphanumeric(param) then
+                player.print('Tag is not valid.', {r = 0.90, g = 0.0, b = 0.0})
+                return
             end
+
+            if param == '' or param == 'Name' then
+                return player.print('You did not specify a tag.', Color.warning)
+            end
+
             if string.len(param) > 32 then
                 player.print('Tag is too long. 64 characters maximum.', {r = 0.90, g = 0.0, b = 0.0})
                 return
             end
 
             set_data(tag_dataset, player.name, param)
+            player.tag = '[' .. param .. ']'
             player.print('Your tag has been saved.', Color.success)
         else
             player.print('You did not specify a tag.', Color.warning)

utils/datastore/quickbar_data.lua

@@ -56,6 +56,12 @@ commands.add_command(
             return
         end
 
+        local secs = Server.get_current_time()
+        if not secs then
+            raw_print(error_offline)
+            return
+        end
+
         local slots = {}
 
         for i = 1, 100 do