Add medkit, remove apples

Author: ClobberXD

mods/ctf_map/schem_map.lua

@@ -13,6 +13,7 @@ minetest.register_alias("flowers:geranium", "air")
 minetest.register_alias("flowers:viola", "air")
 minetest.register_alias("flowers:dandelion_white", "air")
 minetest.register_alias("flowers:chrysanthemum_green", "air")
+minetest.register_alias("default:apple", "air")
 minetest.register_alias("default:grass_1", "air")
 minetest.register_alias("default:grass_2", "air")
 minetest.register_alias("default:grass_3", "air")

mods/ctf_treasure/init.lua

@@ -1,7 +1,6 @@
 treasurer.register_treasure("default:ladder",0.3,5,{1,20})
 treasurer.register_treasure("default:torch",0.3,5,{1,20})
 treasurer.register_treasure("default:cobble",0.4,5,{45,99})
-treasurer.register_treasure("default:apple",0.3,5,{1,8})
 treasurer.register_treasure("default:wood",0.3,5,{30,60})
 treasurer.register_treasure("doors:door_steel",0.3,5,{1,3})
 
@@ -19,3 +18,5 @@ treasurer.register_treasure("shooter:grenade",0.08,2,1)
 treasurer.register_treasure("shooter:machine_gun",0.02,2,1)
 treasurer.register_treasure("shooter:ammo",0.3,2,{1,10})
 treasurer.register_treasure("shooter:arrow_white",0.5,2,{2,18})
+
+treasurer.register_treasure("medkit:medkit",0.5,4,{2,5})

mods/default/aliases.lua

@@ -40,7 +40,6 @@ minetest.register_alias("cobble", "default:cobble")
 minetest.register_alias("mossycobble", "default:mossycobble")
 minetest.register_alias("steelblock", "default:steelblock")
 minetest.register_alias("sapling", "default:sapling")
-minetest.register_alias("apple", "default:apple")
 
 minetest.register_alias("WPick", "default:pick_wood")
 minetest.register_alias("STPick", "default:pick_stone")

mods/default/crafting.lua

