diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png b/mods/homedecor_modpack/homedecor/models/homedecor_desk_fan_uv.png old mode 100644 new mode 100755 diff --git a/mods/mff/mff_pclasses/hunter.lua b/mods/mff/mff_pclasses/hunter.lua index 35a80d53..b5854559 100755 --- a/mods/mff/mff_pclasses/hunter.lua +++ b/mods/mff/mff_pclasses/hunter.lua @@ -27,3 +27,4 @@ pclasses.api.register_class("hunter", { pclasses.api.reserve_item("hunter", "throwing:bow_minotaur_horn") pclasses.api.reserve_item("hunter", "throwing:bow_minotaur_horn_improved") pclasses.api.reserve_item("hunter", "throwing:arrow_mithril") +pclasses.api.reserve_item("hunter", "throwing:arbalest_auto") diff --git a/mods/pclasses/textures/pclasses_grave_button.png b/mods/pclasses/textures/pclasses_grave_button.png old mode 100644 new mode 100755 diff --git a/mods/throwing/README.txt b/mods/throwing/README.txt index dbcb9d47..88e9094c 100755 --- a/mods/throwing/README.txt +++ b/mods/throwing/README.txt @@ -20,6 +20,10 @@ Grahpics & sounds: CC-BY 3.0 (see http://creativecommons.org/licenses/by/3.0/leg Changelog: +Update 1.3: +- Added automated arbalest, the ultimate weapon +- New arbalest texture coherent with steel color + Update 1.2: - Added arbalest - Defaults initialized diff --git a/mods/throwing/build_arrow.lua b/mods/throwing/build_arrow.lua index b8bf0c87..f6a1f5df 100755 --- a/mods/throwing/build_arrow.lua +++ b/mods/throwing/build_arrow.lua @@ -31,6 +31,7 @@ minetest.register_node("throwing:arrow_build_box", { local THROWING_ARROW_ENTITY={ physical = false, + timer=0, visual = "wielditem", visual_size = {x=0.1, y=0.1}, textures = {"throwing:arrow_build_box"}, @@ -43,6 +44,7 @@ local THROWING_ARROW_ENTITY={ } THROWING_ARROW_ENTITY.on_step = function(self, dtime) + self.timer=self.timer+dtime local newpos = self.object:getpos() if self.lastpos.x ~= nil then for _, pos in pairs(throwing_get_trajectoire(self, newpos)) do diff --git a/mods/throwing/crafts.lua b/mods/throwing/crafts.lua old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_arbalest_auto.png b/mods/throwing/textures/throwing_arbalest_auto.png new file mode 100755 index 00000000..c40cd92e Binary files /dev/null and b/mods/throwing/textures/throwing_arbalest_auto.png differ diff --git a/mods/throwing/textures/throwing_arbalest_auto_loaded.png b/mods/throwing/textures/throwing_arbalest_auto_loaded.png new file mode 100755 index 00000000..f971b24c Binary files /dev/null and b/mods/throwing/textures/throwing_arbalest_auto_loaded.png differ diff --git a/mods/throwing/tools.lua b/mods/throwing/tools.lua index 73ad8aca..7f7eefcc 100755 --- a/mods/throwing/tools.lua +++ b/mods/throwing/tools.lua @@ -69,3 +69,11 @@ if not DISABLE_ARBALEST then {'default:steel_ingot', 'farming:string', 'default:stick'}, }) end + +if not DISABLE_AUTOMATED_ARBALEST then + throwing_register_bow ('arbalest_auto', 'Automated arbalest', {x=1, y=1.3, z=0.5}, 40, 3.5, 60, true, { + {'default:steel_ingot', 'farming:string', 'default:mese_crystal'}, + {'default:steel_ingot', 'farming:string', 'default:steel_ingot'}, + {'default:steel_ingot', 'farming:string', 'default:mese_crystal'}, + }) +end diff --git a/other_things/Tableau-valeurs-MFF.ods b/other_things/Tableau-valeurs-MFF.ods index 78347de3..57493975 100755 Binary files a/other_things/Tableau-valeurs-MFF.ods and b/other_things/Tableau-valeurs-MFF.ods differ