Skip to content

Commit e44136b

Browse files
authored
Merge pull request #6 from LittleBeasts/test
add portrait
2 parents 192d4fc + 28402b8 commit e44136b

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
id: bump_version
2525
uses: christian-draeger/increment-semantic-version@1.0.2
2626
with:
27-
current-version: '0.0.0-alpha1'
28-
version-fragment: 'major'
27+
current-version: '1.0.0-alpha1'
28+
version-fragment: 'bug'
2929
- name: Upload Artifacts
3030
run: mkdir builds && cp target/*.jar builds/calculationEngine-${{ steps.bump_version.outputs.next-version }}.jar
3131
- uses: actions/upload-artifact@v2

src/main/java/calculationEngine/entities/CeBeasts.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
public enum CeBeasts {
66

7-
FeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, 15, "StinkenderFeuerFurz", CeRegions.ArkhamCity),
8-
StinkenderFeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, Integer.MAX_VALUE, "", CeRegions.ArkhamCity);
7+
FeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, 15, "StinkenderFeuerFurz", CeRegions.ArkhamCity, "sprites/icon.png"),
8+
StinkenderFeuerFurz(CeBeastTypes.Fire, 100, 25, 25, 25, 25, 25, 25, 25, 25, 25, Integer.MAX_VALUE, "", CeRegions.ArkhamCity, "sprites/icon.png");
99

1010

1111
private final CeBeastTypes type;
@@ -22,8 +22,9 @@ public enum CeBeasts {
2222
private final int evolutionlvl; // Level at which development will take place
2323
private final String evolutionId; // ID of development of beast
2424
private final CeRegions region;
25+
private final String portrait;
2526

26-
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) {
27+
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) {
2728
this.type = type;
2829
this.baseHp = baseHp;
2930
this.baseAttack = baseAttack;
@@ -38,6 +39,7 @@ public enum CeBeasts {
3839
this.evolutionId = developmentId;
3940
this.evolutionlvl = developmentlvl;
4041
this.region = region;
42+
this.portrait = portrait;
4143
}
4244

4345
public static CeBeasts getBeast(String name) {
@@ -99,4 +101,8 @@ public int getEvolutionlvl() {
99101
public String getEvolutionId() {
100102
return evolutionId;
101103
}
104+
105+
public String getPortrait() {
106+
return portrait;
107+
}
102108
}

0 commit comments

Comments
 (0)