From 31668cdde516a955bea9e49cfbd6a287fa11f61c Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 21 Feb 2019 02:37:13 +0100 Subject: [PATCH] Add brown mooshroom --- mods/ENTITIES/mobs_mc/LICENSE-media.md | 5 ++++- mods/ENTITIES/mobs_mc/cow+mooshroom.lua | 9 +++++++-- .../mobs_mc/textures/mobs_mc_mooshroom_brown.png | Bin 0 -> 1048 bytes .../mobs_mc/textures/mobs_mc_mushroom_brown.png | Bin 0 -> 374 bytes mods/ENTITIES/mobs_mc_gameconfig/init.lua | 1 + mods/ENVIRONMENT/lightning/init.lua | 8 ++++++++ 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_brown.png create mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_brown.png diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index fe5c41e7..7cad2241 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -70,6 +70,9 @@ Origin of those models: * `mobs_mc_wither.png` * `mobs_mc_wither_skeleton.png` * `mobs_mc_TEMP_wither_projectile.png` + * Gerold55 + * `mobs_mc_mooshroom_brown.png` (CC0) + * `mobs_mc_mushroom_brown.png` (CC0) * “Spawn egg” textures (`mobs_mc_spawn_icon_*`) by 22i * Any other texture not mentioned here are licensed under the MIT License @@ -183,4 +186,4 @@ Origin of those models: Note: Many of these sounds have been more or less modified to fit the game. -Sounds not mentioned here are licensed under CC0. +Sounds not mentioned hre are licensed under CC0. diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index bf1f9c1d..48a6aac7 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -80,7 +80,7 @@ mobs:register_mob("mobs_mc:cow", cow_def) local mooshroom_def = table.copy(cow_def) mooshroom_def.mesh = "mobs_mc_cow.b3d" -mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, } +mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, {"mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } } mooshroom_def.on_rightclick = function(self, clicker) if mobs:feed_tame(self, clicker, 1, true, true) then return end if mobs:protect(self, clicker) then return end @@ -93,7 +93,12 @@ mooshroom_def.on_rightclick = function(self, clicker) if item:get_name() == mobs_mc.items.shears then local pos = self.object:get_pos() minetest.sound_play("shears", {pos = pos}) - minetest.add_item({x=pos.x, y=pos.y+1.4, z=pos.z}, mobs_mc.items.mushroom_red .. " 5") + + if self.base_texture[1] == "mobs_mc_mooshroom_brown.png" then + minetest.add_item({x=pos.x, y=pos.y+1.4, z=pos.z}, mobs_mc.items.mushroom_brown .. " 5") + else + minetest.add_item({x=pos.x, y=pos.y+1.4, z=pos.z}, mobs_mc.items.mushroom_red .. " 5") + end local oldyaw = self.object:getyaw() self.object:remove() diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_brown.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..115416a53c8a5e525b8f245dac8f40f6f8be1f19 GIT binary patch literal 1048 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{K&-V_;xdG`FsWfq{V~-O<;Pfnj4m_n$;o z1_lPs0*}aI1_r)EAj~ML;nl#vz#viL8c`CQpH@<#W5tq`R@_NM(i(&pCYze_Muk^5os`_25V-z{ezIdb(%Re8-8!R7k%-ZlI`yZN|y z*`gUH`)V!kcC3BCczyZx^^#z*VO&bYM-?C+tcY{bF}x=tlUxE@JGbw*2 zH+}P`E!ICSoTykd=MCq}Z%vB{KpmvtJpm8#rE5dr&RA* zx3xxbS?u(J!iC)be*H-7&goC>{kEpu=)KXNWAY5UPp{3^jh`!EXLsut7x&HJ`9d{$ z*7LUWU)jaiKcVhz>Ds5lfAy12P}Q) z^RuKy$L9S@FVIvip1^)$$9It@ojs|0j_sSrE-=qIIH&*YL(|yUZz}qK`7BM#{xhhQ zZd{Vm#xC$=$GxCfu#_@b>f2A|2S=7Q{=V~m%9(@m3tqd=d-15LqWACj`j$P4ydNyz zO^!9%{)o{gF8RCt*Ubl#Jx|_Q!TuttX~&9&t-WRVcnd*;~tlJo_{kQRO>%*Uu-DfXu|IWU@ zh}G%e@rnFw_qKf2P4v@#DW@3NS9E@P+}b+k+mahu4|}iHU|?Wi@O1TaS?83{1OTaz B0l)wN literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_brown.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..fac0f56ef0c934a782294a77e9a780e77c75ca6b GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=y_ah~ zEDEYF<7H!Dh^m-1D|X)9olI9w+Oa7(g&khkYPj_sYryiF$#xE0#z&31&+fTy#`W6o z-Vt{v28NewKB#0#mdoE`@MUKxdHC6CvaeKRz}u^JQ%)$pzb)XvgTe~DWM4fnB$Ju literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua index ff02ccfd..f24952e9 100644 --- a/mods/ENTITIES/mobs_mc_gameconfig/init.lua +++ b/mods/ENTITIES/mobs_mc_gameconfig/init.lua @@ -44,6 +44,7 @@ mobs_mc.override.items = { shears = "mcl_tools:shears", mushroom_red = "mcl_mushrooms:mushroom_red", + mushroom_brown = "mcl_mushrooms:mushroom_brown", bucket = "mcl_buckets:bucket_empty", grass_block = "mcl_core:dirt_with_grass", string = "mcl_mobitems:string", diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua index dfcfe014..207c4d1a 100644 --- a/mods/ENVIRONMENT/lightning/init.lua +++ b/mods/ENVIRONMENT/lightning/init.lua @@ -189,6 +189,14 @@ lightning.strike = function(pos) obj:remove() obj = minetest.add_entity(pos2, "mobs_mc:pigman") obj:set_yaw(rot) + -- mooshroom: toggle color red/brown + elseif lua.name == "mobs_mc:mooshroom" then + if lua.base_texture[1] == "mobs_mc_mooshroom.png" then + lua.base_texture = { "mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } + else + lua.base_texture = { "mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png" } + end + obj:set_properties({textures = lua.base_texture}) -- villager → witch elseif lua.name == "mobs_mc:villager" then -- Witches are incomplete, this code is unused