Skip to content

Commit

Permalink
Merge pull request #104 from EntelectChallenge/feature/2-0-1-fix-vers…
Browse files Browse the repository at this point in the history
…ion-numbering

Fixed numbering to 2.0.1
  • Loading branch information
ERFullard authored Jun 26, 2018
2 parents fbbcdf2 + 46f95d8 commit 8e1ff55
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion game-engine/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>game-engine</artifactId>
<groupId>za.co.entelect.challenge</groupId>
<version>2.0.0</version>
<version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion game-engine/domain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>game-engine</artifactId>
<groupId>za.co.entelect.challenge</groupId>
<version>2.0.0</version>
<version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ public void fireTeslaTower(Building teslaBuilding) {

TowerDefensePlayer opponentPlayer = null;
try {
if(possibleTargets.size() > 0){
if (possibleTargets.size() > 0) {
opponentPlayer = getPlayer(possibleTargets.get(0).getPlayerType());
}else{
} else {
return;
}
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion game-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>za.co.entelect.challenge</groupId>
<artifactId>game-engine</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
<modules>
<module>domain</module>
<module>core</module>
Expand Down
2 changes: 1 addition & 1 deletion game-runner/game-config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ game.config.attack.config.health = 5
game.config.attack.config.construction-time-left = 1
game.config.attack.config.price = 30
game.config.attack.config.weapon-damage = 5
game.config.attack.config.weapon-speed = 1
game.config.attack.config.weapon-speed = 2
game.config.attack.config.weapon-cooldown-period = 3
game.config.attack.config.icon = A
game.config.attack.config.destroy-multiplier = 1
Expand Down
4 changes: 2 additions & 2 deletions game-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>za.co.entelect.challenge</groupId>
<artifactId>game-runner</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>

<properties>
<java.version>1.8</java.version>
<reflections.version>0.9.11</reflections.version>
<gson.version>2.8.2</gson.version>
<game.engine.interface.version>2.0.0</game.engine.interface.version>
<game.engine.core.version>2.0.0</game.engine.core.version>
<game.engine.core.version>2.0.1</game.engine.core.version>
</properties>

<dependencies>
Expand Down
14 changes: 7 additions & 7 deletions starter-pack/ReadMe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
| |____| | | |/ ____ \| |____| |____| |____| |\ | |__| | |____
\_____|_| |_/_/ \_\______|______|______|_| \_|\_____|______|

___ ___ ___
|__ \ / _ \ / _ \
) | | | | | | | | |
/ / | | | | | | | |
/ /_ _ | |_| | _ | |_| |
|____| (_) \___/ (_) \___/

___ ___ __
|__ \ / _ \ /_ |
) | | | | | | |
/ / | | | | | |
/ /_ _ | |_| | _ | |
|____| (_) \___/ (_) |_|

Welcome to the starter pack for the 2018 Entelect Challenge!
Here you will find all that you'll need to run your first bot and compete in this year's challenge.
Expand Down
2 changes: 1 addition & 1 deletion starter-pack/game-config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ game.config.attack.config.health = 5
game.config.attack.config.construction-time-left = 1
game.config.attack.config.price = 30
game.config.attack.config.weapon-damage = 5
game.config.attack.config.weapon-speed = 1
game.config.attack.config.weapon-speed = 2
game.config.attack.config.weapon-cooldown-period = 3
game.config.attack.config.icon = A
game.config.attack.config.destroy-multiplier = 1
Expand Down
4 changes: 2 additions & 2 deletions starter-pack/makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default:
java -jar tower-defence-runner-2.0.0.jar
java -jar tower-defence-runner-2.0.1.jar

run:
java -jar tower-defence-runner-2.0.0.jar
java -jar tower-defence-runner-2.0.1.jar
2 changes: 1 addition & 1 deletion starter-pack/run.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java -jar tower-defence-runner-2.0.0.jar
java -jar tower-defence-runner-2.0.1.jar
pause
Binary file not shown.

0 comments on commit 8e1ff55

Please sign in to comment.