Merge cleanup

build.gradle

@@ -1,13 +1,19 @@
 buildscript {
+
+
     repositories {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         google()
     }
-
     dependencies {
+        classpath 'org.wisepersist:gwt-gradle-plugin:1.0.13'
+        classpath 'org.gretty:gretty:3.0.2'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.12'
+
+
     }
 }
 
@@ -16,8 +22,8 @@ allprojects {
 
     version = '1.0'
     ext {
-        appName = "ShipsAndGiggles"
-        gdxVersion = '1.9.14'
+        appName = "ENG1"
+        gdxVersion = '1.10.0'
         roboVMVersion = '2.3.12'
         box2DLightsVersion = '1.5'
         ashleyVersion = '1.7.3'
@@ -35,25 +41,79 @@ allprojects {
     }
 }
 
-project(":core") {
+project(":desktop") {
     apply plugin: "java-library"
 
+
     dependencies {
-        api "com.badlogicgames.gdx:gdx:$gdxVersion"
-        api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
-        api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
-        api "com.badlogicgames.gdx:gdx-ai:$aiVersion"
+        implementation project(":core")
+        api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+        api "com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-desktop"
+        api "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
+        api "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
+
     }
 }
 
-project(":desktop") {
+project(":ios") {
     apply plugin: "java-library"
+    apply plugin: "robovm"
+
 
     dependencies {
         implementation project(":core")
-        api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
-        api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-        api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
-        api "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
+        api "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
+        api "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
+        api "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
+        api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios"
+        api "com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-ios"
+        api "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-ios:$gdxControllersVersion"
+
     }
-}
+}
+
+project(":html") {
+    apply plugin: "java-library"
+    apply plugin: "gwt"
+    apply plugin: "war"
+    apply plugin: "org.gretty"
+
+
+    dependencies {
+        implementation project(":core")
+        api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
+        api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
+        api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion:sources"
+        api "com.badlogicgames.gdx:gdx-box2d-gwt:$gdxVersion:sources"
+        api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion:sources"
+        api "com.badlogicgames.ashley:ashley:$ashleyVersion:sources"
+        api "com.badlogicgames.gdx:gdx-ai:$aiVersion:sources"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion:sources"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-gwt:$gdxControllersVersion"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-gwt:$gdxControllersVersion:sources"
+
+    }
+}
+
+project(":core") {
+    apply plugin: "java-library"
+
+
+    dependencies {
+        api "com.badlogicgames.gdx:gdx:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-bullet:$gdxVersion"
+        api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
+        api "com.badlogicgames.ashley:ashley:$ashleyVersion"
+        api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-ai:$aiVersion"
+        api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
+
+    }
+}

core/assets/models/finalset.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="finalset" tilewidth="32" tileheight="32" tilecount="384" columns="32">
+ <image source="tiles_sheet.png" width="1024" height="384"/>
+</tileset>

core/assets/models/map.tmx

@@ -1,65 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="60" height="34" tilewidth="32" tileheight="32" nextobjectid="61">
- <tileset firstgid="1" source="download.tsx"/>
+<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="60" height="34" tilewidth="32" tileheight="32" nextobjectid="2">
+ <tileset firstgid="1" source="finalset.tsx"/>
  <layer name="Tile Layer 1" width="60" height="34">
   <data encoding="csv">
-29,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,21,23,37,37,13,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,37,37,38,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,38,38,15,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,4,5,5,5,6,13,39,15,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,12,12,13,12,15,46,46,46,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,12,13,12,12,15,46,15,46,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,19,20,21,22,20,23,46,13,15,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,19,22,22,23,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,5,5,5,5,5,5,5,5,5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,5,16,5,5,5,5,5,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,6,12,12,12,12,15,15,12,12,12,12,29,1,1,1,1,1,1,1,1,1,1,1,1,1,11,13,24,12,12,14,12,12,29,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,18,37,38,39,33,27,27,27,27,34,12,8,1,1,1,1,1,1,1,1,1,1,1,1,1,11,12,32,14,35,36,14,12,29,1,1,1,1,1,1,11,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,25,27,27,27,42,12,35,36,12,28,15,29,1,1,1,1,1,1,1,1,1,1,1,1,8,11,13,40,12,43,44,12,14,31,8,1,1,1,1,1,19,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,19,23,37,38,39,12,12,43,44,12,28,12,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,12,12,12,46,46,12,12,12,18,18,18,18,18,18,18,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,12,12,12,7,12,46,33,27,27,27,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,34,12,33,27,27,27,27,27,26,26,26,26,26,26,26,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,6,12,7,14,7,12,12,28,12,12,14,29,1,2,1,1,1,1,2,1,1,1,1,2,8,11,28,12,28,12,12,13,12,31,8,1,1,2,1,1,3,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,18,12,12,12,14,12,12,28,14,12,12,29,1,1,1,1,1,1,1,1,1,1,1,1,1,11,28,12,28,13,15,35,36,29,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,25,27,27,27,27,27,27,42,30,29,31,29,1,1,1,1,1,1,1,1,1,1,1,1,1,11,28,12,28,12,12,43,44,29,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,19,23,29,30,31,29,29,30,30,31,30,29,8,1,1,1,1,1,1,1,1,1,1,1,1,1,11,41,27,42,45,45,45,45,29,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,30,30,29,31,31,29,29,29,30,29,29,1,1,1,1,1,1,1,1,1,1,1,1,1,19,22,21,20,21,22,21,20,29,1,1,1,1,1,1,11,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,19,21,22,22,22,21,22,21,21,22,21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,
-29,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6
+298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
+10,42,42,42,42,42,42,42,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,105,105,105,105,105,105,105,298,
+10,42,42,42,42,42,42,42,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,42,42,42,42,42,42,105,298,
+10,237,237,237,238,239,240,241,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,236,237,238,239,240,239,239,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,298,
+42,14,14,14,14,15,16,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,13,14,15,16,14,14,298,
+10,42,42,42,42,42,42,42,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,42,42,42,42,42,42,105,298,
+10,42,42,42,42,42,42,42,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,105,105,105,105,105,105,105,298,
+10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,105,105,298,298,298,298,298,298
 </data>
  </layer>
  <objectgroup name="collider">
-  <object id="49" x="32" y="32">
-   <polyline points="0,0 1768,2 1767,71 1616,73 1607,93 1611,191 1770,191 1774,225 1864,226 1861,1037 1,1036 -1,-1"/>
-  </object>
-  <object id="50" x="633" y="300">
-   <polyline points="0,0 326,1 329,17 357,17 359,343 326,343 328,375 -18,372 -17,313 -43,311 -49,198 -18,191 -16,152 -43,149 -48,40 -22,32 -2,-1"/>
-  </object>
-  <object id="51" x="1029" y="501">
-   <polyline points="0,0 24,3 23,-21 -1,-20 1,-5"/>
-  </object>
-  <object id="53" x="1187" y="501">
-   <polyline points="0,0 26,2 26,-24 -3,-23 -4,1"/>
-  </object>
-  <object id="54" x="1347" y="503">
-   <polyline points="0,0 57,7 58,-29 -3,-27 -2,-1"/>
-  </object>
-  <object id="55" x="1374" y="425">
-   <polyline points="0,0 2,-48 32,-45 34,-126 66,-124 291,-126 292,-110 324,-110 325,-42 352,-42 354,-11 323,-12 322,40 355,39 354,85 322,86 325,220 42,214 41,1 0,0"/>
-  </object>
-  <object id="56" x="1795" y="508">
-   <polyline points="0,0 26,0 27,-35 -5,-34 -2,-1"/>
+  <object id="1" x="286.667" y="33.3333">
+   <polyline points="0,0 -2.66667,225.333 -61.3333,256 -254.667,256 -253.333,764 -33.3333,768 -5.33333,798.667 1.33333,1020 1346.67,1021.33 1344,796 1397.33,762.667 1598.67,766.667 1601.33,250.667 1373.33,249.333 1342.67,209.333 1345.33,-4 0,-2.66667"/>
   </object>
  </objectgroup>
 </map>

core/src/net/shipsandgiggles/pirate/CameraManager.java

@@ -8,6 +8,10 @@
 
 public class CameraManager {
 
+
+	/** manages the camera*/
+
+	/** to lock on to something with no smoothing*/
 	public static void lockOn(Camera camera, Vector2 target) {
 		Vector3 cameraPosition = camera.position;
 		cameraPosition.x = target.x * PIXEL_PER_METER;
@@ -16,6 +20,7 @@ public static void lockOn(Camera camera, Vector2 target) {
 		camera.update();
 	}
 
+	/** applies smoothing to camera "lerping" */
 	public static void lerpOn(Camera camera, Vector2 target, float lerpValue) {
 		Vector3 cameraPosition = camera.position;
 		cameraPosition.x = cameraPosition.x + (target.x - cameraPosition.x) * lerpValue * PIXEL_PER_METER;

core/src/net/shipsandgiggles/pirate/ExplosionController.java

@@ -0,0 +1,42 @@
+package net.shipsandgiggles.pirate;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.*;
+import com.badlogic.gdx.math.Vector2;
+
+public class ExplosionController {
+
+    /** controller for all explosion and creation of them*/
+
+    public static final float FRAME_LENGTH = 0.1f;
+    public static final int OFFSIZE = 2;
+    public static final int SIZE = 20;
+
+    private static Animation anim = null;
+    Vector2 position;
+    float stateTime;
+
+    public boolean remove = false;
+
+    /** constructor of explosion */
+    public ExplosionController(Vector2 position){
+        this.position = new Vector2(position.x - OFFSIZE, position.y - OFFSIZE); /** setting position */
+        stateTime = 0;
+
+        if(anim == null) anim = new Animation(FRAME_LENGTH, TextureRegion.split(new Texture("models/Explosion.png"), SIZE, SIZE)[0]); /** setting textures */
+    }
+
+    public void update(){
+        /** updates explosion */
+        stateTime += Gdx.graphics.getDeltaTime();
+        if(anim.isAnimationFinished(stateTime)) remove = true;
+    }
+
+    /** draws explosion */
+    public void draw(Batch batch){
+        batch.begin();
+        batch.draw((TextureRegion) anim.getKeyFrame(stateTime), position.x, position.y);
+        batch.end();
+    }
+}