Skip to content

Commit 3a06349

Browse files
author
Nicolaas de Bruyn
committed
Bug fixes 03.17
1 parent 7dc87bc commit 3a06349

40 files changed

+741
-1311
lines changed

Skulls/assets/Levels/level1.properties

Lines changed: 577 additions & 577 deletions
Large diffs are not rendered by default.

Skulls/assets/Levels/skulls.properties

Lines changed: 0 additions & 578 deletions
This file was deleted.

Skulls/assets/Materials/tile-wall.j3m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
Material My Material : Common/MatDefs/Light/Lighting.j3md {
1+
Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
22
MaterialParameters {
3-
DiffuseMap : Flip Textures/tile-wall.png
3+
ColorMap : Flip Repeat Textures/tile-wall.png
44
}
55
AdditionalRenderState {
6+
FaceCull Off
67
}
78
}
Binary file not shown.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.
-680 KB
Binary file not shown.

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

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.

Skulls/assets/Models/enemies/mummy/mummy.j3m

Lines changed: 0 additions & 8 deletions
This file was deleted.
-287 KB
Binary file not shown.

Skulls/assets/Models/enemies/mummy/mummy.j3odata

Lines changed: 0 additions & 3 deletions
This file was deleted.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.

Skulls/assets/Models/enemies/skeleton/skeleton.j3m

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

Skulls/assets/Models/enemies/skeleton/skeleton.j3odata

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.
-260 KB
Binary file not shown.

Skulls/assets/Models/enemies/zombie/zombie.j3odata

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
Material My Material : Common/MatDefs/Misc/Unshaded.j3md {
22
MaterialParameters {
3-
ColorMap : Flip Models/enemies/zombie/zombi_col_mobile.png
4-
AlphaDiscardThreshold : 0.6
3+
ColorMap : Flip Models/static/dungeon-color.png
54
}
65
AdditionalRenderState {
7-
86
}
97
}

Skulls/libs/GalagoLibrary.jar

12.3 KB
Binary file not shown.

Skulls/nbproject/build-impl.xml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ is divided into following sections:
2020
2121
-->
2222
<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">
23-
<import file="launch4j-impl.xml"/>
2423
<import file="assets-impl.xml"/>
24+
<import file="linuxlauncher-impl.xml"/>
25+
<import file="launch4j-impl.xml"/>
26+
<import file="mobile-impl.xml"/>
2527
<import file="macapp-impl.xml"/>
2628
<fail message="Please build using Ant 1.8.0 or higher.">
2729
<condition>
@@ -889,13 +891,6 @@ is divided into following sections:
889891
<propertyfile file="${built-jar.properties}">
890892
<entry key="${basedir}" value=""/>
891893
</propertyfile>
892-
<antcall target="-maybe-call-dep">
893-
<param name="call.built.properties" value="${built-jar.properties}"/>
894-
<param location="${project.GalagoLibrary}" name="call.subproject"/>
895-
<param location="${project.GalagoLibrary}/build.xml" name="call.script"/>
896-
<param name="call.target" value="jar"/>
897-
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
898-
</antcall>
899894
</target>
900895
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
901896
<target depends="init" name="-check-automatic-build">
@@ -1021,7 +1016,7 @@ is divided into following sections:
10211016
<!-- Empty placeholder for easier customization. -->
10221017
<!-- You can override this target in the ../build.xml file. -->
10231018
</target>
1024-
<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"/>
1019+
<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"/>
10251020
<!--
10261021
=================
10271022
EXECUTION SECTION
@@ -1372,13 +1367,6 @@ is divided into following sections:
13721367
<propertyfile file="${built-clean.properties}">
13731368
<entry key="${basedir}" value=""/>
13741369
</propertyfile>
1375-
<antcall target="-maybe-call-dep">
1376-
<param name="call.built.properties" value="${built-clean.properties}"/>
1377-
<param location="${project.GalagoLibrary}" name="call.subproject"/>
1378-
<param location="${project.GalagoLibrary}/build.xml" name="call.script"/>
1379-
<param name="call.target" value="clean"/>
1380-
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1381-
</antcall>
13821370
</target>
13831371
<target depends="init" name="-do-clean">
13841372
<delete dir="${build.dir}"/>

Skulls/nbproject/genfiles.properties

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

Skulls/nbproject/private/private.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compile.on.save=true
1+
compile.on.save=false
22
do.depend=false
33
do.jar=true
44
javac.debug=true

