From 82789117d4de26b6b860c593a9b13e0b7dd197dc Mon Sep 17 00:00:00 2001 From: Calinou Date: Sat, 3 May 2014 19:19:19 +0200 Subject: [PATCH] Make coins stackable up to 9999, new coin texture, admin pickaxe kills any entity instantly, compress textures. --- init.lua | 102 +++++++++++++++++-------- textures/fire_basic_flame.png | Bin 794 -> 847 bytes textures/fire_basic_flame_animated.png | Bin 1233 -> 1248 bytes textures/invisible.png | Bin 68 -> 149 bytes textures/maptools_adminpick.png | Bin 210 -> 279 bytes textures/maptools_copper_coin.png | Bin 276 -> 270 bytes textures/maptools_gold_coin.png | Bin 249 -> 270 bytes textures/maptools_infinitefuel.png | Bin 384 -> 495 bytes textures/maptools_silver_coin.png | Bin 324 -> 270 bytes textures/maptools_smoke.png | Bin 300 -> 410 bytes textures/maptools_superapple.png | Bin 126 -> 197 bytes 11 files changed, 72 insertions(+), 30 deletions(-) diff --git a/init.lua b/init.lua index 9da949d..a1a086f 100644 --- a/init.lua +++ b/init.lua @@ -40,6 +40,7 @@ minetest.register_craft({ minetest.register_node("maptools:stone", { description = S("Unbreakable Stone"), range = 12, + stack_max = 9999, tiles = {"default_stone.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -49,6 +50,7 @@ minetest.register_node("maptools:stone", { minetest.register_node("maptools:tree", { description = S("Unbreakable Tree"), range = 12, + stack_max = 9999, tiles = {"default_tree.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -58,6 +60,7 @@ minetest.register_node("maptools:tree", { minetest.register_node("maptools:dirt", { description = S("Unbreakable Dirt"), range = 12, + stack_max = 9999, tiles = {"default_dirt.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -67,6 +70,7 @@ minetest.register_node("maptools:dirt", { minetest.register_node("maptools:wood", { description = S("Unbreakable Wooden Planks"), range = 12, + stack_max = 9999, tiles = {"default_wood.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -76,6 +80,7 @@ minetest.register_node("maptools:wood", { minetest.register_node("maptools:glass", { description = S("Unbreakable Glass"), range = 12, + stack_max = 9999, drawtype = "glasslike", tiles = {"default_glass.png"}, paramtype = "light", @@ -88,6 +93,7 @@ minetest.register_node("maptools:glass", { minetest.register_node("maptools:leaves", { description = S("Unbreakable Leaves"), range = 12, + stack_max = 9999, drawtype = "allfaces_optional", tiles = {"default_leaves.png"}, paramtype = "light", @@ -99,6 +105,7 @@ minetest.register_node("maptools:leaves", { minetest.register_node("maptools:sand", { description = S("Unbreakable Sand"), range = 12, + stack_max = 9999, tiles = {"default_sand.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -108,6 +115,7 @@ minetest.register_node("maptools:sand", { minetest.register_node("maptools:gravel", { description = S("Unbreakable Gravel"), range = 12, + stack_max = 9999, tiles = {"default_gravel.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -120,6 +128,7 @@ minetest.register_node("maptools:gravel", { minetest.register_node("maptools:desert_sand", { description = S("Unbreakable Desert Sand"), range = 12, + stack_max = 9999, tiles = {"default_desert_sand.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -129,6 +138,7 @@ minetest.register_node("maptools:desert_sand", { minetest.register_node("maptools:sandstone", { description = S("Unbreakable Sandstone"), range = 12, + stack_max = 9999, tiles = {"default_sandstone.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -138,6 +148,7 @@ minetest.register_node("maptools:sandstone", { minetest.register_node("maptools:desert_stone", { description = S("Unbreakable Desert Stone"), range = 12, + stack_max = 9999, tiles = {"default_desert_stone.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -147,6 +158,7 @@ minetest.register_node("maptools:desert_stone", { minetest.register_node("maptools:grass", { description = S("Unbreakable Dirt with Grass"), range = 12, + stack_max = 9999, tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -158,6 +170,7 @@ minetest.register_node("maptools:grass", { minetest.register_node("maptools:fullgrass", { description = S("Unbreakable Full Grass"), range = 12, + stack_max = 9999, tiles = {"default_grass.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -169,6 +182,7 @@ minetest.register_node("maptools:fullgrass", { minetest.register_node("maptools:cobble", { description = S("Unbreakable Cobblestone"), range = 12, + stack_max = 9999, tiles = {"default_cobble.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -178,6 +192,7 @@ minetest.register_node("maptools:cobble", { minetest.register_node("maptools:mossycobble", { description = S("Unbreakable Mossy Cobblestone"), range = 12, + stack_max = 9999, tiles = {"default_mossycobble.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -187,6 +202,7 @@ minetest.register_node("maptools:mossycobble", { minetest.register_node("maptools:brick", { description = S("Unbreakable Brick"), range = 12, + stack_max = 9999, tiles = {"default_brick.png"}, drop = "", groups = {unbreakable=1, not_in_creative_inventory = maptools_creative}, @@ -196,6 +212,7 @@ minetest.register_node("maptools:brick", { minetest.register_node("maptools:playerclip", { description = S("Player Clip"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_green.png", drawtype = "airlike", paramtype = "light", @@ -208,6 +225,7 @@ minetest.register_node("maptools:playerclip", { minetest.register_node("maptools:fullclip", { description = S("Full Clip"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_blue.png", drawtype = "airlike", paramtype = "light", @@ -219,6 +237,7 @@ minetest.register_node("maptools:fullclip", { minetest.register_node("maptools:fullclip_face", { description = S("Full Clip Face"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_white.png", drawtype = "nodebox", tiles = {"invisible.png"}, @@ -236,6 +255,7 @@ minetest.register_node("maptools:fullclip_face", { minetest.register_node("maptools:playerclip_bottom", { description = S("Player Clip Bottom Face"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_orange.png", drawtype = "nodebox", tiles = {"invisible.png"}, @@ -253,6 +273,7 @@ minetest.register_node("maptools:playerclip_bottom", { minetest.register_node("maptools:playerclip_top", { description = S("Player Clip Top Face"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_yellow.png", drawtype = "nodebox", tiles = {"invisible.png"}, @@ -271,6 +292,7 @@ for pusher_num=1,10,1 do minetest.register_node("maptools:pusher_" .. pusher_num, { description = S("Pusher (%s)"):format(pusher_num), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^default_apple.png", drawtype = "nodebox", tiles = {"invisible.png"}, @@ -289,6 +311,7 @@ end minetest.register_node("maptools:lightbulb", { description = S("Light Bulb"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^default_mese_crystal_fragment.png", drawtype = "airlike", walkable = false, @@ -304,6 +327,7 @@ minetest.register_node("maptools:lightbulb", { minetest.register_node("maptools:nobuild", { description = S("Build Prevention"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^bones_bones.png", drawtype = "airlike", walkable = false, @@ -317,6 +341,7 @@ minetest.register_node("maptools:nobuild", { minetest.register_node("maptools:nointeract", { description = S("Interact Prevention"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^default_scorched_stuff.png", drawtype = "airlike", walkable = false, @@ -329,6 +354,7 @@ minetest.register_node("maptools:nointeract", { minetest.register_node("maptools:climb", { description = S("Climb Block"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^default_ladder.png", drawtype = "airlike", walkable = false, @@ -345,6 +371,7 @@ for damage_num=1,5,1 do minetest.register_node("maptools:damage_" .. damage_num, { description = S("Damaging Block (%s)"):format(damage_num), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^farming_cotton_" .. damage_num .. ".png", drawtype = "airlike", walkable = false, @@ -360,6 +387,7 @@ end minetest.register_node("maptools:kill", { description = S("Kill Block"), range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^dye_black.png", drawtype = "airlike", walkable = false, @@ -374,6 +402,7 @@ minetest.register_node("maptools:kill", { minetest.register_node("maptools:smoke", { description = S("Smoke Block"), range = 12, + stack_max = 9999, tiles = {"maptools_smoke.png"}, drawtype = "allfaces_optional", walkable = false, @@ -386,6 +415,7 @@ minetest.register_node("maptools:smoke", { minetest.register_node("maptools:ladder", { description = S("Fake Ladder"), range = 12, + stack_max = 9999, drawtype = "signlike", tiles = {"default_ladder.png"}, inventory_image = "default_ladder.png", @@ -405,6 +435,7 @@ minetest.register_node("maptools:ladder", { minetest.register_node("maptools:permanent_fire", { description = S("Permanent Fire"), range = 12, + stack_max = 9999, drawtype = "plantlike", paramtype = "light", tiles = {{ @@ -423,6 +454,7 @@ minetest.register_node("maptools:permanent_fire", { minetest.register_node("maptools:fake_fire", { description = S("Fake Fire"), range = 12, + stack_max = 9999, drawtype = "plantlike", paramtype = "light", tiles = {{ @@ -440,6 +472,7 @@ minetest.register_node("maptools:fake_fire", { minetest.register_node("maptools:igniter", { drawtype = "airlike", range = 12, + stack_max = 9999, inventory_image = "default_steel_block.png^crosshair.png", description = S("Igniter"), paramtype = "light", @@ -451,33 +484,10 @@ minetest.register_node("maptools:igniter", { walkable = false, }) --- Items - -minetest.register_craftitem("maptools:copper_coin", { - description = S("Copper Coin"), - inventory_image = "maptools_copper_coin.png", - groups = {not_in_creative_inventory = maptools_creative}, -}) - -minetest.register_craftitem("maptools:silver_coin", { - description = S("Silver Coin"), - inventory_image = "maptools_silver_coin.png", - groups = {not_in_creative_inventory = maptools_creative}, -}) - -minetest.register_craftitem("maptools:gold_coin", { - description = S("Gold Coin"), - inventory_image = "maptools_gold_coin.png", - groups = {not_in_creative_inventory = maptools_creative}, -}) - -minetest.register_craftitem("maptools:infinitefuel", { - description = S("Infinite Fuel"), - inventory_image = "maptools_infinitefuel.png", -}) - minetest.register_node("maptools:superapple", { description = S("Super Apple"), + range = 12, + stack_max = 9999, drawtype = "plantlike", visual_scale = 1.0, tiles = {"maptools_superapple.png"}, @@ -490,6 +500,36 @@ minetest.register_node("maptools:superapple", { sounds = default.node_sound_defaults(), }) +-- Items + +minetest.register_craftitem("maptools:copper_coin", { + description = S("Copper Coin"), + inventory_image = "maptools_copper_coin.png", + stack_max = 9999, + groups = {not_in_creative_inventory = maptools_creative}, +}) + +minetest.register_craftitem("maptools:silver_coin", { + description = S("Silver Coin"), + inventory_image = "maptools_silver_coin.png", + stack_max = 9999, + groups = {not_in_creative_inventory = maptools_creative}, +}) + +minetest.register_craftitem("maptools:gold_coin", { + description = S("Gold Coin"), + inventory_image = "maptools_gold_coin.png", + stack_max = 9999, + groups = {not_in_creative_inventory = maptools_creative}, +}) + +minetest.register_craftitem("maptools:infinitefuel", { + description = S("Infinite Fuel"), + inventory_image = "maptools_infinitefuel.png", + stack_max = 9999, + groups = {not_in_creative_inventory = maptools_creative}, +}) + -- Tools minetest.register_tool("maptools:pick_admin", { @@ -508,7 +548,8 @@ minetest.register_tool("maptools:pick_admin", { cracky = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, crumbly = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, snappy = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, - } + }, + damage_groups = {fleshy = 1000}, }, }) @@ -518,9 +559,9 @@ minetest.register_tool("maptools:pick_admin_with_drops", { inventory_image = "maptools_adminpick.png", groups = {not_in_creative_inventory = maptools_creative}, tool_capabilities = { - full_punch_interval = 0.1, + full_punch_interval = 0.35, max_drop_level = 3, - groupcaps= { + groupcaps = { unbreakable = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, fleshy = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, choppy = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, @@ -528,14 +569,15 @@ minetest.register_tool("maptools:pick_admin_with_drops", { cracky = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, crumbly = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, snappy = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3}, - } + }, + damage_groups = {fleshy = 1000}, }, }) minetest.register_on_punchnode(function(pos, node, puncher) if puncher:get_wielded_item():get_name() == "maptools:pick_admin" and minetest.env:get_node(pos).name ~= "air" then - minetest.log("action", minetest.env:get_node(pos).name .. " was removed using an Admin Pickaxe.") + minetest.log("action", minetest.env:get_node(pos).name .. " was removed using an Admin Pickaxe at " .. minetest.pos_to_string(pos) .. ".") minetest.env:remove_node(pos) -- The node is removed directly, which means it even works on non-empty containers and group-less nodes. end end) diff --git a/textures/fire_basic_flame.png b/textures/fire_basic_flame.png index e3c52b0d0cc196ab2431174ebc1bcb82725dc035..a5c2afda7adc180e68b3403f803dba72f00cf24e 100644 GIT binary patch delta 62 zcmbQmcAjm5vM~c=age(c!@6@aFBupZI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9Ts*m Pb?Z%1IeZ%xe=-38;A0OH delta 10 RcmX@lHj8b7^2UhoOaK=f1S
n$~ZyAkF&rdvY3H^TNs2H8D`CqU|?WiFY)wsWxvBFA}nEk_iFNEppa~4NJNQq mer|4RUI~!Pz~Eeznpl#WqEMb$lA+-4=^K!um&!g-Q5gWDpcc;n delta 8 PcmbQr=rTcNVyOZE3~U0m diff --git a/textures/maptools_adminpick.png b/textures/maptools_adminpick.png index 6d70203787c7c92487e9857907f3200b6ef07b1a..e6a5fcfd287e8d33e63bb12a8d2f44edd1c6d87c 100644 GIT binary patch delta 101 zcmcb_IGt&NiWy^Zkh>GZx^prw85kHi3p^r=85sDEfH31!Z9ZwBAbW|YuPgf21s-(zJK2T@j;S5~pDj#&Z?NbQZ~V7Rz@Q&3G2ic^1%m7t(td)O;7#eHZ129Oj4}=7}HX zizDZaCg+YQ?5(&L00001bW%=J06^y0W&i*HaY;l$R2UhJ!F|yZf*=$G(5<)-#$^}G zqW=Fw8?_lavCGRCqSUY0Ok>QYdoK@9Sf!W5u1YFk z6`Sa)GuZ=Hq194dRgz(2MHJm-*yTcRB>jfJXwB6v;gByDancVuum#}sKi=2?0000< KMNUMnLSTZH?P|vW diff --git a/textures/maptools_gold_coin.png b/textures/maptools_gold_coin.png index aa3604b7e42c6f071ea5508fd8b5a28adebdc141..78cdf8c28a916eca04d736d61c36f9ea360f3581 100644 GIT binary patch delta 254 zcmey#*vB+MqMn7Bfq~)e-A6${inG8YvY3H^TNs2H8D`Cq01C2~c>21s-(zJKVV*9IAso@k2?v-| zmP<)DWt@x5FSC+vVEK1{Z#A=u$?NxbcbCs??D={BboS})#-2I1Zryr4yOAeb;;_() zC+|`e4nNTg*;t?-V!iofPDdlpp<@Et7Z@4pEmU$N&&*c<+Q8uH>gTe~DWM4flNMI}wN z6L-thukCbv2NYl|3GxeOaCmkj4a7dEW5BWu<=EBB)wn(l6rMP5^Lc#OIZmj5`Aa`fBhSKdtg=cs7Tsxr3Y{&RXH>8m9@TQFwNqUOZH4L7velF{r5}E+;O=(y(ndf=V)c^mOYPEW5Zxth@92sTEDOIvD$S4Ni;RBNu+s~^n3Bt}j zblGt#S3OB^ZiM4E$H8-duq45ntKGg`f*&9WmTYQ4FPcSwBofYI;u*vgs{ktX`ILlG oKD0(8lrfvWOH8@0V*x7k2Oy{i`PH+nCjbBd07*qoM6N<$g3g6ao&W#< diff --git a/textures/maptools_silver_coin.png b/textures/maptools_silver_coin.png index 61f125b48f766670c2da8eafc98500ebcf7f32c1..5b42388451e9a986a61d8fce5d3fca1589ff4cab 100644 GIT binary patch delta 254 zcmX@Y)W21s-(zJKCP)AtFFs=qT}4jla|{!PF!d*G->cU yXTm6XDt$p$Yt}i3EykMVjyx#>K}`{jd<+%33X6WK%ylE47=H)@0000eEe}%w004DROjJbx004-Hh>D7ejg5_tj*gFykC2d% zk&%&-l9H2?la!Q{m6es2mX?>7mzkNFo12@QoSeD2xw^W#ySux*yu7`=y}rJ_zrVl0 zz`()5!NS7A!^6YG#KgtL#m2_Q$jHdr+S=UQ+}+*X-{0Ti;eX-c;^O4w*t?!GBvZDL!0|Sm$cI#0MrQ~vtE4?00000NkvXX Hu0mjfofDep diff --git a/textures/maptools_smoke.png b/textures/maptools_smoke.png index bc0b860a38de49e78c112f8a7a0b04e7997efc7c..98684c83ef58e7b803f69f799347f7618f8da8d2 100644 GIT binary patch delta 271 zcmZ3(G>dtHN<3q6kh>GZx^prw85kHi3p^r=85p>QL70(Y)*K0-AbW|YuPgf%mSjCkFB_DbKsP)tvG|r0Uicb!2_HwA{UYv86*z$3t4So_@{Y*`BL>a?PWl_ O7(8A5T-G@yGywoT-BN%6 delta 161 zcmV;S0ABx^1FQm&Bms4igL8kGnVFoNoTOxWZ2$lO2XsG0EmDY03v`Bh$x`N0st_8A0>2P0sIvKDE0%;E