diff --git a/126r.lua b/126r.lua index da5dcf6..9080210 100755 --- a/126r.lua +++ b/126r.lua @@ -18,6 +18,6 @@ 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=10,z=-4} +definition.driver_attach_at = {x=0,y=0,z=-4} vehicle_mash.register_vehicle("vehicle_mash:"..name, definition) diff --git a/README.md b/README.md index 65047ba..1ede075 100755 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -***Vehicles_mash*** -- version: 2.0 -- by blert2112 +# **Vehicle_mash** +- Current version: 2.1.0 +- By blert2112 A merge of all the vehicles from: -- "Cars" by Radoslaw Slowik -- "Mesecars" by paramat -- "Car" by Esteban -- "Boats" by PilzAdam -- "Hovercraft" by Stuart Jones (experimental and disabled by default) +- "Cars" by Radoslaw Slowik. +- "Mesecars" by paramat. +- "Car" by Esteban. +- "Boats" by PilzAdam. +- "Hovercraft" by Stuart Jones. -- 26 vehicles currently (27 if you include the experimental hovercraft) +- 30 vehicles currently. - Certain vehicles can now carry passengers. Currently one passenger max. - Disable vehicles by commenting out it's 'dofile' line in init.lua @@ -19,49 +19,97 @@ A merge of all the vehicles from: - 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*** -- rename folder to "vehicle_mash" if necessary +## **Installation** +- Unzip the archive, rename the folder to "vehicle_mash" (**without the quotes**) and place it in +../minetest/mods/ -***License*** +- GNU/Linux: If you use a system-wide installation place +it in ~/.minetest/mods/. + +- If you only want this to be used in a single world, place +the folder in worldmods/ in your world directory. + + +For further information or help, see: +https://wiki.minetest.net/Installing_Mods + +## **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. -***Dependencies*** -- Default +## **Dependencies** +- default (included in minetest_game) - lib_mount -***To Do*** -- complete the addition of the hovercraft +## **Requirements** +* "vehicle_mash" 2.1.0 for MT/MTG 5.0.0+. +* "vehicle_mash" 2.0 for MT/MTG 0.4.12+ (may work on older versions). + +## **To-Do** - crafting -***Change Log*** -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 -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 -v1.3 5/5/2015 - - 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 -v1.1 4/25/2015 - - car won't come to a complete stop (fixed) -v1.0 4/24/2015 - - first release +## **Changelog** -***CREDIT WHERE CREDIT IS DUE*** + +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/MTG 5.0.0+ (may not work with official dev-builds). + + +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/MTG 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 + + +v1.3 5/5/2015 + +* 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 + + +v1.1 4/25/2015 + +* car won't come to a complete stop (fixed) + + +v1.0 4/24/2015 + +* 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 @@ -93,4 +141,4 @@ v1.0 4/24/2015 I am sure many others deserve mention. If you feel left out let me know and I will add you in. -Enjoy! \ No newline at end of file +Enjoy! diff --git a/description.txt b/description.txt new file mode 100644 index 0000000..a38d3db --- /dev/null +++ b/description.txt @@ -0,0 +1 @@ +Adds many types of vehicles. \ No newline at end of file diff --git a/f1.lua b/f1.lua index b619566..430b11c 100755 --- a/f1.lua +++ b/f1.lua @@ -18,6 +18,6 @@ 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=8,z=0} +definition.driver_attach_at = {x=0,y=0,z=0} vehicle_mash.register_vehicle("vehicle_mash:"..name, definition) diff --git a/hover_green.lua b/hover_green.lua new file mode 100644 index 0000000..c2f016f --- /dev/null +++ b/hover_green.lua @@ -0,0 +1,11 @@ + +local name = "hover_green" + +local definition = ... + +definition.description = "Green hovercraft" +definition.inventory_image = "hovercraft_green_inv.png" +definition.wield_image = "hovercraft_green_inv.png" +definition.textures = {"hovercraft_green.png"} + +vehicle_mash.register_vehicle("vehicle_mash:"..name, definition) diff --git a/hover_red.lua b/hover_red.lua new file mode 100644 index 0000000..9a89e3b --- /dev/null +++ b/hover_red.lua @@ -0,0 +1,11 @@ + +local name = "hover_red" + +local definition = ... + +definition.description = "Red hovercraft" +definition.inventory_image = "hovercraft_red_inv.png" +definition.wield_image = "hovercraft_red_inv.png" +definition.textures = {"hovercraft_red.png"} + +vehicle_mash.register_vehicle("vehicle_mash:"..name, definition) diff --git a/hover_yellow.lua b/hover_yellow.lua new file mode 100644 index 0000000..3e2bb54 --- /dev/null +++ b/hover_yellow.lua @@ -0,0 +1,11 @@ + +local name = "hover_yellow" + +local definition = ... + +definition.description = "Yellow hovercraft" +definition.inventory_image = "hovercraft_yellow_inv.png" +definition.wield_image = "hovercraft_yellow_inv.png" +definition.textures = {"hovercraft_yellow.png"} + +vehicle_mash.register_vehicle("vehicle_mash:"..name, definition) diff --git a/init.lua b/init.lua index 8aa3974..2d03f2c 100755 --- a/init.lua +++ b/init.lua @@ -60,10 +60,10 @@ local car01_def = { onplace_position_adj = -0.45, --player specific stuff player_rotation = {x=0,y=90,z=0}, - driver_attach_at = {x=3.5,y=12,z=3.5}, + driver_attach_at = {x=3.5,y=3.7,z=3.5}, driver_eye_offset = {x=-4, y=0, z=0}, number_of_passengers = 1, - passenger_attach_at = {x=3.5,y=12,z=-3.5}, + passenger_attach_at = {x=3.5,y=3.7,z=-3.5}, passenger_eye_offset = {x=4, y=0, z=0}, --drop and recipe drop_on_destroy = "", @@ -114,7 +114,7 @@ local mesecar_def = { onplace_position_adj = 0.25, --player specific stuff player_rotation = {x=0,y=0,z=0}, - driver_attach_at = {x=0,y=2,z=0}, + driver_attach_at = {x=0,y=0,z=-2.0}, driver_eye_offset = {x=0, y=0, z=0}, number_of_passengers = 0, passenger_attach_at = {x=0,y=0,z=0}, @@ -153,7 +153,7 @@ local boat_def = { textures = {"default_wood.png"}, --player specific stuff player_rotation = {x=0, y=0, z=0}, - driver_attach_at = {x=0,y=11,z=-3}, + driver_attach_at = {x=0.5,y=1,z=-3}, driver_eye_offset = {x=0, y=0, z=0}, number_of_passengers = 0, passenger_attach_at = {x=0,y=0,z=0}, @@ -187,7 +187,7 @@ local hover_def = { onplace_position_adj = -0.25, --player specific stuff player_rotation = {x=0,y=90,z=0}, - driver_attach_at = {x=-2,y=16.5,z=0}, + driver_attach_at = {x=-2,y=6.3,z=0}, driver_eye_offset = {x=0, y=0, z=0}, number_of_passengers = 0, passenger_attach_at = {x=0,y=0,z=0}, @@ -200,6 +200,9 @@ local hover_def = { -- vehicle specific values in the following files -- you can override any common values from here loadfile(mpath.."/hover_blue.lua")(table.copy(hover_def)) +loadfile(mpath.."/hover_green.lua")(table.copy(hover_def)) +loadfile(mpath.."/hover_red.lua")(table.copy(hover_def)) +loadfile(mpath.."/hover_yellow.lua")(table.copy(hover_def)) -- free unneeded global(s) core.after(10, function() diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..8a4ef2c --- /dev/null +++ b/mod.conf @@ -0,0 +1,3 @@ +name = vehicle_mash +depends = default, lib_mount +description = Adds many types of vehicles. \ No newline at end of file