Update helicopter mod commit & patch...

Commit: https://github.com/APercy/helicopter/tree/d3985b0
master
Jordan Irwin 2021-05-22 23:31:42 -07:00
parent d5439c915d
commit 35e1197ce9
9 changed files with 36 additions and 27 deletions

View File

@ -129,7 +129,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* transport/
* [bike][] ([MIT][lic.bike]) -- version: [1.2][ver.bike] *2021-04-12* ([patched][patch.bike])
* [boats][boats2] ([LGPL][lic.lgpl3.0] / [CC BY-SA][lic.ccbysa3.0]) -- version: [b83231e Git][ver.boats2] *2016-10-14* ([patched][patch.boats2]) ***UPSTREAM MOVED***
* [helicopter][] ([GPL][lic.gpl2.0] / [CC0][lic.cc0] / CC BY-NC) -- version: [1955cdd Git][ver.helicopter] *2021-03-28* ([patched][patch.helicopter])
* [helicopter][] ([GPL][lic.gpl2.0] / [CC0][lic.cc0] / CC BY-NC) -- version: [d3985b0 Git][ver.helicopter] *2021-04-27* ([patched][patch.helicopter])
* [hot_air_balloons][] ([LGPL][lic.lgpl2.1] / [CC BY-SA][lic.ccbysa3.0]) -- version: [39a3572 Git][ver.hot_air_balloons] *2020-11-17*
* [hovercraft][] ([LGPL / CC BY-SA / CC0][lic.hovercraft]) -- version: [4d50e68 Git][ver.hovercraft] *2017-05-14* ([patched][patch.hovercraft])
* [motorbike][] ([MIT][lic.motorbike]) -- version: [9527d56 Git][ver.motorbike] *2021-04-01* ([patched][patch.motorbike])
@ -547,7 +547,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.hbarmor]: http://repo.or.cz/minetest_hbarmor.git/tree/93d994c
[ver.hbsprint]: https://github.com/tacotexmex/hbsprint/tree/f566d0f
[ver.headanim]: https://github.com/LoneWolfHT/headanim/releases/tag/v1.01
[ver.helicopter]: https://github.com/APercy/helicopter/tree/1955cdd
[ver.helicopter]: https://github.com/APercy/helicopter/tree/d3985b0
[ver.hidename]: https://github.com/AntumMT/mod-hidename/releases/tag/v1.1
[ver.home_gui]: https://github.com/cornernote/minetest-home_gui/tree/425466a
[ver.home_workshop]: https://gitlab.com/VanessaE/home_workshop_modpack/tree/03325e8
@ -644,7 +644,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.gems_tools]: https://github.com/AntumMT/mod-gems_tools/tree/7f89843
[patch.hbarmor]: https://github.com/AntumMT/mod-hbarmor/tree/12a7dea
[patch.hbsprint]: https://github.com/AntumMT/mod-hbsprint/tree/03aef67
[patch.helicopter]: https://github.com/AntumMT/mod-helicopter/tree/dc7066b
[patch.helicopter]: https://github.com/AntumMT/mod-helicopter/tree/317573b
[patch.home_gui]: https://github.com/AntumMT/mod-home_gui/tree/014504a
[patch.homedecor]: https://github.com/AntumMT/mp-homedecor/tree/efbc1bb
[patch.hovercraft]: https://github.com/AntumMT/mod-hovercraft/tree/fa431a2

View File

@ -2424,11 +2424,6 @@ torches_enable_ceiling = false
# default: false
#helicopter.pick_up = true
## If enabled, helicopter will be controlled via mouse by default.
# type: bool
# default: false
#helicopter.mouse_default = true
# *** motorbike ***

View File

@ -0,0 +1,4 @@
player_api
biofuel
default?
creative?

View File

