diff --git a/mods/warfare_pack/classes/init.lua b/mods/warfare_pack/classes/init.lua index bda3fce..121aafc 100644 --- a/mods/warfare_pack/classes/init.lua +++ b/mods/warfare_pack/classes/init.lua @@ -6,13 +6,13 @@ local supply_time = 120 local default_class = "Sword" available_classes["Sword"] = {"default:sword_steel", "default:pick_steel", "default:ladder 6", "default:torch 4", "3d_armor:helmet_steel", "3d_armor:chestplate_steel", "xtraarmor:boots_leather_black", "shields:shield_steel"} available_classes["Knight"] = {"default:sword_steel", "default:pick_steel", "default:ladder 6", "default:torch 4", "xtraarmor:helmet_leather_black", "xtraarmor:chestplate_studded", "xtraarmor:boots_leather_black", "shields:shield_steel", "whinny:horseh1"} ---available_classes["Spear"] = {"lottweapons:steel_spear", "default:pick_steel", "default:ladder 6", "default:torch 4", "3d_armor:helmet_steel", "3d_armor:chestplate_steel", "xtraarmor:boots_leather_black", "shields:shield_steel"} ---available_classes["Hammer"] = {"lottweapons:steel_warhammer", "default:pick_steel", "default:ladder 6", "default:torch 4", "3d_armor:helmet_steel", "3d_armor:chestplate_steel", "xtraarmor:boots_leather_black", "shields:shield_steel"} +available_classes["Spear"] = {"lottweapons:steel_spear", "default:pick_steel", "default:ladder 6", "default:torch 4", "3d_armor:helmet_steel", "3d_armor:chestplate_steel", "xtraarmor:boots_leather_black", "shields:shield_steel"} +available_classes["Hammer"] = {"lottweapons:steel_warhammer", "default:pick_steel", "default:ladder 6", "default:torch 4", "3d_armor:helmet_steel", "3d_armor:chestplate_steel", "xtraarmor:boots_leather_black", "shields:shield_steel"} available_classes["Bow"] = {"throwing:bow_composite", "throwing:arrow_stone 32", "throwing:arrow_torch 8", "shooter:grapple_hook", "default:pick_steel", "default:torch 4", "xtraarmor:helmet_leather_black", "xtraarmor:chestplate_leather_black", "xtraarmor:leggings_leather_black", "xtraarmor:boots_leather_black"} available_classes["Crossbow"] = {"throwing:crossbow", "throwing:arrow_steel 32", "throwing:arrow_torch 8", "shooter:grapple_hook", "default:pick_steel", "default:torch 4", "xtraarmor:helmet_leather_brown", "xtraarmor:chestplate_studded", "xtraarmor:leggings_studded", "xtraarmor:boots_leather_brown"} available_classes["Builder"] = {"default:pick_diamond", "default:stonebrick 99", "default:wood 99", "default:torch 4", "doors:door_steel", "default:ladder 16"} available_classes["Healer"] = {"default:pick_steel", "bandages:bandage_2 50", "bandages:bandage_3 10", "default:torch 4", "default:ladder 4", "3d_armor:chestplate_bronze", "xtraarmor:boots_leather_black", "shields:shield_enhanced_wood"} -available_classes["Bomber"] = {"default:pick_steel", "tnt:tnt 2", "mesecons_pressureplates:pressure_plate_stone_off 2", "default:torch 4", "default:ladder 4", "shields:shield_wood"} +available_classes["Bomber"] = {"default:pick_steel", "tnt:tnt 2", "mesecons_pressureplates:pressure_plate_grass_off 2", "default:torch 4", "default:ladder 4", "shields:shield_wood"} local world_path = minetest.get_worldpath() local file = world_path .. "/classes.txt" diff --git a/mods/warfare_pack/mesecons-master/mesecons_pressureplates/init.lua b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/init.lua index cd4529b..92ee935 100644 --- a/mods/warfare_pack/mesecons-master/mesecons_pressureplates/init.lua +++ b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/init.lua @@ -92,3 +92,12 @@ mesecon.register_pressure_plate( "jeija_pressure_plate_stone_wield.png", "jeija_pressure_plate_stone_inv.png", {{"default:cobble", "default:cobble"}}) + mesecon.register_pressure_plate( + "mesecons_pressureplates:pressure_plate_grass", + "Stone Pressure Plate", + {"jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off_edges.png"}, + {"jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on_edges.png"}, + "jeija_pressure_plate_stone_wield.png", + "jeija_pressure_plate_stone_inv.png", + {{"mesecons_pressureplates:pressure_plate_stone", "default:grass"}}) + diff --git a/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_inv.png b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_inv.png new file mode 100644 index 0000000..89bd13c Binary files /dev/null and b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_inv.png differ diff --git a/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_wield.png b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_wield.png new file mode 100644 index 0000000..c28481f Binary files /dev/null and b/mods/warfare_pack/mesecons-master/mesecons_pressureplates/textures/jeija_pressure_plate_grass_wield.png differ diff --git a/mods/warfare_pack/shortrange/depends.txt b/mods/warfare_pack/shortrange/depends.txt new file mode 100644 index 0000000..6752274 --- /dev/null +++ b/mods/warfare_pack/shortrange/depends.txt @@ -0,0 +1,2 @@ +default +lottweapons \ No newline at end of file diff --git a/mods/warfare_pack/shortrange/init.lua b/mods/warfare_pack/shortrange/init.lua new file mode 100644 index 0000000..9a06796 --- /dev/null +++ b/mods/warfare_pack/shortrange/init.lua @@ -0,0 +1,23 @@ +local default_range = 4 +local long_range = default_range + 1 +local short_range = default_range - 2 + +local battleaxes = {"lottweapons:wood_battleaxe", "lottweapons:stone_battleaxe", "lottweapons:copper_battleaxe", "lottweapons:steel_battleaxe", "lottweapons:bronze_battleaxe", "lottweapons:gold_battleaxe"} +local warhammers = {"lottweapons:wood_warhammer", "lottweapons:stone_warhammer", "lottweapons:copper_warhammer", "lottweapons:steel_warhammer", "lottweapons:bronze_warhammer", "lottweapons:gold_warhammer"} +local spears = {"lottweapons:wood_spear", "lottweapons:stone_spear", "lottweapons:copper_spear", "lottweapons:steel_spear", "lottweapons:bronze_spear", "lottweapons:gold_spear"} +local daggers = {"lottweapons:wood_dagger", "lottweapons:stone_dagger", "lottweapons:copper_dagger", "lottweapons:steel_dagger", "lottweapons:bronze_dagger", "lottweapons:gold_dagger"} + +minetest.override_item("", {range = default_range,}) + +for id, item in pairs(battleaxes) do + minetest.override_item(item, {range = (short_range+default_range)/2,}) +end +for id, item in pairs(warhammers) do + minetest.override_item(item, {range = short_range,}) +end +for id, item in pairs(daggers) do + minetest.override_item(item, {range = short_range,}) +end +for id, item in pairs(spears) do + minetest.override_item(item, {range = long_range,}) +end \ No newline at end of file diff --git a/mods/warfare_pack/throwing/torch_arrow.lua b/mods/warfare_pack/throwing/torch_arrow.lua index 6115bb4..55fa2ee 100644 --- a/mods/warfare_pack/throwing/torch_arrow.lua +++ b/mods/warfare_pack/throwing/torch_arrow.lua @@ -81,7 +81,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime) local tnt = minetest.find_node_near(self.lastpos, 1, {"tnt:tnt"}) if tnt then minetest.sound_play("tnt_ignite", {pos=tnt}) - minetest.set_node(tnt, {name="tnt:tnt_burning"}) + minetest.set_node(tnt, {name="tnt:boom"}) end else local toughness = 0.9