Merge pull request 'master' (#2) from master into milan2018
This commit is contained in:
commit
0f25491cd5
2 changed files with 1 additions and 2 deletions
|
@ -39,7 +39,7 @@ local ball_spawner_update_form = function (pos)
|
||||||
bounce = meta:get_int("bounce"); -- if nonzero bounces when hit obstacle, 0 gets absorbed
|
bounce = meta:get_int("bounce"); -- if nonzero bounces when hit obstacle, 0 gets absorbed
|
||||||
gravity = meta:get_float("gravity"); -- gravity
|
gravity = meta:get_float("gravity"); -- gravity
|
||||||
hp = meta:get_float("hp");
|
hp = meta:get_float("hp");
|
||||||
hurt = meta:get_float("hurt");
|
|
||||||
puncheable = meta:get_int("puncheable"); -- if 1 can be punched by players in protection, if 2 can be punched by anyone
|
puncheable = meta:get_int("puncheable"); -- if 1 can be punched by players in protection, if 2 can be punched by anyone
|
||||||
solid = meta:get_int("solid"); -- if 1 then entity is solid - cant be walked on
|
solid = meta:get_int("solid"); -- if 1 then entity is solid - cant be walked on
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@ mobs:register_mob("mobs_animal:cow", {
|
||||||
mesh = "mobs_cow.x",
|
mesh = "mobs_cow.x",
|
||||||
textures = {
|
textures = {
|
||||||
{"mobs_cow.png"},
|
{"mobs_cow.png"},
|
||||||
{"mobs_cow2.png"},
|
|
||||||
},
|
},
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
sounds = {
|
sounds = {
|
||||||
|
|
Loading…
Reference in a new issue