Fixes by MoNTE48

api/api.lua

@@ -2,6 +2,8 @@
 -- API --
 ---------
 
+local S = draconis.S
+
 -- Math --
 
 local pi = math.pi
@@ -53,7 +55,7 @@ local yaw2dir = minetest.yaw_to_dir
 -- Settings --
 --------------
 
-local terrain_destruction = minetest.settings:get_bool("dragon_terrain_destruction", true)
+local terrain_destruction = minetest.settings:get_bool("dragon_terrain_destruction", false)
 
 ---------------------
 -- Local Utilities --
@@ -302,7 +304,8 @@ local function generate_texture(self, force)
 		self.wing_overlay = "(draconis_wing_fade.png^[multiply:" .. color .. ")"
 		self:memorize("wing_overlay", self.wing_overlay)
 	end
-	if self:get_props().textures[1]:find("wing_fade") and not force then return end
+	local props = self:get_props()
+	if props and props.textures and props.textures[1]:find("wing_fade") and not force then return end
 	textures[1] = textures[1] .. "^" .. self.wing_overlay
 	self:set_texture(1, textures)
 end
@@ -690,7 +693,12 @@ local function damage_objects(self, pos, radius)
 			damage = is_mob and (ent.hp or ent.health or 0) > 0
 		end
 		if damage then
-			object:punch(self.object, 1.0, {damage_groups = {fleshy = math.ceil(self.damage * 0.33)}})
+			local puncher = self.object
+			if self.rider
+			and self.rider:get_look_horizontal() then
+				puncher = self.rider
+			end
+			object:punch(puncher, 1.0, {damage_groups = {fleshy = math.ceil(self.damage * 0.33)}})
 			--self:punch_target(object, math.ceil(self.damage * 0.2))
 			if self.name == "draconis:ice_dragon" then
 				freeze_object(object)
