diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 6011b7bb..4472204f 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -49,12 +49,14 @@ end function search_player(player) for category,items in pairs(_root_tree) do - for _,_inventory in pairs(inventorys) do - local inventory = player.get_inventory(_inventory) - if inventory then - for _,item in pairs(items) do - local found = inventory.remove(item) - if found > 0 then take_action(player,item,category) end + if category ~= 'low_items' or not Ranking.get_rank(player).allowed('admin-items') then + for _,_inventory in pairs(inventorys) do + local inventory = player.get_inventory(_inventory) + if inventory then + for _,item in pairs(items) do + local found = inventory.remove(item) + if found > 0 then take_action(player,item,category) end + end end end end @@ -71,6 +73,7 @@ Event.register(defines.events.on_tick,function(event) local players = game.connected_players if #players == 0 then return end local player = players[math.random(#players)] + if Ranking.get_rank(player).allowed('all-items') then return end search_player(player) end end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 33ce9502..b58e3b38 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -53,7 +53,9 @@ groups['Root']:edit('allow',false,{ ['clear-player']=true, ['announcements']=true, ['warp-list']=true, - ['polls']=true + ['polls']=true, + ['admin-items']=true, + ['all-items']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -154,7 +156,8 @@ ranks['Developer']:edit('allow',false,{ ranks['Admin']:edit('allow',false,{ ['game-settings']=true, - ['always-warp']=true + ['always-warp']=true, + ['admin-items']=true }) ranks['Mod']:edit('allow',false,{ ['go-to']=true, diff --git a/StandAlone/health.lua b/StandAlone/health.lua index fbba642a..d753c72b 100644 --- a/StandAlone/health.lua +++ b/StandAlone/health.lua @@ -14,7 +14,7 @@ Event.register(defines.events.on_entity_damaged, function(event) if global.player_health[index] == nil then global.player_health[index] = health end if global.player_health[index] ~= health then if health < global.player_health[index] then - local text = health..' (-'..event.final_damage_amount..')' + local text = health..' (-'..math.floor(event.final_damage_amount)..')' if health > 200 then player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} elseif health > 100 then