diff --git a/fish_market.lua b/fish_market.lua index de0393ab..09557104 100644 --- a/fish_market.lua +++ b/fish_market.lua @@ -291,21 +291,6 @@ local function market_item_purchased(event) fish_cost = market_item.price[1].amount * event.count global.fish_market_fish_spent[event.player_index] = global.fish_market_fish_spent[event.player_index] + fish_cost - --to reenable buffs and pets remove this block: - if event.offer_index < 4 then - - local fish_amount = 10 - if event.offer_index == 2 then fish_amount = 30 end - player.insert{name="raw-fish", count = fish_amount} - player.remove_item{name="small-plane", count = 100} - player.remove_item{name="discharge-defense-remote", count = 100}--nobody useds that anyways - player.remove_item{name="wood", count = event.count} - player.print("This item is currently disabled due to desync concerns. Please don't hurt us :(") - end - - return - --upto here - if event.offer_index == 1 then -- discharge-defense-remote player.remove_item({name="discharge-defense-remote", count=event.count}) boost_player_runningspeed(player) --disabled due to on_tick being disabled diff --git a/on_tick.lua b/on_tick.lua index 4e01b300..d84c2b7c 100644 --- a/on_tick.lua +++ b/on_tick.lua @@ -1,18 +1,18 @@ local function on_tick() - walk_on_tick() - if game.tick % 60 == 0 then + walk_on_tick() + if game.tick % 60 == 0 then poll_on_second() - walk_distance_on_second() - if game.tick % 1200 == 0 then - player_list_on_12_seconds() - end + walk_distance_on_second() + if game.tick % 1200 == 0 then + player_list_on_12_seconds() + end if game.tick % 180 == 0 then fish_market_on_180_ticks() if game.tick % 900 == 0 then refill_well() end - end + end end end ---Event.register(defines.events.on_tick, on_tick) +Event.register(defines.events.on_tick, on_tick)