mrtoth/cicaprojekt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implemented PlayerBase.pickZPM() (former pickItem()) callback method

Browse Source
This commit is contained in:
Kjistóf 2016-04-24 22:48:17 +02:00
parent 69a2384160
commit d0d656452c
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cicaprojekt/Field.java
View File

@ -25,7 +25,7 @@ public class Field extends cicaprojekt.Tile
return; return;
playerBase.setCurrentTile(this); playerBase.setCurrentTile(this);
if(zpmOnTile != null) if(zpmOnTile != null)
playerBase.pickItem(); playerBase.pickZPM(this);
} }
public void onExit(PlayerBase playerBase) { public void onExit(PlayerBase playerBase) {

12
cicaprojekt/Player.java
View File

@ -1,5 +1,6 @@
package cicaprojekt; package cicaprojekt;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Player extends PlayerBase{ public class Player extends PlayerBase{
@ -8,6 +9,7 @@ public class Player extends PlayerBase{
public Player(Tile startTile, Direction startDirection){ public Player(Tile startTile, Direction startDirection){
zpmContainer = new ArrayList<>();
currentTile = startTile; currentTile = startTile;
facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */ facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */
} }
@ -20,8 +22,14 @@ public class Player extends PlayerBase{
currentTile.getAdjacentTile(facingDirection).putABox(boxLifted); currentTile.getAdjacentTile(facingDirection).putABox(boxLifted);
boxLifted = null; boxLifted = null;
} }
public void shootStargate(Stargate stargate) { @Override
public void pickZPM(Tile tile)
{
zpmContainer.add(tile.getZPMFromTile());
}
public void shootStargate(Stargate stargate) {
this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection); this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection);
} }
} }

7
cicaprojekt/PlayerBase.java
View File

@ -6,8 +6,7 @@ public class PlayerBase implements Destroyable{
protected Direction facingDirection; protected Direction facingDirection;
public void destroy() { public void destroy() {}
}
public Tile getCurrentTile() { public Tile getCurrentTile() {
return currentTile; return currentTile;
@ -20,10 +19,12 @@ public class PlayerBase implements Destroyable{
public void move(Direction direction) { public void move(Direction direction) {
this.setFacingDirection(direction); this.setFacingDirection(direction);
Tile tile = this.getCurrentTile().getAdjacentTile(direction); Tile tile = this.getCurrentTile().getAdjacentTile(direction);
tile.onEntry(); tile.onEntry(this);
setCurrentTile(tile); setCurrentTile(tile);
} }
public void pickZPM(Tile tile) { /* PlayerBase does not collect ZPM modules */ }
public void rotateLeft() { public void rotateLeft() {
switch (facingDirection) { switch (facingDirection) {
case NORTH: case NORTH: