Minor changes to robocops

mods/shit_poop/init.lua

@@ -169,9 +169,9 @@ function destruction_counter.updateCounter(player)
     end
     
     local totalDestruction = destruction_counter.nodesDestroyed + math.floor(nodesDestroyedByHand / 10)
-    local percentage = (totalDestruction / 200 * 4)
-    if percentage > 200 then
-        percentage = 200
+    local percentage = (totalDestruction / 100 * 4)
+    if percentage > 100 then
+        percentage = 100
     end
     player:hud_change(idText, "text", "Shitting & Packing Meter: " .. totalDestruction)
     player:hud_change(idMeter, "scale", {x = percentage, y = 4})
@@ -391,10 +391,12 @@ minetest.register_craftitem("poop:plumba", {
 		local node = minetest.get_node(pointed_thing.under)
 		-- check if node is poop
 		if node.name == "poop:Poop" then
+			pooped_things = pooped_things + 1
+			destruction_counter.nodesDestroyed = pooped_things
+			destruction_counter.updateCounter(user)
 			minetest.remove_node(pointed_thing.under)
 			minetest.add_node(pointed_thing.under, {name="poop:box"})			
-			minetest.chat_send_player(user:get_player_name(), "You packed "..pooped_things.." shits!")
-			pooped_things = pooped_things + 1
+			minetest.chat_send_player(user:get_player_name(), "You packed "..pooped_things.."/200 shits!")
 			
 			if pooped_things >= 100 then
 			if(b == false)then
@@ -410,18 +412,18 @@ minetest.register_craftitem("poop:plumba", {
 			end
 			end
 
-			destruction_counter.nodesDestroyed = pooped_things
-			destruction_counter.updateCounter(user)
+			
 			pakuj_guwno()
 			return itemstack
 		else if node.name == "poop:Poop2" then
+			pooped_things = pooped_things + 1
+			destruction_counter.nodesDestroyed = pooped_things
+			destruction_counter.updateCounter(user)
 			minetest.remove_node(pointed_thing.under)
 			minetest.add_node(pointed_thing.under, {name="poop:box"})
 			minetest.chat_send_player(user:get_player_name(), "You packed "..pooped_things.." shits!")
 			pakuj_guwno()
-			pooped_things = pooped_things + 1
-			destruction_counter.nodesDestroyed = pooped_things
-			destruction_counter.updateCounter(user)
+
 			return itemstack
 		end
 

mods/shit_robocops/init.lua

@@ -2,8 +2,13 @@ local numberOfCops = 0
 
 minetest.register_abm({
     nodenames = {"poop:grey_bricks"},
+<<<<<<< HEAD
     interval = 20,
     chance = 300,
+=======
+    interval = 30,
+    chance = 200,
+>>>>>>> bcfc53e3489d47918c04d9ae562a665c71fc33ee
     action = function(pos, node, active_object_count, active_object_count_wider)
 		if numberOfCops < 50 then
 			minetest.add_entity({x = pos.x, y = pos.y + 1, z = pos.z}, "robocops:robocop")