runsy
/
petz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

master
runs 2019-10-09 19:27:53 +02:00
parent b046348b97
commit 95d549ecfe
15 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
petz/init.lua
View File

@ -33,7 +33,7 @@ petz.petz_list_by_owner = {} --a list of tamed petz with owner
assert(loadfile(modpath .. "/api/api.lua"))(modpath, modname, S)
assert(loadfile(modpath .. "/misc/mount.lua"))(modpath, S) --Load the mount engine
assert(loadfile(modpath .. "/misc/mobkit.lua"))(modpath, S)
assert(loadfile(modpath .. "/misc/mobkit_plus.lua"))(modpath, S)
assert(loadfile(modpath .. "/misc/brains.lua"))(modpath, S)
assert(loadfile(modpath .. "/misc/behaviours.lua"))(modpath, S)
assert(loadfile(modpath .. "/misc/nodes.lua"))(modpath, S) --Load the nodes
assert(loadfile(modpath .. "/misc/items.lua"))(modpath, S) --Load the items

19
petz/misc/mobkit_plus.lua → petz/misc/brains.lua
View File

@ -89,16 +89,6 @@ function mobkit.hq_wanderfly(self, prty)
end
function mobkit.dumbstepfly(self)
if mobkit.node_name_in(self, "front") ~= "air" then
local yaw = self.object:get_yaw()
if yaw then
local rotation_integer = math.random(0, 5)
local rotation_decimals = math.random()
local new_yaw = yaw + rotation_integer + rotation_decimals
self.object:set_yaw(new_yaw)
mobkit.set_velocity(self, self.object:getvelocity())
end
end
mobkit.lq_dumbfly(self, 0.3)
end
@ -124,19 +114,14 @@ function mobkit.lq_dumbfly(self, speed_factor)
local random_num
mobkit.animate(self, 'fly')
random_num = math.random(1, 300)
if random_num <= 1 then
if random_num <= 1 or mobkit.node_name_in(self, "front") ~= "air" then
local yaw = self.object:get_yaw()
if yaw then
local rotation_integer = math.random(0, 5)
local rotation_decimals = math.random()
local new_yaw = yaw + rotation_integer + rotation_decimals
self.object:set_yaw(new_yaw)
velocity = {
x = self.max_speed* speed_factor,
y = self.max_speed* speed_factor,
z = self.max_speed* speed_factor,
}
mobkit.set_velocity(self, velocity)
mobkit.set_velocity(self, self.object:getvelocity())
end
end
if mobkit.check_height(self) == false or mobkit.node_name_in(self, "top") ~= "air" then --check if max height, then stand or descend, or a node above the petz

BIN
petz/models/petz_toucan.blend
View File

Binary file not shown.

BIN
petz/models/petz_toucan.blend1
View File

Binary file not shown.

6
petz/petz/bat_mobkit.lua
View File

