diff --git a/games/default/files/mobs_animal/bear.lua b/games/default/files/mobs_animal/bear.lua index b498ff1e5..45970f59e 100644 --- a/games/default/files/mobs_animal/bear.lua +++ b/games/default/files/mobs_animal/bear.lua @@ -94,7 +94,7 @@ mobs:register_mob("mobs_animal:bear", { mobs:spawn({ name = "mobs_animal:bear", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass"}, min_light = 0, interval = 30, chance = 15000, diff --git a/games/default/files/mobs_animal/bunny.lua b/games/default/files/mobs_animal/bunny.lua index 92b60892a..b0207e7a4 100644 --- a/games/default/files/mobs_animal/bunny.lua +++ b/games/default/files/mobs_animal/bunny.lua @@ -102,7 +102,7 @@ mobs:register_mob("mobs_animal:bunny", { mobs:spawn({ name = "mobs_animal:bunny", - nodes = {"default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass"}, min_light = 10, interval = 30, chance = 8000, diff --git a/games/default/files/mobs_animal/cow.lua b/games/default/files/mobs_animal/cow.lua index 329f026af..6957bd2c9 100644 --- a/games/default/files/mobs_animal/cow.lua +++ b/games/default/files/mobs_animal/cow.lua @@ -129,7 +129,7 @@ mobs:register_mob("mobs_animal:cow", { mobs:spawn({ name = "mobs_animal:cow", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_dry_grass", "default:dirt_with_grass"}, min_light = 5, interval = 30, chance = 10000, diff --git a/games/default/files/mobs_animal/dog.lua b/games/default/files/mobs_animal/dog.lua index 87f946d16..a0d5b1a56 100644 --- a/games/default/files/mobs_animal/dog.lua +++ b/games/default/files/mobs_animal/dog.lua @@ -60,7 +60,7 @@ mobs:register_mob("mobs_animal:wolf", { mobs:spawn({ name = "mobs_animal:wolf", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass"}, min_light = 0, interval = 30, chance = 15000, diff --git a/games/default/files/mobs_animal/kitten.lua b/games/default/files/mobs_animal/kitten.lua index 3135617c1..83657c7bb 100644 --- a/games/default/files/mobs_animal/kitten.lua +++ b/games/default/files/mobs_animal/kitten.lua @@ -54,7 +54,7 @@ mobs:register_mob("mobs_animal:kitten", { mobs:spawn({ name = "mobs_animal:kitten", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass"}, min_light = 10, interval = 30, chance = 10000, diff --git a/games/default/files/mobs_animal/pig.lua b/games/default/files/mobs_animal/pig.lua index b1c34cdff..3ee2680ee 100644 --- a/games/default/files/mobs_animal/pig.lua +++ b/games/default/files/mobs_animal/pig.lua @@ -52,7 +52,7 @@ mobs:register_mob("mobs_animal:pig", { mobs:spawn({ name = "mobs_animal:pig", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass"}, min_light = 5, interval = 30, chance = 15000, diff --git a/games/default/files/mobs_animal/sheep.lua b/games/default/files/mobs_animal/sheep.lua index 2af88c848..0489dedbb 100644 --- a/games/default/files/mobs_animal/sheep.lua +++ b/games/default/files/mobs_animal/sheep.lua @@ -236,7 +236,7 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_black", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:dirt_with_dry_grass", "default:dirt_with_grass"}, min_light = 7, interval = 30, chance = 40000, @@ -247,7 +247,7 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_brown", - nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:dirt_with_dry_grass", "default:dirt_with_grass"}, min_light = 7, interval = 30, chance = 40000, diff --git a/games/default/files/mobs_monster/models/mobs_spider.b3d b/games/default/files/mobs_monster/models/mobs_spider.b3d index c77075495..e1b1662fc 100644 Binary files a/games/default/files/mobs_monster/models/mobs_spider.b3d and b/games/default/files/mobs_monster/models/mobs_spider.b3d differ diff --git a/games/default/files/mobs_monster/skeleton.lua b/games/default/files/mobs_monster/skeleton.lua index 0b4da604e..eb8e0e9e7 100644 --- a/games/default/files/mobs_monster/skeleton.lua +++ b/games/default/files/mobs_monster/skeleton.lua @@ -53,7 +53,7 @@ mobs:register_mob("mobs_monster:skeleton", { mobs:spawn({ name = "mobs_monster:skeleton", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 10, chance = 7000, diff --git a/games/default/files/mobs_monster/spider.lua b/games/default/files/mobs_monster/spider.lua index 51e839eb1..27bc36b10 100644 --- a/games/default/files/mobs_monster/spider.lua +++ b/games/default/files/mobs_monster/spider.lua @@ -10,11 +10,13 @@ mobs:register_mob("mobs_monster:spider", { hp_min = 15, hp_max = 20, armor = 100, - collisionbox = {-0.7, -0.01, -0.7, 0.7, 0.6, 0.7}, + collisionbox = {-0.8, -0.5, -0.8, 0.8, 0, 0.8}, visual = "mesh", mesh = "mobs_spider.b3d", textures = { {"mobs_spider.png"}, + {"mobs_spider_grey.png"}, + {"mobs_spider_orange.png"}, }, makes_footstep_sound = false, sounds = { @@ -59,7 +61,7 @@ mobs:register_mob("mobs_monster:spider", { mobs:spawn({ name = "mobs_monster:spider", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 12, interval = 30, @@ -69,13 +71,14 @@ mobs:spawn({ }) mobs:register_egg("mobs_monster:spider", "Spider egg", "mobs_chicken_egg.png^mobs_cobweb.png", 1) +mobs:register_egg("mobs_monster:small_spider", "Small Spider egg", "mobs_chicken_egg.png^mobs_cobweb.png", 1) mobs:alias_mob("mobs:spider", "mobs_monster:spider") -- compatibility -- Small spider mobs:register_mob("mobs_monster:small_spider", { - docile_by_day = true, + --docile_by_day = true, group_attack = true, type = "animal", passive = false, @@ -85,11 +88,13 @@ mobs:register_mob("mobs_monster:small_spider", { hp_min = 5, hp_max = 10, armor = 100, - collisionbox = {-0.23, -0.01, -0.23, 0.23, 0.2, 0.23}, + collisionbox = {-0.3, -0.15, -0.3, 0.3, 0.05, 0.3}, visual = "mesh", mesh = "mobs_spider.b3d", textures = { {"mobs_spider.png"}, + {"mobs_spider_grey.png"}, + {"mobs_spider_orange.png"}, }, visual_size = {x = 0.3, y = 0.3}, makes_footstep_sound = false, @@ -134,7 +139,7 @@ mobs:register_mob("mobs_monster:small_spider", { mobs:spawn({ name = "mobs_monster:small_spider", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 15, interval = 30, diff --git a/games/default/files/mobs_monster/textures/mobs_spider.png b/games/default/files/mobs_monster/textures/mobs_spider.png index cd719b1b6..ed34c857d 100644 Binary files a/games/default/files/mobs_monster/textures/mobs_spider.png and b/games/default/files/mobs_monster/textures/mobs_spider.png differ diff --git a/games/default/files/mobs_monster/textures/mobs_spider_grey.png b/games/default/files/mobs_monster/textures/mobs_spider_grey.png new file mode 100644 index 000000000..eccd2025c Binary files /dev/null and b/games/default/files/mobs_monster/textures/mobs_spider_grey.png differ diff --git a/games/default/files/mobs_monster/textures/mobs_spider_orange.png b/games/default/files/mobs_monster/textures/mobs_spider_orange.png new file mode 100644 index 000000000..92ef0986f Binary files /dev/null and b/games/default/files/mobs_monster/textures/mobs_spider_orange.png differ diff --git a/games/default/files/mobs_monster/zombie.lua b/games/default/files/mobs_monster/zombie.lua index 942a6bcaf..b69951a03 100644 --- a/games/default/files/mobs_monster/zombie.lua +++ b/games/default/files/mobs_monster/zombie.lua @@ -53,7 +53,7 @@ mobs:register_mob("mobs_monster:zombie", { mobs:spawn({ name = "mobs_monster:zombie", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 10, chance = 7000, diff --git a/games/default/files/player_api/init.lua b/games/default/files/player_api/init.lua index ffb7f9de8..6f0ad99b4 100644 --- a/games/default/files/player_api/init.lua +++ b/games/default/files/player_api/init.lua @@ -19,12 +19,20 @@ player_api.register_model("character.b3d", { walk_mine = {x = 200, y = 219}, sit = {x = 81, y = 160}, }, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, eye_height = 1.47, }) if creative_mode_cache then + minetest.register_item(":", { + type = "none", + wield_image = "blank.png", + tool_capabilities = { + full_punch_interval = 0.5, + damage_groups = {fleshy = 5}, + } + }) + local digtime = 128 local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 192} minetest.register_node("player_api:hand", { @@ -38,7 +46,7 @@ if creative_mode_cache then node_placement_prediction = "", range = 10, tool_capabilities = { - full_punch_interval = 0.9, + full_punch_interval = 0.5, max_drop_level = 3, groupcaps = { crumbly = caps, @@ -51,6 +59,15 @@ if creative_mode_cache then } }) else + minetest.register_item(":", { + type = "none", + wield_image = "blank.png", + tool_capabilities = { + full_punch_interval = 0.9, + damage_groups = {fleshy = 1}, + } + }) + minetest.register_node("player_api:hand", { tiles = {"character.png"}, wield_scale = {x = 1, y = 1, z = 0.7}, @@ -61,14 +78,14 @@ else drop = "", node_placement_prediction = "", tool_capabilities = { - full_punch_interval = 0.9, - max_drop_level = 0, - groupcaps = { - crumbly = {times={[2]=3.00, [3]=0.70}, uses=0, maxlevel=1}, - snappy = {times={[3]=0.40}, uses=0, maxlevel=1}, - choppy = {times={[3]=3}}, - cracky = {times={[10]=10, [3]=7.5}}, - oddly_breakable_by_hand = {times = {[0]=90.00, [1]=7.00, [2]=3.00, [3]=3*3.33, [4]=250, [5]=999999.0, [6]=0.5}, uses = 0, maxlevel = 5} + full_punch_interval = 0.9, + max_drop_level = 0, + groupcaps = { + crumbly = {times = {[2]=3.00, [3]=0.70}, uses = 0, maxlevel = 1}, + snappy = {times ={[3]=0.40}, uses = 0, maxlevel = 1}, + choppy = {times = {[3]=3}, uses = 0, maxlevel = 1}, + cracky = {times = {[10]=10, [3]=7.5}, uses = 0, maxlevel = 1}, + oddly_breakable_by_hand = {times = {[0]=90.00, [1]=7.00, [2]=3.00, [3]=3*3.33, [4]=250, [5]=999999.0, [6]=0.5}, uses = 0, maxlevel = 5} }, damage_groups = {fleshy = 1}, }