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

Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3

Browse Source
This commit is contained in:
Woody Folsom
2012-03-18 16:41:37 -04:00
parent 992f2eef46 a6f467d724
commit 0619f95f33
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,53 +619,54 @@ public class PCGLevel extends Level {
: PlayerProfile.ChallengeRewardType.JUMP); numPipes++) { : PlayerProfile.ChallengeRewardType.JUMP); numPipes++) {
} }
localHeight = random.nextInt(2) + 1; localHeight = 4;
loop: for (int i = 0; i < numPipes; i++) { loop: for (int i = 0; i < numPipes; i++) {
space = (length + 2) <= maxLength; space = (length + 2) <= maxLength;
if (space) { if (space) {
while (Math.abs(localHeight - lastHeight) > 3) {
localHeight += localHeight > lastHeight ? -1 : 1;
}
lastHeight = localHeight; lastHeight = localHeight;
pipeHeight = localHeight > 5 ? 4 + random pipeHeight = localHeight > 5 ? 4 + random
.nextInt(localHeight - 4) : 4; .nextInt(localHeight - 4) : 4;
for (int y = 0; y < localHeight; y++) { for (int y = height - localHeight; y < height; y++) {
setBlock(xo + length, this.height - 1 - y, Level.GROUND);
setBlock(xo + length + 1, this.height - 1 - y, Level.GROUND);
if (y == localHeight - 1) { if (y == height - localHeight) {
setBlock(xo + length, this.height - 1 - y, setBlock(xo + length, y, Level.TUBE_TOP_LEFT);
Level.TUBE_TOP_LEFT); setBlock(xo + length + 1, y, Level.TUBE_TOP_RIGHT);
setBlock(xo + length + 1, this.height - 1 - y,
Level.TUBE_TOP_RIGHT);
if (shouldAddChallenge(PlayerProfile.ChallengeRewardType.ENEMY)) {
setSpriteTemplate(xo + length, this.height - y,
new SpriteTemplate(
SpriteTemplate.JUMP_FLOWER, false));
}
} else if (y > localHeight - pipeHeight) {
setBlock(xo + length, this.height - 1 - y,
Level.TUBE_SIDE_LEFT);
setBlock(xo + length + 1, this.height - 1 - y,
Level.TUBE_SIDE_RIGHT);
} }
else if (y - height - localHeight < pipeHeight) {
setBlock(xo + length, y, Level.TUBE_SIDE_LEFT);
setBlock(xo + length + 1, y, Level.TUBE_SIDE_RIGHT);
}
else {
setBlock(xo + length, y, Level.GROUND);
setBlock(xo + length + 1, y, Level.GROUND);
}
}
if (shouldAddChallenge(PlayerProfile.ChallengeRewardType.ENEMY)) {
setSpriteTemplate(xo + length, height - localHeight,
new SpriteTemplate(SpriteTemplate.JUMP_FLOWER,
false));
} }
length += 2; length += 2;
localHeight = random.nextInt(7) + 4; localHeight = random.nextInt(7) + 4;
while (Math.abs(localHeight - lastHeight) > 3) {
localHeight += localHeight > lastHeight ? -1 : 1;
}
midFloor = localHeight - (random.nextInt(4) + 1); midFloor = localHeight - (random.nextInt(4) + 1);
if (midFloor <= 0) { if (midFloor <= 0) {
midFloor = 1; midFloor = 1;
} }
for (gap = 0; gap < 4 for (gap = 0; gap <= 4
&& length + gap <= maxLength && length + gap <= maxLength
&& shouldAddChallenge(PlayerProfile.ChallengeRewardType.JUMP); gap++) { && shouldAddChallenge(PlayerProfile.ChallengeRewardType.JUMP); gap++) {