@@ -878,12 +878,6 @@ minetest.register_craft({
 	burntime = 30,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:apple",
-	burntime = 3,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:coal_lump",

mods/default/mapgen.lua

@@ -22,7 +22,6 @@ minetest.register_alias("mapgen_sandstone", "default:sandstone")
 
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
-minetest.register_alias("mapgen_apple", "default:apple")
 minetest.register_alias("mapgen_jungletree", "default:jungletree")
 minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
 minetest.register_alias("mapgen_junglegrass", "air")

mods/default/nodes.lua

@@ -73,7 +73,6 @@ default:tree
 default:wood
 default:leaves
 default:sapling
-default:apple
 
 default:jungletree
 default:junglewood
@@ -565,32 +564,6 @@ minetest.register_node("default:leaves", {
 	after_place_node = default.after_place_leaves,
 })
 
-minetest.register_node("default:apple", {
-	description = "Apple",
-	drawtype = "plantlike",
-	tiles = {"default_apple.png"},
-	inventory_image = "default_apple.png",
-	stack_max = 30,
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	is_ground_content = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16}
-	},
-	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
-		leafdecay = 3, leafdecay_drop = 1},
-	on_use = minetest.item_eat(2),
-	sounds = default.node_sound_leaves_defaults(),
-
-	after_place_node = function(pos, placer, itemstack)
-		if placer:is_player() then
-			minetest.set_node(pos, {name = "default:apple", param2 = 1})
-		end
-	end,
-})
-
 
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
@@ -1256,7 +1229,7 @@ minetest.register_node("default:meselamp", {
 if minetest.get_mapgen_setting("mg_name") == "v6" then
 	default.register_leafdecay({
 		trunks = {"default:tree"},
-		leaves = {"default:apple", "default:leaves"},
+		leaves = {"default:leaves"},
 		radius = 2,
 	})
 
@@ -1274,7 +1247,7 @@ if minetest.get_mapgen_setting("mg_name") == "v6" then
 else
 	default.register_leafdecay({
 		trunks = {"default:tree"},
-		leaves = {"default:apple", "default:leaves"},
+		leaves = {"default:leaves"},
 		radius = 3,
 	})
 

mods/default/textures/default_apple.png

@@ -0,0 +1,118 @@
+-- Table of tables indexed by player names, each having two fields:
+-- HP at time of left-click + max_regen,
+-- ID of "healing effect" HUD element
+local players = {}
+local max_regen = 6
+
+-- Called when player uses a medkit
+-- Aborts if player is already healing
+function on_use(stack, user)
+	if not user then
+		return
+	end
+	local name = user:get_player_name()
+
+	if players[name] or user:get_hp() == 20 then
+		return nil
+	end
+
+	players[name] = {}
+	players[name].hp = user:get_hp() + max_regen
+
+	-- Add effects
+	players[name].hud = user:hud_add({
+		hud_elem_type = "image",
+		position = {x = 0.5, y = 0.5},
+		scale = {x = -100, y = -100},
+		text = "medkit_hud.png"
+	})
+	user:set_properties({glow = 5})
+	user:set_physics_override({speed = 0.5})
+
+	minetest.after(0.5, update_hp, user)
+
+	stack:take_item()
+	return stack
+end
+
+-- Called when player drops a stack of medkits
+-- Healing is considered to be interrupted
+function on_drop(stack, dropper)
+	local name = dropper:get_player_name()
+	local inv = dropper:get_inventory()
+
+	local drop = minetest.item_drop(stack, dropper, dropper:get_pos())
+	inv:remove_item("main", stack)
+
+	-- If healing and no more medkits in inv after drop, stop healing
+	if players[name] and
+			not inv:contains_item("main", ItemStack("medkit:medkit")) then
+		stop_healing(dropper, true)
+	end
+
+	-- Return original stack as item has already been removed from inv
+	return stack
+end
+
+-- Recursively called after left-click every 0.5s for a
+-- total regen of max_regen, limited by player's max hp (20)
+function update_hp(player)
+	local name = player:get_player_name()
+	local hp = player:get_hp()
+
+	if not players[name] then
+		return
+	end
+
+	player:set_hp(hp + 1)
+	if hp < players[name].hp and hp < 20 then
+		minetest.after(0.5, update_hp, player)
+	else
+		stop_healing(player)
+	end
+end
+
+-- Called after regen is complete. Remove additional effects
+-- If interrupted == true, revert to original HP and give back one medkit.
+function stop_healing(player, interrupted)
+	local name = player:get_player_name()
+
+	if interrupted then
+		minetest.chat_send_player(name, minetest.colorize("#FF4444",
+				"Your healing was interrupted!"))
+		player:set_hp(players[name].hp - max_regen)
+		player:get_inventory():add_item("main", ItemStack("medkit:medkit 1"))
+	end
+
+	player:set_properties({glow = 0})
+	player:hud_remove(players[name].hud)
+	player:set_physics_override({speed = 1})
+	players[name] = nil
+end
+
+minetest.register_craftitem("medkit:medkit", {
+	description = "Medkit",
+	inventory_image = "medkit_medkit.png",
+	wield_image = "medkit_medkit.png",--^[transform:",
+	stack_max = 5,
+
+	on_use = on_use,
+	on_drop = on_drop
+})
+
+-- Stop regen and revert back to original state if healing interrupted
+-- i.e. if player punches or is punched
+minetest.register_on_punchplayer(function(player, hitter)
+	local pname = player:get_player_name()
+	local hname = hitter:get_player_name()
+
+	if not player or not hitter then
+		return
+	end
+	if players[pname] then
+		stop_healing(player, true)
+	end
+	if players[hname] then
+		stop_healing(hitter, true)
+	end
+end)