diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..cde6257 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,9 @@ +unused_args = false +allow_defined_top = true + +read_globals = { + "minetest", + "airutils", + "vector", + "DIR_DELIM", +} diff --git a/crafts.lua b/crafts.lua index 614ffec..3141bba 100755 --- a/crafts.lua +++ b/crafts.lua @@ -20,11 +20,11 @@ minetest.register_craftitem("ju52:ju52", { if pointed_thing.type ~= "node" then return end - + local pointed_pos = pointed_thing.under --local node_below = minetest.get_node(pointed_pos).name --local nodedef = minetest.registered_nodes[node_below] - + pointed_pos.y=pointed_pos.y+3.0 local new_ju52 = minetest.add_entity(pointed_pos, "ju52:ju52") if new_ju52 and placer then @@ -45,7 +45,7 @@ minetest.register_craftitem("ju52:ju52", { -- crafting -- if not minetest.settings:get_bool('ju52.disable_craftitems') and minetest.get_modpath("default") then - --[[minetest.register_craft({ + minetest.register_craft({ output = "ju52:wings", recipe = { {"wool:white", "farming:string", "wool:white"}, @@ -67,5 +67,5 @@ if not minetest.settings:get_bool('ju52.disable_craftitems') and minetest.get_mo {"ju52:wings",}, {"ju52:body",}, } - })]]-- + }) end diff --git a/entities.lua b/entities.lua index 756350b..61b3219 100644 --- a/entities.lua +++ b/entities.lua @@ -22,17 +22,17 @@ initial_properties = { "airutils_metal.png", --roda trem }, }, - + on_activate = function(self,std) self.sdata = minetest.deserialize(std) or {} if self.sdata.remove then self.object:remove() end end, - + get_staticdata=function(self) self.sdata.remove=true return minetest.serialize(self.sdata) end, - + }) minetest.register_entity('ju52:cabin_interactor',{ @@ -46,12 +46,12 @@ minetest.register_entity('ju52:cabin_interactor',{ }, dist_moved = 0, max_hp = 65535, - + on_activate = function(self,std) self.sdata = minetest.deserialize(std) or {} if self.sdata.remove then self.object:remove() end end, - + get_staticdata=function(self) self.sdata.remove=true return minetest.serialize(self.sdata) @@ -73,7 +73,7 @@ minetest.register_entity('ju52:cabin_interactor',{ if parent_self.co_pilot and parent_self._have_copilot then copilot_name = parent_self.co_pilot end - + if name == parent_self.driver_name then local itmstck=clicker:get_wielded_item() local item_name = "" diff --git a/forms.lua b/forms.lua index 13d0cf9..2cdfb48 100644 --- a/forms.lua +++ b/forms.lua @@ -8,7 +8,7 @@ function ju52.paint_formspec(name) basic_form = basic_form.."image_button[0.5,0.5;3,1;ju52_p_lufthansa.png;lufthansa;Lufthansa;false;true;]" basic_form = basic_form.."image_button[0.5,1.6;3,1;ju52_p_lufthansa.png;lufthansa2;Lufthansa 2;false;true;]" basic_form = basic_form.."image_button[0.5,2.7;3,1;ju52_p_luftwaffe.png;luftwaffe;Luftwaffe;false;true;]" - --basic_form = basic_form.."image_button[1,4.3;3,1;ju52_white.png^[multiply:#2b2b2b;black;Black;false;true;]" + --basic_form = basic_form.."image_button[1,4.3;3,1;ju52_white.png^[multiply:#2b2b2b;black;Black;false;true;]" minetest.show_formspec(name, "ju52:paint", basic_form) end @@ -23,7 +23,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end local ent = plane_obj:get_luaentity() if ent then - + if fields.lufthansa then ent._skin = "ju52_skin_lufthansa.png" end if fields.lufthansa2 then ent._skin = "ju52_skin_lufthansa2.png" end if fields.luftwaffe then ent._skin = "ju52_skin_luftwaffe.png" end diff --git a/init.lua b/init.lua index bc93a4e..d7c6bfe 100755 --- a/init.lua +++ b/init.lua @@ -48,8 +48,6 @@ end function ju52.destroy_parts_method(self) if self.wheels then self.wheels:remove() end if self.cabin then self.cabin:remove() end - - local pos = self.object:get_pos() end function ju52.step_additional_function(self) @@ -69,7 +67,7 @@ function ju52.step_additional_function(self) local energy_indicator_angle = airutils.get_gauge_angle((self._max_fuel - self._energy)/3) - 90 self.object:set_bone_position("fuel", {x=0, y=-40.6, z=15.35}, {x=0, y=(energy_indicator_angle+180), z=0}) - + self.object:set_bone_position("compass", {x=0, y=-40.55, z=18.2}, {x=0, y=(math.deg(self._yaw)), z=0}) self.object:set_bone_position("compass_plan", {x=0, y=-40.4, z=18.2}, {x=0, y=airutils.get_adf_angle(self, pos), z=0}) @@ -274,13 +272,6 @@ dofile(minetest.get_modpath("ju52") .. DIR_DELIM .. "entities.lua") -- items -- -settings = Settings(minetest.get_worldpath() .. "/ju52.conf") -local function fetch_setting(name) - local sname = name - return settings and settings:get(sname) or minetest.settings:get(sname) -end - - local old_entities = {"ju52:seat_base","ju52:engine"} for _,entity_name in ipairs(old_entities) do minetest.register_entity(":"..entity_name, { diff --git a/mod.conf b/mod.conf index c748bcb..c53e8be 100644 --- a/mod.conf +++ b/mod.conf @@ -1,6 +1,6 @@ name = ju52 depends = airutils -optional_depends = compassgps,climate_api,biofuel +optional_depends = compassgps,climate_api,biofuel,default author = APercy description = Adds a Ju52 airplane title = Ju52 diff --git a/textures/ju52.png b/textures/ju52.png index 714d170..3944b5f 100644 Binary files a/textures/ju52.png and b/textures/ju52.png differ diff --git a/textures/ju52_altimeter.png b/textures/ju52_altimeter.png index 0ee1751..92a7f2c 100644 Binary files a/textures/ju52_altimeter.png and b/textures/ju52_altimeter.png differ diff --git a/textures/ju52_bege.png b/textures/ju52_bege.png index 98443e1..f75718f 100644 Binary files a/textures/ju52_bege.png and b/textures/ju52_bege.png differ diff --git a/textures/ju52_black.png b/textures/ju52_black.png index 9aed822..4c43222 100644 Binary files a/textures/ju52_black.png and b/textures/ju52_black.png differ diff --git a/textures/ju52_body.png b/textures/ju52_body.png index 6b41a08..e5387ea 100644 Binary files a/textures/ju52_body.png and b/textures/ju52_body.png differ diff --git a/textures/ju52_brown.png b/textures/ju52_brown.png index 2e8a3bb..b541c2a 100644 Binary files a/textures/ju52_brown.png and b/textures/ju52_brown.png differ diff --git a/textures/ju52_climber.png b/textures/ju52_climber.png index 1ab5e59..c182626 100644 Binary files a/textures/ju52_climber.png and b/textures/ju52_climber.png differ diff --git a/textures/ju52_compass.png b/textures/ju52_compass.png index 4e9fbe8..575c689 100644 Binary files a/textures/ju52_compass.png and b/textures/ju52_compass.png differ diff --git a/textures/ju52_compass_ind.png b/textures/ju52_compass_ind.png index 2feeeba..86001d4 100644 Binary files a/textures/ju52_compass_ind.png and b/textures/ju52_compass_ind.png differ diff --git a/textures/ju52_compass_plan.png b/textures/ju52_compass_plan.png old mode 100755 new mode 100644 index dd64f17..3b819b8 Binary files a/textures/ju52_compass_plan.png and b/textures/ju52_compass_plan.png differ diff --git a/textures/ju52_engine.png b/textures/ju52_engine.png index 34993d0..4c0215f 100644 Binary files a/textures/ju52_engine.png and b/textures/ju52_engine.png differ diff --git a/textures/ju52_fuel.png b/textures/ju52_fuel.png index 517d36e..6c5448b 100644 Binary files a/textures/ju52_fuel.png and b/textures/ju52_fuel.png differ diff --git a/textures/ju52_glass.png b/textures/ju52_glass.png index fde1907..e416e47 100644 Binary files a/textures/ju52_glass.png and b/textures/ju52_glass.png differ diff --git a/textures/ju52_helice.png b/textures/ju52_helice.png index 777863a..83127e7 100644 Binary files a/textures/ju52_helice.png and b/textures/ju52_helice.png differ diff --git a/textures/ju52_hud_panel.png b/textures/ju52_hud_panel.png index 85d5cef..419307d 100644 Binary files a/textures/ju52_hud_panel.png and b/textures/ju52_hud_panel.png differ diff --git a/textures/ju52_ind_box.png b/textures/ju52_ind_box.png index dabada9..af72d15 100644 Binary files a/textures/ju52_ind_box.png and b/textures/ju52_ind_box.png differ diff --git a/textures/ju52_metal.png b/textures/ju52_metal.png index 3128f33..f55daca 100644 Binary files a/textures/ju52_metal.png and b/textures/ju52_metal.png differ diff --git a/textures/ju52_p_lufthansa.png b/textures/ju52_p_lufthansa.png index 3159d13..43344ba 100644 Binary files a/textures/ju52_p_lufthansa.png and b/textures/ju52_p_lufthansa.png differ diff --git a/textures/ju52_p_luftwaffe.png b/textures/ju52_p_luftwaffe.png index 44b9519..b5cef03 100644 Binary files a/textures/ju52_p_luftwaffe.png and b/textures/ju52_p_luftwaffe.png differ diff --git a/textures/ju52_painting.png b/textures/ju52_painting.png index 0693570..835e2b2 100644 Binary files a/textures/ju52_painting.png and b/textures/ju52_painting.png differ diff --git a/textures/ju52_panel_color.png b/textures/ju52_panel_color.png index e1dd582..a7a8fad 100644 Binary files a/textures/ju52_panel_color.png and b/textures/ju52_panel_color.png differ diff --git a/textures/ju52_red.png b/textures/ju52_red.png index e5b86ba..072c055 100644 Binary files a/textures/ju52_red.png and b/textures/ju52_red.png differ diff --git a/textures/ju52_skin_lufthansa.png b/textures/ju52_skin_lufthansa.png index 2c856a5..dc2bcfd 100644 Binary files a/textures/ju52_skin_lufthansa.png and b/textures/ju52_skin_lufthansa.png differ diff --git a/textures/ju52_skin_lufthansa2.png b/textures/ju52_skin_lufthansa2.png old mode 100755 new mode 100644 index 1f69bbc..6447db9 Binary files a/textures/ju52_skin_lufthansa2.png and b/textures/ju52_skin_lufthansa2.png differ diff --git a/textures/ju52_skin_luftwaffe.png b/textures/ju52_skin_luftwaffe.png index 781463a..4fd6c0d 100644 Binary files a/textures/ju52_skin_luftwaffe.png and b/textures/ju52_skin_luftwaffe.png differ diff --git a/textures/ju52_speed.png b/textures/ju52_speed.png index b6f4e9f..11d1b78 100644 Binary files a/textures/ju52_speed.png and b/textures/ju52_speed.png differ diff --git a/textures/ju52_white.png b/textures/ju52_white.png index 769e09b..40a6987 100644 Binary files a/textures/ju52_white.png and b/textures/ju52_white.png differ diff --git a/textures/ju52_wings.png b/textures/ju52_wings.png index c2bc8d8..f73c46b 100644 Binary files a/textures/ju52_wings.png and b/textures/ju52_wings.png differ