From 9681811488b383821b60fc0b850b2f5e0aaa7c93 Mon Sep 17 00:00:00 2001 From: ElCeejo <40281901+ElCeejo@users.noreply.github.com> Date: Thu, 16 Apr 2020 22:51:30 -0700 Subject: [PATCH] Add files via upload --- init.lua | 1 - ores.lua | 2 -- register_lightsabers.lua | 44 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index ff4691b..d9626b0 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,6 @@ local modpath = minetest.get_modpath("adv_lightsabers") dofile(modpath.."/force_api.lua") dofile(modpath.."/register_lightsabers.lua") -dofile(modpath.."/lightsabers.lua") dofile(modpath.."/craftitems.lua") dofile(modpath.."/ores.lua") diff --git a/ores.lua b/ores.lua index ab89811..8ceb525 100644 --- a/ores.lua +++ b/ores.lua @@ -3,8 +3,6 @@ -------------------------- ------- Ver 1.1 ---------- -local default = {} - minetest.register_node("adv_lightsabers:kyber_ore", { description = "Kyber Ore", tiles = {"default_stone.png^adv_lightsabers_kyber_ore.png"}, diff --git a/register_lightsabers.lua b/register_lightsabers.lua index ec7692c..55ee609 100644 --- a/register_lightsabers.lua +++ b/register_lightsabers.lua @@ -239,7 +239,7 @@ function adv_lightsabers.register_lightsaber(type,color) wield_image = "adv_lightsabers_blade_single_"..color..".png^adv_lightsabers_hilt_single.png", wield_scale = {x = 2,y = 2,z = 1}, stack_max = 1, - on_use = function(player,pointed_thing) + on_use = function(_,player,pointed_thing) local swing = "adv_lightsabers_swing" local clash = "adv_lightsabers_clash" adv_lightsabers.lightsaber_attack(player,pointed_thing,swing,clash) @@ -290,7 +290,7 @@ function adv_lightsabers.register_lightsaber(type,color) wield_image = "adv_lightsabers_blade_cross_"..color..".png^adv_lightsabers_hilt_cross.png", wield_scale = {x = 2,y = 2,z = 1}, stack_max = 1, - on_use = function(player,pointed_thing) + on_use = function(_,player,pointed_thing) local swing = "adv_lightsabers_swing_cross" local clash = "adv_lightsabers_clash_cross" adv_lightsabers.lightsaber_attack(player,pointed_thing,swing,clash) @@ -341,7 +341,7 @@ function adv_lightsabers.register_lightsaber(type,color) wield_image = "adv_lightsabers_hilt_double.png^adv_lightsabers_blade_double_"..color..".png", wield_scale = {x = 4,y = 4,z = 1}, stack_max = 1, - on_use = function(player,pointed_thing) + on_use = function(_,player,pointed_thing) local swing = "adv_lightsabers_swing" local clash = "adv_lightsabers_clash" adv_lightsabers.lightsaber_attack(player,pointed_thing,swing,clash) @@ -369,4 +369,40 @@ function adv_lightsabers.register_lightsaber(type,color) groups = {not_in_creative_inventory=1,lightsaber=1}, }) end -end \ No newline at end of file +end + +-- Red Single Blade Lightsaber -- + +adv_lightsabers.register_lightsaber("single","red") + +-- Green Single Blade Lightsaber -- + +adv_lightsabers.register_lightsaber("single","green") + +-- Blue Single Blade Lightsaber -- + +adv_lightsabers.register_lightsaber("single","blue") + +-- Red Crossguarded Lightsaber -- + +adv_lightsabers.register_lightsaber("cross","red") + +-- Green Crossguarded Lightsaber -- + +adv_lightsabers.register_lightsaber("cross","green") + +-- Blue Crossguarded Lightsaber -- + +adv_lightsabers.register_lightsaber("cross","blue") + +-- Red Double Bladed Lightsaber -- + +adv_lightsabers.register_lightsaber("double","red") + +-- Green Double Bladed Lightsaber -- + +adv_lightsabers.register_lightsaber("double","green") + +-- Blue Double Bladed Lightsaber -- + +adv_lightsabers.register_lightsaber("double","blue") \ No newline at end of file