diff --git a/mods/petz/petz/api/api_breed.lua b/mods/petz/petz/api/api_breed.lua index 29db307..e862378 100644 --- a/mods/petz/petz/api/api_breed.lua +++ b/mods/petz/petz/api/api_breed.lua @@ -18,7 +18,7 @@ petz.breed = function(self, clicker, wielded_item, wielded_item_name) end petz.pony_breed = function(self, clicker, wielded_item, wielded_item_name) - if wielded_item_name == "petz:glass_syringe" and self.is_male== true then + if wielded_item_name == "petz:glass_syringe" and self.is_male then local new_wielded_item = ItemStack("petz:glass_syringe_sperm") local meta = new_wielded_item:get_meta() local speedup = (self.horseshoes or 0) * petz.settings.horseshoe_speedup @@ -38,10 +38,10 @@ petz.pony_breed = function(self, clicker, wielded_item, wielded_item_name) else clicker:set_wielded_item(new_wielded_item) end - elseif wielded_item_name == "petz:glass_syringe_sperm" and self.is_male== false then + elseif wielded_item_name == "petz:glass_syringe_sperm" and not(self.is_male) then local meta = wielded_item:get_meta() local petz_type = meta:get_string("petz_type") - if self.is_pregnant == false and self.pregnant_count > 0 and self.type == petz_type then + if not(self.is_pregnant) and self.pregnant_count > 0 and self.type == petz_type then self.is_pregnant = mobkit.remember(self, "is_pregnant", true) local pregnant_count = self.pregnant_count - 1 mobkit.remember(self, "pregnant_count", pregnant_count) diff --git a/mods/petz/petz/api/api_capture.lua b/mods/petz/petz/api/api_capture.lua index 6d8f4d1..a4c1842 100644 --- a/mods/petz/petz/api/api_capture.lua +++ b/mods/petz/petz/api/api_capture.lua @@ -96,7 +96,7 @@ petz.capture = function(self, clicker, put_in_inventory) end if self.breed then local genre - if self.is_male == true then + if self.is_male then genre = "Male" else genre = "Female" diff --git a/mods/petz/petz/api/api_init_prop.lua b/mods/petz/petz/api/api_init_prop.lua index 0d2d772..f2e0923 100644 --- a/mods/petz/petz/api/api_init_prop.lua +++ b/mods/petz/petz/api/api_init_prop.lua @@ -38,7 +38,7 @@ petz.dyn_prop = { home_pos = {type= "table", default = nil}, horseshoes = {type= "int", default = 0}, is_baby = {type= "boolean", default = false}, - is_male = {type= "boolean", default = nil}, + is_male = {type= "boolean", default = false}, is_pregnant = {type= "boolean", default = false}, is_rut = {type= "boolean", default = false}, lashed = {type= "boolean", default = false}, @@ -184,10 +184,7 @@ function petz.set_initial_properties(self, staticdata, dtime_s) end --Define some settings -> --Set a random gender for all the mobs (not defined in the entity definition) - if self.is_male == nil then - self.is_male = petz.set_random_gender() --set a random gender - end - mobkit.remember(self, "is_male", self.is_male) + self.is_male = mobkit.remember(self, "is_male", petz.set_random_gender()) if self.is_mountable == true then if baby_born == false then self.max_speed_forward= mobkit.remember(self, "max_speed_forward", math.random(2, 4)) --set a random velocity for walk and run diff --git a/mods/petz/petz/misc/items.lua b/mods/petz/petz/misc/items.lua index 6b8f203..1367b06 100644 --- a/mods/petz/petz/misc/items.lua +++ b/mods/petz/petz/misc/items.lua @@ -131,7 +131,8 @@ minetest.register_craftitem("petz:leather", { minetest.register_craftitem("petz:beaver_fur", { description = S("Beaver Fur"), inventory_image = "petz_beaver_fur.png", - wield_image = "petz_beaver_fur.png" + wield_image = "petz_beaver_fur.png", + groups = {leather = 1, flammable = 2} }) minetest.register_craftitem("petz:ducky_feather", { @@ -151,6 +152,7 @@ minetest.register_craftitem("petz:wolf_jaw", { minetest.register_craftitem("petz:wolf_fur", { description = S("Wolf Fur"), inventory_image = "petz_wolf_fur.png", + groups = {leather = 1, flammable = 2} }) --Material for Lion's Cage @@ -324,7 +326,7 @@ end minetest.register_craftitem("petz:saddle", { description = S("Saddle"), inventory_image = "petz_saddle.png", - groups = {flammable = 2}, + groups = {flammable = 2, saddle = 1} }) minetest.register_craft({ @@ -434,8 +436,9 @@ minetest.register_craftitem("petz:honey_bottle", { description = S("Honey Bottle"), inventory_image = "petz_honey_bottle.png", on_use = function (itemstack, user, pointed_thing) - return minetest.do_item_eat(7, "vessels:glass_bottle", itemstack, user, pointed_thing) - end, + return minetest.do_item_eat(7, "vessels:glass_bottle", itemstack, user, pointed_thing) + end, + groups = {food_honey = 1, food_sugar = 1} }) minetest.register_craftitem("petz:honeycomb", { @@ -562,11 +565,13 @@ minetest.register_craftitem("petz:spider_eye", { minetest.register_craftitem("petz:leopard_skin", { description = S("Leopard Skin"), inventory_image = "petz_leopard_skin.png", + groups = {leather = 1, flammable = 2} }) minetest.register_craftitem("petz:snow_leopard_skin", { description = S("Snow Leopard Skin"), inventory_image = "petz_snow_leopard_skin.png", + groups = {leather = 1, flammable = 2} }) --Ant Drops @@ -591,7 +596,8 @@ minetest.register_craftitem("petz:ant_leg", { minetest.register_craftitem("petz:rabbit_hide", { description = S("Rabbit Hide"), inventory_image = "petz_rabbit_hide.png", - wield_image = "petz_rabbit_hide.png" + wield_image = "petz_rabbit_hide.png", + groups = {leather = 1, flammable = 2} }) --minetest.register_node("petz:squirrel_cage", { diff --git a/mods/petz/petz/misc/nodes.lua b/mods/petz/petz/misc/nodes.lua index 94594ed..73edd44 100644 --- a/mods/petz/petz/misc/nodes.lua +++ b/mods/petz/petz/misc/nodes.lua @@ -553,7 +553,7 @@ minetest.register_node("petz:poop", { description = S("Poop"), inventory_image = "petz_poop_inv.png", tiles = {"petz_poop.png"}, - groups = {crumbly=1, falling_node=1}, + groups = {crumbly=3, falling_node=1}, sounds = default.node_sound_stone_defaults(), paramtype = "light", walkable = false, diff --git a/mods/petz/petz/mobkit/bh_breed.lua b/mods/petz/petz/mobkit/bh_breed.lua index fa5cabe..60ee37c 100644 --- a/mods/petz/petz/mobkit/bh_breed.lua +++ b/mods/petz/petz/mobkit/bh_breed.lua @@ -3,7 +3,7 @@ -- function petz.bh_breed(self, pos) - if self.breed == true and self.is_rut == true and self.is_male == true then --search a couple for a male! + if self.breed == true and self.is_rut == true and self.is_male then --search a couple for a male! local couple_name = "petz:"..self.type if self.type == "elephant" then couple_name = couple_name.."_female"