From 8d480f4cff785e144ae44cd83a600a70e1f7119a Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 7 Sep 2018 23:37:47 +0200 Subject: [PATCH] Version MFF. --- .gitignore | 1 - README.md | 0 jumping/init.lua => init.lua | 34 +++++++++++------- jumping/textures/jumping_cushion_sides.png | Bin 284 -> 0 bytes jumping/textures/jumping_cushion_tb.png | Bin 618 -> 0 bytes .../textures/jumping_trampoline_bottom.png | Bin 451 -> 0 bytes jumping/textures/jumping_trampoline_sides.png | Bin 216 -> 0 bytes .../jumping_trampoline_sides_overlay1.png | Bin 185 -> 0 bytes .../jumping_trampoline_sides_overlay2.png | Bin 188 -> 0 bytes .../jumping_trampoline_sides_overlay3.png | Bin 178 -> 0 bytes .../jumping_trampoline_sides_overlay4.png | Bin 180 -> 0 bytes .../jumping_trampoline_sides_overlay5.png | Bin 176 -> 0 bytes .../jumping_trampoline_sides_overlay6.png | Bin 171 -> 0 bytes jumping/textures/jumping_trampoline_top.png | Bin 539 -> 0 bytes modpack.txt | 0 textures/jumping_cushion_sides.png | Bin 0 -> 268 bytes textures/jumping_cushion_tb.png | Bin 0 -> 621 bytes textures/jumping_trampoline_bottom.png | Bin 0 -> 232 bytes textures/jumping_trampoline_sides.png | Bin 0 -> 164 bytes .../jumping_trampoline_sides_overlay_1.png | Bin 0 -> 110 bytes .../jumping_trampoline_sides_overlay_2.png | Bin 0 -> 114 bytes .../jumping_trampoline_sides_overlay_3.png | Bin 0 -> 113 bytes .../jumping_trampoline_sides_overlay_4.png | Bin 0 -> 111 bytes .../jumping_trampoline_sides_overlay_5.png | Bin 0 -> 120 bytes .../jumping_trampoline_sides_overlay_6.png | Bin 0 -> 105 bytes textures/jumping_trampoline_top.png | Bin 0 -> 240 bytes 26 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 .gitignore mode change 100644 => 100755 README.md rename jumping/init.lua => init.lua (61%) mode change 100644 => 100755 delete mode 100644 jumping/textures/jumping_cushion_sides.png delete mode 100644 jumping/textures/jumping_cushion_tb.png delete mode 100644 jumping/textures/jumping_trampoline_bottom.png delete mode 100644 jumping/textures/jumping_trampoline_sides.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay1.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay2.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay3.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay4.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay5.png delete mode 100644 jumping/textures/jumping_trampoline_sides_overlay6.png delete mode 100644 jumping/textures/jumping_trampoline_top.png delete mode 100644 modpack.txt create mode 100755 textures/jumping_cushion_sides.png create mode 100755 textures/jumping_cushion_tb.png create mode 100755 textures/jumping_trampoline_bottom.png create mode 100755 textures/jumping_trampoline_sides.png create mode 100755 textures/jumping_trampoline_sides_overlay_1.png create mode 100755 textures/jumping_trampoline_sides_overlay_2.png create mode 100755 textures/jumping_trampoline_sides_overlay_3.png create mode 100755 textures/jumping_trampoline_sides_overlay_4.png create mode 100755 textures/jumping_trampoline_sides_overlay_5.png create mode 100755 textures/jumping_trampoline_sides_overlay_6.png create mode 100755 textures/jumping_trampoline_top.png diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/jumping/init.lua b/init.lua old mode 100644 new mode 100755 similarity index 61% rename from jumping/init.lua rename to init.lua index 7937c63..cf2a7fe --- a/jumping/init.lua +++ b/init.lua @@ -24,9 +24,14 @@ local trampoline_punch = function(pos, node) minetest.add_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id}) end -for i = 1, 6 do - minetest.register_node("jumping:trampoline"..i, { - description = "Trampoline", +local u = 6 + +local bounces = {90, 100, 110, 120, 130, 140} + +for i = 1, u do + local bnc_pct = bounces[i] + minetest.register_node("jumping:trampoline_" .. i, { + description = "Trampoline (bounce : " .. bnc_pct .. "%)", drawtype = "nodebox", node_box = trampolinebox, selection_box = trampolinebox, @@ -35,9 +40,10 @@ for i = 1, 6 do tiles = { "jumping_trampoline_top.png", "jumping_trampoline_bottom.png", - "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png" + "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay_" .. i .. ".png", }, - groups = {dig_immediate=2, bouncy=20+i*20, fall_damage_add_percent=-70}, + drop = "jumping:trampoline_1", + groups = {dig_immediate = 2, bouncy = bnc_pct, fall_damage_add_percent = -95}, }) end @@ -50,25 +56,29 @@ minetest.register_node("jumping:cushion", { tiles = { "jumping_cushion_tb.png", "jumping_cushion_tb.png", - "jumping_cushion_sides.png" + "jumping_cushion_sides.png", }, - groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100}, + groups = {dig_immediate = 2, disable_jump = 1, fall_damage_add_percent = -100}, }) minetest.register_craft({ - output = "jumping:trampoline1", + output = "jumping:trampoline_1", recipe = { - {"default:wood", "default:wood", "default:wood"}, + {"group:ingot", "group:ingot", "group:ingot"}, {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} + {"default:stick", "default:stick", "default:stick"}, } }) minetest.register_craft({ output = "jumping:cushion", recipe = { + {"default:junglegrass", "default:junglegrass", "default:junglegrass"}, {"default:leaves", "default:leaves", "default:leaves"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} + {"default:stick", "default:stick", "default:stick"}, } }) + +if minetest.setting_getbool("log_mods") then + minetest.log("action", "Carbone: [jumping] loaded.") +end diff --git a/jumping/textures/jumping_cushion_sides.png b/jumping/textures/jumping_cushion_sides.png deleted file mode 100644 index 8c6de57d6339f3ee8b73f7a560402ea87d03d532..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks(Oy8gT6Em=UJ-JULvAr`0Kp7r%&b`)s1xPDi4PfD`LW2KM$+wZx)e{Onb z=V`$b2aX*b(t(Oi8ELa#uG2dIpza>4T#uVFLuPn+T}9Ec*VkLx&x(H67f;|43S8SD zEO19l@ojPS-*abEPhZ^fVRNnWT>a-Ff8w)+dtS<&nRa}MjmF&zleZk&pgK)b=-_JM zD+T5%E(NYxZU35MdSdMZk`!&XW&4R2o0z|;<3I6JTEwSUK-%Geb{gwMm;0p|-#I6r dxcs@z{_)mu)&Eb76@cDg@O1TaS?83{1OQe0ZF&Fz diff --git a/jumping/textures/jumping_cushion_tb.png b/jumping/textures/jumping_cushion_tb.png deleted file mode 100644 index 09b50e847cbc26f41a134bd1e099692ef4df3927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmV-w0+s!VP)6vgrX+WUEP zLT3CJFbs(w(V#<+3_`555J3^Ni=ZiNya#K&2|MpVY%RpxfJLy7gec|%#z{sLw3rEV z=Dg3dm&F+@_iEOUwe|DOuXkR3>F?#U-`>9T-R&0%)hJwmVnQgm{@U-Kz5eTSPu2a0 zk955E{WrIEe!RDR@Z@O%K;TgTNU7>w*)E(r{P4;@pYQ$>2S=MXA3T3>w27dgu(5|- zKJ7_YKRDX_;qKPnzl+>{=gXh=wqk0YSCXn$QcxX+a-y&YNTI{N5Yn};Itq|$Mgdl| zT0OzUV#A{=1<5Iqu-6nvrj#P8uk13#=*lK#%}c7N?%|LmrK=O+S}DLq4Qf<%YE-Yt zg=ITxESue_1l8)qt}%LzRn5mhD#``6LeZoorvHaD7#onZ7TfEGoSy5f0a(gZPA)JW zD-f=j&MBHQYCZwkC1t}RgzW(ohMZIbk7!ek?olx|fkCR7Om}=rxc+N}?gTW=37yIC}r(N0-mf`SC|@e{i+G zx&63h-uY{b2x7Pj91)7J>&6?8zj*7;yO;mG``g3+0I5+fktUTAO#lD@07*qoM6N<$ Ef~VRfSO5S3 diff --git a/jumping/textures/jumping_trampoline_bottom.png b/jumping/textures/jumping_trampoline_bottom.png deleted file mode 100644 index cd9da65b93ac2fddb9919e8f3dcd2b85ac452b1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VRP)2H5czptF(`VSZ{)GhjIZAB_lWp>J|bdf07OJp=bUD?YE?ZP4(^^> zYrXf!;{iZbMPzB*z4xAT9%Dqr^?I$f`ss9fKA#Z*z|2&YGBazfxjR<@c)eb`-Od0+ zgou<<%*@Qj80<(XMTEP%dntuelB$xS*1AXlP?k~}V~jB{XE z)7O>#4ks%Qlj4)b`TRhka!(h>5R21q`#16)Q4nCcuAkm==OVN1-KATaJx{J|QPOBq z`j)-n&n5MFHSX32PIEU%D4*@QUK;2kk-TL0=B;j_sa~CF$L?9XwkSE3r>~v5>J&4> ze3>6Mx)#spL}VwvugzYu>V)NEmIeVPFU{k!2PK;AJ%8+fzz@Pfx*+& K&t;ucLK6Vp=uJBS diff --git a/jumping/textures/jumping_trampoline_sides_overlay1.png b/jumping/textures/jumping_trampoline_sides_overlay1.png deleted file mode 100644 index aebcf05154b5498ce0a2f7d4d8feee01cc50f71d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks%QJMU_q?<;{q5uPrNAr`0KUep$9Fc5LRIQ!E}wj1Kz3IE$9L*nBD7ECxH zH?^~aljku1mi%_^)`H|~Odp=9cz!?s&#+zk;jty0JaZWo=C(+$)(W53@u|;a(eBNw d`ndlUF#F8VoO|nwa0t*222WQ%mvv4FO#l{hJ!Aj? diff --git a/jumping/textures/jumping_trampoline_sides_overlay2.png b/jumping/textures/jumping_trampoline_sides_overlay2.png deleted file mode 100644 index 74f43fa13a499db4b0fe42b8d77730775431563b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks%QyO?68ohwi%+SA1`#NzbZGaDHXIS3qa&^>;+Gqe5QZH3K$w|g_0Fg)~M z;jlrce!=f=9V}(RrVKMaFUXqkW%qrC7yrI6I33vf`+(g hLtR0r{`l$sxYt_x*_m@&J_D^`@O1TaS?83{1OQExK_dVF diff --git a/jumping/textures/jumping_trampoline_sides_overlay3.png b/jumping/textures/jumping_trampoline_sides_overlay3.png deleted file mode 100644 index d619fcc39b7ad6de4961a2d875fb6a4067dfac79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks%QyL`mfwueBWKu;IP5R21qPj2LGFc4wBSj@60MfuzP_D||&tW8~$jMi_e zG4Qp&Q1>QKSnu*Rwh!+tQl5OS*ID_%D5}M<$NGkv=$6j9G8IOHtOaV9-kbe>z;wk} V+e~ojjbxzV44$rjF6*2UngDE)Ij{f# diff --git a/jumping/textures/jumping_trampoline_sides_overlay4.png b/jumping/textures/jumping_trampoline_sides_overlay4.png deleted file mode 100644 index f1679e62821620bcbb80517eded503c6239d585f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks%QyBhljzL!9uU{4pv5R21qFDmjeDDt>mjAvST-@2&2Q71Qi0&kk?q~&Up zx1>GT#W&&Jd>z&^ldiGcuw=UP|F^%X_nApi;Sc9AxU69gP2_P;vDajM#uBmdKI;Vst0O3V9p#T5? diff --git a/jumping/textures/jumping_trampoline_sides_overlay5.png b/jumping/textures/jumping_trampoline_sides_overlay5.png deleted file mode 100644 index 2af894d5b30b8b005886aa0368b88bf8d0bd1634..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4ks%QyY7Uf>mYUho-U3d7N_5y*~r^qz~geUp7B_Mcv|BBX-ux$G@V4atTg^= zolciu@`d^BZ7J6P-3T?t{XE z)7O>#4ks%QyO|WbTrW__%hSa%#NzbZGlqN(20YFe=X2y;=q~(UY!G@(XKe_Zn#AX2 zC&GA^{!!?=HpgN6P3450`VRU(x0FiXe8Q2!Y%|ZlGs3OtOYx4H5@w?`<;2N0=cWNo OW$<+Mb6Mw<&;$SiKQrV2 diff --git a/jumping/textures/jumping_trampoline_top.png b/jumping/textures/jumping_trampoline_top.png deleted file mode 100644 index a927fdbeea60ca570366b014d92f3465d4c3f05c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 539 zcmV+$0_6RPP)F|InL@Z5cbSCiP%K* z*T4yg7NH@Aum|R}_T|_TFo)1(Q-DA|ldSYpnr51Awe^&Iy2sm^p-i zh+69qLI{C~1dsFi91)2q&+}e}_g?4;Pehda?RJaC7-n|PeZSv4&xNkmS}FA#iI`Gi z=9H4PmOh`)>-F;9Bcf7Dm6bFOKcwr!;M1& diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/textures/jumping_cushion_sides.png b/textures/jumping_cushion_sides.png new file mode 100755 index 0000000000000000000000000000000000000000..9d65797d2167301a4660ca9d5edc84d1fd3accbe GIT binary patch literal 268 zcmV+n0rUQeP)$=uf%%`VDKC=u;Nai@ zAiTdk`T5li-@7>v&yQ@XHCYjHGX%lYgr$kRh>V^n7iZkx-f^*T>c2I*x-JP4Ff&91 ziHb;I9GuCFkOdsDWJoS_b&U S9fVc@000026 z>J6U%{q&0;9>43S4m|-#*k>D8%{?m;7;>qsn5OlWVe{m{mvrJEyq(|9^8p#FYPne2 zT9>`~u2*DLQDaE7=qJ0Am#4}v{l9%3kb#jaivY`u3W-TavDwE}%gpei0iQkpgD-!6 zIXsBadxk|@wSdH+N=OI<0%hPr#*8@Y7nGhdN_d3@uOvL;kgALbtjZ&0x)xIcC5bQ% zM?+?@u&l)|jFp9{qGE{(@HuQ}-Mr5x6PFeBok2l*auEV%PX^k*J1~juIuT1LCJ0gA zyNn_-iXS=vdQ?^|yUu_ziY>+iRR`omB0#dm^Wc)6IGxkCXZ`niLru4F^U^y8hcRaK9a3KKFRco0$o z$e0tA6Duls-4w@%_r9f1HnzbHoL59hBW9_HJ{vIN$durF*QvopT(arYtA@Y-`t!}t zZv6Eozj^%dv`(u^kbDUqlmx9CI9$7Q^}AblKi>MQ*Z=$v%|v=dQ5bps00000NkvXX Hu0mjf$te{? literal 0 HcmV?d00001 diff --git a/textures/jumping_trampoline_bottom.png b/textures/jumping_trampoline_bottom.png new file mode 100755 index 0000000000000000000000000000000000000000..7ade61ef15c7577812a93076857581a43d6d412b GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UA)_b}*hDb=V9yIi0H56dJu+cX0 z^#>GHCz+ literal 0 HcmV?d00001 diff --git a/textures/jumping_trampoline_sides_overlay_1.png b/textures/jumping_trampoline_sides_overlay_1.png new file mode 100755 index 0000000000000000000000000000000000000000..1119f46a0adc319a59174d231aa8119ed6185264 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rk*a2Ar_~T6C_v{H*hspFZ4lZu?*V-^jqoIN9USk^leyc5e_|#W#IkpaW3%_KQMnrDpFVfd(*my85}S Ib4q9e03ehmKL7v# literal 0 HcmV?d00001 diff --git a/textures/jumping_trampoline_sides_overlay_2.png b/textures/jumping_trampoline_sides_overlay_2.png new file mode 100755 index 0000000000000000000000000000000000000000..3853953fc1ad00ce615bf30c08ce900592824e50 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`mYyz-Ar_~T6C_v{H*hspFZ4nZu?*V-_XFwIML(Kk^leyoj!2j2**ajReaOu1v&stSh`p6pXst2qCi6! NJYD@<);T3K0RZz^DQW-! literal 0 HcmV?d00001 diff --git a/textures/jumping_trampoline_sides_overlay_3.png b/textures/jumping_trampoline_sides_overlay_3.png new file mode 100755 index 0000000000000000000000000000000000000000..7c3ae249b22f81bc1f2c7f66306128776502f0bb GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`7M?DSAr_~T6C_v{H*hsEq@CcyLZRN~VRpcxFF Lu6{1-oD!MXCQgTe~DWM4f D^Z+45 literal 0 HcmV?d00001 diff --git a/textures/jumping_trampoline_top.png b/textures/jumping_trampoline_top.png new file mode 100755 index 0000000000000000000000000000000000000000..c5df874c119584c2f76361e1838944fbf1cae524 GIT binary patch literal 240 zcmV z(G9~O3`E%=v3)kQ{iuO#(Io96%#@XDR8`^x*zoS0&TH(U^Yzn_Mr$=zZJTe^{YqCC zR#n&v2Kh)wlUvSY3f5fwoz5!E0wpmfv|w~A1gsEM(H4xhtl6TZk_o}soh9CL{Lq{9 zPdc7F?+Q{wX?q%OvmFjt6*U+&Otaj>7O*!5R3ax# qvRI#t?rl!z{)|0xjO+aC73VMayC-_X?IB_S0000