From 6af63a7e5d47ce158443a7a59da2954f046f7129 Mon Sep 17 00:00:00 2001 From: Ataron Date: Fri, 14 Nov 2014 18:47:49 +0100 Subject: [PATCH] Enlevement du silver et du tin deja existants dans moreores --- minetestforfun_game/mods/default/crafting.lua | 89 ------------------ .../mods/default/craftitems.lua | 28 ------ minetestforfun_game/mods/default/mapgen.lua | 36 ------- minetestforfun_game/mods/default/nodes.lua | 48 ---------- .../textures/default_mineral_silver.png | Bin 142 -> 0 bytes .../default/textures/default_mineral_tin.png | Bin 142 -> 0 bytes .../default/textures/default_silver_block.png | Bin 604 -> 0 bytes .../default/textures/default_silver_ingot.png | Bin 283 -> 0 bytes .../default/textures/default_silver_lump.png | Bin 188 -> 0 bytes .../default/textures/default_tin_block.png | Bin 486 -> 0 bytes .../default/textures/default_tin_ingot.png | Bin 259 -> 0 bytes .../default/textures/default_tin_lump.png | Bin 225 -> 0 bytes .../textures/default_tool_silveraxe.png | Bin 142 -> 0 bytes .../textures/default_tool_silverknife.png | Bin 142 -> 0 bytes .../textures/default_tool_silverpick.png | Bin 186 -> 0 bytes .../textures/default_tool_silvershovel.png | Bin 148 -> 0 bytes .../textures/default_tool_silversword.png | Bin 169 -> 0 bytes minetestforfun_game/mods/default/tools.lua | 63 ------------- 18 files changed, 264 deletions(-) delete mode 100644 minetestforfun_game/mods/default/textures/default_mineral_silver.png delete mode 100644 minetestforfun_game/mods/default/textures/default_mineral_tin.png delete mode 100644 minetestforfun_game/mods/default/textures/default_silver_block.png delete mode 100644 minetestforfun_game/mods/default/textures/default_silver_ingot.png delete mode 100644 minetestforfun_game/mods/default/textures/default_silver_lump.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tin_block.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tin_ingot.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tin_lump.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tool_silveraxe.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tool_silverknife.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tool_silverpick.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tool_silvershovel.png delete mode 100644 minetestforfun_game/mods/default/textures/default_tool_silversword.png diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 3e418f4e..ba9af2ad 100644 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -108,15 +108,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:pick_silver", - recipe = { - {"default:silver_ingot", "default:silver_ingot", "default:silver_ingot"}, - {"", "group:stick", ""}, - {"", "group:stick", ""}, - } -}) - minetest.register_craft({ output = "default:pick_gold", recipe = { @@ -191,15 +182,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:shovel_silver", - recipe = { - {"default:silver_ingot"}, - {"group:stick"}, - {"group:stick"}, - } -}) - minetest.register_craft({ output = "default:shovel_gold", recipe = { @@ -274,24 +256,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:axe_silver", - recipe = { - {"default:silver_ingot", "default:silver_ingot"}, - {"default:silver_ingot", "group:stick"}, - {"", "group:stick"}, - } -}) - -minetest.register_craft({ - output = "default:axe_silver", - recipe = { - {"default:silver_ingot", "default:silver_ingot"}, - {"group:stick", "default:silver_ingot"}, - {"group:stick", ""}, - } -}) - minetest.register_craft({ output = "default:axe_gold", recipe = { @@ -384,15 +348,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:sword_silver", - recipe = { - {"default:silver_ingot"}, - {"default:silver_ingot"}, - {"group:stick"}, - } -}) - minetest.register_craft({ output = "default:sword_gold", recipe = { @@ -431,16 +386,6 @@ minetest.register_craft({ -minetest.register_craft({ - output = "default:knife_silver", - recipe = { - {"default:silver_ingot"}, - {"group:stick"}, - } -}) - - - minetest.register_craft({ output = "default:rail 16", recipe = { @@ -532,20 +477,6 @@ minetest.register_craft({ recipe = {{"default:steelblock"},} }) -minetest.register_craft({ - output = "default:tinblock", - recipe = { - {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"}, - {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"}, - {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"}, - } -}) - -minetest.register_craft({ - output = "default:tin_ingot 9", - recipe = {{"default:tinblock"},} -}) - minetest.register_craft({ output = "default:copperblock", recipe = { @@ -574,19 +505,7 @@ minetest.register_craft({ recipe = {{"default:bronzeblock"},} }) -minetest.register_craft({ - output = "default:silverblock", - recipe = { - {"default:silver_ingot", "default:silver_ingot", "default:silver_ingot"}, - {"default:silver_ingot", "default:silver_ingot", "default:silver_ingot"}, - {"default:silver_ingot", "default:silver_ingot", "default:silver_ingot"}, - } -}) -minetest.register_craft({ - output = "default:silver_ingot 9", - recipe = {{"default:silverblock"},} -}) minetest.register_craft({ output = "default:goldblock", @@ -795,18 +714,10 @@ minetest.register_craft({ type = "cooking", output = "default:steel_ingot", recipe = "default:iron_lump", }) -minetest.register_craft({ - type = "cooking", output = "default:tin_ingot", recipe = "default:tin_lump", -}) - minetest.register_craft({ type = "cooking", output = "default:copper_ingot", recipe = "default:copper_lump", }) -minetest.register_craft({ - type = "cooking", output = "default:silver_ingot", recipe = "default:silver_lump", -}) - minetest.register_craft({ type = "cooking", output = "default:gold_ingot", recipe = "default:gold_lump", }) diff --git a/minetestforfun_game/mods/default/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua index b0482a80..7a8185f7 100755 --- a/minetestforfun_game/mods/default/craftitems.lua +++ b/minetestforfun_game/mods/default/craftitems.lua @@ -32,13 +32,6 @@ minetest.register_craftitem("default:iron_lump", { groups = {ingot_lump = 1}, }) -minetest.register_craftitem("default:tin_lump", { - description = "Tin Lump", - wield_scale = {x = 1, y = 1, z = 2}, - inventory_image = "default_tin_lump.png", - groups = {ingot_lump = 1}, -}) - minetest.register_craftitem("default:copper_lump", { description = "Copper Lump", wield_scale = {x = 1, y = 1, z = 2}, @@ -51,13 +44,6 @@ minetest.register_craftitem("default:mese_crystal", { inventory_image = "default_mese_crystal.png", }) -minetest.register_craftitem("default:silver_lump", { - description = "Silver Lump", - wield_scale = {x = 1, y = 1, z = 2}, - inventory_image = "default_silver_lump.png", - groups = {ingot_lump = 1}, -}) - minetest.register_craftitem("default:gold_lump", { description = "Gold Lump", wield_scale = {x = 1, y = 1, z = 2}, @@ -84,13 +70,6 @@ minetest.register_craftitem("default:steel_ingot", { groups = {ingot = 1}, }) -minetest.register_craftitem("default:tin_ingot", { - description = "Tin Ingot", - wield_scale = {x = 1, y = 1, z = 2}, - inventory_image = "default_tin_ingot.png", - groups = {ingot = 1}, -}) - minetest.register_craftitem("default:copper_ingot", { description = "Copper Ingot", wield_scale = {x = 1, y = 1, z = 2}, @@ -105,13 +84,6 @@ minetest.register_craftitem("default:bronze_ingot", { groups = {ingot = 1}, }) -minetest.register_craftitem("default:silver_ingot", { - description = "Silver Ingot", - wield_scale = {x = 1, y = 1, z = 2}, - inventory_image = "default_silver_ingot.png", - groups = {ingot = 1}, -}) - minetest.register_craftitem("default:gold_ingot", { description = "Gold Ingot", wield_scale = {x = 1, y = 1, z = 2}, diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index 87f9d56d..d5c98f14 100644 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -229,30 +229,6 @@ minetest.register_ore({ flags = "absheight", }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_silver", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 3, - clust_size = 2, - height_min = -127, - height_max = -16, - flags = "absheight", -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_silver", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 5, - clust_size = 3, - height_min = -30000, - height_max = -128, - flags = "absheight", -}) - minetest.register_ore({ ore_type = "scatter", ore = "default:stone_with_gold", @@ -335,18 +311,6 @@ minetest.register_ore({ flags = "absheight", }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 5, - clust_size = 3, - height_min = -30000, - height_max = 64, - flags = "absheight", -}) - minetest.register_ore({ ore_type = "scatter", ore = "default:stone_with_coal", diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index e62cb352..f83ee98a 100644 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -119,21 +119,6 @@ minetest.register_node("default:desert_stone_with_copper", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_tin", { - description = "Tin Ore", - tiles = {"default_stone.png^default_mineral_tin.png"}, - is_ground_content = true, - groups = {cracky = 3}, - drop = { - items = { - {items = {"default:cobble"}}, - {items = {"default:tin_lump"}}, - {items = {"maptools:copper_coin 2"}}, - }, - }, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_node("default:stone_with_mese", { description = "Mese Ore", tiles = {"default_stone.png^default_mineral_mese.png"}, @@ -149,21 +134,6 @@ minetest.register_node("default:stone_with_mese", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_silver", { - description = "Silver Ore", - tiles = {"default_stone.png^default_mineral_silver.png"}, - is_ground_content = true, - groups = {cracky = 3}, - drop = { - items = { - {items = {"default:cobble"}}, - {items = {"default:silver_lump"}}, - {items = {"maptools:copper_coin 3"}}, - }, - }, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_node("default:stone_with_gold", { description = "Gold Ore", tiles = {"default_stone.png^default_mineral_gold.png"}, @@ -2037,14 +2007,6 @@ minetest.register_node("default:steelblock", { sounds = default.node_sound_metal_defaults(), }) -minetest.register_node("default:tinblock", { - description = "Tin Block", - tiles = {"default_tin_block.png"}, - is_ground_content = true, - groups = {cracky = 1, level = 2, ingot_block = 1}, - sounds = default.node_sound_metal_defaults(), -}) - minetest.register_node("default:copperblock", { description = "Copper Block", tiles = {"default_copper_block.png"}, @@ -2100,14 +2062,6 @@ minetest.register_node("default:meze", { }) minetest.register_alias("default:meze_block", "default:meze") -minetest.register_node("default:silverblock", { - description = "Silver Block", - tiles = {"default_silver_block.png"}, - is_ground_content = true, - groups = {cracky = 1, ingot_block = 1}, - sounds = default.node_sound_metal_defaults(), -}) - minetest.register_node("default:goldblock", { description = "Gold Block", tiles = {"default_gold_block.png"}, @@ -2401,9 +2355,7 @@ if minetest.setting_getbool("xray") then -- Nodes to make partially see-through: minetest.override_item("default:stone_with_coal", {tiles = {"default_mineral_coal.png"}}) minetest.override_item("default:stone_with_iron", {tiles = {"default_mineral_iron.png"}}) - minetest.override_item("default:stone_with_tin", {tiles = {"default_mineral_tin.png"}}) minetest.override_item("default:stone_with_copper", {tiles = {"default_mineral_copper.png"}}) - minetest.override_item("default:stone_with_silver", {tiles = {"default_mineral_silver.png"}}) minetest.override_item("default:stone_with_gold", {tiles = {"default_mineral_gold.png"}}) minetest.override_item("default:stone_with_mese", {tiles = {"default_mineral_mese.png"}}) minetest.override_item("default:stone_with_diamond", {tiles = {"default_mineral_diamond.png"}}) diff --git a/minetestforfun_game/mods/default/textures/default_mineral_silver.png b/minetestforfun_game/mods/default/textures/default_mineral_silver.png deleted file mode 100644 index 9f83f5b66692ab6df524ecf9fb859215c2aa1dcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0ZwdM9t`9# zmIV0)GdMiEkp|=#d%8G=a6~63Ff=n5Xfhq?@nz&$!^cx_;KhLhQnO538xuu+T&_4W kcx*~@6m=9eW^2%7xb4WA_4dD#5KudVr>mdKI;Vst0QYSu0{{R3 diff --git a/minetestforfun_game/mods/default/textures/default_mineral_tin.png b/minetestforfun_game/mods/default/textures/default_mineral_tin.png deleted file mode 100644 index 8ec4d8bfbe77896e7be64ce22befb88a6fa78081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0XnD=ESK>=knDg&IWQA zOM?7@862M7NCR?=JzX3_IHHpi7@8RjG?|X{_%iaW;o~Vd@Z!J$sadA2jftW@E>|2G kJT|2{iaLrKvo&Zk+;(Kmdi!5V2&kRG)78&qol`;+07Bd*8UO$Q diff --git a/minetestforfun_game/mods/default/textures/default_silver_block.png b/minetestforfun_game/mods/default/textures/default_silver_block.png deleted file mode 100644 index 0f7918ee5909e6c6aa7a00247b3f258bac41bba0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmV-i0;BzjP)hWr-2tFT3SnYvvN=n9*cz{_)z@z_V)GlMMTcIQp)vu9fo0^=hNvl zj-!Z(h^p3FUtV5_$a(KyUta+LP^u7bW+^2AA|Xa4A|e97%pV^ga=+gJ6adVm;aG5fG=8%sLOk36 zawZXBW&=fuW|pSW%r2LUdwhHZKtj`>MOzKREPA{|L=38B72m97tCdnpG7N*6nOW={ z7c&t44;P7Hue6rUiHpIjsyshGn^`reC>W&_t9-=Q4RzlEDO(L8 zFiWlr0MFEPP02feHUy1qW}ly*LPYz%4}V6l%FNEGRpgv^!#t;IaLzgBsEC=J&u3R_ z4IuzxW(V&W$)BcrSE%UY8nrq?&|@7nE-?k39?(wITMkHv~BBh z&cc$H+I2qFx-AP4nVEsseQJH5mccuBh@}*FKA!=Qv)|JQpbC{`E2T_JI`_Ybt?gPX zwbXJHRBpGMsX-Ota@<#Ks?dio1yt9D@!1vc*h0000anMpx{|g z7srr_IY%dNQ0A%8z0u>~;;Z0V!MSD{x9*LbO+2@hGzoG8yn8Z e|2cG@HJ_urY~}R7`!)hS#^CAd=d#Wzp$Py(cWkZz diff --git a/minetestforfun_game/mods/default/textures/default_silver_lump.png b/minetestforfun_game/mods/default/textures/default_silver_lump.png deleted file mode 100644 index 4f686cd916f3af5345055f021b029e33d09b60e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=929&tJWI_13Lhw{PFR zd-v|Wd-v|&zyHXQBWKQ>Ie-4V9`l6;pd!YSAirP+hi5m^fE-Ux7sn8enaK$UxYPU^ zF3d5ul2TxjeR?$ESkI>~2Fw$Dey<8$?ZDIbDRg1CXamnSk?Si`43u@VH%?^m*tl`x jB&7)P$&(f_#BnoTuM&`*X}W7U&`<_XS3j3^P6@P)B~!shg^*oU5yytgN1`t)H&0p{}l?udk!9u%xlE zrLwZ7v$LnPw5YYUskXMNx3{afxU9LkuDZIfy1KBtyRp2yvc0{tzP_}-zqP=?w!y)- z!os-2!@0!7y2Zu3#l^kG#=ghLz{$zM%F4pa%frmf#Ldmc&d$cq&&SZv$&ehe?*w{TN3S$5O0K-W{K~xwS1;JZR12GH*&}+v@+D-*3m0%0(e+_H}{!z&s8n31C3pKg}!IEiVlj^2M;#gm|NApzb1%s2mYpTyfra5|KP87Z;e1 zr#as+A4gyXBzz~5HIg+O0;x)}@wcO4YOD;!sTdDmwc|NGW|Xs{th=^GmSS1Yb5BMm zU$v(iPWr1UuczWbKZ?s3!6AR3vU`rOz98mu_j%}0749t}!RQ3pE)}q#?ak>UYycU| c%%isX50z|zv`n)8qyPW_07*qoM6N<$f|Wh}aR2}S diff --git a/minetestforfun_game/mods/default/textures/default_tin_ingot.png b/minetestforfun_game/mods/default/textures/default_tin_ingot.png deleted file mode 100644 index 4481928de03e18754442ac979465f2565002eefc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V1Q4EE09jeFUhE^%c^c@nz5jL z{_?)1>!z>WJa5yEdS@V@i$KfkD^>z5_Pujj3F>3Gi=XHnG06284>t!=o2`I*_XS6twTm^rI`rbo8w zUPkehSq)3SFr6}Tw_yv?x}7fGCLNdBHNmd;?b>;N^sPU0Fq?%v);I^Wi^0>?&t;uc GLK6V|CvjQ; diff --git a/minetestforfun_game/mods/default/textures/default_tin_lump.png b/minetestforfun_game/mods/default/textures/default_tin_lump.png deleted file mode 100644 index aae9988ec6ce84de9a98475ceeeedd3d60f7ae6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`E0FdG_VW%442+LRtH{r; zEh%iRsp@U1o6^}ly|;DdgpN6rJLgX6nm4t3{ZxWB>!vwM0oIhG6Zt^`6;!!GjtSMM|ieaB{x{Hg22WQ%mvv4FO#lL9R_Oo$ diff --git a/minetestforfun_game/mods/default/textures/default_tool_silveraxe.png b/minetestforfun_game/mods/default/textures/default_tool_silveraxe.png deleted file mode 100644 index 890363deb607ed15345c126c50fc0a3a0cf68d48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=3DRoUyhlnVFeewru(T z|NqamavOo7j3q&S!3+-1ZlnP@TAnVBAso@k2?w~C7MQHoo+9{&Ni?ajk#nYnvt$>W kz${M&HHM|00u77|Mu(Z3MK|B%1?pn(boFyt=akR{04Pc)T>t<8 diff --git a/minetestforfun_game/mods/default/textures/default_tool_silverknife.png b/minetestforfun_game/mods/default/textures/default_tool_silverknife.png deleted file mode 100644 index 83c42f9c6cad2812f520166391f445dce12bb69b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUO)Oy06k&Bz;*7ObDe%*% zuCBg#@#6pg|AQ@SPXg62mIV0)GdMiEkp|?bc)B=-a9mGLP!OBqnE5Sah6BT_hG52) lw7@nl4oL^eE|=R(3`|Ry18W&?Tm!0S@O1TaS?83{1OQVmDCYnG diff --git a/minetestforfun_game/mods/default/textures/default_tool_silverpick.png b/minetestforfun_game/mods/default/textures/default_tool_silverpick.png deleted file mode 100644 index fd817cca2af185884d3ef1a56fbfb44e59ad3967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=7l*oQ6^yPD-49ri!t) zDw8HnI(F>XnKNhp|Np=Dr|vGG3dWKkzhDN3XE)M-94}87#}JO_NKK@A2?N4XD}tY(Z>b!li^D5Jy>!Y7)LFrPs%A%S^S7}IL+295>> e7Y2?5CWeN~T=Tbjw^#v9W$<+Mb6Mw<&;$UTDLL2x diff --git a/minetestforfun_game/mods/default/textures/default_tool_silvershovel.png b/minetestforfun_game/mods/default/textures/default_tool_silvershovel.png deleted file mode 100644 index 2b73c24e59a05733b85c6b05de544cf6d5695299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=3DRoNjJzv9>B(wru(T z|37!M-XowWV@Z%-FoVOh8)-m}fv1aO2uE~sf&-%$m%yx(S6L4Qa5fr6#Kb7_OrF5N qad?8LlQFk}1FOUdv4jRr28NnI7S{)B_QGI+ZBxvX%ur@IX%-Se>YJ!Gv z1D8sYXo5%smx0-#kPL@V0~T|qj4)yDj*d;t$}YLWSFGF^O@1>@YvFifV|jc%&=>|! LS3j3^P6