Bug fixes 03.17

Author: Nicolaas de Bruyn

Skulls/assets/Levels/level1.properties

@@ -1,7 +1,8 @@
-Material My Material : Common/MatDefs/Light/Lighting.j3md {
+Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
      MaterialParameters {
-        DiffuseMap : Flip Textures/tile-wall.png
+        ColorMap : Flip Repeat Textures/tile-wall.png
      }
     AdditionalRenderState {
+      FaceCull Off
     }
 }

Skulls/assets/Levels/skulls.properties

@@ -1,9 +1,7 @@
 Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
      MaterialParameters {
-        ColorMap : Flip Models/enemies/zombie/zombi_col_mobile.png
-        AlphaDiscardThreshold : 0.6
+        ColorMap : Flip Models/static/dungeon-color.png
      }
     AdditionalRenderState {
-
     }
 }

Skulls/assets/Materials/tile-wall.j3m

@@ -20,8 +20,10 @@ is divided into following sections:
 
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Skulls-impl">
-    <import file="launch4j-impl.xml"/>
     <import file="assets-impl.xml"/>
+    <import file="linuxlauncher-impl.xml"/>
+    <import file="launch4j-impl.xml"/>
+    <import file="mobile-impl.xml"/>
     <import file="macapp-impl.xml"/>
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
@@ -889,13 +891,6 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.GalagoLibrary}" name="call.subproject"/>
-            <param location="${project.GalagoLibrary}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1021,7 +1016,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,-mac-app,-launch4j-exe" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,-mac-app,-mobile-deployment,-launch4j-exe,-linux-launcher" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1372,13 +1367,6 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.GalagoLibrary}" name="call.subproject"/>
-            <param location="${project.GalagoLibrary}/build.xml" name="call.script"/>
-            <param name="call.target" value="clean"/>
-            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

Skulls/assets/Models/effects/explosion/explosion.j3o

@@ -3,6 +3,6 @@ build.xml.script.CRC32=79a29eb7
 build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=310e6d43
-nbproject/build-impl.xml.script.CRC32=5ca687f8
+nbproject/build-impl.xml.data.CRC32=0ccb49ba
+nbproject/build-impl.xml.script.CRC32=a0c37273
 nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

Skulls/assets/Models/enemies/ghost/ghost.blend renamed to Skulls/assets/Models/enemies/ghost.blend

@@ -1,4 +1,4 @@
-compile.on.save=true
+compile.on.save=false
 do.depend=false
 do.jar=true
 javac.debug=true

Skulls/assets/Models/enemies/ghost/ghost.j3m

@@ -2,7 +2,7 @@ annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
-ant.customtasks.libs=launch4j
+ant.customtasks.libs=android-base,launch4j
 application.title=Skulls
 application.vendor=jMonkeyEngine
 assets.jar.name=assets.jar
@@ -32,14 +32,15 @@ dist.jar=${dist.dir}/${application.title}.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
+file.reference.GalagoLibrary.jar=libs/GalagoLibrary.jar
 file.reference.tween-engine-api.jar=libs/tween-engine-api.jar
 includes=**
 jar.compress=false
 javac.classpath=\
     ${libs.jme3.classpath}:\
     ${libs.jme3-libraries.classpath}:\
     ${file.reference.tween-engine-api.jar}:\
