From 6930725a253e03d0fac815c5f349d88aa3355b94 Mon Sep 17 00:00:00 2001
From: lnittsch <lnittsch@uni-bremen.de>
Date: Mon, 25 May 2020 20:28:10 +0200
Subject: [PATCH] =?UTF-8?q?Aktuellesmodel=20in=20intelliJ=20=C3=BCbertrage?=
=?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
GT_Modulsicht/GalaxyTrucker.vpp | Bin 770048 -> 770048 bytes
.../Model/Map/Overworld.java | 13 ++++++
.../Model/{Planet => Map}/Planet.java | 4 +-
.../Model/Map/PlanetEvent.java | 5 +++
.../Model/Planet/PlanetEvent.java | 5 ---
.../galaxytruckerreloaded/Model/Ship.java | 40 ++++++++++++++++--
.../ShipLayout/{Room.java => Section.java} | 2 +-
.../Model/ShipLayout/System.java | 2 +-
.../Model/Weapons/Weapon.java | 4 ++
9 files changed, 63 insertions(+), 12 deletions(-)
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
rename core/src/com/galaxytrucker/galaxytruckerreloaded/Model/{Planet => Map}/Planet.java (77%)
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java
delete mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java
rename core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/{Room.java => Section.java} (94%)
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp b/GT_Modulsicht/GalaxyTrucker.vpp
index 26c7bc03931d6b1fb9e2f4b903781bb97f625f61..431578cdd9d24601b8a0a6545031e96c6a54c81e 100644
GIT binary patch
delta 2310
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
SdGTFl$*pP|88$7D*zi50oP?49
delta 8121
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
D%YJk_
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
new file mode 100644
index 00000000..fa3ebe1f
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
@@ -0,0 +1,13 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+import jdk.internal.util.xml.impl.Pair;
+
+import java.util.HashMap;
+
+public class Overworld {
+ private HashMap<Pair,Planet> planetMap;
+
+ public Overworld(int seed) {
+ planetMap = new HashMap<>();
+ }
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
similarity index 77%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
index c175c08b..8b11bac5 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
@@ -1,8 +1,8 @@
-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
public abstract class Planet {
- /** Planet name */
+ /** Map name */
private String name;
/** Horizontale Position auf der Karte */
private float posX;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java
new file mode 100644
index 00000000..e700d436
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java
@@ -0,0 +1,5 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+public enum PlanetEvent {
+
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java
deleted file mode 100644
index a7220baf..00000000
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
-
-public enum PlanetEvent {
-
-}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index c042567c..e72e0ff2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -1,16 +1,50 @@
package com.galaxytrucker.galaxytruckerreloaded.Model;
+import jdk.internal.util.xml.impl.Pair;
+
public class Ship {
/**
* HP
*/
- private int hp;
+ private int health;
+
+ /**
+ * Resources are stored in ship
+ */
+ private int money;
+ private int missiles;
+ private int fuel;
+
+ /**
+ * Energy to be distributed
+ */
+ private int energy;
+
+ /**
+ * Shields that are currently active
+ */
+ private int shieldCharge;
+
+ /**
+ * Total number of Shields that are powered. Possibly redundant through Shield.getEnergy/2
+ */
+ private int maxShieldCharge;
+
+ /**
+ * chance for the ship to dodge incoming attacks
+ */
+ private float evasion;
+
+ /**
+ * X and Y coordinates on the map
+ */
+ private Pair position;
/**
- * Shields
+ * time needed until position can be changed again
*/
- private int shields;
+ private int FTLcharge;
/**
* Take damage
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
similarity index 94%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
index 94c8d511..dc006fcd 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Section.java
@@ -1,6 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-public abstract class Room {
+public abstract class Section {
/**
* Höhe des Raumes. Räume sind immer rechteckig.
*/
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
index 5646eea8..b82701b4 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
@@ -1,6 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-public abstract class System extends Room {
+public abstract class System extends Section {
private int energy;
private int maxEnergy;
private int damage;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index 32c66c11..a8dbf0e3 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -14,6 +14,10 @@ public abstract class Weapon {
private int missileCost;
private float dropchance;
private int crewdamage;
+ /**
+ * Amount of shields ignored by attack
+ */
+ private int piercing;
/**
* How many projectiles are fired per burst
*/
--
GitLab