Skulls/nbproject/project.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotation.processing.enabled=true
22
annotation.processing.enabled.in.editor=false
33
annotation.processing.processors.list=
44
annotation.processing.run.all.processors=true
5-
ant.customtasks.libs=launch4j
5+
ant.customtasks.libs=android-base,launch4j
66
application.title=Skulls
77
application.vendor=jMonkeyEngine
88
assets.jar.name=assets.jar
@@ -32,14 +32,15 @@ dist.jar=${dist.dir}/${application.title}.jar
3232
dist.javadoc.dir=${dist.dir}/javadoc
3333
endorsed.classpath=
3434
excludes=
35+
file.reference.GalagoLibrary.jar=libs/GalagoLibrary.jar
3536
file.reference.tween-engine-api.jar=libs/tween-engine-api.jar
3637
includes=**
3738
jar.compress=false
3839
javac.classpath=\
3940
${libs.jme3.classpath}:\
4041
${libs.jme3-libraries.classpath}:\
4142
${file.reference.tween-engine-api.jar}:\
42-
${reference.GalagoLibrary.jar}
43+
${file.reference.GalagoLibrary.jar}
4344
# Space-separated list of extra javac options
4445
javac.compilerargs=
4546
javac.deprecation=false
@@ -68,16 +69,16 @@ jnlp.enabled=false
6869
jnlp.offline-allowed=false
6970
jnlp.signed=false
7071
launch4j.exe.enabled=true
72+
linux.launcher.enabled=true
7173
mac.app.enabled=true
7274
main.class=com.jme3.skulls.MainApplication
7375
meta.inf.dir=${src.dir}/META-INF
7476
manifest.file=MANIFEST.MF
7577
mkdist.disabled=false
78+
mobile.android.enabled=true
7679
mobile.android.package=com.jme3.skulls
7780
mobile.android.target=android-19
7881
platform.active=default_platform
79-
project.GalagoLibrary=../../../bruynhuis/GalagoLibrary
80-
reference.GalagoLibrary.jar=${project.GalagoLibrary}/dist/GalagoLibrary.jar
8182
run.classpath=\
8283
${javac.classpath}:\
8384
${build.classes.dir}:\

Skulls/nbproject/project.xml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
<extension file="macapp-impl.xml" id="macapp">
1313
<dependency dependsOn="-mac-app" target="jar"/>
1414
</extension>
15+
<extension file="linuxlauncher-impl.xml" id="linuxlauncher">
16+
<dependency dependsOn="-linux-launcher" target="jar"/>
17+
</extension>
18+
<extension file="mobile-impl.xml" id="mobile">
19+
<dependency dependsOn="-mobile-deployment" target="jar"/>
20+
</extension>
1521
</buildExtensions>
1622
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
1723
<name>Skulls</name>
@@ -20,15 +26,6 @@
2026
</source-roots>
2127
<test-roots/>
2228
</data>
23-
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
24-
<reference>
25-
<foreign-project>GalagoLibrary</foreign-project>
26-
<artifact-type>jar</artifact-type>
27-
<script>build.xml</script>
28-
<target>jar</target>
29-
<clean-target>clean</clean-target>
30-
<id>jar</id>
31-
</reference>
32-
</references>
29+
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
3330
</configuration>
3431
</project>

Skulls/src/com/jme3/skulls/MainApplication.java

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,20 @@ protected void initSound(SoundManager soundManager) {
9494
soundManager.loadSoundFx("mutant", "Sounds/SFX/Powers/Mutant/217282__jarredgibb__zombie4.ogg");
9595
soundManager.setSoundVolume("mutant", 0.6f);
9696

97+
soundManager.loadSoundFx("acid", "Sounds/SFX/Powers/Acid-gas/acid_burn_sizzle.ogg");
98+
soundManager.setSoundVolume("acid", 0.6f);
99+
100+
soundManager.loadSoundFx("spawn", "Sounds/SFX/Misc/Spawn/spawn-miniskull.ogg");
101+
soundManager.setSoundVolume("spawn", 0.6f);
102+
97103

98104
//Music
99105

100106
soundManager.loadMusic("menu", "Sounds/Music/Dark_Fun.ogg");
101-
soundManager.setMusicVolume("menu", 0.3f);
107+
soundManager.setMusicVolume("menu", 0.2f);
102108

103109
soundManager.loadMusic("level", "Sounds/Music/haunted_village.ogg");
104-
soundManager.setMusicVolume("level", 0.3f);
110+
soundManager.setMusicVolume("level", 0.2f);
105111

106112
}
107113

@@ -119,14 +125,18 @@ public void initModelManager(ModelManager modelManager) {
119125
//Here we preload models and materials that might be shared between levels.
120126
//It is not needed one can still call the assetmanager to load models.
121127

122-
modelManager.loadMaterial("Models/enemies/skeleton/skeleton.j3m");
123-
modelManager.loadMaterial("Materials/tile-blank.j3m");
128+
// modelManager.loadMaterial("Models/enemies/skeleton/skeleton.j3m");
129+
// modelManager.loadMaterial("Materials/tile-blank.j3m");
124130
modelManager.loadMaterial("Materials/tile-enemy.j3m");
125-
126-
modelManager.loadModel("Models/enemies/ghost/ghost.j3o");
127-
modelManager.loadModel("Models/enemies/mummy/mummy.j3o");
128-
modelManager.loadModel("Models/enemies/skeleton/skeleton.j3o");
129-
modelManager.loadModel("Models/enemies/zombie/zombie.j3o");
131+
modelManager.loadMaterial("Materials/tile-floor.j3m");
132+
modelManager.loadMaterial("Materials/tile-wall.j3m");
133+
modelManager.loadMaterial("Models/enemies/enemies.j3m");
134+
135+
modelManager.loadModel("Models/enemies/ghost.j3o");
136+
modelManager.loadModel("Models/enemies/mummy.j3o");
137+
modelManager.loadModel("Models/enemies/skeleton.j3o");
138+
modelManager.loadModel("Models/enemies/zombie.j3o");
139+
130140
modelManager.loadModel("Models/enemies/shadow.j3o");
131141

132142
modelManager.loadModel("Models/powers/poison.j3o");
@@ -140,10 +150,11 @@ public void initModelManager(ModelManager modelManager) {
140150
modelManager.loadModel("Models/powers/acid.j3o");
141151
modelManager.loadModel("Models/powers/lantern/lantern.j3o");
142152

143-
modelManager.loadModel("Models/static/dungeon.j3o");
144-
modelManager.loadMaterial("Models/static/dungeon.j3m");
145-
153+
// modelManager.loadModel("Models/static/dungeon.j3o");
154+
// modelManager.loadMaterial("Models/static/dungeon.j3m");
146155

156+
modelManager.loadModel("Models/static/dungeon_pixel.j3o");
157+
modelManager.loadMaterial("Models/static/dungeon_pixel.j3m");
147158

148159
}
149160

Skulls/src/com/jme3/skulls/game/EnemyControl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,31 @@ public EnemyControl(Game game, int type, Tile tile) {
6666
private void init() {
6767
if (type == TYPE_YOUNG) {
6868
spatial.setLocalScale(0.8f);
69-
animationSpeed = 2f;
70-
moveSpeed = 3f;
69+
animationSpeed = 2.4f;
70+
moveSpeed = 3.3f;
7171
turnSpeed = 1f;
7272
growthTime = (float) FastMath.nextRandomInt(800, 1000);
7373
growTimer = new Timer(growthTime);
7474

7575
} else if (type == TYPE_MALE) {
7676
spatial.setLocalScale(1f);
77-
animationSpeed = 1f;
78-
moveSpeed = 1.5f;
77+
animationSpeed = 1.8f;
78+
moveSpeed = 2.5f;
7979
turnSpeed = 1f;
8080
growthTime = 0f;
8181
growTimer = null;
8282

8383
} else if (type == TYPE_FEMALE) {
8484
spatial.setLocalScale(1f);
85-
animationSpeed = 1f;
86-
moveSpeed = 1.5f;
85+
animationSpeed = 1.8f;
86+
moveSpeed = 2.5f;
8787
turnSpeed = 1f;
8888
growthTime = 0f;
8989
growTimer = null;
9090

9191
} else if (type == TYPE_MUTATED) {
92-
animationSpeed = 2f;
93-
moveSpeed = 3f;
92+
animationSpeed = 2.4f;
93+
moveSpeed = 3.3f;
9494
turnSpeed = 1f;
9595
growthTime = 0f;
9696
growTimer = null;

0 commit comments

Comments
 (0)