Merge pull request #45 from Our-Magic-Journey/teleport

Teleport

assets/assets.txt

@@ -22,6 +22,30 @@ images/planet-field.png
 images/planet-field-over.png
 images/planet-field-down.png
 images/planet-field-color.png
+images/casino.png
+images/casino-over.png
+images/casino-down.png
+images/hiper-hub.png
+images/hiper-hub-over.png
+images/hiper-hub-down.png
+images/mine.png
+images/mine-over.png
+images/mine-down.png
+images/nebula.png
+images/nebula-over.png
+images/nebula-down.png
+images/start.png
+images/start-over.png
+images/start-down.png
+images/teleport.png
+images/teleport-over.png
+images/teleport-down.png
+images/unknown-jump.png
+images/unknown-jump-over.png
+images/unknown-jump-down.png
+images/event.png
+images/event-over.png
+images/event-down.png
 images/map-done.png
 images/board-background.png
 images/player0.png

assets/skin/ui.skin.atlas

@@ -101,17 +101,17 @@ panel
   orig: 57, 96
   offset: 0, 0
   index: -1
-white-pixel
-  rotate: false
-  xy: 1, 1
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 panel-margin
   rotate: false
   xy: 60, 84
   size: 5, 4
   orig: 5, 4
   offset: 0, 0
   index: -1
+white-pixel
+  rotate: false
+  xy: 1, 1
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1

core/src/xyz/magicjourney/nebulaquest/board/Board.java

