From d8007c5301a5e7b49dd9209a60a1df13c4b4beb4 Mon Sep 17 00:00:00 2001 From: Victor Hackeridze Date: Wed, 14 Mar 2012 16:07:07 +0600 Subject: [PATCH] flowers fix --- approved/flowers/depends.txt | 1 - approved/flowers/init.lua | 44 +++++++++++++----- approved/flowers/textures/cotton.png | Bin 0 -> 680 bytes approved/flowers/textures/flower_cotton.png | Bin 0 -> 315 bytes .../flowers/textures/flower_cotton_pot.png | Bin 0 -> 498 bytes .../{flower_tulip.png => flower_orange.png} | Bin ...er_tulip_pot.png => flower_orange_pot.png} | Bin .../{flower_rose.png => flower_red.png} | Bin ...flower_rose_pot.png => flower_red_pot.png} | Bin .../{flower_viola.png => flower_violet.png} | Bin ...er_viola_pot.png => flower_violet_pot.png} | Bin ...r_dandelion_white.png => flower_white.png} | Bin ...ion_white_pot.png => flower_white_pot.png} | Bin ...dandelion_yellow.png => flower_yellow.png} | Bin ...n_yellow_pot.png => flower_yellow_pot.png} | Bin shit/OLD/moarcraft/depends.txt | 1 - shit/OLD/moarcraft/init.lua | 44 ------------------ shit/OLD/moarcraft/textures/moarcraft_ash.png | Bin 1031 -> 0 bytes .../textures/moarcraft_stone_brick.png | Bin 607 -> 0 bytes 19 files changed, 32 insertions(+), 58 deletions(-) create mode 100644 approved/flowers/textures/cotton.png create mode 100644 approved/flowers/textures/flower_cotton.png create mode 100644 approved/flowers/textures/flower_cotton_pot.png rename approved/flowers/textures/{flower_tulip.png => flower_orange.png} (100%) rename approved/flowers/textures/{flower_tulip_pot.png => flower_orange_pot.png} (100%) rename approved/flowers/textures/{flower_rose.png => flower_red.png} (100%) rename approved/flowers/textures/{flower_rose_pot.png => flower_red_pot.png} (100%) rename approved/flowers/textures/{flower_viola.png => flower_violet.png} (100%) rename approved/flowers/textures/{flower_viola_pot.png => flower_violet_pot.png} (100%) rename approved/flowers/textures/{flower_dandelion_white.png => flower_white.png} (100%) rename approved/flowers/textures/{flower_dandelion_white_pot.png => flower_white_pot.png} (100%) rename approved/flowers/textures/{flower_dandelion_yellow.png => flower_yellow.png} (100%) rename approved/flowers/textures/{flower_dandelion_yellow_pot.png => flower_yellow_pot.png} (100%) delete mode 100644 shit/OLD/moarcraft/depends.txt delete mode 100644 shit/OLD/moarcraft/init.lua delete mode 100644 shit/OLD/moarcraft/textures/moarcraft_ash.png delete mode 100644 shit/OLD/moarcraft/textures/moarcraft_stone_brick.png diff --git a/approved/flowers/depends.txt b/approved/flowers/depends.txt index 3a7daa1..4ad96d5 100644 --- a/approved/flowers/depends.txt +++ b/approved/flowers/depends.txt @@ -1,2 +1 @@ default - diff --git a/approved/flowers/init.lua b/approved/flowers/init.lua index 0cbadf1..9d1212c 100644 --- a/approved/flowers/init.lua +++ b/approved/flowers/init.lua @@ -7,15 +7,16 @@ math.randomseed(os.time()) local DEBUG = 0 local FLOWERS = { - "rose", - "dandelion_yellow", - "dandelion_white", - "tulip", - "viola", + "red", + "yellow", + "white", + "orange", + "violet", + "cotton", } local MAX_RATIO = 2000 -local GROWING_DELAY = 3600 +local GROWING_DELAY = 7200 -- Local Functions local dbg = function(s) @@ -121,6 +122,12 @@ minetest.register_craftitem('flowers:flower_pot', { material = minetest.digprop_constanttime(0.5), }) +minetest.register_craftitem('flowers:cotton', { + image = 'cotton.png', + furnace_burntime = 15; + on_place_on_ground = minetest.craftitem_place_item, +}) + for _, color in ipairs(FLOWERS) do local fname = 'flower_' .. color local pname = fname .. '_pot' @@ -151,7 +158,7 @@ for _, color in ipairs(FLOWERS) do local pname = fname .. '_pot' minetest.register_craft({ - output = 'CraftItem "' .. pname .. '" 1', + output = 'CraftItem "' .. pname .. '" 9', recipe = { {'NodeItem "' .. fname .. '" 1'}, {'CraftItem "flowers:flower_pot" 1'}, @@ -159,22 +166,35 @@ for _, color in ipairs(FLOWERS) do }) end +minetest.register_craft({ + output = 'CraftItem "flowers:cotton" 1', + recipe = { + {'NodeItem "flowers:flower_cotton" 1'}, + } +}) + -- Make it grow ! grow_blocks_on_surfaces(GROWING_DELAY * 2, { - "flowers:flower_rose", - "flowers:flower_dandelion_white", - "flowers:flower_viola", + "flowers:flower_red", + "flowers:flower_white", + "flowers:flower_violet", }, { {name = "dirt_with_grass", chance = 4, spacing = 15}, }) grow_blocks_on_surfaces(GROWING_DELAY, { - "flowers:flower_dandelion_yellow", - "flowers:flower_tulip", + "flowers:flower_yellow", + "flowers:flower_orange", }, { {name = "dirt_with_grass", chance = 2, spacing = 10}, }) +grow_blocks_on_surfaces(GROWING_DELAY*2, { + "flowers:flower_cotton", + }, { + {name = "dirt_with_grass", chance = 5, spacing = 7}, +}) + grow_blocks_on_surfaces(GROWING_DELAY / 2, { "flowers:flower_waterlily", }, { diff --git a/approved/flowers/textures/cotton.png b/approved/flowers/textures/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..c184db25a22b83fddef424ab990e65b24903c44f GIT binary patch literal 680 zcmV;Z0$2TsP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt` z3K<$u{=q>200JmUL_t(I%dL~KYZO5k#ecK8TeIC5=Yo32+CvecJvG zyaql3Pl0Pnsm^(VO=HZn(P-3)uYOk)!}d`@;sj_^?kn{;HQZ5#tGQpyh5-DY&h(@D96h$cYdp)eR?C zYPCjZ2z=k)%CgL{)?%$iYdr^*YciRzva*7;cKiGyeGozfgTa6(ifFgnxUNf*Bp74n z1gE|jA;b@@^<%BInwvNn3_dxIb3+JG6+&RGMF_!oJVr{1F@_)r=yWQL70(Y)*K0-AbW|YuPgg)9v)5u;e4ftaG=m`PZ!4!i_>o> zZRBk>5OAHZERwe46wkz_CN=IQXEa#Z=uU8HdbEPt4Wl zf7$>4ul0||-vbt=T{aO@=u38SVU$SLIbgt};<-qSm0{JYO;OqZ^KOeZnE2ke2<*t| z5p=&4^;_!DyXHo@1+T5%xjuAl_?*Rd`RCp9sgaXXB^%DC6n7N=E^d6lp_eKcxc#{3 zgBNBGj+j55@;>*(-B(h}pX{p(dcOGAt4n;-GcJDOX3g|*US9De6X*>FPgg&ebxsLQ E0C%Z(`~Uy| literal 0 HcmV?d00001 diff --git a/approved/flowers/textures/flower_cotton_pot.png b/approved/flowers/textures/flower_cotton_pot.png new file mode 100644 index 0000000000000000000000000000000000000000..9432adf8ffcab9b8adeb6ce5d5308f2350d0ba45 GIT binary patch literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg)9v)63ga5_e%Yj0&nIRD+&iT2y zsd*(pE(3#eQEFmIYKlU6W=V#EyQgnJie4%^&^k{~7sn8b)4h}SdNDhSwC=Z#!}xg8gFT7w&KokxpKT87 z-#y~_tn$~7CY|4&rwq@%|6j=PVaMGIzg1j?yd8V5{#ZIiI)qb0_OZI=C%N@rQCkoE jn|s1&f{f$Zs`7n|kE*AYe|w<39u(T1u6{1-oD!M<`)A2a literal 0 HcmV?d00001 diff --git a/approved/flowers/textures/flower_tulip.png b/approved/flowers/textures/flower_orange.png similarity index 100% rename from approved/flowers/textures/flower_tulip.png rename to approved/flowers/textures/flower_orange.png diff --git a/approved/flowers/textures/flower_tulip_pot.png b/approved/flowers/textures/flower_orange_pot.png similarity index 100% rename from approved/flowers/textures/flower_tulip_pot.png rename to approved/flowers/textures/flower_orange_pot.png diff --git a/approved/flowers/textures/flower_rose.png b/approved/flowers/textures/flower_red.png similarity index 100% rename from approved/flowers/textures/flower_rose.png rename to approved/flowers/textures/flower_red.png diff --git a/approved/flowers/textures/flower_rose_pot.png b/approved/flowers/textures/flower_red_pot.png similarity index 100% rename from approved/flowers/textures/flower_rose_pot.png rename to approved/flowers/textures/flower_red_pot.png diff --git a/approved/flowers/textures/flower_viola.png b/approved/flowers/textures/flower_violet.png similarity index 100% rename from approved/flowers/textures/flower_viola.png rename to approved/flowers/textures/flower_violet.png diff --git a/approved/flowers/textures/flower_viola_pot.png b/approved/flowers/textures/flower_violet_pot.png similarity index 100% rename from approved/flowers/textures/flower_viola_pot.png rename to approved/flowers/textures/flower_violet_pot.png diff --git a/approved/flowers/textures/flower_dandelion_white.png b/approved/flowers/textures/flower_white.png similarity index 100% rename from approved/flowers/textures/flower_dandelion_white.png rename to approved/flowers/textures/flower_white.png diff --git a/approved/flowers/textures/flower_dandelion_white_pot.png b/approved/flowers/textures/flower_white_pot.png similarity index 100% rename from approved/flowers/textures/flower_dandelion_white_pot.png rename to approved/flowers/textures/flower_white_pot.png diff --git a/approved/flowers/textures/flower_dandelion_yellow.png b/approved/flowers/textures/flower_yellow.png similarity index 100% rename from approved/flowers/textures/flower_dandelion_yellow.png rename to approved/flowers/textures/flower_yellow.png diff --git a/approved/flowers/textures/flower_dandelion_yellow_pot.png b/approved/flowers/textures/flower_yellow_pot.png similarity index 100% rename from approved/flowers/textures/flower_dandelion_yellow_pot.png rename to approved/flowers/textures/flower_yellow_pot.png diff --git a/shit/OLD/moarcraft/depends.txt b/shit/OLD/moarcraft/depends.txt deleted file mode 100644 index 4ad96d5..0000000 --- a/shit/OLD/moarcraft/depends.txt +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/shit/OLD/moarcraft/init.lua b/shit/OLD/moarcraft/init.lua deleted file mode 100644 index 425fecd..0000000 --- a/shit/OLD/moarcraft/init.lua +++ /dev/null @@ -1,44 +0,0 @@ -minetest.register_craft({ - output = 'CraftItem "steel_ingot" 9', - recipe = { - {'NodeItem "steelblock"'}, - } -}) - -minetest.register_craft({ - output = 'NodeItem "wood" 4', - recipe = { - {'NodeItem "jungletree"'}, - } -}) - -minetest.register_craft({ - output = 'node "moarcraft:stone_brick" 4', - recipe = { - {'node "default:stone"','node "default:stone"'}, - {'node "default:stone"','node "default:stone"'}, - } -}) - -minetest.register_node("moarcraft:stone_brick", { - tile_images = {"default_stone.png^moarcraft_stone_brick.png"}, - inventory_image = minetest.inventorycube("default_stone.png^moarcraft_stone_brick.png"), - paramtype = "mineral", - is_ground_content = true, - often_contains_mineral = true, -- Texture atlas hint - material = minetest.digprop_stonelike(1.7), - dug_item = 'node "moarcraft:stone_brick" 1', -}) - -minetest.register_craftitem(":default:stick", { - image = "default_stick.png", - cookresult_itemstring = 'craft "moarcraft:ash" 1', - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem("moarcraft:ash", { - image = "moarcraft_ash.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -print("[Moarcraft] Loaded!") diff --git a/shit/OLD/moarcraft/textures/moarcraft_ash.png b/shit/OLD/moarcraft/textures/moarcraft_ash.png deleted file mode 100644 index c88fd5136ff8ea4885507cd0718217a9b27f4e70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmV+i1o-=jP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipuE z6&3{#xXecY0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~000AC zNkl>5-i1Z;Rm=7+(;3sm}KFi z>uy}?O0XihQKYCCR8$bGWMgURqKa5ZVr$e!No+!s%*2^V=JVc}d*5^1`TPeDee%(V zyi?sh5coEwFgbOJ4`W~OQ?}aJt-qVi^sXt}X06do4i`qwREnEFh1T0RcjCmQ-&X$~ zw%CL^4i9B zw^FT59vK~8??lnkz15X#>bkQoac`+OK=qr%Ij9ObC&WyPXf!i(-(OBi5DL=Q7%m(_6n4lOz!K#>rtg#pDuP%Q8h4*C#zKxxM{Ic2mMh(^v2-_z?G@)* zp*3bZlMY~wMI40>ebK1TUg*m$GZT`i3lJemLKOP@0m3+MS9gw|njEvm(*4&(G|x!h z9?p(h<9Sc}L3-iUfx+LcH893NRUk(9-MU$*&u`}vjE&M$NZfO6@dtsux1vYFhAQMd;p zfYm_MfrwxYLsVfs3lQs9@BINX#$fLAFA+zP8fF+GGKN$|$cd<`5L8uEsS~viLQ%}I zSB|Y-I6UTm!1MDzsCE;z%-f!^U?va%QGu$1iol6LMIfRjCxU-n>|eiiik z>eb@2{X_X1iF13_aL&aE1d4^_I~X6IC~+Leez9Dlo*+wI^6~9Em+ti+JAPeTA-Km@ zg5KQxQ1-wYfpR0c)Y4AaLcJZ*#o3GFQzJ*ua7PKMsxFDubluYVH{O4_wZ5H&=QqhW zZxSP@b?WBI)vI{?(aF0I0(l;8-TwK>#jX1X{{s`F&vJE5*E;|J002ovPDHLkV1hXV B-I)LY diff --git a/shit/OLD/moarcraft/textures/moarcraft_stone_brick.png b/shit/OLD/moarcraft/textures/moarcraft_stone_brick.png deleted file mode 100644 index 7cdde2cd0061be712a59a87935bb54e0dacf9573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01l=A01l=Bhuo=e00007bV*G`2ipuB z3_CX>@2HM@dakWG-a~0005D zNklxt)>JV@oO1<$_a194#u%J)09>zE zwAKLheUFq9fDi)D&(Eovk|s08V6Dx8T5FV2c<=L@bB?a-*ladD2_bT2V@wY0`#v9Q zEq&kTCcE8^vMdoo{6Lr|%qRKN=5VBx#2BekN{b*VCC)j#_ZjzeYprvmwrxo%QH2nA zJRV3X2_bO5-vRjg`pN|X#&P6yIvj5{H3C#I#-c3C+-a)* zOKf_5eJvi32Qfx&w;MtTw%aYvxgQ-IkH-b}iKM1!cz=JVX_^HmpP!$3n)CV0lQ9Nk z%z`YX6sy$=?>%K%=H#i-d_&dboIAYtbX|uK0wDxSDX!OR7S>!V)qM9#sXWCn48$1e zx(;jYLe6u0l2T>@t+fl)rIbi1VT{Serzt1c)#Y+otmyZXV2mMzz&MV4e0=co^1?6- tSszW){BW?}@BgKN^!E1lR}Cno_y(6OMDj#MVDbO}002ovPDHLkV1gMN0G