drunkendog
/
final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge just cus

master
bob 2022-06-20 14:48:46 -04:00
parent bc7dfd982a
commit a85893fd06
8 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
saves/Level1-signs.txt
View File

@ -3,7 +3,7 @@
1500 200 it looks like it could hurt you 1500 200 it looks like it could hurt you
2350 300 You can guess what this 2350 300 You can guess what this
2350 350 orange substance does 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 5000 500 Avoid da fiiiiiiirrrrrrreeeeeebbbaaaalllsss
5700 100 Oh yeah, bombs can 5700 100 Oh yeah, bombs can
5700 150 kill slimes 5700 150 kill slimes
@ -15,3 +15,4 @@
4250 100 You can pickup/placedown steel using right click 4250 100 You can pickup/placedown steel using right click
4250 150 Hold right click to see your pickup/placedown range 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

8
saves/Level3.txt
View File

@ -11,8 +11,8 @@ asssssd b ad
asssssd b zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd asssssd b zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
asssssd b asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd asssssd b asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
asssssd !!!! b zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd asssssd !!!! b zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd
asssssdbbbbbbb + asssssdbbbbbbb vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
asssssdbbbbbbb qe qe + asssssdbbbbbbb qe qe vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
asssssd ad ak + asssssd ad ak vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
asssssdo ad ! hd + asssssdo ad ! hd vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv+
assssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww assssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

2
saves/Level4-dialogue.txt Normal file
View File

@ -0,0 +1,2 @@
$Villain
Cringe

5
saves/Level4-signs.txt Normal file
View File

@ -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

2
saves/Level4.txt
View File

@ -13,6 +13,6 @@ d ad zc assssssss
swww3 hd asssssssssd swww3 hd asssssssssd
d ad asssssssssd d ad asssssssssd
d ad hsssssssssd d ad hsssssssssd
d ad ! ! qe asssssssssd d+ ad ! ! qe asssssssssd
twwww atwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwuwwwwuwwwwuwwwwwwwwwrsssssssssd twwww atwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwuwwwwuwwwwuwwwwwwwwwrsssssssssd
sssssllllllllllllllssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd sssssllllllllllllllssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd

36
saves/Level5.txt
View File

@ -1,18 +1,18 @@
wwwwwwwwwwwwwwwwwe assd + qwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwe
sssssssssssssssssd qwwwwwwwwwwwwwwwwwwe assd + a d
sssssssssssssssssd agxxxxxxxxxxxxxxxxxc assd + a d
sssssssssssssssssd ad assd + a d
sssssssssssssssssd qwe ak assd + a d
sssssssssssssssssd asd ak assd + a d
sssssssssssssssssd zxc ak zxxc + a d
sssssssssssssssssd ad bbbb qe qe + a d
sssssssssssssssssd qsd bbbb ad ad + a d
sssssssssssssssssd ask bbbb ad ! ! ad + a d
sssssssssssssssssd zxc qwwwwwwwwwwwwwwwwwwwwwwwwwwe qrtwwwwwwwwwwwwrd + a lll d
sssssssssssssssssd agxxxxxxxxxxxxxxxxxxxxxxxxxfllllllllllgxxxxxxxxxxxxxxxc + a lsl d
sssssssssssssssssd qwwwwwwwwwe o ad zxxxxxxxxxxc + a lsl d
sssssssssssssssssd zxxxxxxxxxc qwe ad + a lsl d
sssssssssssssssssd+ asd zc + a lsl d
ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwe zxc qe ! ! ! ! qe aoo lsl d
ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllatwwwwwwwwwwwwwwwwwwwwwwwwwrd allllllllllllllsllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllld
ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllssssssssssssssssssssssssssssd zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc

6
src/LevelManager.java
View File

@ -42,6 +42,12 @@ public class LevelManager implements Serializable {
ySpawn = 460; ySpawn = 460;
filePath = "saves/Level4.txt"; filePath = "saves/Level4.txt";
bombs = 5; bombs = 5;
} else if(level == 5){
//-1100/460
xSpawn = -1100;
ySpawn = 350;
filePath = "saves/Level5.txt";
bombs = 0;
} }
try { try {
MapReader.inputMap(filePath); MapReader.inputMap(filePath);

8
src/Player.java
View File

@ -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){ if(this.y<0){
canPlaceSteel = false; canPlaceSteel = false;
return; return;
} }
if(canUpdate(0,2)){
canPlaceSteel = false;
return;
}
canPlaceSteel = true; canPlaceSteel = true;
boolean adjacent = false; boolean adjacent = false;
int realX = x*Tile.length-GameFrame.game.camera.x; 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}}; int[][]check = {{1,0},{0,1},{-1,0},{0,-1}};
for(int[]a: check){ for(int[]a: check){
try{ 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; adjacent = true;
break; break;
} }