@ -37,7 +37,7 @@ minetest.register_entity("petz:"..pet_name,{
-- api props
springiness= 0,
buoyancy = 0.5, -- portion of hitbox submerged
max_speed = 2,
max_speed = 2.5,
jump_height = 2.0,
view_range = 10,
lung_capacity = 10, -- seconds
@ -53,8 +53,8 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=60, y=70}, speed=5, loop=true},
{range={x=71, y=91}, speed=5, loop=true},
},
fly={range={x=92, y=98}, speed=20, loop=true},
stand_fly={range={x=92, y=98}, speed=20, loop=true},
fly={range={x=92, y=98}, speed=25, loop=true},
stand_fly={range={x=92, y=98}, speed=25, loop=true},
},
sounds = {
misc = "petz_bat_sound",

2
petz/petz/beaver_mobkit.lua
View File

@ -54,7 +54,7 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=82, y=95}, speed=5, loop=true},
},
sit = {range={x=60, y=81}, speed=5, loop=false},
swin = {range={x=96, y=116}, speed=25, loop=true},
def = {range={x=96, y=116}, speed=25, loop=true},
},
sounds = {
misc = "petz_beaver_sound",

2
petz/petz/clownfish_mobkit.lua
View File

@ -45,7 +45,7 @@ minetest.register_entity("petz:"..pet_name,{
max_height = -2,
animation = {
swin={range={x=1, y=13}, speed=20, loop=true},
def={range={x=1, y=13}, speed=20, loop=true},
stand={
{range={x=13, y=25}, speed=5, loop=true},
},

2
petz/petz/dolphin_mobkit.lua
View File

@ -47,7 +47,7 @@ minetest.register_entity("petz:"..pet_name,{
max_height = -2,
animation = {
swin={range={x=1, y=13}, speed=20, loop=true},
def={range={x=1, y=13}, speed=20, loop=true},
stand={
{range={x=13, y=25}, speed=5, loop=true},
{range={x=28, y=43}, speed=5, loop=true},

2
petz/petz/frog_mobkit.lua
View File

@ -50,7 +50,7 @@ minetest.register_entity("petz:"..pet_name,{
stand={
{range={x=0, y=12}, speed=5, loop=true},
},
swin = {range={x=39, y=51}, speed=15, loop=true},
def = {range={x=39, y=51}, speed=15, loop=true},
},
sounds = {
misc = "petz_frog_croak",

6
petz/petz/moth_mobkit.lua
View File

@ -40,7 +40,7 @@ minetest.register_entity("petz:"..pet_name,{
-- api props
springiness= 0,
buoyancy = 0.5, -- portion of hitbox submerged
max_speed = 2,
max_speed = 2.5,
jump_height = 2.0,
view_range = 10,
lung_capacity = 10, -- seconds
@ -56,8 +56,8 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=60, y=70}, speed=5, loop=true},
{range={x=71, y=91}, speed=5, loop=true},
},
fly={range={x=92, y=98}, speed=20, loop=true},
stand_fly={range={x=92, y=98}, speed=20, loop=true},
fly={range={x=92, y=98}, speed=25, loop=true},
stand_fly={range={x=92, y=98}, speed=25, loop=true},
},
sounds = {
misc = "petz_moth_chirp",

6
petz/petz/parrot_mobkit.lua
View File

@ -38,7 +38,7 @@ minetest.register_entity("petz:"..pet_name,{
-- api props
springiness= 0,
buoyancy = 0.5, -- portion of hitbox submerged
max_speed = 2,
max_speed = 2.5,
jump_height = 2.0,
view_range = 10,
lung_capacity = 10, -- seconds
@ -54,8 +54,8 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=60, y=70}, speed=5, loop=true},
{range={x=71, y=91}, speed=5, loop=true},
},
fly={range={x=92, y=98}, speed=20, loop=true},
stand_fly={range={x=92, y=98}, speed=20, loop=true},
fly={range={x=92, y=98}, speed=25, loop=true},
stand_fly={range={x=92, y=98}, speed=25, loop=true},
},
sounds = {
misc = "petz_parrot_chirp",

6
petz/petz/pigeon_mobkit.lua
View File

@ -39,7 +39,7 @@ minetest.register_entity("petz:"..pet_name,{
-- api props
springiness= 0,
buoyancy = 0.5, -- portion of hitbox submerged
max_speed = 2,
max_speed = 2.5,
jump_height = 2.0,
view_range = 10,
lung_capacity = 10, -- seconds
@ -55,8 +55,8 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=60, y=70}, speed=5, loop=true},
{range={x=71, y=91}, speed=5, loop=true},
},
fly={range={x=92, y=98}, speed=20, loop=true},
stand_fly={range={x=92, y=98}, speed=20, loop=true},
fly={range={x=92, y=98}, speed=25, loop=true},
stand_fly={range={x=92, y=98}, speed=25, loop=true},
},
sounds = {
misc = "petz_pigeon_cooing",

2
petz/petz/tropicalfish_mobkit.lua
View File

@ -45,7 +45,7 @@ minetest.register_entity("petz:"..pet_name,{
max_height = -2,
animation = {
swin={range={x=1, y=13}, speed=20, loop=true},
def={range={x=1, y=13}, speed=20, loop=true},
stand={
{range={x=13, y=25}, speed=5, loop=true},
},

2
petz/petz/turtle_mobkit.lua
View File

@ -51,7 +51,7 @@ minetest.register_entity("petz:"..pet_name,{
{range={x=26, y=46}, speed=5, loop=true},
{range={x=47, y=59}, speed=5, loop=true},
},
swin = {range={x=101, y=113}, speed=5, loop=true},
def = {range={x=101, y=113}, speed=5, loop=true},
},
brainfunc = petz.semiaquatic_brain,

BIN
petz/textures/petz_toucan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 893 B

After

Width:  |  Height:  |  Size: 894 B