From 205c8a6095946b5e024bcba2aae41ab92948e425 Mon Sep 17 00:00:00 2001
From: meisterfuu <info@meister-fuu.de>
Date: Mon, 24 Apr 2017 20:07:21 +0200
Subject: [PATCH] Fixed html

---
 build.gradle                                          | 1 +
 core/src/LDGame.gwt.xml                               | 2 +-
 core/src/de/dogedev/ld38/ashley/systems/AiSystem.java | 2 +-
 core/src/de/dogedev/ld38/assets/GameSettings.java     | 5 +++--
 core/src/de/dogedev/ld38/screens/GameScreen.java      | 3 +--
 html/build.gradle                                     | 2 +-
 html/src/de/dogedev/ld38/GdxDefinition.gwt.xml        | 3 +++
 html/src/de/dogedev/ld38/client/HtmlLauncher.java     | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index fbaa2fe..26ad0a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,7 @@ project(":html") {
         compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
         compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
         compile "com.badlogicgames.ashley:ashley:$ashleyVersion:sources"
+        compile "com.github.czyzby:noise4j:0.1.0:sources"
     }
 }
 
diff --git a/core/src/LDGame.gwt.xml b/core/src/LDGame.gwt.xml
index c2b5f3b..c65dd63 100644
--- a/core/src/LDGame.gwt.xml
+++ b/core/src/LDGame.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
 <module>
-	<source path="de/dogedev/dl38" />
+	<source path="de/dogedev/ld38" />
 </module>
\ No newline at end of file
diff --git a/core/src/de/dogedev/ld38/ashley/systems/AiSystem.java b/core/src/de/dogedev/ld38/ashley/systems/AiSystem.java
index 43ef869..1242c35 100644
--- a/core/src/de/dogedev/ld38/ashley/systems/AiSystem.java
+++ b/core/src/de/dogedev/ld38/ashley/systems/AiSystem.java
@@ -25,7 +25,7 @@ public class AiSystem extends IntervalSystem {
     private ImmutableArray<Entity> spawns;
 
     public AiSystem(GameScreen gameScreen) {
-        super(0.5f);
+        super(Statics.settings.aiTickRate);
         this.gameScreen = gameScreen;
     }
 
diff --git a/core/src/de/dogedev/ld38/assets/GameSettings.java b/core/src/de/dogedev/ld38/assets/GameSettings.java
index 896eff5..e313754 100644
--- a/core/src/de/dogedev/ld38/assets/GameSettings.java
+++ b/core/src/de/dogedev/ld38/assets/GameSettings.java
@@ -15,9 +15,10 @@ public class GameSettings {
     public int maxPeeps = 10;
 
     public int numBuildings = (int) ((tilesX*tilesY)*.4);
-    public float difficulty = .6f; // 0 = easy peasy; 1 = "super hard"
-    public float finishCheckInterval = 1;
+    public float difficulty = .4f; // 0 = easy peasy; 1 = "super hard"
+    public float aiTickRate = 0.1f;
 
+    public float finishCheckInterval = 1;
     // effects
     //movementspeed
     public float hangar = 20;
diff --git a/core/src/de/dogedev/ld38/screens/GameScreen.java b/core/src/de/dogedev/ld38/screens/GameScreen.java
index 37fe37e..c8d1eb2 100644
--- a/core/src/de/dogedev/ld38/screens/GameScreen.java
+++ b/core/src/de/dogedev/ld38/screens/GameScreen.java
@@ -4,7 +4,6 @@
 import com.badlogic.ashley.core.Family;
 import com.badlogic.ashley.utils.ImmutableArray;
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
@@ -70,7 +69,7 @@ public GameScreen() {
         ashley.addSystem(new InputSystem(camera, this));
         ashley.addSystem(new CameraSystem(camera));
         ashley.addSystem(new MovementSystem());
-//        ashley.addSystem(new AiSystem(this));
+        ashley.addSystem(new AiSystem(this));
         ashley.addSystem(mapRenderSystem);
         ashley.addSystem(renderSystem);
 //        ashley.addSystem(new DebugUISystem(camera));
diff --git a/html/build.gradle b/html/build.gradle
index 55166df..f8eaa06 100644
--- a/html/build.gradle
+++ b/html/build.gradle
@@ -60,7 +60,7 @@ task addSource << {
 tasks.compileGwt.dependsOn(addSource)
 tasks.draftCompileGwt.dependsOn(addSource)
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.7
 sourceSets.main.java.srcDirs = [ "src/" ]
 
 
diff --git a/html/src/de/dogedev/ld38/GdxDefinition.gwt.xml b/html/src/de/dogedev/ld38/GdxDefinition.gwt.xml
index 598db5a..fdd2a6e 100644
--- a/html/src/de/dogedev/ld38/GdxDefinition.gwt.xml
+++ b/html/src/de/dogedev/ld38/GdxDefinition.gwt.xml
@@ -3,9 +3,12 @@
 <module rename-to="html">
 	<inherits name='com.badlogic.gdx.backends.gdx_backends_gwt' />
 	<inherits name='com.badlogic.ashley_gwt' />
+	<inherits name='com.github.czyzby.noise4j.Noise4J' />
+
 
 	<inherits name='LDGame' />
 	<entry-point class='de.dogedev.ld38.client.HtmlLauncher' />
 	<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
 	<set-configuration-property name="gdx.assetpath" value="../core/assets" />
+	<extend-configuration-property name="gdx.reflect.include" value="de.dogedev.ld38" />
 </module>
diff --git a/html/src/de/dogedev/ld38/client/HtmlLauncher.java b/html/src/de/dogedev/ld38/client/HtmlLauncher.java
index 18f2e40..19f0725 100644
--- a/html/src/de/dogedev/ld38/client/HtmlLauncher.java
+++ b/html/src/de/dogedev/ld38/client/HtmlLauncher.java
@@ -9,7 +9,7 @@ public class HtmlLauncher extends GwtApplication {
 
         @Override
         public GwtApplicationConfiguration getConfig () {
-                return new GwtApplicationConfiguration(480, 320);
+                return new GwtApplicationConfiguration(1280, 720);
         }
 
         @Override