@@ -142,7 +142,16 @@ public void setPlayerPosition(Player player, int fieldNumber, boolean isFinalMov
 
   public void movePlayer(Player player, int moveBy, boolean isFinalMove) {
     Pawn pawn = players.get(player);
-    int finalPos = (pawn.getField() + moveBy) % this.fields.length();
+    int finalPos = pawn.getField() + moveBy;
+
+    if (finalPos >= this.fields.length()) {
+      for (int i = pawn.getField() + 1; i < this.fields.length(); i++) {
+        this.fields.get(i).getEntity().onPass(player);
+      }
+
+      pawn.setField(-1);
+      finalPos -= this.fields.length();
+    }
 
     for (int i = pawn.getField() + 1; i <= finalPos; i++) {
       this.fields.get(i).getEntity().onPass(player);

core/src/xyz/magicjourney/nebulaquest/board/field/BigField.java

@@ -6,8 +6,10 @@
 
 public class BigField extends Field {
   public BigField(Entity entity, AssetManager assets) {
-    super(entity, assets, 64, 64);
+    this(entity, "images/big-field", assets);
+  }
 
-    this.setTexture("images/big-field", assets);
+  public BigField(Entity entity, String texture, AssetManager assets) {
+    super(entity, texture, assets, 64, 64);
   }
 }

core/src/xyz/magicjourney/nebulaquest/board/field/Field.java

@@ -14,18 +14,22 @@ public class Field extends Button {
   protected int correctPawnRotation;
 
   public Field(Entity entity, AssetManager assets) {
-    this(entity, assets, 32, 64);
+    this(entity, "images/small-field", assets);
   }
 
-  public Field(Entity entity, AssetManager assets, int width, int height) {
+  public Field(Entity entity, String texture, AssetManager assets) {
+    this(entity, texture, assets, 32, 64);
+  }
+
+  public Field(Entity entity, String texture, AssetManager assets, int width, int height) {
     this.style = new ButtonStyle();
     this.entity = entity;
     this.correctPawnRotation = 0;
 
     this.setWidth(width);
     this.setHeight(height);
     this.setStyle(this.style);
-    this.setTexture("images/small-field", assets);
+    this.setTexture(texture, assets);
 
     // Rotate children with parent
     this.setTransform(true);

core/src/xyz/magicjourney/nebulaquest/entity/Buyable.java

@@ -16,7 +16,7 @@ default boolean isOwner(Player player) {
   void setOwner(Player player);
 
   default boolean mustPayFee(Player player) {
-    return this.getOwner().isPresent() && !this.isOwner(player);
+    return this.getOwner().isPresent() && this.getOwner().get() != player;
   }
 
   default boolean canByBought() {

core/src/xyz/magicjourney/nebulaquest/entity/entities/Casino.java

@@ -10,7 +10,7 @@
 public class Casino extends Entity implements Interactiveable {
 
   public Casino() {
-    super("Casino", "Nice casino");
+    super("Suspicious\nSpace Station", "According to the local Republic administration, this space station should be abandoned. However, it appears freshly built and teeming with life. Will you dare to investigate its mysteries?");
   }
 
   @Override
@@ -23,7 +23,7 @@ public void onPass(Player player) {
 
   @Override
   public Field toField(AssetManager assets) {
-    return new Field(this, assets);
+    return new Field(this, "images/casino", assets);
   }
 
   @Override

core/src/xyz/magicjourney/nebulaquest/entity/entities/EmergencySignal.java

@@ -0,0 +1,31 @@
+package xyz.magicjourney.nebulaquest.entity.entities;
+
+import java.util.Optional;
+
+import com.badlogic.gdx.assets.AssetManager;
+
+import xyz.magicjourney.nebulaquest.board.field.Field;
+import xyz.magicjourney.nebulaquest.entity.Entity;
+import xyz.magicjourney.nebulaquest.player.Player;
+
+public class EmergencySignal extends Entity {
+  protected int value;
+  protected Optional<Player> owner;
+
+  public EmergencySignal() {
+    super("Emergency\nsignal", "");
+  }
+
+  @Override
+  public void onEnter(Player player) {
+  }
+
+  @Override
+  public void onPass(Player player) {
+  }
+
+  @Override
+  public Field toField(AssetManager assets) {
+    return new Field(this, "images/event", assets);
+  }
+}

core/src/xyz/magicjourney/nebulaquest/entity/entities/Mine.java

@@ -0,0 +1,26 @@
+package xyz.magicjourney.nebulaquest.entity.entities;
+
+import com.badlogic.gdx.assets.AssetManager;
+
+import xyz.magicjourney.nebulaquest.board.field.Field;
+import xyz.magicjourney.nebulaquest.entity.Entity;
+import xyz.magicjourney.nebulaquest.player.Player;
+
+public class Mine extends Entity {
+  public Mine() {
+    super("Asteroid Mine", "");
+  }
+
+  @Override
+  public void onEnter(Player player) {
+  }
+
+  @Override
+  public void onPass(Player player) {
+  }
+
+  @Override
+  public Field toField(AssetManager assets) {
+    return new Field(this, "images/mine", assets);
+  }
+}

core/src/xyz/magicjourney/nebulaquest/entity/entities/Nebula.java

@@ -0,0 +1,27 @@
+package xyz.magicjourney.nebulaquest.entity.entities;
+
+import com.badlogic.gdx.assets.AssetManager;
+
+import xyz.magicjourney.nebulaquest.board.field.BigField;
+import xyz.magicjourney.nebulaquest.board.field.Field;
+import xyz.magicjourney.nebulaquest.entity.Entity;
+import xyz.magicjourney.nebulaquest.player.Player;
+
+public class Nebula extends Entity {
+  public Nebula() {
+    super("Nebula", "");
+  }
+
+  @Override
+  public void onEnter(Player player) {
+  }
+
+  @Override
+  public void onPass(Player player) {
+  }
+
+  @Override
+  public Field toField(AssetManager assets) {
+    return new BigField(this, "images/nebula", assets);
+  }
+}

core/src/xyz/magicjourney/nebulaquest/entity/entities/Start.java

@@ -20,11 +20,12 @@ public void onEnter(Player player) {
 
   @Override
   public void onPass(Player player) {
+    System.out.println("Give money!");
     player.setMoney(player.getMoney() + MONEY_ON_PASS_START);
   }
 
   @Override
   public Field toField(AssetManager assets) {
-    return new BigField(this, assets);
+    return new BigField(this, "images/start", assets);
   }
 }

core/src/xyz/magicjourney/nebulaquest/entity/entities/Teleport.java

@@ -12,12 +12,18 @@
 public class Teleport extends Entity implements Buyable {
   protected int value;
   protected Optional<Player> owner;
+  protected int exitField;
 
-  public Teleport() {
+  public Teleport(int exitField) {
     super("Teleport", "This is a well-known hyperspace path. It allows you to traverse to the opposite edge of the galaxy. You can fornicate the start and finish fields, then jumping players need to pay you a fee. Jump doesn't count as passing the starting field.");
 
     this.value = 350;
     this.owner = Optional.empty();
+    this.exitField = exitField;
+  }
+
+  public int getExit() {
+    return this.exitField;
   }
 
   @Override
@@ -50,6 +56,24 @@ public void onPass(Player player) {
 
   @Override
   public Field toField(AssetManager assets) {
-    return new Field(this, assets);
+    return new Field(this, "images/teleport", assets);
+  }
+
+  @Override
+  public String getInteractiveablePanelName(Player player) {
+    if (this.getOwner().isPresent() && this.getOwner().get() != player) {
+      return "TeleportPayFee"; 
+    }
+
+    return  "Teleport";
+  }
+
+  @Override
+  public boolean isDecisionRequired(Player player) {
+    if (this.getOwner().isPresent() && this.getOwner().get() != player) {
+      return true;
+    }
+
+    return false;
   }
 }

core/src/xyz/magicjourney/nebulaquest/entity/entities/TeleportHub.java

@@ -0,0 +1,27 @@
+package xyz.magicjourney.nebulaquest.entity.entities;
+
+import com.badlogic.gdx.assets.AssetManager;
+
+import xyz.magicjourney.nebulaquest.board.field.BigField;
+import xyz.magicjourney.nebulaquest.board.field.Field;
+import xyz.magicjourney.nebulaquest.entity.Entity;
+import xyz.magicjourney.nebulaquest.player.Player;
+
+public class TeleportHub extends Entity {
+  public TeleportHub() {
+    super("Teleport Hub", "");
+  }
+
+  @Override
+  public void onEnter(Player player) {
+  }
+
+  @Override
+  public void onPass(Player player) {
+  }
+
+  @Override
+  public Field toField(AssetManager assets) {
+    return new BigField(this, "images/hiper-hub", assets);
+  }
+}

core/src/xyz/magicjourney/nebulaquest/entity/entities/UnknownJump.java

@@ -0,0 +1,27 @@
+package xyz.magicjourney.nebulaquest.entity.entities;
+
+import com.badlogic.gdx.assets.AssetManager;
+
+import xyz.magicjourney.nebulaquest.board.field.BigField;
+import xyz.magicjourney.nebulaquest.board.field.Field;
+import xyz.magicjourney.nebulaquest.entity.Entity;
+import xyz.magicjourney.nebulaquest.player.Player;
+
+public class UnknownJump extends Entity {
+  public UnknownJump() {
+    super("UnknownJump", "");
+  }
+
+  @Override
+  public void onEnter(Player player) {
+  }
+
+  @Override
+  public void onPass(Player player) {
+  }
+
+  @Override
+  public Field toField(AssetManager assets) {
+    return new BigField(this, "images/unknown-jump", assets);
+  }
+}

core/src/xyz/magicjourney/nebulaquest/player/Player.java

@@ -54,9 +54,11 @@ public void setMoney(int money) {
   }
 
   public boolean buyProperty(Buyable property) {
-    if (property.canByBought() && this.pay(property.getValue())) {
+    if (property.canByBought() && this.getMoney() >= property.getValue()) {
+      this.money -= property.getValue();
       this.properties.add(property);
       property.setOwner(this);
+      this.changedEvent.emit(this);
 
       return true;
     }