Merge pull request #6 from LittleBeasts/test

add portrait
LittleBeasts · Jan 9, 2021 · e44136b · e44136b
2 parents 192d4fc + 28402b8
commit e44136b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -24,8 +24,8 @@ jobs:
       id: bump_version
       uses: christian-draeger/increment-semantic-version@1.0.2
       with:
-        current-version: '0.0.0-alpha1'
-        version-fragment: 'major'
+        current-version: '1.0.0-alpha1'
+        version-fragment: 'bug'
     - name: Upload Artifacts
       run: mkdir builds && cp target/*.jar builds/calculationEngine-${{ steps.bump_version.outputs.next-version }}.jar
     - uses: actions/upload-artifact@v2

diff --git a/src/main/java/calculationEngine/entities/CeBeasts.java b/src/main/java/calculationEngine/entities/CeBeasts.java
@@ -4,8 +4,8 @@
 
 public enum CeBeasts {
 
-    FeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, 15, "StinkenderFeuerFurz", CeRegions.ArkhamCity),
-    StinkenderFeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, Integer.MAX_VALUE, "", CeRegions.ArkhamCity);
+    FeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, 15, "StinkenderFeuerFurz", CeRegions.ArkhamCity, "sprites/icon.png"),
+    StinkenderFeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, Integer.MAX_VALUE, "", CeRegions.ArkhamCity, "sprites/icon.png");
 
 
     private final CeBeastTypes type;
@@ -22,8 +22,9 @@ public enum CeBeasts {
     private final int evolutionlvl; // Level at which development will take place
     private final String evolutionId; // ID of development of beast
     private final CeRegions region;
+    private final String portrait;
 
-    CeBeasts(CeBeastTypes type, int baseHp, int baseAttack, int baseDefense, int baseSpeed, int baseStamina, int hpLvlScaling, int attackLvlScaling, int defenseLvlScaling, int speedLvlScaling, int staminaLvlScaling, int developmentlvl, String developmentId, CeRegions region) {
+    CeBeasts(CeBeastTypes type, int baseHp, int baseAttack, int baseDefense, int baseSpeed, int baseStamina, int hpLvlScaling, int attackLvlScaling, int defenseLvlScaling, int speedLvlScaling, int staminaLvlScaling, int developmentlvl, String developmentId, CeRegions region, String portrait) {
         this.type = type;
         this.baseHp = baseHp;
         this.baseAttack = baseAttack;
@@ -38,6 +39,7 @@ public enum CeBeasts {
         this.evolutionId = developmentId;
         this.evolutionlvl = developmentlvl;
         this.region = region;
+        this.portrait = portrait;
     }
 
     public static CeBeasts getBeast(String name) {
@@ -99,4 +101,8 @@ public int getEvolutionlvl() {
     public String getEvolutionId() {
         return evolutionId;
     }
+
+    public String getPortrait() {
+        return portrait;
+    }
 }