@ -1,6 +1,5 @@
--global constants
helicopter.gravity = tonumber(minetest.settings:get("movement_gravity")) or 9.8
helicopter.tilting_speed = 1
helicopter.tilting_max = 0.20
helicopter.power_max = 15
@ -177,7 +176,7 @@ function helicopter.heli_control(self, dtime, touching_ground, liquid_below, vel
if touching_ground or liquid_below then
--criar uma fucao pra isso pois ela repete na linha 268
-- sound and animation
minetest.sound_stop(self.sound_handle)
if self.sound_handle then minetest.sound_stop(self.sound_handle) end
self.object:set_animation_frame_speed(0)
-- gravity
self.object:set_acceleration(vector.multiply(helicopter.vector_up, -helicopter.gravity))

View File

@ -50,7 +50,7 @@ minetest.register_entity("helicopter:heli", {
hp_max = 50,
color = "#0063b0",
_passenger = nil,
_by_mouse = helicopter.mouse_default,
_by_mouse = helicopter.turn_player_look,
get_staticdata = function(self) -- unloaded/unloads ... is now saved
return minetest.serialize({
@ -170,7 +170,7 @@ minetest.register_entity("helicopter:heli", {
pitch = 1.0,
})
--[[if self.damage > 100 then --if acumulated damage is greater than 100, adieu
helicopter.destroy(self)
helicopter.destroy(self, player)
end]]--
end
@ -274,10 +274,21 @@ minetest.register_entity("helicopter:heli", {
if self.hp_max <= 0 then
if helicopter.pick_up then
self.object:remove()
puncher:get_inventory():add_item("main", "helicopter:heli")
local pinv = puncher:get_inventory()
local stack = ItemStack("helicopter:heli")
if not pinv:room_for_item("main", stack) then
minetest.chat_send_player(puncher:get_player_name(),
"You do not have room in your inventory")
else
if self.pointer then self.pointer:remove() end
if self.pilot_seat_base then self.pilot_seat_base:remove() end
if self.passenger_seat_base then self.passenger_seat_base:remove() end
self.object:remove()
pinv:add_item("main", stack)
end
else
helicopter.destroy(self)
helicopter.destroy(self, puncher)
end
end

View File

@ -1,4 +1,4 @@
helicopter.gravity = tonumber(minetest.settings:get("movement_gravity")) or 9.8
helicopter.vector_up = vector.new(0, 1, 0)
function helicopter.get_hipotenuse_value(point1, point2)
@ -120,7 +120,7 @@ function helicopter.dettach_pax(self, player)
end
-- destroy the helicopter
function helicopter.destroy(self)
function helicopter.destroy(self, puncher)
if self.sound_handle then
minetest.sound_stop(self.sound_handle)
self.sound_handle = nil

View File

@ -1,12 +1,15 @@
--- Determines gravity force on helicopter.
helicopter.gravity = tonumber(minetest.settings:get("movement_gravity") or 9.8)
--- Determines handling of punched helicopter.
--
-- If `false`, helicopter is destroyed. Otherwise, it is added to inventory.
-- - Default: false
-- If `false`, helicopter is destroyed. Otherwise, it is added to inventory.
-- - Default: false
helicopter.pick_up = minetest.settings:get_bool("helicopter.pick_up", false)
--- Determines default control of helicopter.
--
-- If enabled, helicopter will be controlled via mouse by default.
-- - Default: false
helicopter.mouse_default = minetest.settings:get_bool("helicopter.mouse_default", false)
-- Use facing direction to turn instead of a/d keys by default.
-- - Default: false
helicopter.turn_player_look = minetest.settings:get_bool("mount_turn_player_look", false)

View File

@ -3,5 +3,5 @@
# when punched.
helicopter.pick_up (Place in inventory) bool false
# If enabled, helicopter will be controlled via mouse by default.
helicopter.mouse_default (Mouse control default) bool false
# Use facing direction to turn instead of a/d keys by default.
mount_turn_player_look (Turn with look direction) bool false

View File

@ -529,9 +529,6 @@ sprint_breath_drain (Breath drain) float 1
# when punched.
helicopter.pick_up (Place in inventory) bool false
# If enabled, helicopter will be controlled via mouse by default.
helicopter.mouse_default (Mouse control default) bool false
[*hidename]