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 fe5c41e7e..7cad2241c 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 bf1f9c1d6..48a6aac7a 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 zcmV+z1n2vSP)N2bZe?^J zG%hhNHDpIvQUCx0mPtfGRA@upn7wLLQ51y-5iA73LM#GS7B)6hq!IE0S_!sd5wWw? z(juL$orN#q3;1NCYqGz%W}SU+?qD(`9{4!>?4PywIhn-7)zo@-e6$g#FP`pz|IM?< z7j~kUG`@W~-H5H=0oSM3$HUwm%Bzxb=^{$fWhlV*i(;ow7ytR=Y|9}Zfr~lvRe1U0 zGF(3KOLu&J|7wSlz4qmo7Mv@*e5ts5fcz9p@%H6Bq*;%szWvcU&|B&OU?-bvd9jIUS05?HuH|UfK@+y4LbVGZ%3fLXewK zt2jB>>C4-tJ_+pqTpWxFW|7G~FU0e|7a*q3zo3ZVs z_E{47x?XR-pPXDg!qgy~J+2znN&_G9gcv$qZWp6Jw#Q_9ysou;A*NlIaB-mv{`&Y~ zi)@c&jrOc}GVe0H#vcH?%dKlIU!4#>KHB;U3)xej5`1nup0^Lwx(<(!e(iOwXXiJi9OHa@>cX zo?J|Lj{AHUHTJla`EIJ!qkE^z|WbNbT#e+`U=l+KQZ5H>~Xoc(8Upz zU1`IjQPxu{IA_ijUgH`-Par4#;5s$-xV(Y5Tfg{VSK6?=k=F~FVrP5`uW=3Vo`Rh8 z6Jr-O_P7+J0m*)@v|)KO^1Tin*Sid_aSiaE!t>^0qQ;*7XK*PcbC3tfxc3y~iHv2u z#=f2h5S~L*Y>&<1HC0w03>y>q-2H%5ahVtQeELSU0wDgFZ~WVHTL-f z;KZhZ``qu8%)uX^>qnmG;(~aM{r7)_yde$nIqs8PGPmLZJYHk>KlQV~V@b)}s0Zj` zg1D%$```R1a36M_OXmN20FvD2HiEKC=63%KKopxK_qmOj?2@?=4v;ly z#&oW+S1bL2!-e7blSiAQhxZ4+as@*E$B_>P-n8>AVNNUQ9wAYVa?ht;t$qXB8LPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TN2bZe?^JG%hhNHDpIvQUCw|)Ja4^R5(xV zk+BW|K@f)LAtX9MqjquKMWK+Z!0@TSq1|ULK!>)xfweAH_r+kw>KngR(GK)zl*l3P+YmquNC0>4-w+YG0Zy*< Udftq})c^nh07*qoM6N<$f|%ou*8l(j literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua index ff02ccfd8..f24952e91 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 dfcfe0149..207c4d1ae 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