Resolved Master branch merge conflicts

Renamed the following:
ship_ship_2              is now ship_2
ship_shuttle_no_boosters is now ship_shuttle_2
noPlanet.tmx             is now no_planets.tmx

All references are updated in the code.

entities/player.lua

@@ -1,6 +1,17 @@
 --local sounds = require 'services/sounds'
+local shipList = require('ships/shipList')
+
+-- Returns the ship's attribute table based on index (shipList.lua) - J.R.C 2/2/22
+local function get_ship(index)
+    if index == nil then
+        index = 1 -- Defaults to Trevor's OG ship if none is found in the map props.
+    end
+    return shipList[index]
+end
 
 return function(props)
+    local ship_index = tonumber(props.ship_type)
+    local ship = get_ship(ship_index)
     return {
         body = {
             mass = 1

services/textures.lua

@@ -12,6 +12,15 @@ textures.load = function()
     textures.star               = i 'star.png'
     textures.planet             = i 'planet.png'
     textures.speedboost         = i 'speedboost.png'
+
+    -- Assorted spaceships by Jon
+    textures.ship_2             = i 'ship_2.png'          -- Ship Index 2
+    textures.ship_ufo           = i 'ship_ufo.png'        -- Ship Index 3
+    textures.ship_shuttle       = i 'ship_shuttle.png'    -- Ship Index 4
+    textures.ship_shuttle_2     = i 'ship_shuttle_2.png'  -- Ship Index 5
+    textures.ship_purple        = i 'ship_purple.png'     -- Ship Index 6
+    textures.ship_green         = i 'ship_green.png'      -- Ship Index 7
+    textures.ship_big           = i 'ship_big.png'        -- Ship Index 8
 end
 
 return textures

ships/shipList.lua

@@ -35,7 +35,7 @@ return {
     },
     [2] = {
         displayName = 'Ship Two', -- Index 2
-        filename = 'ship_spaceship_2',
+        filename = 'ship_2',
         shape = {
             points = {
                 0, -25,
@@ -47,7 +47,7 @@ return {
             type = 'polygon'
         },
         spritesheet = {
-            image = 'ship_spaceship_2',
+            image = 'ship_2',
             offset_x = 12.5,
             scale_x = 2
         }
@@ -92,7 +92,7 @@ return {
     },
     [5] = {
         displayName = 'Shuttle', -- Index 5
-        filename = 'ship_shuttle_no_boosters',
+        filename = 'ship_shuttle_2',
         shape = {
             points = {
                 0, -32,
@@ -104,7 +104,7 @@ return {
             type = 'polygon'
         },
         spritesheet = {
-            image = 'ship_shuttle_no_boosters',
+            image = 'ship_shuttle_2',
             offset_x = 16,
             scale_x = 2
         }