Merge remote-tracking branch 'origin/master'
John
commit
b8120fa64f
|
|
@ -3,7 +3,7 @@
|
|||
1500 200 it looks like it could hurt you
|
||||
2350 300 You can guess what this
|
||||
2350 350 orange substance does
|
||||
4250 255 Psssss.. use a bomb to jump out of the hole
|
||||
4250 300 Psssss.. use a bomb to jump out of the hole
|
||||
5000 500 Avoid da fiiiiiiirrrrrrreeeeeebbbaaaalllsss
|
||||
5700 100 Oh yeah, bombs can
|
||||
5700 150 kill slimes
|
||||
|
|
@ -14,4 +14,5 @@
|
|||
500 250 S makes you fall down faster
|
||||
4250 100 You can pickup/placedown steel using right click
|
||||
4250 150 Hold right click to see your pickup/placedown range
|
||||
4250 200 You can't jump or throw bombs while while holding steel
|
||||
4250 200 You can't jump or throw bombs while while holding steel
|
||||
4250 250 You can't place steel blocks while in the air
|
||||
|
|
@ -11,8 +11,8 @@ asssssd b ad
|
|||
asssssd b zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
|
||||
asssssd b asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
|
||||
asssssd !!!! b zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd
|
||||
asssssdbbbbbbb +
|
||||
asssssdbbbbbbb qe qe +
|
||||
asssssd ad ak +
|
||||
asssssdo ad ! hd +
|
||||
asssssdbbbbbbb vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
|
||||
asssssdbbbbbbb qe qe vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
|
||||
asssssd ad ak vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
|
||||
asssssdo ad ! hd vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
|
||||
assssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
$Villain
|
||||
Cringe
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
200 350 This is a sign
|
||||
300 400 This is also a sign
|
||||
/
|
||||
300 200 This is a different sign
|
||||
400 250 sign sign sign sign
|
||||
|
|
@ -13,6 +13,6 @@ d ad zc assssssss
|
|||
swww3 hd asssssssssd
|
||||
d ad asssssssssd
|
||||
d ad hsssssssssd
|
||||
d ad ! ! qe asssssssssd
|
||||
d+ ad ! ! qe asssssssssd
|
||||
twwww atwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwuwwwwuwwwwuwwwwwwwwwrsssssssssd
|
||||
sssssllllllllllllllssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
wwwwwwwwwwwwwwwwwe assd +
|
||||
sssssssssssssssssd qwwwwwwwwwwwwwwwwwwe assd +
|
||||
sssssssssssssssssd agxxxxxxxxxxxxxxxxxc assd +
|
||||
sssssssssssssssssd ad assd +
|
||||
sssssssssssssssssd qwe ak assd +
|
||||
sssssssssssssssssd asd ak assd +
|
||||
sssssssssssssssssd zxc ak zxxc +
|
||||
sssssssssssssssssd ad bbbb qe qe +
|
||||
sssssssssssssssssd qsd bbbb ad ad +
|
||||
sssssssssssssssssd ask bbbb ad ! ! ad +
|
||||
sssssssssssssssssd zxc qwwwwwwwwwwwwwwwwwwwwwwwwwwe qrtwwwwwwwwwwwwrd +
|
||||
sssssssssssssssssd agxxxxxxxxxxxxxxxxxxxxxxxxxfllllllllllgxxxxxxxxxxxxxxxc +
|
||||
sssssssssssssssssd qwwwwwwwwwe o ad zxxxxxxxxxxc +
|
||||
sssssssssssssssssd zxxxxxxxxxc qwe ad +
|
||||
sssssssssssssssssd+ asd zc +
|
||||
ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwe zxc qe ! ! ! ! qe
|
||||
ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllatwwwwwwwwwwwwwwwwwwwwwwwwwrd
|
||||
ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllssssssssssssssssssssssssssssd
|
||||
qwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwe
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a d
|
||||
a lll d
|
||||
a lsl d
|
||||
a lsl d
|
||||
a lsl d
|
||||
a lsl d
|
||||
aoo lsl d
|
||||
allllllllllllllsllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllld
|
||||
zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc
|
||||
|
|
@ -42,6 +42,12 @@ public class LevelManager implements Serializable {
|
|||
ySpawn = 460;
|
||||
filePath = "saves/Level4.txt";
|
||||
bombs = 5;
|
||||
} else if(level == 5){
|
||||
//-1100/460
|
||||
xSpawn = -1100;
|
||||
ySpawn = 350;
|
||||
filePath = "saves/Level5.txt";
|
||||
bombs = 0;
|
||||
}
|
||||
try {
|
||||
MapReader.inputMap(filePath);
|
||||
|
|
|
|||
|
|
@ -140,11 +140,15 @@ public class Player extends GenericSprite {
|
|||
}
|
||||
|
||||
|
||||
public void updatePlaceSteel(int x, int y){
|
||||
public void updatePlaceSteel(int x, int y) throws UnsupportedAudioFileException, LineUnavailableException, IOException {
|
||||
if(this.y<0){
|
||||
canPlaceSteel = false;
|
||||
return;
|
||||
}
|
||||
if(canUpdate(0,2)){
|
||||
canPlaceSteel = false;
|
||||
return;
|
||||
}
|
||||
canPlaceSteel = true;
|
||||
boolean adjacent = false;
|
||||
int realX = x*Tile.length-GameFrame.game.camera.x;
|
||||
|
|
@ -174,7 +178,7 @@ public class Player extends GenericSprite {
|
|||
int[][]check = {{1,0},{0,1},{-1,0},{0,-1}};
|
||||
for(int[]a: check){
|
||||
try{
|
||||
if(GameFrame.game.map[x+a[0]][y+a[1]]!=null&&!GameFrame.game.map[x+a[0]][y+a[1]].replaceAble){
|
||||
if(GameFrame.game.map[x+a[0]][y+a[1]]!=null&&!GameFrame.game.map[x+a[0]][y+a[1]].replaceAble&&!GameFrame.game.map[x+a[0]][y+a[1]].kills){
|
||||
adjacent = true;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue