Merge remote-tracking branch 'refs/remotes/origin/master' into toby

mods/mapgen/nodes.lua

@@ -1,17 +1,59 @@
 
-minetest.register_node("mapgen:yellow_ipe_leves", {
-	description = "yellow ipe leves",
+minetest.register_node("mapgen:baobab_leaves", {
+	description = "baobab leaves",
 	drawtype = "allfaces",
 	paramtype = "light",
 	tiles = {
-		"mapgen_yellow_ipe_leves.png",
+		"mapgen_baobab_leaves.png",
 	},
 	groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 1, dig_immediate = 1, leaves = 1, leafdecay = 3},
 	sounds = default.node_sound_leaves_defaults()
 })
 
-minetest.register_node("mapgen:yellow_ipe_Planks", {
-	description = "yellow ipe Planks",
+minetest.register_node("mapgen:baobab_wood_Planks", {
+	description = "baobab wood Planks",
+	tiles = {
+		"mapgen_baobab_wood.png",
+	},
+	groups = {choppy = 1, flammable = 1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_wood_defaults()
+})
+
+minetest.register_node("mapgen:baobab_tree", {
+	description = "baobab tree",
+	tiles = {
+		"mapgen_baobab_tree_top.png",
+		"mapgen_baobab_tree_top.png",
+		"mapgen_baobab_tree.png",
+	},
+	groups = {choppy = 2, tree = 1, flammable = 1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_wood_defaults(),
+	on_place = minetest.rotate_node
+})
+
+default.register_fence("mapgen:fence_baobab", {
+	description = "Baobab Fence",
+	texture = "mapgen_baobab_wood.png",
+	inventory_image = "default_fence_overlay.png^mapgen_baobab_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+	wield_image = "default_fence_overlay.png^mapgen_baobab_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+	material = "mapgen:baobab_wood_planks",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
+
+minetest.register_node("mapgen:yellow_ipe_leaves", {
+	description = "Yellow Ipe Leaves",
+	drawtype = "allfaces",
+	paramtype = "light",
+	tiles = {
+		"mapgen_yellow_ipe_leaves.png",
+	},
+	groups = {snappy = 1, oddly_breakable_by_hand = 1, flammable = 1, dig_immediate = 1, leaves = 1, leafdecay = 3},
+	sounds = default.node_sound_leaves_defaults()
+})
+
+minetest.register_node("mapgen:yellow_ipe_planks", {
+	description = "Yellow Ipe Planks",
 	tiles = {
 		"mapgen_yellow_ipe_wood.png",
 	},
@@ -20,7 +62,7 @@ minetest.register_node("mapgen:yellow_ipe_Planks", {
 })
 
 minetest.register_node("mapgen:yellow_ipe_tree", {
-	description = "yellowv ipe tree",
+	description = "Yellow Ipe Tree",
 	tiles = {
 		"mapgen_yellow_ipe_tree_top.png",
 		"mapgen_yellow_ipe_tree_top.png",
@@ -31,8 +73,18 @@ minetest.register_node("mapgen:yellow_ipe_tree", {
 	on_place = minetest.rotate_node
 })
 
+default.register_fence("mapgen:fence_yellow_ipe", {
+	description = "Yellow Ipe Fence",
+	texture = "mapgen_yellow_ipe_wood.png",
+	inventory_image = "default_fence_overlay.png^mapgen_yellow_ipe_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+	wield_image = "default_fence_overlay.png^mapgen_yellow_ipe_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+	material = "mapgen:yellow_ipe_planks",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
+
 minetest.register_node("mapgen:coarse_dirt", {
-	description = "coarse dirt",
+	description = "Coarse Dirt",
 	tiles = {"mapgen_coarse_dirt.png"},
 	groups = {crumbly = 1, oddly_breakable_by_hand = 1},
 	sounds = default.node_sound_dirt_defaults()
@@ -149,4 +201,24 @@ minetest.register_node("mapgen:moss", {
 	buildable_to = true,
 	groups = {snappy = 1, oddly_breakable_by_hand=1, dig_immediate=3},
 	sounds = default.node_sound_defaults()
+})
+
+minetest.register_node("mapgen:tallgrass", {
+	description = "Tall Grass",
+	drawtype = "plantlike",
+	tiles = {"moreplants_longgrass.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	buildable_to = true, 
+	sunlight_propagates = true,
+	inventory_image = "moreplants_longgrass.png",
+	visual_scale = 1.4,
+	wield_scale = {x=0.5, y=0.5, z=0.5},
+	groups = {snappy=3, flammable=1, attatched_node=1, flora=1},
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
+	},
+	walkable = false,
 })

mods/mobs_minetestia/aquatic.lua

@@ -50,6 +50,52 @@ mobs:register_spawn("mobs_m:smallfish", {"default:water_source",}, 20, 10, 15000
 
 mobs:register_egg("mobs_m:smallfish", "Small Fish", "default_water.png", 1)
 
+mobs:register_mob("mobs_m:trilobite", {
+	type = "animal",
+	passive = true,
+	reach = 1,
+	damage = 0,
+	attack_type = "dogfight",
+	hp_min = 10,
+	hp_max = 25,
+	armor = 100,
+	collisionbox = {-0.2, 0, -0.2, 0.2, 0.2, 0.2},
+	visual = "mesh",
+	mesh = "trilobite.b3d",
+	textures = {
+		{"mobs_trilobite.png"},
+	},
+	makes_footstep_sound = false,
+	view_range = 5,
+	walk_velocity = 1,
+	run_velocity = 2,
+	runaway = true,
+	runaway_timer = 40,
+	jump = 0,
+	floats = 0,
+	jump_height = 0,
+	stepheight = 1.3,
+	fall_damage = 0,
+	fall_speed = -5,
+	water_damage = 0,
+	lava_damage = 1,
+	light_damage = 0,
+	animation = {
+		speed_normal = 15,
+		speed_run = 20,
+		stand_start = 40,
+		stand_end = 60,
+		walk_start = 1,
+		walk_end = 30,
+		run_start = 1,
+		run_end = 30,
+	},
+})
+
+mobs:register_spawn("mobs_m:trilobite", {"default:water_source",}, 20, 10, 15000, 2, 11000)
+
+mobs:register_egg("mobs_m:trilobite", "Trilobite", "default_water.png", 1)
+
 mobs:register_mob("mobs_m:riverfish", {
 	type = "animal",
 	passive = true,

mods/mobs_minetestia/dinosaurs.lua

@@ -0,0 +1,68 @@
+
+
+--spawns
+mobs:register_spawn("mobs_m:velociraptor", {"default:dirt_with_grass","default:dirt"}, 20, 10, 32000, 2, 31000)
+
+--mobs
+
+mobs:register_mob("mobs_m:velociraptor", {
+	type = "monster",
+	reach = 1.5,
+	damage = 4,
+	attack_type = "dogfight",
+	hp_min = 42,
+	hp_max = 52,
+	armor = 100,
+	collisionbox = {-0.4, 0, -0.4, 0.4, 0.5, 0.4},
+	runaway = true,
+	pathfinding = true,
+	visual = "mesh",
+	mesh = "velociraptor.b3d",
+	textures = {
+		{"mobs_velociraptor.png"},
+	},
+	blood_texture = "mobs_blood.png",
+	visual_size = {x=1.5, y=1.5},
+	makes_footstep_sound = true,
+	walk_velocity = 2.5,
+	run_velocity = 3,
+	jump = true,
+	drops = {
+		{name = "mobs:meat_raw", chance = 3, min = 1, max = 2},
+	},
+	on_activate = function(self)
+		if math.random(1,5) == 1 then
+		self.type = "animal"
+		end
+	end,
+	water_damage = 0,
+	lava_damage = 2,
+	light_damage = 0,
+	fall_damage = 1,
+	fear_height = 8,
+	follow = {"mobs:meat_raw"},
+	view_range = 14,
+	animation = {
+		speed_normal = 12,
+		speed_run = 18,
+		walk_start = 45,
+		walk_end = 65,
+		stand_start = 16,
+		stand_end = 42,
+		run_start = 45,
+		run_end = 65,
+		punch_start = 1,
+		punch_end = 16,
+	},
+	on_rightclick = function(self, clicker)
+
+		if mobs:feed_tame(self, clicker, 8, true, true) then
+			return
+		end
+
+		mobs:capture_mob(self, clicker, 0, 5, 50, false, nil)
+	end,
+})
+
+
+mobs:register_egg("mobs_m:velociraptor", "Velociraptor", "wool_orange.png", 1)

mods/mobs_minetestia/init.lua

@@ -1,4 +1,5 @@
 
 local path = minetest.get_modpath("mobs_m")
 
-dofile(path.."/aquatic.lua")
+dofile(path.."/aquatic.lua")
+dofile(path.."/dinosaurs.lua")

mods/nyancat/README.txt

@@ -1,16 +0,0 @@
-Minetest Game mod: nyancat
-==========================
-See license.txt for license information.
-
-Authors of source code
-----------------------
-Originally by celeron55, Perttu Ahola <celeron55@gmail.com> (LGPL 2.1)
-Various Minetest developers and contributors (LGPL 2.1)
-
-Authors of media files
-----------------------
-VanessaE (CC BY-SA 3.0):
-  nyancat_front.png
-  nyancat_back.png
-  nyancat_side.png
-  nyancat_rainbow.png

mods/nyancat/depends.txt

@@ -1 +0,0 @@
-default

mods/nyancat/init.lua

@@ -1,89 +0,0 @@
-minetest.register_node("nyancat:nyancat", {
-	description = "Nyan Cat",
-	tiles = {"nyancat_side.png", "nyancat_side.png", "nyancat_side.png",
-		"nyancat_side.png", "nyancat_back.png", "nyancat_front.png"},
-	paramtype = "light",
-	light_source = default.LIGHT_MAX,
-	paramtype2 = "facedir",
-	groups = {cracky = 2},
-	is_ground_content = false,
-	legacy_facedir_simple = true,
-	sounds = default.node_sound_defaults(),
-})
-
-minetest.register_node("nyancat:nyancat_rainbow", {
-	description = "Nyan Cat Rainbow",
-	tiles = {
-		"nyancat_rainbow.png^[transformR90",
-		"nyancat_rainbow.png^[transformR90",
-		"nyancat_rainbow.png"
-	},
-	paramtype = "light",
-	light_source = default.LIGHT_MAX,
-	paramtype2 = "facedir",
-	groups = {cracky = 2},
-	is_ground_content = false,
-	sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "nyancat:nyancat",
-	burntime = 1,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "nyancat:nyancat_rainbow",
-	burntime = 1,
-})
-
-nyancat = {}
-
-function nyancat.place(pos, facedir, length)
-	if facedir > 3 then
-		facedir = 0
-	end
-	local tailvec = minetest.facedir_to_dir(facedir)
-	local p = {x = pos.x, y = pos.y, z = pos.z}
-	minetest.set_node(p, {name = "nyancat:nyancat", param2 = facedir})
-	for i = 1, length do
-		p.x = p.x + tailvec.x
-		p.z = p.z + tailvec.z
-		minetest.set_node(p, {name = "nyancat:nyancat_rainbow", param2 = facedir})
-	end
-end
-
-function nyancat.generate(minp, maxp, seed)
-	local height_min = -31000
-	local height_max = -32
-	if maxp.y < height_min or minp.y > height_max then
-		return
-	end
-	local y_min = math.max(minp.y, height_min)
-	local y_max = math.min(maxp.y, height_max)
-	local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
-	local pr = PseudoRandom(seed + 9324342)
-	local max_num_nyancats = math.floor(volume / (16 * 16 * 16))
-	for i = 1, max_num_nyancats do
-		if pr:next(0, 1000) == 0 then
-			local x0 = pr:next(minp.x, maxp.x)
-			local y0 = pr:next(minp.y, maxp.y)
-			local z0 = pr:next(minp.z, maxp.z)
-			local p0 = {x = x0, y = y0, z = z0}
-			nyancat.place(p0, pr:next(0, 3), pr:next(3, 15))
-		end
-	end
-end
-
-minetest.register_on_generated(function(minp, maxp, seed)
-	nyancat.generate(minp, maxp, seed)
-end)
-
--- Legacy
-minetest.register_alias("default:nyancat", "nyancat:nyancat")
-minetest.register_alias("default:nyancat_rainbow", "nyancat:nyancat_rainbow")
-minetest.register_alias("nyancat", "nyancat:nyancat")
-minetest.register_alias("nyancat_rainbow", "nyancat:nyancat_rainbow")
-default.make_nyancat = nyancat.place
-default.generate_nyancats = nyancat.generate

mods/nyancat/license.txt

@@ -1,50 +0,0 @@
-License of source code
-----------------------
-
-GNU Lesser General Public License, version 2.1
-Copyright (C) 2011-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2012-2016 Various Minetest developers and contributors
-
-This program is free software; you can redistribute it and/or modify it under the terms
-of the GNU Lesser General Public License as published by the Free Software Foundation;
-either version 2.1 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU Lesser General Public License for more details:
-https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-
-
-Licenses of media (textures)
-----------------------------
-
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-Copyright (C) 2012-2016 VanessaE
-
-You are free to:
-Share — copy and redistribute the material in any medium or format.
-Adapt — remix, transform, and build upon the material for any purpose, even commercially.
-The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-Under the following terms:
-
-Attribution — You must give appropriate credit, provide a link to the license, and
-indicate if changes were made. You may do so in any reasonable manner, but not in any way
-that suggests the licensor endorses you or your use.
-
-ShareAlike — If you remix, transform, or build upon the material, you must distribute
-your contributions under the same license as the original.
-
-No additional restrictions — You may not apply legal terms or technological measures that
-legally restrict others from doing anything the license permits.
-
-Notices:
-
-You do not have to comply with the license for elements of the material in the public
-domain or where your use is permitted by an applicable exception or limitation.
-No warranties are given. The license may not give you all of the permissions necessary
-for your intended use. For example, other rights such as publicity, privacy, or moral
-rights may limit how you use the material.
-
-For more details:
-http://creativecommons.org/licenses/by-sa/3.0/