Minor changes and improvements
Removed F1 and 126r cars due to closed-source license.
This commit is contained in:
David Leal
parent
b0e5a30156
commit
e1a81c09f0
50
LICENSE.md
50
LICENSE.md
@ -1,31 +1,29 @@
|
||||
# Credits
|
||||
- F1 and 126R cars from: "Cars" by Radoslaw Slowik
|
||||
- https://forum.minetest.net/viewtopic.php?f=9&t=8698
|
||||
- License: Code WTFPL, modeles/textures CC BY-NC-ND 4.0
|
||||
|
||||
- Black, Blue, Brown, Cyan, Dark Green, Dark Grey, Green, Grey, Magenta, Orange, Pink, Red, Violet, White, Yellow, Hot Rod, Nyan Ride, Oerkki Bliss, and Road Master from: "Car" by Esteban
|
||||
# Credit where credit is due
|
||||
|
||||
- https://forum.minetest.net/viewtopic.php?f=13&t=7407
|
||||
- License:
|
||||
- No info given in that mod but I am going to assume the credit for the original model goes to:
|
||||
- Melcor and his CAR01 model
|
||||
- https://forum.minetest.net/viewtopic.php?f=9&t=6512
|
||||
- License: CC-BY-NC-SA
|
||||
- Black, Blue, Brown, Cyan, Dark Green, Dark Grey, Green, Grey, Magenta, Orange, Pink, Red, Violet, White, Yellow, Hot Rod, Nyan Ride, Oerkki Bliss, and Road Master from: "Car" by Esteban
|
||||
- <https://forum.minetest.net/viewtopic.php?f=13&t=7407>
|
||||
- License:
|
||||
- No info given in that mod but I am going to assume the credit for the original model goes to:
|
||||
- Melcor and his CAR01 model
|
||||
- <https://forum.minetest.net/viewtopic.php?f=9&t=6512>
|
||||
- License: CC-BY-NC-SA
|
||||
|
||||
- MeseCars from: "Mesecars" by paramat
|
||||
- https://forum.minetest.net/viewtopic.php?f=11&t=7967
|
||||
- Licenses: Code WTFPL, textures CC BY-SA
|
||||
- Boats from "Boats" by PilzAdam
|
||||
- textures: Zeg9
|
||||
- model: thetoon and Zeg9, modified by PavelS(SokolovPavel)
|
||||
- License: WTFPL
|
||||
- Hovercraft from "Hovercraft" by Stuart Jones
|
||||
- Licenses:
|
||||
- textures: CC-BY-SA
|
||||
- sounds: freesound.org
|
||||
- Rocket Boost Engine Loop by qubodup - CC0
|
||||
- CARTOON-BING-LOW by kantouth - CC-BY-3.0
|
||||
- All other sounds: Copyright Stuart Jones - CC-BY-SA
|
||||
- <https://forum.minetest.net/viewtopic.php?f=11&t=7967>
|
||||
- Licenses: Code WTFPL, textures CC BY-SA
|
||||
|
||||
I am sure many others deserve mention.
|
||||
- Boats from "Boats" by PilzAdam
|
||||
- textures: Zeg9
|
||||
- model: thetoon and Zeg9, modified by PavelS(SokolovPavel)
|
||||
- License: WTFPL
|
||||
|
||||
- Hovercraft from "Hovercraft" by Stuart Jones
|
||||
- Licenses:
|
||||
- textures: CC-BY-SA
|
||||
- sounds: freesound.org
|
||||
- Rocket Boost Engine Loop by qubodup - CC0
|
||||
- CARTOON-BING-LOW by kantouth - CC-BY-3.0
|
||||
- All other sounds: Copyright Stuart Jones - CC-BY-SA
|
||||
|
||||
I am sure many others deserve mention.\
|
||||
If you feel left out let me know and I will add you in.
|
||||
|
||||
162
README.md
162
README.md
@ -6,24 +6,25 @@
|
||||
|
||||
|
||||
A merge of all the vehicles from:
|
||||
* "Cars" by Radoslaw Slowik.
|
||||
* "Mesecars" by paramat.
|
||||
* "Car" by Esteban.
|
||||
* "Boats" by PilzAdam.
|
||||
* "Hovercraft" by Stuart Jones.
|
||||
|
||||
- 30 vehicles currently.
|
||||
- "Mesecars" by paramat.
|
||||
- "Car" by Esteban.
|
||||
- "Boats" by PilzAdam.
|
||||
- "Hovercraft" by Stuart Jones.
|
||||
|
||||
- 28 vehicles currently.
|
||||
- All CAR01's can carry 3 passengers.
|
||||
|
||||
* Disable vehicles by going to your Minetest Settings.
|
||||
* Adding new vehicles is a simple matter of:
|
||||
* Create/acquire vehicle model and textures.
|
||||
* Create, and name appropriately, a new `.lua` file on its appropiate folder for the vehicle based on one of the existing ones.
|
||||
* Add a setting in `settingtypes.txt` for users to enable/disable it.
|
||||
* Change settings in the file you created to reflect the new vehicle.
|
||||
* Add a new line to `init.lua` to load the vehicle `dofile(minetest.get_modpath("vehicle_mash") .. "/NAME_OF_VEHICLE.lua")`
|
||||
- Disable vehicles by going to your Minetest Settings.
|
||||
- Adding new vehicles is a simple matter of:
|
||||
- Create/acquire vehicle model and textures.
|
||||
- Create, and name appropriately, a new `.lua` file on its appropiate folder for the vehicle based on one of the existing ones.
|
||||
- Add a setting in `settingtypes.txt` for users to enable/disable it.
|
||||
- Change settings in the file you created to reflect the new vehicle.
|
||||
- Add a new line to `init.lua` to load the vehicle `dofile(minetest.get_modpath("vehicle_mash") .. "/NAME_OF_VEHICLE.lua")`
|
||||
|
||||
## Installation
|
||||
|
||||
- Unzip the archive, rename the folder to `vehicle_mash` and place it in
|
||||
../minetest/mods/
|
||||
|
||||
@ -34,137 +35,132 @@ it in ~/.minetest/mods/.
|
||||
the folder in worldmods/ in your world directory.
|
||||
|
||||
For further information or help, see:\
|
||||
https://wiki.minetest.net/Installing_Mods
|
||||
<https://wiki.minetest.net/Installing_Mods>
|
||||
|
||||
## Known issues
|
||||
|
||||
- Attachments incorrectly ordered.
|
||||
|
||||
## License
|
||||
|
||||
All licenses of previous works, of course, apply. (see credits below)
|
||||
As far as the work I did... It's really just a fork of a fork of a fork of a fork, tossed it all into a blender and spun it on puree for a bit. Baked it for a while and set it on the counter to cool. What I mean is, make what you will of it, it matters not to me.
|
||||
|
||||
See [`LICENSE.md`](LICENSE.md) for more information.
|
||||
|
||||
## Dependencies
|
||||
|
||||
- `default` (included in [Minetest Game](https://github.com/minetest/minetest_game))
|
||||
- [`lib_mount`](https://github.com/Panquesito7/lib_mount)
|
||||
|
||||
## Requirements
|
||||
|
||||
- `vehicle_mash` 2.1.0 for MT 5.0.0+.
|
||||
- `vehicle_mash` 2.0 for MT 0.4.12+ (may work on older versions).
|
||||
|
||||
## TODO
|
||||
|
||||
There are no pending tasks to do yet.
|
||||
|
||||
## Changelog
|
||||
|
||||
v2.2.2 6/02/2020
|
||||
|
||||
* Fix passengers not detaching when driver gets out.
|
||||
* Various other tweaks and fixes for passengers.
|
||||
- Fix passengers not detaching when driver gets out.
|
||||
- Various other tweaks and fixes for passengers.
|
||||
|
||||
v2.2.1 5/28/2020
|
||||
|
||||
* Added vehicle crafting (Enabled by default).
|
||||
* Added car battery, windshield, tire, and motor.
|
||||
* All CAR01's can now carry 3 passengers.
|
||||
* Add `screenshot.png`.
|
||||
* Improve `README.md`.
|
||||
- Added vehicle crafting (Enabled by default).
|
||||
- Added car battery, windshield, tire, and motor.
|
||||
- All CAR01's can now carry 3 passengers.
|
||||
- Add `screenshot.png`.
|
||||
- Improve `README.md`.
|
||||
|
||||
v2.2 5/15/2020
|
||||
|
||||
* Move files to a folder of its own.
|
||||
* Add GitHub workflow and LuaCheck.
|
||||
* Add `settingtypes.txt` to select enabled cars.
|
||||
* Improve `README.md`.
|
||||
* Short a bit the code.
|
||||
- Move files to a folder of its own.
|
||||
- Add GitHub workflow and LuaCheck.
|
||||
- Add `settingtypes.txt` to select enabled cars.
|
||||
- Improve `README.md`.
|
||||
- Short a bit the code.
|
||||
|
||||
v2.1 6/10/2019
|
||||
|
||||
* Fix attachment positions for drivers/passengers on all vehicles.
|
||||
* Adds red, green, and yellow hovercrafts.
|
||||
* Use `mod.conf` for name, description and dependencies.
|
||||
* Support for MT 5.0.0+.
|
||||
|
||||
|
||||
- Fix attachment positions for drivers/passengers on all vehicles.
|
||||
- Adds red, green, and yellow hovercrafts.
|
||||
- Use `mod.conf` for name, description and dependencies.
|
||||
- Support for MT 5.0.0+.
|
||||
|
||||
v2.0 8/13/2016
|
||||
|
||||
* converted to use the lib_mount mod for "driving"
|
||||
* enlarged F1 and 126r models x2.5
|
||||
* added yellow Mesecar
|
||||
* updated boat model from default boat mod
|
||||
* various speed/braking/turning/acceleration tweaks
|
||||
* various collision box tweaks
|
||||
* various other tweaks I probably forgot about
|
||||
* last version supporting MT 0.4.12+.
|
||||
|
||||
|
||||
- converted to use the lib_mount mod for "driving"
|
||||
- enlarged F1 and 126r models x2.5
|
||||
- added yellow Mesecar
|
||||
- updated boat model from default boat mod
|
||||
- various speed/braking/turning/acceleration tweaks
|
||||
- various collision box tweaks
|
||||
- various other tweaks I probably forgot about
|
||||
- last version supporting MT 0.4.12+.
|
||||
|
||||
v1.4 5/19/2015
|
||||
|
||||
* attach (one) passenger added
|
||||
* reorganized vehicle definition file code and added some variables pertaining to passengers
|
||||
* added a vehicle definition file template with comments
|
||||
* cleaned up to remove code dulplication
|
||||
|
||||
|
||||
- attach (one) passenger added
|
||||
- reorganized vehicle definition file code and added some variables pertaining to passengers
|
||||
- added a vehicle definition file template with comments
|
||||
- cleaned up to remove code dulplication
|
||||
|
||||
v1.3 5/5/2015
|
||||
|
||||
* player now sits forward in vehicles
|
||||
* tweaked player sit positions
|
||||
* tweaked collison boxes
|
||||
* proper placement on_ground/in_water
|
||||
|
||||
- player now sits forward in vehicles
|
||||
- tweaked player sit positions
|
||||
- tweaked collison boxes
|
||||
- proper placement on_ground/in_water
|
||||
|
||||
v1.2 5/1/2015
|
||||
|
||||
* added boats
|
||||
* changed name so to not conflict with other mods
|
||||
|
||||
|
||||
- added boats
|
||||
- changed name so to not conflict with other mods
|
||||
|
||||
v1.1 4/25/2015
|
||||
|
||||
* car won't come to a complete stop (fixed)
|
||||
|
||||
|
||||
- car won't come to a complete stop (fixed)
|
||||
|
||||
v1.0 4/24/2015
|
||||
|
||||
* first release
|
||||
|
||||
|
||||
- first release
|
||||
|
||||
## Bugs, suggestions and new features
|
||||
|
||||
Report bugs or suggest ideas by [creating an issue](https://github.com/blert2112/vehicle_mash/issues/new).
|
||||
If you know how to fix an issue, consider opening a [pull request](https://github.com/blert2112/vehicle_mash/compare).
|
||||
|
||||
## Credit where credit is due
|
||||
- F1 and 126R cars from: "Cars" by Radoslaw Slowik
|
||||
- https://forum.minetest.net/viewtopic.php?f=9&t=8698
|
||||
- License: Code WTFPL, modeles/textures CC BY-NC-ND 4.0
|
||||
|
||||
- Black, Blue, Brown, Cyan, Dark Green, Dark Grey, Green, Grey, Magenta, Orange, Pink, Red, Violet, White, Yellow, Hot Rod, Nyan Ride, Oerkki Bliss, and Road Master from: "Car" by Esteban
|
||||
- https://forum.minetest.net/viewtopic.php?f=13&t=7407
|
||||
- License:
|
||||
- No info given in that mod but I am going to assume the credit for the original model goes to:
|
||||
- Melcor and his CAR01 model
|
||||
- https://forum.minetest.net/viewtopic.php?f=9&t=6512
|
||||
- License: CC-BY-NC-SA
|
||||
- <https://forum.minetest.net/viewtopic.php?f=13&t=7407>
|
||||
- License:
|
||||
- No info given in that mod but I am going to assume the credit for the original model goes to:
|
||||
- Melcor and his CAR01 model
|
||||
- <https://forum.minetest.net/viewtopic.php?f=9&t=6512>
|
||||
- License: CC-BY-NC-SA
|
||||
|
||||
- MeseCars from: "Mesecars" by paramat
|
||||
- https://forum.minetest.net/viewtopic.php?f=11&t=7967
|
||||
- Licenses: Code WTFPL, textures CC BY-SA
|
||||
- <https://forum.minetest.net/viewtopic.php?f=11&t=7967>
|
||||
- Licenses: Code WTFPL, textures CC BY-SA
|
||||
|
||||
- Boats from "Boats" by PilzAdam
|
||||
- textures: Zeg9
|
||||
- model: thetoon and Zeg9, modified by PavelS(SokolovPavel)
|
||||
- License: WTFPL
|
||||
- textures: Zeg9
|
||||
- model: thetoon and Zeg9, modified by PavelS(SokolovPavel)
|
||||
- License: WTFPL
|
||||
|
||||
- Hovercraft from "Hovercraft" by Stuart Jones
|
||||
- Licenses:
|
||||
- textures: CC-BY-SA
|
||||
- sounds: freesound.org
|
||||
- Rocket Boost Engine Loop by qubodup - CC0
|
||||
- CARTOON-BING-LOW by kantouth - CC-BY-3.0
|
||||
- All other sounds: Copyright Stuart Jones - CC-BY-SA
|
||||
- Licenses:
|
||||
- textures: CC-BY-SA
|
||||
- sounds: freesound.org
|
||||
- Rocket Boost Engine Loop by qubodup - CC0
|
||||
- CARTOON-BING-LOW by kantouth - CC-BY-3.0
|
||||
- All other sounds: Copyright Stuart Jones - CC-BY-SA
|
||||
|
||||
I am sure many others deserve mention.\
|
||||
If you feel left out let me know and I will add you in.
|
||||
|
||||
19
crafts.lua
19
crafts.lua
@ -304,22 +304,3 @@ minetest.register_craft({
|
||||
{"vehicle_mash:tire", "vehicle_mash:battery", "vehicle_mash:tire"},
|
||||
}
|
||||
})
|
||||
|
||||
-- Other cars
|
||||
minetest.register_craft({
|
||||
output = "vehicle_mash:car_f1",
|
||||
recipe = {
|
||||
{"vehicle_mash:tire", "", "vehicle_mash:tire"},
|
||||
{"vehicle_mash:motor", "wool:red", "vehicle_mash:motor"},
|
||||
{"vehicle_mash:tire", "vehicle_mash:battery", "vehicle_mash:tire"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "vehicle_mash:car_126r",
|
||||
recipe = {
|
||||
{"vehicle_mash:tire", "xpanes:obsidian_pane_flat", "vehicle_mash:tire"},
|
||||
{"vehicle_mash:motor", "wool:red", "vehicle_mash:motor"},
|
||||
{"vehicle_mash:tire", "vehicle_mash:battery", "vehicle_mash:tire"},
|
||||
}
|
||||
})
|
||||
|
||||
41
init.lua
41
init.lua
@ -15,51 +15,12 @@ end
|
||||
-- load vehicles down here
|
||||
-- ***********************
|
||||
|
||||
-- ** 126r and F1 **
|
||||
------------------------------------------------------------------------------
|
||||
-- create Cars common def
|
||||
local cars_def = {
|
||||
-- adjust to change how vehicle reacts while driving
|
||||
terrain_type = 1, -- 0 = air, 1 = land, 2 = liquid, 3 = land + liquid
|
||||
-- model specific stuff
|
||||
visual = "mesh",
|
||||
visual_size = {x=1, y=1},
|
||||
wield_scale = {x=1, y=1, z=1},
|
||||
-- player specific stuff
|
||||
player_rotation = {x=0,y=0,z=0},
|
||||
driver_eye_offset = {x=0, y=0, z=0},
|
||||
number_of_passengers = 0,
|
||||
passenger_attach_at = {x=0,y=0,z=0},
|
||||
passenger_eye_offset = {x=0, y=0, z=0},
|
||||
|
||||
passenger2_attach_at = {x=0,y=0,z=0},
|
||||
passenger2_eye_offset = {x=0, y=0, z=0},
|
||||
|
||||
passenger3_attach_at = {x=0,y=0,z=0},
|
||||
passenger3_eye_offset = {x=0, y=0, z=0},
|
||||
|
||||
-- recipe
|
||||
recipe = nil
|
||||
}
|
||||
|
||||
local other_car_names = {
|
||||
"126r",
|
||||
"f1",
|
||||
}
|
||||
|
||||
for _, name in ipairs(other_car_names) do
|
||||
local check_enabled = minetest.settings:get_bool("vehicle_mash.enable_" .. name .. "_car")
|
||||
if check_enabled or check_enabled == nil then
|
||||
loadfile(mpath.. "/other_cars/" .. name .. ".lua")(table.copy(cars_def))
|
||||
end
|
||||
end
|
||||
|
||||
-- ** CAR01s **
|
||||
------------------------------------------------------------------------------
|
||||
-- create CAR01 common def
|
||||
local car01_def = {
|
||||
-- adjust to change how vehicle reacts while driving
|
||||
terrain_type = 1,
|
||||
terrain_type = 1, -- 0 = air, 1 = land, 2 = liquid, 3 = land + liquid
|
||||
max_speed_forward = 10,
|
||||
max_speed_reverse = 7,
|
||||
accel = 2,
|
||||
|
||||
BIN
luacheck.exe
Normal file
BIN
luacheck.exe
Normal file
Binary file not shown.
@ -1,24 +0,0 @@
|
||||
|
||||
local name = "car_126r"
|
||||
local definition = ...
|
||||
|
||||
definition.description = "126r car"
|
||||
-- adjust to change how vehicle reacts while driving
|
||||
definition.max_speed_forward = 12
|
||||
definition.max_speed_reverse = 10
|
||||
definition.accel = 3
|
||||
definition.braking = 6
|
||||
definition.turn_speed = 4
|
||||
definition.stepheight = 1.1
|
||||
-- model specific stuff
|
||||
definition.mesh = "car_126r.x"
|
||||
definition.collisionbox = {-0.7, -0.5, -0.7, 0.7, 0.7, 0.7}
|
||||
definition.onplace_position_adj = 0
|
||||
definition.inventory_image = "car_126r_inventory.png"
|
||||
definition.wield_image = "car_126r_wield.png"
|
||||
definition.textures = {"car_126r.png"}
|
||||
-- player specific stuff
|
||||
definition.driver_attach_at = {x=0,y=0,z=-4}
|
||||
definition.drop_on_destroy = {"vehicle_mash:tire 2", "vehicle_mash:battery", "vehicle_mash:motor"}
|
||||
|
||||
vehicle_mash.register_vehicle("vehicle_mash:"..name, definition)
|
||||
@ -1,24 +0,0 @@
|
||||
|
||||
local name = "car_f1"
|
||||
local definition = ...
|
||||
|
||||
definition.description = "F1 car"
|
||||
-- adjust to change how vehicle reacts while driving
|
||||
definition.max_speed_forward = 15
|
||||
definition.max_speed_reverse = 7
|
||||
definition.accel = 4
|
||||
definition.braking = 8
|
||||
definition.turn_speed = 4
|
||||
definition.stepheight = 0.6
|
||||
-- model specific stuff
|
||||
definition.mesh = "car_f1.x"
|
||||
definition.collisionbox = {-0.5, -0.4, -0.5, 0.5, 0.5, 0.5}
|
||||
definition.onplace_position_adj = -0.1
|
||||
definition.inventory_image = "car_f1_inventory.png"
|
||||
definition.wield_image = "car_f1_wield.png"
|
||||
definition.textures = {"car_f1.png"}
|
||||
-- player specific stuff
|
||||
definition.driver_attach_at = {x=0,y=0,z=0}
|
||||
definition.drop_on_destroy = {"vehicle_mash:tire 2", "vehicle_mash:battery", "vehicle_mash:motor"}
|
||||
|
||||
vehicle_mash.register_vehicle("vehicle_mash:"..name, definition)
|
||||
@ -2,11 +2,6 @@
|
||||
|
||||
vehicle_mash.enable_crafts (Allows crafting vehicles) bool true
|
||||
|
||||
# Other cars
|
||||
|
||||
vehicle_mash.enable_126r_car (Enables 126r car) bool true
|
||||
vehicle_mash.enable_f1_car (Enables F1 car) bool true
|
||||
|
||||
# CAR01's cars
|
||||
|
||||
vehicle_mash.enable_black_car (Enables black car) bool true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user