From a56d7cb92b59c8c869b83aafa22aaa8de8a50259 Mon Sep 17 00:00:00 2001 From: runs Date: Wed, 14 Aug 2019 22:25:54 +0200 Subject: [PATCH] silkworm! --- petz/api.lua | 2 +- petz/api_silk.lua | 12 ++++----- .../{petz_silkworn.b3d => petz_silkworm.b3d} | Bin ...etz_silkworn.blend => petz_silkworm.blend} | Bin ...z_silkworn.blend1 => petz_silkworm.blend1} | Bin .../{petz_silkworn.obj => petz_silkworm.obj} | 0 ...lkworn_eggs.b3d => petz_silkworm_eggs.b3d} | Bin ...rn_eggs.blend => petz_silkworm_eggs.blend} | Bin ...lkworn_eggs.nbe => petz_silkworm_eggs.nbe} | Bin petz/nodes.lua | 24 +++++++++--------- petz/petz.conf | 14 +++++----- petz/settings.lua | 10 ++++---- ...ilkworn_mobkit.lua => silkworm_mobkit.lua} | 14 +++++----- .../{petz_silkworn.png => petz_silkworm.png} | Bin ...lkworn_back.png => petz_silkworm_back.png} | Bin ...rn_bottom.png => petz_silkworm_bottom.png} | Bin ...lkworn_eggs.png => petz_silkworm_eggs.png} | Bin ...worn_front.png => petz_silkworm_front.png} | Bin ...lkworn_left.png => petz_silkworm_left.png} | Bin ...worn_right.png => petz_silkworm_right.png} | Bin ...silkworn_top.png => petz_silkworm_top.png} | Bin ...ilkworn.png => petz_spawnegg_silkworm.png} | Bin 22 files changed, 38 insertions(+), 38 deletions(-) rename petz/models/{petz_silkworn.b3d => petz_silkworm.b3d} (100%) rename petz/models/{petz_silkworn.blend => petz_silkworm.blend} (100%) rename petz/models/{petz_silkworn.blend1 => petz_silkworm.blend1} (100%) rename petz/models/{petz_silkworn.obj => petz_silkworm.obj} (100%) rename petz/models/{petz_silkworn_eggs.b3d => petz_silkworm_eggs.b3d} (100%) rename petz/models/{petz_silkworn_eggs.blend => petz_silkworm_eggs.blend} (100%) rename petz/nodeboxes/{petz_silkworn_eggs.nbe => petz_silkworm_eggs.nbe} (100%) rename petz/{silkworn_mobkit.lua => silkworm_mobkit.lua} (87%) rename petz/textures/{petz_silkworn.png => petz_silkworm.png} (100%) rename petz/textures/{petz_silkworn_back.png => petz_silkworm_back.png} (100%) rename petz/textures/{petz_silkworn_bottom.png => petz_silkworm_bottom.png} (100%) rename petz/textures/{petz_silkworn_eggs.png => petz_silkworm_eggs.png} (100%) rename petz/textures/{petz_silkworn_front.png => petz_silkworm_front.png} (100%) rename petz/textures/{petz_silkworn_left.png => petz_silkworm_left.png} (100%) rename petz/textures/{petz_silkworn_right.png => petz_silkworm_right.png} (100%) rename petz/textures/{petz_silkworn_top.png => petz_silkworm_top.png} (100%) rename petz/textures/{petz_spawnegg_silkworn.png => petz_spawnegg_silkworm.png} (100%) diff --git a/petz/api.lua b/petz/api.lua index cedb35e..ab1176d 100644 --- a/petz/api.lua +++ b/petz/api.lua @@ -10,7 +10,7 @@ petz = {} petz.petz_list = {"kitty", "puppy", "ducky", "lamb", "lion", "calf", "panda", --A table with all the petz names "grizzly", "pony", "parrot", "chicken", "piggy", "wolf", "elephant", - "elephant_female", "pigeon", "moth", "camel", "clownfish", "bat", "silkworn"} + "elephant_female", "pigeon", "moth", "camel", "clownfish", "bat", "silkworm"} petz.petz_list_by_owner = {} --a list of tamed petz with owner diff --git a/petz/api_silk.lua b/petz/api_silk.lua index 302a89a..87a5d5b 100644 --- a/petz/api_silk.lua +++ b/petz/api_silk.lua @@ -35,20 +35,20 @@ petz.init_lay_eggs = function(self) local node_name = mobkit.node_name_in(self, "below") --minetest.chat_send_player("singleplayer", "node name=".. node_name) local spawn_egg = false - --minetest.chat_send_player("singleplayer", string.sub(petz.settings.silkworn_lay_egg_on_node, 1, 5)) - if string.sub(petz.settings.silkworn_lay_egg_on_node, 1, 5) == "group" then - --minetest.chat_send_player("singleplayer", string.sub(petz.settings.silkworn_lay_egg_on_node, 7)) - local node_group = minetest.get_item_group(node_name, string.sub(petz.settings.silkworn_lay_egg_on_node, 7)) + --minetest.chat_send_player("singleplayer", string.sub(petz.settings.silkworm_lay_egg_on_node, 1, 5)) + if string.sub(petz.settings.silkworm_lay_egg_on_node, 1, 5) == "group" then + --minetest.chat_send_player("singleplayer", string.sub(petz.settings.silkworm_lay_egg_on_node, 7)) + local node_group = minetest.get_item_group(node_name, string.sub(petz.settings.silkworm_lay_egg_on_node, 7)) if node_group > 0 then spawn_egg = true end else - if node_name == petz.settings.silkworn_lay_egg_on_node then + if node_name == petz.settings.silkworm_lay_egg_on_node then spawn_egg = true end end if spawn_egg == true then - minetest.set_node(pos, {name= "petz:silkworn_egg"}) + minetest.set_node(pos, {name= "petz:silkworm_egg"}) self.eggs_count = mobkit.remember(self, "eggs_count", (self.eggs_count+1)) --increase the count of eggs end petz.init_lay_eggs(self) --reinit the timer diff --git a/petz/models/petz_silkworn.b3d b/petz/models/petz_silkworm.b3d similarity index 100% rename from petz/models/petz_silkworn.b3d rename to petz/models/petz_silkworm.b3d diff --git a/petz/models/petz_silkworn.blend b/petz/models/petz_silkworm.blend similarity index 100% rename from petz/models/petz_silkworn.blend rename to petz/models/petz_silkworm.blend diff --git a/petz/models/petz_silkworn.blend1 b/petz/models/petz_silkworm.blend1 similarity index 100% rename from petz/models/petz_silkworn.blend1 rename to petz/models/petz_silkworm.blend1 diff --git a/petz/models/petz_silkworn.obj b/petz/models/petz_silkworm.obj similarity index 100% rename from petz/models/petz_silkworn.obj rename to petz/models/petz_silkworm.obj diff --git a/petz/models/petz_silkworn_eggs.b3d b/petz/models/petz_silkworm_eggs.b3d similarity index 100% rename from petz/models/petz_silkworn_eggs.b3d rename to petz/models/petz_silkworm_eggs.b3d diff --git a/petz/models/petz_silkworn_eggs.blend b/petz/models/petz_silkworm_eggs.blend similarity index 100% rename from petz/models/petz_silkworn_eggs.blend rename to petz/models/petz_silkworm_eggs.blend diff --git a/petz/nodeboxes/petz_silkworn_eggs.nbe b/petz/nodeboxes/petz_silkworm_eggs.nbe similarity index 100% rename from petz/nodeboxes/petz_silkworn_eggs.nbe rename to petz/nodeboxes/petz_silkworm_eggs.nbe diff --git a/petz/nodes.lua b/petz/nodes.lua index 09ac0be..f307ae3 100644 --- a/petz/nodes.lua +++ b/petz/nodes.lua @@ -299,7 +299,7 @@ minetest.register_craft({ --Coocon minetest.register_node("petz:cocoon", { - description = S("Silkworn Cocoon"), + description = S("Silkworm Cocoon"), inventory_image = "petz_cocoon_inv.png", groups = {snappy=1, bendy=2, cracky=1}, sounds = default.node_sound_wood_defaults(), @@ -321,16 +321,16 @@ minetest.register_node("petz:cocoon", { end, }) ---Silkworn Egg -minetest.register_node("petz:silkworn_eggs", { - description = S("Silkworn Eggs"), +--Silkworm Egg +minetest.register_node("petz:silkworm_eggs", { + description = S("Silkworm Eggs"), groups = {snappy=1, bendy=2, cracky=1, falling_node = 1}, sounds = default.node_sound_wood_defaults(), paramtype = "light", drawtype = "mesh", - mesh = 'petz_silkworn_eggs.b3d', + mesh = 'petz_silkworm_eggs.b3d', visual_scale = {x = 0.5, y = 0.5}, - tiles = {"petz_silkworn_eggs.png"}, + tiles = {"petz_silkworm_eggs.png"}, collision_box = { type = "fixed", fixed = {-0.25, -0.5, -0.062500, 0.1875, -0.4375, 0.1875}, @@ -341,26 +341,26 @@ minetest.register_node("petz:silkworn_eggs", { }, }) --- Chance to hatch an egg into a silkworn +-- Chance to hatch an egg into a silkworm minetest.register_abm({ - nodenames = {"petz:silkworn_eggs"}, + nodenames = {"petz:silkworm_eggs"}, neighbors = {}, interval = 300.0, -- Run every 5 minuts chance = 3, -- Select every 1 in 5 nodes action = function(pos, node, active_object_count, active_object_count_wider) - if not minetest.registered_entities["petz:silkworn"] then + if not minetest.registered_entities["petz:silkworm"] then return end if pos then minetest.set_node(pos, {name= "air"}) - minetest.add_entity(pos, "petz:silkworn") + minetest.add_entity(pos, "petz:silkworm") local pos2 = { x = pos.x + 1, y = pos.y, z = pos.z + 1, } if minetest.get_node(pos2) and minetest.get_node(pos2).name == "air" then - minetest.add_entity(pos2, "petz:silkworn") + minetest.add_entity(pos2, "petz:silkworm") end local pos3 = { x = pos.x - 1, @@ -368,7 +368,7 @@ minetest.register_abm({ z = pos.z -1, } if minetest.get_node(pos3) and minetest.get_node(pos3).name == "air" then - minetest.add_entity(pos3, "petz:silkworn") + minetest.add_entity(pos3, "petz:silkworm") end end end diff --git a/petz/petz.conf b/petz/petz.conf index d4a2b2a..b5c7eb9 100644 --- a/petz/petz.conf +++ b/petz/petz.conf @@ -68,7 +68,7 @@ elephant_female_spawn = true moth_spawn = true camel_spawn = true bat_spawn = true -silkworn_spawn = true +silkworm_spawn = true ##Air Damage air_damage = 1 @@ -236,9 +236,9 @@ clownfish_spawn_chance = 1.0 clownfish_spawn_nodes = default:water_source clownfish_spawn_biome = default -##Silkworn Specific -silkworn_follow = default:pine_needles -silkworn_spawn_chance = 1.0 -silkworn_spawn_nodes = default:pine_needles -silkworn_spawn_biome = default -silkworn_lay_egg_on_node = group:leaves +##Silkworm Specific +silkworm_follow = default:pine_needles +silkworm_spawn_chance = 1.0 +silkworm_spawn_nodes = default:pine_needles +silkworm_spawn_biome = default +silkworm_lay_egg_on_node = group:leaves diff --git a/petz/settings.lua b/petz/settings.lua index 39e8b58..56adaf8 100644 --- a/petz/settings.lua +++ b/petz/settings.lua @@ -175,11 +175,11 @@ petz.settings.bat_spawn = settings:get_bool("bat_spawn", true) petz.settings.bat_spawn_chance = tonumber(settings:get("bat_spawn_chance")) petz.settings.bat_spawn_nodes = settings:get("bat_spawn_nodes", "") petz.settings.bat_spawn_biome = settings:get("bat_spawn_biome", "default") -petz.settings.silkworn_spawn = settings:get_bool("silkworn_spawn", true) -petz.settings.silkworn_spawn_chance = tonumber(settings:get("silkworn_spawn_chance")) -petz.settings.silkworn_spawn_nodes = settings:get("silkworn_spawn_nodes", "") -petz.settings.silkworn_spawn_biome = settings:get("silkworn_spawn_biome", "default") -petz.settings.silkworn_lay_egg_on_node = settings:get("silkworn_lay_egg_on_node", "") +petz.settings.silkworm_spawn = settings:get_bool("silkworm_spawn", true) +petz.settings.silkworm_spawn_chance = tonumber(settings:get("silkworm_spawn_chance")) +petz.settings.silkworm_spawn_nodes = settings:get("silkworm_spawn_nodes", "") +petz.settings.silkworm_spawn_biome = settings:get("silkworm_spawn_biome", "default") +petz.settings.silkworm_lay_egg_on_node = settings:get("silkworm_lay_egg_on_node", "") if petz.settings.type_model == "mesh" then petz.settings.visual = "mesh" diff --git a/petz/silkworn_mobkit.lua b/petz/silkworm_mobkit.lua similarity index 87% rename from petz/silkworn_mobkit.lua rename to petz/silkworm_mobkit.lua index 1431304..c9460f4 100644 --- a/petz/silkworn_mobkit.lua +++ b/petz/silkworm_mobkit.lua @@ -1,17 +1,17 @@ -- ---SILKWORN +--SILKWORM -- local S = ... -local pet_name = "silkworn" +local pet_name = "silkworm" local scale_model = 0.5 -local mesh = 'petz_silkworn.b3d' -local textures= {"petz_silkworn.png"} +local mesh = 'petz_silkworm.b3d' +local textures= {"petz_silkworm.png"} local collisionbox = {-0.125, -0.75*scale_model, -0.375, 0.0625, -0.25, 0.3125} minetest.register_entity("petz:"..pet_name,{ --Petz specifics - type = "silkworn", + type = "silkworm", init_timer = false, is_pet = false, has_affinity = false, @@ -19,7 +19,7 @@ minetest.register_entity("petz:"..pet_name,{ give_orders = false, can_be_brushed = false, capture_item = "net", - follow = petz.settings.silkworn_follow, + follow = petz.settings.silkworm_follow, drops = { }, replace_rate = 10, @@ -77,4 +77,4 @@ minetest.register_entity("petz:"..pet_name,{ end, }) -petz:register_egg("petz:silkworn", S("Silkworn"), "petz_spawnegg_silkworn.png", 0) +petz:register_egg("petz:silkworm", S("Silkworm"), "petz_spawnegg_silkworm.png", 0) diff --git a/petz/textures/petz_silkworn.png b/petz/textures/petz_silkworm.png similarity index 100% rename from petz/textures/petz_silkworn.png rename to petz/textures/petz_silkworm.png diff --git a/petz/textures/petz_silkworn_back.png b/petz/textures/petz_silkworm_back.png similarity index 100% rename from petz/textures/petz_silkworn_back.png rename to petz/textures/petz_silkworm_back.png diff --git a/petz/textures/petz_silkworn_bottom.png b/petz/textures/petz_silkworm_bottom.png similarity index 100% rename from petz/textures/petz_silkworn_bottom.png rename to petz/textures/petz_silkworm_bottom.png diff --git a/petz/textures/petz_silkworn_eggs.png b/petz/textures/petz_silkworm_eggs.png similarity index 100% rename from petz/textures/petz_silkworn_eggs.png rename to petz/textures/petz_silkworm_eggs.png diff --git a/petz/textures/petz_silkworn_front.png b/petz/textures/petz_silkworm_front.png similarity index 100% rename from petz/textures/petz_silkworn_front.png rename to petz/textures/petz_silkworm_front.png diff --git a/petz/textures/petz_silkworn_left.png b/petz/textures/petz_silkworm_left.png similarity index 100% rename from petz/textures/petz_silkworn_left.png rename to petz/textures/petz_silkworm_left.png diff --git a/petz/textures/petz_silkworn_right.png b/petz/textures/petz_silkworm_right.png similarity index 100% rename from petz/textures/petz_silkworn_right.png rename to petz/textures/petz_silkworm_right.png diff --git a/petz/textures/petz_silkworn_top.png b/petz/textures/petz_silkworm_top.png similarity index 100% rename from petz/textures/petz_silkworn_top.png rename to petz/textures/petz_silkworm_top.png diff --git a/petz/textures/petz_spawnegg_silkworn.png b/petz/textures/petz_spawnegg_silkworm.png similarity index 100% rename from petz/textures/petz_spawnegg_silkworn.png rename to petz/textures/petz_spawnegg_silkworm.png