From a7ff067ceac3b8ee3830e121659e64216aa42e88 Mon Sep 17 00:00:00 2001 From: D00Med Date: Mon, 16 Jan 2017 18:05:40 +1000 Subject: [PATCH] Sky fix, texture changes --- mods/beds/beds.lua | 4 ++-- mods/default/textures/default_coal_lump.png | Bin 291 -> 313 bytes mods/default/textures/default_gravel.png | Bin 4715 -> 509 bytes mods/hell/init.lua | 7 +++++++ mods/hyrule_mapgen/schematics/big_tree.mts | Bin 189 -> 362 bytes mods/hyrule_mapgen/schematics/big_tree2.mts | Bin 0 -> 189 bytes mods/hyruletools/init.lua | 6 +++--- mods/lightning/init.lua | 6 +++++- mods/mobs_animal/textures/mobs_cucco2.png | Bin 0 -> 5430 bytes 9 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 mods/hyrule_mapgen/schematics/big_tree2.mts create mode 100644 mods/mobs_animal/textures/mobs_cucco2.png diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index bb2fd5d..9a822cd 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -44,7 +44,7 @@ beds.register_bed("beds:fancy_bed", { selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { {"", "", "group:stick"}, - {"wool:red", "wool:red", "wool:white"}, + {"wool:green", "wool:green", "wool:white"}, {"group:wood", "group:wood", "group:wood"}, }, }) @@ -79,7 +79,7 @@ beds.register_bed("beds:bed", { }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { - {"wool:red", "wool:red", "wool:white"}, + {"wool:green", "wool:green", "wool:white"}, {"group:wood", "group:wood", "group:wood"} }, }) diff --git a/mods/default/textures/default_coal_lump.png b/mods/default/textures/default_coal_lump.png index f4eefcf3f1ce407221652b49d28e7637fb917140..0583fcc75d8a7654bbe7218cf4e51b149c01d2d9 100644 GIT binary patch delta 286 zcmV+(0pb3m0=WW^B!3BTNLh0L01FcU01FcV0GgZ_0002%Nkl^P6gnxjdC;$M?Im)s`UDv<4 zufM{UWuYhvaL%!98h5?jPT-SwZn#jM-sO!44 kZCkpoD}SJ$=NEp|HxW%z_o@+H-F?%9%djtMD5JEtVF$2z!h`@V~ZQHVU z0fZ1R3I2DolF)S^Lr(wz O002ovPDHLkU;%>p^LO6> diff --git a/mods/default/textures/default_gravel.png b/mods/default/textures/default_gravel.png index 8852d38486a58a7cd0cc085cd1ac9de075fb6107..4bfe715da7ff43744ca58db1a94f97f8a054b184 100644 GIT binary patch delta 476 zcmV<20VDqFB>e-B83+ad001BJ|6!9Y5f^^}uSrBfR5;63lc93#FbqXcGxba>ViK?> zo@qmtENK64|DZp%xTFP3OhQbwKt!Mg9qH{0N=CkxuI|ah`F#GVwPI$JQW#?(BJ|#w za}tlcv#x8NDW$NkD@%yyoVYt8Lamk0&reDzm>H@{YYkQ9dcD$G%i2;(K}1p*#om8A zr4+Vp17P2GRF%`|gu7#AxI2$#hMBRhEAbxRA&k-IoLO^s02X(rwU)w|B1RXH|Ms%) zJJ;(q8!iBlTDjeByuZI^m*eq>sBMs>#O^;#gQ~ zjdfiSkxU@G$7OGCZ`pJSvgVu#hneyG{7mniF$R~*C7ZZA-{0TK$74ixJRT8|#P)W( zVP*gcPirk{opUnh{97WB+y|9&&a^e>WQ@Vr*H`W(Y%Z#rnFnbR;lA&Q_O?iE^xgqD z91hvw;p5}u2S~Pqwty!%hzVmV5#ew+{8_kX|8lt`f%ktYz{|@^?g`-O>4{$gNOJ#K Se17Ku0000!|Cw= literal 4715 zcmeH}YdBPE8^^~fOpX!7t7Z>!Xfuw53_{4+MC3e2#xQ3L+j$tLF&IPS&@QJ=4oT9M zRFWwbWut@+LLy|7O~t#Wy|4X#dB61G{qSB_ziU0~S?gK%`mg)>U(fZdJKNLUQ5viQ z27y4*N1f~uKrbg~5+cA^TTk{F2qe}Y@9jrNAY&n9DhY>=#6swCWGn>Bz~ew5#%O~t z{^|TasW1IHR8bANK8iuyQup3jt7)f;jGY41t2!}bN$%&sj#)jOz>~JTf zSyzp#Dd&qKw3h}wHeUDyjl2mk+mMbcH!JE&?v*lN{c7AidB{6q>bd4EW`S*YCAk;z zslIbT7~OUEapkl!qkc7`k~F&4>I~UxHhm?d@Kezjm5#gtWkTB@y*61^pV#_TV`vyBNDTVFW01 zP2b_>Zn80Lruj4YRnyqP6-tnad8P_$yI5fKlG4DVUggox!<`}ZX_ey0eF|*(<6qjx znk=^ZqNN^PM^x}nGIxG?Q=CFZ8(v!|6|)W3t!w!>e)5+-)h&le5VHlTFVVa{XGoFk zr0$Qb5}D4Bu7*pYu3m;>Q4NpkuQEjC z8@jlg&u|GuO`cy(4cA5IYU=}2n>#gir-JmZ4i7iunX{}RX=DG6Kf%5?-a7lu#6R&Ef$3)WYQNNksmu$FCyTK~b z_F1D!hFs`Rsp^3$CS*9-h7zJa0CQg3bBAxNiU`c)^rRbJ+vYNO0&RU=zjQ4jOQq}y zIyjH zyW3&=FUygK#C)G67AQJ;`0>4rjjBQ;rZi;jYsK8#dW7aK&)Kz$!ev5?ctQ!yw_0uo z(o-{yNBJI15h{k{F%{D>1m@D46g6%-Tk$_Pyy$Vl3~Q;S;ddCt6;g??ipxms=VE-S_Fd|RW&YqJ)$$*(6` zLwD*nea?!mOn*bhD&0=E@W9uX|EdNvyBmF;;N5X*r@~-r4-z8ly4ajbdtUc9XW9H$~V#ZOY?q^Jn##g$AXMbwu6<&Bm1W z0TD3%K6~8?@w9cLXlNI83-cs8QgK~ovG&8U-ISYG)@hXw;hQ14vq_dd`6(CWCmX`{ zx-U$c%{h{}Ld6Rw&lXcl5Y{F-YK~fI#~go5eqBj(l1&k zm&@Pi_E|gV+cB;=9fAEEsU;H(d+hS}+WQ zLcWF232>;NndHI-P6*gT=c<-Elc-@ZLvwR;n1K<@$Vd-}(4)l>=}3kik)|$?_)EhcOG8ru>+mEZM4*X8k)r8v zC=_@O`CA-={zsb}O^y7fj6uV&k=Q6Kkxqjd>Knqo#beMG4kT(65_lgUg$%>O$iy%x zOpqSfD%tZKc?NKtiUTuHHxd{QUg=1HTaz6c_{$9262992^=P0uUM+8iEW(p->nU z8UTaAV6j*{7K;-Qj>AQSg@uKON8s`J@CZR4As~uCAVfw+MhT#j$z&RZN*54Krvr6U z96&;Re1d?KL;=Z(iOi&=q+|iiq?EK20nFsoB3Sj5v7P8sw>^u%TuOKfkkIi9oIGp_ad`C@HK zwP$P29?X{10BTbql#8Q1C`(Mu3Am9YJDs3`K-(1rO$cD+q3%v^!&7Ri9?i8i;bG?TImgN zUqLl-e{VzMi);K4H|3<&BOapi)KBw!TU|~=j)P$)Ei2>VwWiKXGQ>YMf9o@@F`HKn c%vhFvC}Z)uQ^nICZ~}Dnh`W8GZD`uR0m$*S;Q#;t diff --git a/mods/hell/init.lua b/mods/hell/init.lua index 00587e9..d611e03 100644 --- a/mods/hell/init.lua +++ b/mods/hell/init.lua @@ -8,6 +8,7 @@ hell.player_teleporting = {} -- 0 for huge caves -- 0.5 for smaller caves local TCAVE = 0 +local regular_sky = false local BLEND = 128 -- Cave blend distance near YMIN, YMAX @@ -138,11 +139,17 @@ minetest.register_globalstep(function(dtime) for i, player in pairs(minetest.get_connected_players()) do local pos = player:getpos().y if pos < YMAX and pos > YMIN then + if regular_sky then print("set player to hell color") player:set_sky({r=66, g=0, b=0},"plain",{}) + regular_sky = false + end else --if not in hell, change back to default sky + if not regular_sky then player:set_sky({r=0, g=0, b=0},"regular",{}) + regular_sky = true + end end end hell.sky_color_timer = 0 diff --git a/mods/hyrule_mapgen/schematics/big_tree.mts b/mods/hyrule_mapgen/schematics/big_tree.mts index f4113ce4075eba8c056a9bc3f7417b6312f3d273..07c8d9b01b48a2a8715f859b24e4e3482cefcc1b 100644 GIT binary patch literal 362 zcmeYb3HD`RVc=pAWZW1*v)QIjML}6YgXWK&8##~v-^4Y_gBruTO1BAyL}{sKhnucrrh17^jrqRM#*Z;w~ZN< zcQ0JKT#FiP<{g`nlJFYdWt>{^4+a&F)Ud$4{fvm}s zzilXpF#l(J_SH?9KkLHQd7Ra}o{{se?^s@ORqDOBb8VL0^N;>o)MjmY^}s0x4ej#V zwy*BFeSN<0{QRZw^4?3A#a`q;Y`}BaLi7L5*mrDVRp}W{9~mrO%@itLVOZkq)ur`D zZjI&HV?Pt-B&{&CiQL;$b;_HWKThyoaX*vJ-Vc1X=i`n|-cjQ!GfQOEl7;5Jnk&T@ zTC1e~c*CFM>16eL)B8);Z6_HypX$*xS`{AhzSd!nQ}*tV_Z7KP>c2R{`20cup`xd^ literal 189 zcmeYb3HD`RVPIq6U|_3<0tRLV=ETe*2ELTkw8YY!604ll#In?41|Ar{q$oADV$R!% z7x@|#I9zxBxNxf~>*@P%uSK(@X7$e7ozr#uYlp)ZM+>F&mm$x}H+G(Ldf2qWdH+!% z%jJH39`#ArYwA+7>gLB?&wo8(uYH*0v)zARt-72tQ}~?jn!x1S`xsVBOunT1e3{E) kgSj0k3m(p&tNc{`qxSEk%NIuWv)62vyIo)Yefoq_0AK4_IsgCw diff --git a/mods/hyrule_mapgen/schematics/big_tree2.mts b/mods/hyrule_mapgen/schematics/big_tree2.mts new file mode 100644 index 0000000000000000000000000000000000000000..f4113ce4075eba8c056a9bc3f7417b6312f3d273 GIT binary patch literal 189 zcmeYb3HD`RVPIq6U|_3<0tRLV=ETe*2ELTkw8YY!604ll#In?41|Ar{q$oADV$R!% z7x@|#I9zxBxNxf~>*@P%uSK(@X7$e7ozr#uYlp)ZM+>F&mm$x}H+G(Ldf2qWdH+!% z%jJH39`#ArYwA+7>gLB?&wo8(uYH*0v)zARt-72tQ}~?jn!x1S`xsVBOunT1e3{E) kgSj0k3m(p&tNc{`qxSEk%NIuWv)62vyIo)Yefoq_0AK4_IsgCw literal 0 HcmV?d00001 diff --git a/mods/hyruletools/init.lua b/mods/hyruletools/init.lua index 1b48b5b..a90c346 100644 --- a/mods/hyruletools/init.lua +++ b/mods/hyruletools/init.lua @@ -837,7 +837,7 @@ minetest.register_craftitem("hyruletools:ocarina2", { local dir = placer:get_look_dir(); local player = placer:get_player_name() if minetest.setting_getbool("enable_weather") then - weather.state = "rain" + weather.state = "thunder" else minetest.chat_send_player(player, "weather not enabled!") end @@ -916,7 +916,7 @@ minetest.register_craftitem("hyruletools:ocarina4", { ) local playerpos = placer:getpos(); local dir = placer:get_look_dir(); - local obj = minetest.env:add_entity({x=playerpos.x+1+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+1+dir.z}, "mobs:deku") + local obj = minetest.env:add_entity({x=playerpos.x+1+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+1+dir.z}, "mobs_loz:business_scrub_passive") end }) @@ -2234,7 +2234,7 @@ minetest.register_node("hyruletools:bomb_plant", { "hyruletools_bombflower_plant.png", }, paramtype = "light", - groups = {cracky=1}, + groups = {snappy=1, oddly_breakable_by_hand=1}, collision_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.5, 0.5 } diff --git a/mods/lightning/init.lua b/mods/lightning/init.lua index cc77de9..eede71f 100644 --- a/mods/lightning/init.lua +++ b/mods/lightning/init.lua @@ -24,6 +24,7 @@ local rng = PcgRandom(32321123312123) local ps = {} local ttl = 1 +local sky_set = false local revertsky = function() if ttl == 0 then @@ -35,8 +36,11 @@ local revertsky = function() end for key, entry in pairs(ps) do + if not sky_set then local sky = entry.sky entry.p:set_sky(sky.bgcolor, sky.type, sky.textures) + sky_set = true + end end ps = {} @@ -135,7 +139,7 @@ lightning.strike = function(pos) local sky = {} sky.bgcolor, sky.type, sky.textures = player:get_sky() - + sky_set = false local name = player:get_player_name() if ps[name] == nil then ps[name] = {p = player, sky = sky} diff --git a/mods/mobs_animal/textures/mobs_cucco2.png b/mods/mobs_animal/textures/mobs_cucco2.png new file mode 100644 index 0000000000000000000000000000000000000000..96051fd49327b0a637b786364a2c5404a0561dc7 GIT binary patch literal 5430 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%0AfGw6ZfIiUPe|HumJT-c!sVGf2?n-j?};2q&qu- zGfP+GN|Xz*K>8lk)sAlA9gSix4?kT%dnGaX(!b`$_Tb_X2J+JyUaD0*W!$ft&WwAdPCfQ9|*nPk)@O#Bd6*SV9kN3zH_b^TmO#%OT_UPMjUhHan2M@{L>-Jzu71M|V&l#}Xna=;yDRE|DYRxHYsgiQ6eeg&4hqiE4 z4KYhM^1ixcTzpbkKfInBaweE+!WU=u#yTVZ5QRUVaE>jt2VAW+%8(|dF1E*Sq5;x6 zT30Vv^igPMrJs|zl_hm!E$H8>5#Md-Far2wzY9)Qz{SW6KP-P2JMCbVekZ-qA)IHB zg%Bu48iAlA8J85iBtXHHCZ&-`f$>*HYjg2rHvvy~h~S zC8O4NbjI=FXVTbNSU`yo_3s-XQrSv{Og0K$tB)~VbFVR&TVd-UnpDUTNd%_4Aw6!Y zt=LQT)*6iymv(Lc;)os@dwgmqk0FeA1Lfblb0%x~WGxEI`Dyl@Xdf>K5f%~9Rcr=MqAmI-HitMbzeA1W{XFE%S3%%?X8dy(HoW)zU1YWN zNTm%7mR}T3x7if%VlMm%DoZz1mP(!wooD$@ac3wQCeM~=lu>7RJJ{e5d^uGyqDrl< zQO-c(cI)?%C`8B6BWGzbnxfD*x5N+&Bh3I~R)Q*R;SXKLU3Li>WgUN0ij{IW>OW8Brru?@IA&%r9 zWXqI@;e{*)A?tA!gBU}u`3tL-JJTyCuQW*w%BiJ@Rs7&_Uyq)Bi2Cyy9e#Z;G*jV3 zeg6ry3tJa!0Ckf!eCm=(R%Qr}3Qa~LS!YEPSq6SIG6*J##9kZqUWq1Vsj^NKPel$Z zu-Cxti!Nn`mM(Bm*!)BA%5dm+C;mD*%*})@uHT(qp+pO|FO?5XW~56Xn5D^zdv&|R zIaLj6bw)>FyKi;xfA#^Z3N3(LRi|w9WOZWJ)E*od-fc@H#%)J>DN$d?6(iQ)DQPKn zJmM;3$RHB?NhgDr-sCwJ%nV2*THQ9d;cqE&h;pgs zirvU2$fS!Y^&K^Fg-LsEh4>l&9P)4q3u;jGB(9@xXbJse_aS=V`2{XitEfvWg%e^l z^XjoneXO7R^$Mrgzy0T27@{G(w>lxfypBJ{>b+rD@&ZdQyKBNMLuDwEKtyI(yt}QER%c|qLZm1T@)R7`WCw( zSf~m{GT72uyWK5G%QqAVAX6%alo(=M-#e|`7bdqUX(=;3O@#DkxC_^v70wPh4;2!E zbon_9QY;iA>ZrpnwMRT)Cb00g7SeA!2#LbNxLZaUNAK^%^N{A!=^K#T6cw_~5Rh>D z9!o(sX=$##jP7(RWkp21r+ZCP+QqKelr4+igbt@i(1SY1o<&4qxD97`Hp9BG92w8} z-|2Ws#&2b)lDNp2btT5!c=Z`BbNhyBaa!0qR~IMS1r$6jPDj#|%iWmzluT9YPO%6q zDy(aayd18N11D6lXJUnnOX^~e zvC85QRR)@h{pc5T)Mlp3^Tc>6NYoQt$pA@gIhe_gy{3Q;N-x5gKw|9I+y)blIZb(6 z4zu;-N*-80UWKd;bLNz&6c?qu-0!0J8n#}@l{MS>fK9hk_dk-&-EY4-L>el(%C(9wBK`vc1cF=u literal 0 HcmV?d00001