Merge remote-tracking branch 'origin/master'

master
D00Med 2017-09-13 06:25:46 +10:00
commit 8a2970fd8c
5 changed files with 16 additions and 16 deletions

View File

@ -17,7 +17,7 @@ minetest.register_node("mapgen:"..name, {
paramtype2 = "degrotate",
walkable = false,
buildable_to = true,
groups = {snappy = 1, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
groups = {snappy = 3, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
sounds = default.node_sound_leaves_defaults()
})
end
@ -43,7 +43,7 @@ minetest.register_node("mapgen:"..name, {
visual_scale = 0.5,
walkable = false,
buildable_to = true,
groups = {snappy = 1, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
groups = {snappy = 3, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
sounds = default.node_sound_leaves_defaults()
})
end
@ -647,8 +647,8 @@ minetest.register_node("mapgen:moss", {
}
},
buildable_to = true,
groups = {snappy = 1, oddly_breakable_by_hand=1, dig_immediate=3},
sounds = default.node_sound_defaults()
groups = {snappy = 3, oddly_breakable_by_hand=1, dig_immediate=3},
sounds = default.node_sound_leaves_defaults(),
})
--plantlike (PLNT02)
@ -848,7 +848,7 @@ minetest.register_node("mapgen:bush", {
paramtype = "light",
is_ground_content = false,
sunlight_propagates = false,
groups = {snappy=1, flammable=1, oddly_breakable_by_hand=1, leaves=1},
groups = {snappy=3, flammable=1, oddly_breakable_by_hand=1, leaves=1},
visual_scale = 1.2,
sounds = default.node_sound_leaves_defaults(),
walkable = false,

View File

@ -5,9 +5,9 @@ mobs:register_mob("mobs_m:smallfish", {
reach = 1,
damage = 0,
attack_type = "dogfight",
hp_min = 10,
hp_max = 25,
armor = 130,
hp_min = 1,
hp_max = 3,
armor = 100,
collisionbox = {-0.2, -0.2, -0.2, 0.2, 0.2, 0.2},
visual = "mesh",
mesh = "fish.b3d",
@ -343,9 +343,9 @@ mobs:register_mob("mobs_m:whale", {
reach = 1,
damage = 2,
attack_type = "dogfight",
hp_min = 52,
hp_max = 82,
armor = 130,
hp_min = 25,
hp_max = 35,
armor = 100,
collisionbox = {-4, -2, -4, 4, 2, 4},
visual = "mesh",
mesh = "whale.b3d",

View File

@ -174,7 +174,7 @@ mobs:register_mob("mobs_m:wasp", {
damage = 1,
attack_type = "dogfight",
hp_min = 2,
hp_max = 5,
hp_max = 3,
armor = 100,
collisionbox = {-0.1, -0, -0.1, 0.1, 0.5, 0.1},
fly = true,

View File

@ -108,8 +108,8 @@ mobs:register_mob("mobs_npc:npc", {
attack_type = "dogfight",
attacks_monsters = true,
pathfinding = true,
hp_min = 10,
hp_max = 20,
hp_min = 20,
hp_max = 25,
armor = 100,
collisionbox = {-0.35,0,-0.35, 0.35,1.8,0.35},
visual = "mesh",

View File

@ -56,8 +56,8 @@ mobs:register_mob("mobs_npc:travelling_merchant", {
attack_type = "dogfight",
attacks_monsters = true,
pathfinding = false,
hp_min = 10,
hp_max = 20,
hp_min = 20,
hp_max = 25,
armor = 100,
collisionbox = {-0.5,0,-0.5, 0.5,2.2,0.5},
visual = "mesh",