@@ -1161,13 +1169,15 @@ draconis.dragon_api = {
 			if collision.type == "node" then
 				local n_pos = collision.node_pos
 				if n_pos.y - pos.y >= 1 then
-					local node = minetest.get_node(n_pos)
-					if minetest.get_item_group(node.name, "cracky") ~= 1
-					and minetest.get_item_group(node.name, "unbreakable") < 1 then
-						if random(6) < 2 then
-							minetest.dig_node(n_pos)
-						else
-							minetest.remove_node(n_pos)
+					if not minetest.is_protected(n_pos, "") then
+						local node = minetest.get_node(n_pos)
+						if minetest.get_item_group(node.name, "cracky") ~= 1
+						and minetest.get_item_group(node.name, "unbreakable") < 1 then
+							if random(6) < 2 then
+								minetest.dig_node(n_pos)
+							else
+								minetest.remove_node(n_pos)
+							end
 						end
 					end
 				end
@@ -1177,6 +1187,7 @@ draconis.dragon_api = {
 	-- Textures
 	update_emission = function(self, force)
 		local pos = self.object:get_pos()
+		if not pos then return end
 		local level = minetest.get_node_light(pos, minetest.get_timeofday())
 		if not level then return end
 		local texture = self:get_props().textures[1]
@@ -1203,7 +1214,7 @@ draconis.dragon_api = {
 		if self.name == "draconis:fire_dragon" then
 			dragon_type = "fire"
 		end
-		local eyes =  "draconis_" .. dragon_type .. "_eyes_".. self.eye_color .. ".png"
+		local eyes = "draconis_" .. dragon_type .. "_eyes_".. self.eye_color .. ".png"
 		if self.growth_scale < 0.25 then
 			eyes = "draconis_" .. dragon_type .. "_eyes_child_".. self.eye_color .. ".png"
 		end
@@ -1619,17 +1630,16 @@ minetest.register_chatcommand("tamedragon", {
 		pos.y = pos.y + player:get_properties().eye_height or 1.625
 		local dest = vec_add(pos, vec_multi(dir, 40))
 		local object, ent = get_pointed_mob(pos, dest)
-		if object
-		and ent.name:match("^draconis:")
+		if object and ent
 		and ent.memorize then
-			local ent_pos = object:get_pos()
+			local ent_pos = ent:get_center_pos()
 			local particle = "creatura_particle_green.png"
 			if not ent.owner then
 				ent.owner = name
 				ent:memorize("owner", ent.owner)
-				minetest.chat_send_player(name, correct_name(ent.name) .. " has been tamed!")
+				minetest.chat_send_player(name, S("@1 has been tamed!", correct_name(ent.name)))
 			else
-				minetest.chat_send_player(name, correct_name(ent.name) .. " is already tamed.")
+				minetest.chat_send_player(name, S("@1 is already tamed.", correct_name(ent.name)))
 				particle = "creatura_particle_red.png"
 			end
 			minetest.add_particlespawner({
@@ -1655,7 +1665,7 @@ minetest.register_chatcommand("tamedragon", {
 				glow = 16
 			})
 		else
-			minetest.chat_send_player(name, "You must be pointing at a mob.")
+			minetest.chat_send_player(name, S("You must be pointing at a mob."))
 		end
 	end
 })
@@ -1673,12 +1683,12 @@ minetest.register_chatcommand("set_dragon_owner", {
 		pos.y = pos.y + player:get_properties().eye_height or 1.625
 		local dest = vec_add(pos, vec_multi(dir, 40))
 		local object, ent = get_pointed_mob(pos, dest)
-		if object then
+		if object and ent then
 			local ent_pos = ent:get_center_pos()
 			local particle = "creatura_particle_green.png"
 			ent.owner = param_name
 			ent:memorize("owner", ent.owner)
-			minetest.chat_send_player(name, correct_name(ent.name) .. " is now owned by " .. param_name)
+			minetest.chat_send_player(name, S("@1 is now owned by @2", correct_name(ent.name), param_name))
 			minetest.add_particlespawner({
 				amount = 16,
 				time = 0.25,
@@ -1702,13 +1712,13 @@ minetest.register_chatcommand("set_dragon_owner", {
 				glow = 16
 			})
 		else
-			minetest.chat_send_player(name, "You must be pointing at a mob.")
+			minetest.chat_send_player(name, S("You must be pointing at a mob."))
 		end
 	end
 })
 
 minetest.register_chatcommand("revive_dragon", {
-	description = "Revives pointed Dragon",
+	description = S("Revives pointed Dragon"),
 	privs = {draconis_admin = true},
 	func = function(name)
 		local player = minetest.get_player_by_name(name)
@@ -1718,13 +1728,13 @@ minetest.register_chatcommand("revive_dragon", {
 		pos.y = pos.y + player:get_properties().eye_height or 1.625
 		local dest = vec_add(pos, vec_multi(dir, 40))
 		local object, ent = get_pointed_mob(pos, dest)
-		if object
+		if object and ent
 		and ent.hp <= 0 then
 			local ent_pos = ent:get_center_pos()
 			local particle = "creatura_particle_green.png"
 			ent.hp = ent.max_health
 			ent:memorize("hp", ent.hp)
-			minetest.chat_send_player(name, correct_name(ent.name) .. " has been revived!")
+			minetest.chat_send_player(name, S("@1 has been revived!", correct_name(ent.name)))
 			minetest.add_particlespawner({
 				amount = 16,
 				time = 0.25,
@@ -1748,42 +1758,42 @@ minetest.register_chatcommand("revive_dragon", {
 				glow = 16
 			})
 		else
-			minetest.chat_send_player(name, "You must be pointing at a mob.")
+			minetest.chat_send_player(name, S("You must be pointing at a mob."))
 		end
 	end
 })
 
 minetest.register_chatcommand("dragon_attack_blacklist_add", {
-	description = "Adds player to attack blacklist",
+	description = S("Adds player to attack blacklist"),
 	params = "<name>",
 	privs = {draconis_admin = true},
 	func = function(name, params)
 		local player = minetest.get_player_by_name(name)
 		local param_name = params:match("%S+")
 		if not player or not param_name then return false end
 		if draconis.attack_blacklist[param_name] then
-			minetest.chat_send_player(name, param_name .. " is already on the Dragon attack blacklist.")
+			minetest.chat_send_player(name, S("@1 is already on the Dragon attack blacklist.", param_name))
 			return false
 		end
 		draconis.attack_blacklist[param_name] = true
-		minetest.chat_send_player(name, param_name .. " has been added to the Dragon attack blacklist.")
+		minetest.chat_send_player(name, S("@1 has been added to the Dragon attack blacklist.", param_name))
 	end
 })
 
 minetest.register_chatcommand("dragon_attack_blacklist_remove", {
-	description = "Removes player to attack blacklist",
+	description = S("Removes player to attack blacklist"),
 	params = "<name>",
 	privs = {draconis_admin = true},
 	func = function(name, params)
 		local player = minetest.get_player_by_name(name)
 		local param_name = params:match("%S+")
 		if not player or not param_name then return false end
 		if not draconis.attack_blacklist[param_name] then
-			minetest.chat_send_player(name, param_name .. " isn't on the Dragon attack blacklist.")
+			minetest.chat_send_player(name, S("@1 isn't on the Dragon attack blacklist.", param_name))
 			return false
 		end
 		draconis.attack_blacklist[param_name] = nil
-		minetest.chat_send_player(name, param_name .. " has been removed from the Dragon attack blacklist.")
+		minetest.chat_send_player(name, S("@1 has been removed from the Dragon attack blacklist.", param_name))
 	end
 })
 

api/behaviors.lua

@@ -2,6 +2,8 @@
 -- Behaviors --
 ---------------
 
+local S = draconis.S
+
 draconis.fire_dragon_targets = {}
 
 draconis.ice_dragon_targets = {}
@@ -906,15 +908,15 @@ creatura.register_utility("draconis:wyvern_breaking", function(self, player)
 					texture = texture,
 				})
 				minetest.chat_send_player(player:get_player_name(),
-					"The Jungle Wyvern ate some " .. def.description .. "! Taming is at " .. taming .. "%")
+					S("The Jungle Wyvern ate some @1! Taming is at @2%", def.description, taming))
 			else
 				draconis.detach_player(_self, player)
 				return true
 			end
 			feed_timer = 10
 		end
 		if taming >= 100 then
-			minetest.chat_send_player(player:get_player_name(), "The Jungle Wyvern has been tamed!")
+			minetest.chat_send_player(player:get_player_name(), S("The Jungle Wyvern has been tamed!"))
 			_self.owner = _self:memorize("owner", player:get_player_name())
 			return true
 		end

api/forms.lua

@@ -60,8 +60,9 @@ local function get_dragon_formspec(self)
 	local breath = get_perc(self.attack_stamina, 100)
 	-- Visuals
 	local frame_range = self.animations["stand"].range
-	local frame_loop = frame_range.x .. "," ..  frame_range.y
-	local texture = self:get_props().textures[1]
+	local frame_loop = frame_range.x .. "," .. frame_range.y
+	local props = self:get_props()
+	local texture = (props and props.textures and props.textures[1]) or "blank.png"
 	local health_ind = "draconis_forms_health_bg.png^[lowpart:" .. health .. ":draconis_forms_health_fg.png"
 	local hunger_ind = "draconis_forms_hunger_bg.png^[lowpart:" .. hunger .. ":draconis_forms_hunger_fg.png"
 	local stamina_ind = "draconis_forms_stamina_bg.png^[lowpart:" .. stamina .. ":draconis_forms_stamina_fg.png"
@@ -106,9 +107,10 @@ draconis.dragon_api.show_formspec = function(self, player)
 end
 
 local function get_customize_formspec(self)
-	local texture = self.object:get_properties().textures[1]
+	local props = self.object:get_properties()
+	local texture = (props and props.textures and props.textures[1]) or "blank.png"
 	local frame_range = self.animations["stand"].range
-	local frame_loop = frame_range.x .. "," ..  frame_range.y
+	local frame_loop = frame_range.x .. "," .. frame_range.y
 	local form
 	if self.name == "draconis:fire_dragon" then
 		form = {
@@ -148,7 +150,7 @@ local function get_wyvern_formspec(self)
 	local stamina = get_perc(self.flight_stamina, 900)
 	-- Visuals
 	local frame_range = self.animations["stand"].range
-	local frame_loop = frame_range.x .. "," ..  frame_range.y
+	local frame_loop = frame_range.x .. "," .. frame_range.y
 	local props = self:get_props()
 	local texture = (props and props.textures and props.textures[1]) or "blank.png"
 	local health_ind = "draconis_forms_health_bg.png^[lowpart:" .. health .. ":draconis_forms_health_fg.png"
@@ -360,4 +362,4 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			form_objref[name] = nil
 		end
 	end
-end)
+end)

api/libri.lua

@@ -2,6 +2,8 @@
 -- Libri --
 -----------
 
+local S = draconis.S
+
 local color = minetest.colorize
 
 local libri_bg = {
@@ -409,14 +411,14 @@ end
 ---------------
 
 minetest.register_craftitem("draconis:libri_draconis", {
-	description = "Libri Draconis",
+	description = S("Libri Draconis"),
 	inventory_image = "draconis_libri_draconis.png",
 	stack_max = 1,
 	on_place = function(itemstack, player)
 		local meta = itemstack:get_meta()
 		local desc = meta:get_string("description")
 		if desc:find("Bestiary") then
-			meta:set_string("description", "Libri Draconis")
+			meta:set_string("description", S("Libri Draconis"))
 			meta:set_string("pages", nil)
 		end
 		local name = player:get_player_name()
@@ -426,7 +428,7 @@ minetest.register_craftitem("draconis:libri_draconis", {
 		local meta = itemstack:get_meta()
 		local desc = meta:get_string("description")
 		if desc:find("Bestiary") then
-			meta:set_string("description", "Libri Draconis")
+			meta:set_string("description", S("Libri Draconis"))
 			meta:set_string("pages", nil)
 		end
 		local name = player:get_player_name()

api/mount.lua

@@ -2,6 +2,8 @@
 -- Mount API --
 ---------------
 
+local S = draconis.S
+
 draconis.mounted_player_data = {}
 
 local abs = math.abs
@@ -270,7 +272,7 @@ function draconis.detach_player(self, player)
 		return
 	end
 	local player_name = player:get_player_name()
-	local data = draconis.mounted_player_data[player_name]
+	local data = draconis.mounted_player_data[player_name] or {}
 	-- Attach Player
 	player:set_detach()
 	-- Set HUD
@@ -368,11 +370,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if formname == "draconis:dragon_mount_settings" then
 		if fields.btn_view_point then
 			draconis.aux_key_setting[name] = "pov"
-			minetest.chat_send_player(name, "Sprint key now changes point of view")
+			minetest.chat_send_player(name, S("Sprint key now changes point of view"))
 		end
 		if fields.btn_pitch_toggle then
 			draconis.aux_key_setting[name] = "vert_method"
-			minetest.chat_send_player(name, "Sprint key now changes vertical movement method")
+			minetest.chat_send_player(name, S("Sprint key now changes vertical movement method"))
 		end
 	end
 end)
@@ -386,9 +388,9 @@ end)
 
 minetest.register_on_dieplayer(function(player)
 	local name = player:get_player_name()
-	if name
-	and draconis.mounted_player_data[name] then
-		draconis.detach_player(draconis.mounted_player_data[name].dragon, player)
+	local data = draconis.mounted_player_data[name]
+	if data and data.dragon then
+		draconis.detach_player(data.dragon, player)
 	end
 end)
 
@@ -411,10 +413,12 @@ local function update_hud(self, player)
 	local breath = self.attack_stamina / 100 * 100
 	local hud_data = draconis.mounted_player_data[name].huds
 	-- Update Elements
-	player:hud_remove(hud_data["health"])
-	player:hud_remove(hud_data["hunger"])
-	player:hud_remove(hud_data["stamina"])
-	player:hud_remove(hud_data["breath"])
+	if hud_data then
+		player:hud_remove(hud_data["health"])
+		player:hud_remove(hud_data["hunger"])
+		player:hud_remove(hud_data["stamina"])
+		player:hud_remove(hud_data["breath"])
+	end
 	draconis.mounted_player_data[name].huds = {
 		["health"] = set_hud(player, {
 			text = "draconis_forms_health_bg.png^[lowpart:" .. health .. ":draconis_forms_health_fg.png",