Skip to content

Commit

Permalink
feat(#146): Add teleporter tile
Browse files Browse the repository at this point in the history
This branch will resolve issue #146 . It will add the teleporter feature where
a marble is able to teleport from one location of a teleporter track to the
other location.

EasyLevel has been modified to demonstrate the teleporter feature and has to be
changed back if the request is approved, before merging.

Closes #146
  • Loading branch information
bmusters authored and fabianishere committed Oct 27, 2017
1 parent 1fc62b3 commit 6768118
Show file tree
Hide file tree
Showing 16 changed files with 1,096 additions and 465 deletions.
184 changes: 184 additions & 0 deletions broccoli-core/src/main/java/nl/tudelft/broccoli/core/Teleporter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2017 Fabian Mastenbroek, Christian Slothouber,
* Earth Grob, Matthijs Rijm, Bas Musters
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package nl.tudelft.broccoli.core;

import nl.tudelft.broccoli.core.grid.Direction;
import nl.tudelft.broccoli.core.grid.Tile;
import nl.tudelft.broccoli.core.grid.Tileable;
import nl.tudelft.broccoli.core.grid.TileableListener;
import nl.tudelft.broccoli.core.track.Track;

/**
* This tileable teleports a {@link Marble} from one {@link Tile} to another.
*
* @author Bas Musters (m.b.musters@student.tudelft.nl)
*/
public class Teleporter extends Tileable implements TileableListener {
/**
* The {@link Track} that is transformed to be a {@link Teleporter}.
*/
private final Track track;

/**
* The other location this teleporter can teleport to or from.
*/
private Teleporter destination;

/**
* Constructs the {@link Teleporter}.
*
* @param track The {@link Track} that is transformed to be a teleporter.
*/
public Teleporter(Track track) {
this.track = track;
this.track.addListener(this);
}

/**
* Connects this teleporter to another one.
* @param destination The other location {@link Marble}'s can be teleported
* to/from.
*/
public void setDestination(Teleporter destination) {
if (!track.getClass().equals(destination.getTrack().getClass())) {
throw new IllegalStateException("Both connected teleporters must be either"
+ " horizontal or vertical");
}

this.destination = destination;
}

/**
* Returns the {@link Track}.
*
* @return The {@link Track}.
*/
public Track getTrack() {
return track;
}

/**
* Return the connected {@link Teleporter}.
*
* @return The other {@link Teleporter} that is connected to this one.
*/
public Teleporter getDestination() {
return destination;
}


/**
* Determine whether this tileable entity has a connection at the given direction with the
* entity next to this entity in the given direction.
*
* <p>This means the entity is able to have a {@link Marble} travel from the given direction
* onto the tile.</p>
*
* <p>Be aware that the direction parameter is seen from the origin of this {@link Tileable}
* meaning the direction may need to be inverted.</p>
*
* @param direction The direction from the origin of the tile to a possible port of the entity.
* @return <code>true</code> if a ball is able to travel from that direction, <code>false</code>
* otherwise.
*/
@Override
public boolean allowsConnection(Direction direction) {
return track.allowsConnection(direction);
}

/**
* Determine whether this tileable entity accepts a ball onto its tile at the moment of
* execution.
*
* <p>If {@link Tileable#allowsConnection(Direction)} returns <code>false</code> for any given
* direction, this method should not be invoked for that direction.
* </p>
*
* <p>Be aware that the direction parameter is seen from the origin of this {@link Tileable}
* meaning the direction may need to be inverted.</p>
*
* @param direction The direction from which a ball wants to be accepted onto this tileable
* entity.
* @param marble The {@link Marble} to be accepted.
* @return <code>true</code> if the tileable entity accepts the ball onto its tile,
* <code>false</code> otherwise.
*/
@Override
public boolean accepts(Direction direction, Marble marble) {
return track.accepts(direction, marble);
}

/**
* Accept a {@link Marble} onto the tile of this tileable entity.
*
* <p>Be aware that the direction parameter is seen from the origin of this {@link Tileable}
* meaning the direction may need to be inverted.</p>
*
* @param direction The direction from which a marble wants to be accepted onto this tileable
* entity.
* @param marble The marble that wants to be accepted onto the tile of this tileable entity.
*/
@Override
public void accept(Direction direction, Marble marble) {
track.accept(direction, marble);
}

/**
* This method is invoked when a {@link Tileable} has accepted a marble.
*
* @param tileable The tileable that has accepted the marble.
* @param direction The direction from which the marble was accepted.
* @param marble The marble that has been accepted.
*/
@Override
public void ballAccepted(Tileable tileable, Direction direction, Marble marble) {
informAcceptation(direction, marble);
}

/**
* This method is invoked when a {@link Tileable} has disposed a marble.
*
* @param tileable The tileable that has disposed the marble.
* @param direction The direction from which the marble was disposed.
* @param marble The marble that has been disposed.
*/
@Override
public void ballDisposed(Tileable tileable, Direction direction, Marble marble) {
informDispose(direction, marble);
}

/**
* This method is invoked when a {@link Tileable} has released a marble to a neighbour.
*
* @param tileable The tileable that has released the marble.
* @param direction The direction from which the marble was released.
* @param marble The marble that has been released.
*/
@Override
public void ballReleased(Tileable tileable, Direction direction, Marble marble) {
informRelease(direction, marble);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
package nl.tudelft.broccoli.core.track;

import nl.tudelft.broccoli.core.Marble;
import nl.tudelft.broccoli.core.MarbleType;
import nl.tudelft.broccoli.core.grid.Direction;
import nl.tudelft.broccoli.core.grid.Grid;
import nl.tudelft.broccoli.core.grid.Tile;
Expand Down Expand Up @@ -56,7 +57,7 @@ public boolean isConnected() {
}

/**
* Determine whether a certain {@link Marble.Type} is allowed to pass the middle
* Determine whether a certain {@link MarbleType} is allowed to pass the middle
* of the {@link Track}.
*
* @param direction The {@link Direction} the {@link Marble} i coming from.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
package nl.tudelft.broccoli.core.track;

import nl.tudelft.broccoli.core.Marble;
import nl.tudelft.broccoli.core.MarbleType;
import nl.tudelft.broccoli.core.grid.Direction;
import nl.tudelft.broccoli.core.grid.Tileable;

Expand All @@ -45,7 +46,7 @@ public abstract class Track extends Tileable {
public abstract boolean isConnected();

/**
* Determine whether a certain {@link Marble.Type} is allowed to pass the middle
* Determine whether a certain {@link MarbleType} is allowed to pass the middle
* of the {@link Track}.
*
* @param direction The {@link Direction} the {@link Marble} i coming from.
Expand Down
Loading

0 comments on commit 6768118

Please sign in to comment.