wfolsom/cs8803p3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed NPE when the default player.txt does not exist. Fixed bug when requesting PowerUp component of invalid length. Change default lives to 1.

Browse Source
This commit is contained in:
Woody Folsom
2012-03-18 18:14:11 -04:00
parent 0619f95f33
commit 18643d17e4
8 changed files with 176 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/dk/itu/mario/level/PCGLevel.java
View File

@@ -1137,46 +1137,52 @@ public class PCGLevel extends Level {
LevelComponent.TYPE lctype = lcomp.getType();
System.out.println("Building for: " + lcomp);
while (length < Math.min(width - 64, lcomp.getEnd())) {
int lcLength;
switch (lctype) {
case FLAT_LO:
case FLAT_HI:
length += buildStraight(length, lcomp.getEnd(), true);
lcLength = buildStraight(length, lcomp.getEnd(), true);
break;
case PIPE_JUMP:
length += buildPipeJump(length, width - 64 - length);
lcLength = buildPipeJump(length, width - 64 - length);
break;
case PLATFORM_JUMP:
length += buildPlatformJump(length, width - 64 - length);
lcLength = buildPlatformJump(length, width - 64 - length);
break;
case MAZE:
length += buildMaze(length, width - 64 - length);
lcLength = buildMaze(length, width - 64 - length);
break;
case BLOCKS:
length += buildMaze(length, width - 64 - length);
lcLength = buildMaze(length, width - 64 - length);
break;
case BOWLING_ALLEY :
length += buildBowlingAlley(length, width - 64 - length);
lcLength = buildBowlingAlley(length, width - 64 - length);
break;
case CANNON_LINE :
length += buildCannonLine(length, width - 64 - length);
lcLength = buildCannonLine(length, width - 64 - length);
break;
case COIN_DIVE :
length += buildCoinDive(length, width - 64 - length);
lcLength = buildCoinDive(length, width - 64 - length);
break;
case LEMMING_TRAP :
length += buildLemmingTrap(length, width - 64 - length);
lcLength = buildLemmingTrap(length, width - 64 - length);
break;
case POWER_UP :
length += buildFreebie(length, width - 64 - length);
lcLength = buildFreebie(length, width - 64 - length);
break;
case SINGLE_PIT :
length += buildSinglePit(length, width - 64 - length);
lcLength = buildSinglePit(length, width - 64 - length);
break;
default:
lcLength = 0;
System.out
.println("Cannot build level segment for unrecognized LevelComponent type: "
+ type);
}
if (lcLength == 0) {
lcLength = buildStraight(length, lcomp.getEnd(), true);
}
length += lcLength;
}
}
}
@@ -1247,8 +1253,7 @@ public class PCGLevel extends Level {
playerMetrics, dataRecorder);
System.out.println("PlayerProfile: " + profile);
LevelArchetype archetype = ArchetypeMatcher.getMatchingArchetype(
playerMetrics, dataRecorder);
LevelArchetype archetype = ArchetypeMatcher.getMatchingArchetype(profile);
System.out.println("LevelArchetype: " + archetype);
System.out.println("Creating level grammar");