EpicKnarvik97/Rogue101
EpicKnarvik97/Rogue101
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

I give up

Browse Source
This commit is contained in:
Kristian Knarvik 2018-03-21 21:42:52 +01:00
parent 0597f182b3
commit de6607442b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -27,7 +27,7 @@ Dette prosjektet inneholder [Semesteroppgave 1](SEM-1.md). Du kan også [lese op
* Del A: [x] helt ferdig, [ ] delvis ferdig * Del A: [x] helt ferdig, [ ] delvis ferdig
* Del B: [x] helt ferdig, [ ] delvis ferdig * Del B: [x] helt ferdig, [ ] delvis ferdig
* Del C: [X] helt ferdig, [ ] delvis ferdig * Del C: [X] helt ferdig, [ ] delvis ferdig
* [ ] hele semesteroppgaven er ferdig og klar til retting! * [x] hele semesteroppgaven er ferdig og klar til retting!
# Del A # Del A
## Svar på spørsmål ## Svar på spørsmål

15
src/inf101/v18/rogue101/objects/Player.java
View File

@ -17,11 +17,9 @@ public class Player implements IPlayer {
private int attack = 40; private int attack = 40;
private int defence = 20; private int defence = 20;
private final Backpack equipped = new Backpack(); private final Backpack equipped = new Backpack();
// True if the player wants to pick up something using the digit keys private boolean dropping = false; //True if the player wants to drop something using the digit keys
private boolean dropping = false; private boolean picking = false; //True if the player wants to pick up something using the digit keys
// True if the player wants to drop something using the digit keys private boolean writing = false; //True if the user is writing a name
private boolean picking = false;
private boolean writing = false;
private boolean exploringChest = false; private boolean exploringChest = false;
private String text = ""; private String text = "";
private String name = "Player"; private String name = "Player";
@ -150,12 +148,13 @@ public class Player implements IPlayer {
if (items.size() < 1) { if (items.size() < 1) {
game.displayMessage("There is nothing to pick up"); game.displayMessage("There is nothing to pick up");
} else { } else {
if (items.get(0) instanceof IStatic && items.get(0) instanceof IContainer) { //A Static item is always the biggest (and hopefully the only) item on a tile. IItem item = items.get(0);
if (item instanceof IStatic && item instanceof IContainer) { //A Static item is always the biggest (and hopefully the only) item on a tile.
openChest(game, items); openChest(game, items);
} else if (items.get(0) instanceof IStatic && items.get(0) instanceof StairsUp) { } else if (item instanceof IStatic && item instanceof StairsUp) {
((Game)game).goUp(); ((Game)game).goUp();
return true; return true;
} else if (items.get(0) instanceof IStatic && items.get(0) instanceof StairsDown) { } else if (item instanceof IStatic && item instanceof StairsDown) {
((Game)game).goDown(); ((Game)game).goDown();
return true; return true;
} else { } else {