-    ${reference.GalagoLibrary.jar}
+    ${file.reference.GalagoLibrary.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -68,16 +69,16 @@ jnlp.enabled=false
 jnlp.offline-allowed=false
 jnlp.signed=false
 launch4j.exe.enabled=true
+linux.launcher.enabled=true
 mac.app.enabled=true
 main.class=com.jme3.skulls.MainApplication
 meta.inf.dir=${src.dir}/META-INF
 manifest.file=MANIFEST.MF
 mkdist.disabled=false
+mobile.android.enabled=true
 mobile.android.package=com.jme3.skulls
 mobile.android.target=android-19
 platform.active=default_platform
-project.GalagoLibrary=../../../bruynhuis/GalagoLibrary
-reference.GalagoLibrary.jar=${project.GalagoLibrary}/dist/GalagoLibrary.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

Skulls/assets/Models/enemies/ghost/ghost.j3o

@@ -12,6 +12,12 @@
             <extension file="macapp-impl.xml" id="macapp">
                 <dependency dependsOn="-mac-app" target="jar"/>
             </extension>
+            <extension file="linuxlauncher-impl.xml" id="linuxlauncher">
+                <dependency dependsOn="-linux-launcher" target="jar"/>
+            </extension>
+            <extension file="mobile-impl.xml" id="mobile">
+                <dependency dependsOn="-mobile-deployment" target="jar"/>
+            </extension>
         </buildExtensions>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>Skulls</name>
@@ -20,15 +26,6 @@
             </source-roots>
             <test-roots/>
         </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>GalagoLibrary</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
     </configuration>
 </project>

Skulls/assets/Models/enemies/ghost/ghost.j3odata

@@ -94,14 +94,20 @@ protected void initSound(SoundManager soundManager) {
         soundManager.loadSoundFx("mutant", "Sounds/SFX/Powers/Mutant/217282__jarredgibb__zombie4.ogg");
         soundManager.setSoundVolume("mutant", 0.6f);
 
+        soundManager.loadSoundFx("acid", "Sounds/SFX/Powers/Acid-gas/acid_burn_sizzle.ogg");
+        soundManager.setSoundVolume("acid", 0.6f);
+        
+        soundManager.loadSoundFx("spawn", "Sounds/SFX/Misc/Spawn/spawn-miniskull.ogg");
+        soundManager.setSoundVolume("spawn", 0.6f);
+        
 
         //Music
 
         soundManager.loadMusic("menu", "Sounds/Music/Dark_Fun.ogg");
-        soundManager.setMusicVolume("menu", 0.3f);
+        soundManager.setMusicVolume("menu", 0.2f);
 
         soundManager.loadMusic("level", "Sounds/Music/haunted_village.ogg");
-        soundManager.setMusicVolume("level", 0.3f);
+        soundManager.setMusicVolume("level", 0.2f);
 
     }
 
@@ -119,14 +125,18 @@ public void initModelManager(ModelManager modelManager) {
         //Here we preload models and materials that might be shared between levels.
         //It is not needed one can still call the assetmanager to load models.
 
-        modelManager.loadMaterial("Models/enemies/skeleton/skeleton.j3m");
-        modelManager.loadMaterial("Materials/tile-blank.j3m");
+//        modelManager.loadMaterial("Models/enemies/skeleton/skeleton.j3m");
+//        modelManager.loadMaterial("Materials/tile-blank.j3m");
         modelManager.loadMaterial("Materials/tile-enemy.j3m");
-
-        modelManager.loadModel("Models/enemies/ghost/ghost.j3o");
-        modelManager.loadModel("Models/enemies/mummy/mummy.j3o");
-        modelManager.loadModel("Models/enemies/skeleton/skeleton.j3o");
-        modelManager.loadModel("Models/enemies/zombie/zombie.j3o");
+        modelManager.loadMaterial("Materials/tile-floor.j3m");
+        modelManager.loadMaterial("Materials/tile-wall.j3m");
+        modelManager.loadMaterial("Models/enemies/enemies.j3m");
+
+        modelManager.loadModel("Models/enemies/ghost.j3o");
+        modelManager.loadModel("Models/enemies/mummy.j3o");
+        modelManager.loadModel("Models/enemies/skeleton.j3o");
+        modelManager.loadModel("Models/enemies/zombie.j3o");
+        
         modelManager.loadModel("Models/enemies/shadow.j3o");
 
         modelManager.loadModel("Models/powers/poison.j3o");
@@ -140,10 +150,11 @@ public void initModelManager(ModelManager modelManager) {
         modelManager.loadModel("Models/powers/acid.j3o");
         modelManager.loadModel("Models/powers/lantern/lantern.j3o");
 
-        modelManager.loadModel("Models/static/dungeon.j3o");
-        modelManager.loadMaterial("Models/static/dungeon.j3m");
-
+//        modelManager.loadModel("Models/static/dungeon.j3o");
+//        modelManager.loadMaterial("Models/static/dungeon.j3m");
 
+        modelManager.loadModel("Models/static/dungeon_pixel.j3o");
+        modelManager.loadMaterial("Models/static/dungeon_pixel.j3m");
 
     }
 

Skulls/assets/Models/enemies/ghost/ghost_col_mobile.png

@@ -66,31 +66,31 @@ public EnemyControl(Game game, int type, Tile tile) {
     private void init() {
         if (type == TYPE_YOUNG) {
             spatial.setLocalScale(0.8f);
-            animationSpeed = 2f;
-            moveSpeed = 3f;
+            animationSpeed = 2.4f;
+            moveSpeed = 3.3f;
             turnSpeed = 1f;
             growthTime = (float) FastMath.nextRandomInt(800, 1000);
             growTimer = new Timer(growthTime);
 
         } else if (type == TYPE_MALE) {
             spatial.setLocalScale(1f);
-            animationSpeed = 1f;
-            moveSpeed = 1.5f;
+            animationSpeed = 1.8f;
+            moveSpeed = 2.5f;
             turnSpeed = 1f;
             growthTime = 0f;
             growTimer = null;
 
         } else if (type == TYPE_FEMALE) {
             spatial.setLocalScale(1f);
-            animationSpeed = 1f;
-            moveSpeed = 1.5f;
+            animationSpeed = 1.8f;
+            moveSpeed = 2.5f;
             turnSpeed = 1f;
             growthTime = 0f;
             growTimer = null;
 
         } else if (type == TYPE_MUTATED) {
-            animationSpeed = 2f;
-            moveSpeed = 3f;
+            animationSpeed = 2.4f;
+            moveSpeed = 3.3f;
             turnSpeed = 1f;
             growthTime = 0f;
             growTimer = null;