From 707ee15fe347fb4d202f3abb3b23a0ec3fadb0c6 Mon Sep 17 00:00:00 2001 From: juraj Date: Sun, 21 Feb 2016 02:52:24 +0100 Subject: [PATCH] wield scale, shovel wield rotation --- axe.lua | 51 ++++++++++++++++++ depends.txt | 3 +- ingots.lua | 41 --------------- init.lua | 9 ++-- lumps.lua | 43 ---------------- obsidian_glass.lua | 10 ---- shovels.lua | 88 ++++---------------------------- steel_bars.lua | 24 --------- swords.lua | 77 +++++++--------------------- textures/enhancements_sword.png | Bin 238 -> 0 bytes 10 files changed, 85 insertions(+), 261 deletions(-) create mode 100644 axe.lua delete mode 100644 ingots.lua delete mode 100644 lumps.lua delete mode 100644 obsidian_glass.lua delete mode 100644 steel_bars.lua delete mode 100644 textures/enhancements_sword.png diff --git a/axe.lua b/axe.lua new file mode 100644 index 0000000..39a6c0b --- /dev/null +++ b/axe.lua @@ -0,0 +1,51 @@ +-- AXE DEFAULT +minetest.override_item("default:axe_diamond", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_wood", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_stone", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_steel", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_bronze", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_mese", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +minetest.override_item("default:axe_mese", { + wield_scale = {x=1.5, y=2, z=1}, +}) + +-- SWORDS MOREORES +if (minetest.get_modpath("moreores")) then + minetest.override_item("moreores:axe_mithril", { + wield_scale = {x=1.5, y=2, z=1}, + }) + + minetest.override_item("moreores:axe_silver", { + wield_scale = {x=1.5, y=2, z=1}, + }) +end + +-- SWORDS SUPER DIAMONDS +if (minetest.get_modpath("diamonds")) then + minetest.override_item("diamonds:axe", { + wield_scale = {x=1.5, y=2, z=1}, + }) + + minetest.override_item("diamonds:steelaxe", { + wield_scale = {x=1.5, y=2, z=1}, + }) +end + diff --git a/depends.txt b/depends.txt index ddc201b..e98a60a 100644 --- a/depends.txt +++ b/depends.txt @@ -1,2 +1,3 @@ default -xpanes +diamonds? +moreores? \ No newline at end of file diff --git a/ingots.lua b/ingots.lua deleted file mode 100644 index e1ca71b..0000000 --- a/ingots.lua +++ /dev/null @@ -1,41 +0,0 @@ -minetest.register_craftitem(":default:steel_ingot", { - description = "Steel Ingot", - inventory_image = "default_steel_ingot.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:copper_ingot", { - description = "Copper Ingot", - inventory_image = "default_copper_ingot.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:bronze_ingot", { - description = "Bronze Ingot", - inventory_image = "default_bronze_ingot.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:gold_ingot", { - description = "Gold Ingot", - inventory_image = "default_gold_ingot.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:mese_crystal_fragment", { - description = "Mese Crystal Fragment", - inventory_image = "default_mese_crystal_fragment.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:clay_brick", { - description = "Clay Brick", - inventory_image = "default_clay_brick.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:obsidian_shard", { - description = "Obsidian Shard", - inventory_image = "default_obsidian_shard.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) diff --git a/init.lua b/init.lua index 6a516a9..b6195b9 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,3 @@ -dofile(minetest.get_modpath("enhancements").."/swords.lua") -- Changes swords -dofile(minetest.get_modpath("enhancements").."/lumps.lua") -- Changes lumps, diamonds -dofile(minetest.get_modpath("enhancements").."/ingots.lua") -- Changes ingots -dofile(minetest.get_modpath("enhancements").."/obsidian_glass.lua") --Makes obsidian glass joined -dofile(minetest.get_modpath("enhancements").."/steel_bars.lua") -- Renames iron bars to steel bars -dofile(minetest.get_modpath("enhancements").."/shovels.lua") -- Changes shovels so they are no longer in the way. +dofile(minetest.get_modpath("enhancements").."/swords.lua") +dofile(minetest.get_modpath("enhancements").."/axe.lua") +dofile(minetest.get_modpath("enhancements").."/shovels.lua") diff --git a/lumps.lua b/lumps.lua deleted file mode 100644 index 684aee4..0000000 --- a/lumps.lua +++ /dev/null @@ -1,43 +0,0 @@ -minetest.register_craftitem(":default:coal_lump", { - description = "Coal Lump", - inventory_image = "default_coal_lump.png", - groups = {coal = 1}, - wield_scale = {x=1.5, y=1.5, z=1}, -}) - - -minetest.register_craftitem(":default:clay_lump", { - description = "Clay Lump", - inventory_image = "default_clay_lump.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:iron_lump", { - description = "Iron Lump", - inventory_image = "default_iron_lump.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:copper_lump", { - description = "Copper Lump", - inventory_image = "default_copper_lump.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:mese_crystal", { - description = "Mese Crystal", - inventory_image = "default_mese_crystal.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:gold_lump", { - description = "Gold Lump", - inventory_image = "default_gold_lump.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) - -minetest.register_craftitem(":default:diamond", { - description = "Diamond", - inventory_image = "default_diamond.png", - wield_scale = {x=1.5, y=1.5, z=1}, -}) diff --git a/obsidian_glass.lua b/obsidian_glass.lua deleted file mode 100644 index 1dd22e5..0000000 --- a/obsidian_glass.lua +++ /dev/null @@ -1,10 +0,0 @@ -minetest.register_node(":default:obsidian_glass", { - description = "Obsidian Glass", - drawtype = "glasslike_framed_optional", - tiles = {"default_obsidian_glass.png", "blank.png^[colorize:#0001"}, - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - sounds = default.node_sound_glass_defaults(), - groups = {cracky=3,oddly_breakable_by_hand=3}, -}) diff --git a/shovels.lua b/shovels.lua index 6c644ba..ca52b24 100644 --- a/shovels.lua +++ b/shovels.lua @@ -1,78 +1,10 @@ -minetest.register_tool(":default:shovel_wood", { - description = "Wooden Shovel", - inventory_image = "default_tool_woodshovel.png", - wield_image = "default_tool_woodshovel.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=3.00, [2]=1.60, [3]=0.60}, uses=10, maxlevel=1}, - }, - damage_groups = {fleshy=2}, - }, -}) -minetest.register_tool(":default:shovel_stone", { - description = "Stone Shovel", - inventory_image = "default_tool_stoneshovel.png", - wield_image = "default_tool_stoneshovel.png", - tool_capabilities = { - full_punch_interval = 1.4, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=1.80, [2]=1.20, [3]=0.50}, uses=20, maxlevel=1}, - }, - damage_groups = {fleshy=2}, - }, -}) -minetest.register_tool(":default:shovel_steel", { - description = "Steel Shovel", - inventory_image = "default_tool_steelshovel.png", - wield_image = "default_tool_steelshovel.png", - tool_capabilities = { - full_punch_interval = 1.1, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=30, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, -}) -minetest.register_tool(":default:shovel_bronze", { - description = "Bronze Shovel", - inventory_image = "default_tool_bronzeshovel.png", - wield_image = "default_tool_bronzeshovel.png", - tool_capabilities = { - full_punch_interval = 1.1, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=40, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, -}) -minetest.register_tool(":default:shovel_mese", { - description = "Mese Shovel", - inventory_image = "default_tool_meseshovel.png", - wield_image = "default_tool_meseshovel.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=3, - groupcaps={ - crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=20, maxlevel=3}, - }, - damage_groups = {fleshy=4}, - }, -}) -minetest.register_tool(":default:shovel_diamond", { - description = "Diamond Shovel", - inventory_image = "default_tool_diamondshovel.png", - wield_image = "default_tool_diamondshovel.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=30, maxlevel=3}, - }, - damage_groups = {fleshy=4}, - }, -}) +-- SHOVELS MOREORES +if (minetest.get_modpath("moreores")) then + minetest.override_item("moreores:shovel_mithril", { + wield_image = "moreores_tool_mithrilshovel.png^[transformR90", + }) + + minetest.override_item("moreores:shovel_silver", { + wield_image = "moreores_tool_silvershovel.png^[transformR90", + }) +end \ No newline at end of file diff --git a/steel_bars.lua b/steel_bars.lua deleted file mode 100644 index 9679639..0000000 --- a/steel_bars.lua +++ /dev/null @@ -1,24 +0,0 @@ --- Steel bars - -xpanes.register_pane("bar", { - description = "Steel bar", - tiles = {"xpanes_space.png"}, - drawtype = "airlike", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - air_equivalent = true, - textures = {"xpanes_bar.png","xpanes_bar.png","xpanes_space.png"}, - inventory_image = "xpanes_bar.png", - wield_image = "xpanes_bar.png", - groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3, pane=1}, - sounds = default.node_sound_stone_defaults(), - recipe = { - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'} - } -}) diff --git a/swords.lua b/swords.lua index dfd5ba2..40cc1c4 100644 --- a/swords.lua +++ b/swords.lua @@ -1,4 +1,4 @@ --- SWORDS +-- SWORDS DEFAULT minetest.override_item("default:sword_diamond", { wield_scale = {x=1.5, y=2, z=1}, }) @@ -23,64 +23,25 @@ minetest.override_item("default:sword_mese", { wield_scale = {x=1.5, y=2, z=1}, }) -minetest.override_item("moreores:sword_mithril", { - wield_scale = {x=1.5, y=2, z=1}, -}) +-- SWORDS MOREORES +if (minetest.get_modpath("moreores")) then + minetest.override_item("moreores:sword_mithril", { + wield_scale = {x=1.5, y=2, z=1}, + }) -minetest.override_item("moreores:sword_silver", { - wield_scale = {x=1.5, y=2, z=1}, -}) + minetest.override_item("moreores:sword_silver", { + wield_scale = {x=1.5, y=2, z=1}, + }) +end -minetest.override_item("diamonds:sword", { - wield_scale = {x=1.5, y=2, z=1}, -}) +-- SWORDS SUPER DIAMONDS +if (minetest.get_modpath("diamonds")) then + -- minetest.override_item("diamonds:sword", { + -- wield_scale = {x=1.5, y=2, z=1}, + -- }) -minetest.override_item("diamonds:steelsword", { - wield_scale = {x=1.5, y=2, z=1}, -}) - --- AXE -minetest.override_item("default:axe_diamond", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_wood", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_stone", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_steel", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_bronze", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_mese", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("default:axe_mese", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("moreores:axe_mithril", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("moreores:axe_silver", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("diamonds:axe", { - wield_scale = {x=1.5, y=2, z=1}, -}) - -minetest.override_item("diamonds:steelaxe", { - wield_scale = {x=1.5, y=2, z=1}, -}) + minetest.override_item("diamonds:steelsword", { + wield_scale = {x=1.5, y=2, z=1}, + }) +end diff --git a/textures/enhancements_sword.png b/textures/enhancements_sword.png deleted file mode 100644 index 7055b79d98d1a1b5885b55f92daafc4b7a939330..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=8+ru0GygVWA<>&kwgOOnArVU4NKRiKcAr;B3<$Mxg{2i9~xhm2=y z*#z3UHZsgeE8=V6nvo