diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..b96cf03 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,24 @@ +pipeline { + agent any + stages { + stage('Build') { + steps { + echo 'Building...' + sh 'mvn clean & mvn validate & mvn compile' + } + } + stage('Test') { + steps { + echo 'Testing...' + sh 'mvn clean & mvn test' + } + } + stage('Deploy') { + steps { + echo 'Deploying...' + sh 'mvn clean & mvn compile & mvn package & mvn verify & mvn install' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + } + } + } +} \ No newline at end of file diff --git a/README.md b/README.md index 400c38d..3f682dc 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ A commandline pokemon clone written in java. This started as an assignment in computer science, but since it became quite advanced in just one week, I want to see where it might go. -This project has no clear goal, except mimicking the original pokemon games in a commandline interface. It would be interestig if people used this project as a base for custom games. There is still a lot to implement, but if it reaches a near complete stage, it should be possible to create custom types, moves pokemon, trainers, gyms, badges and maps. +This project has no clear goal, except mimicking the original pokemon games in a commandline interface. It would be interesting if people used this project as a base for custom games. There is still a lot to implement, but if it reaches a near complete stage, it should be possible to create custom types, moves pokemon, trainers, gyms, badges and maps. diff --git a/docs/issue_template.md b/docs/issue_template.md index 2f09db5..9bd7ea4 100644 --- a/docs/issue_template.md +++ b/docs/issue_template.md @@ -4,4 +4,4 @@ ### Steps to reproduce the behavior -### Information about java version, enviroment, project branch etc. +### Information about java version, environment, project branch etc. diff --git a/src/main/java/Game.java b/src/main/java/Game.java index e84dab0..9cf6176 100644 --- a/src/main/java/Game.java +++ b/src/main/java/Game.java @@ -49,7 +49,7 @@ public class Game { System.out.printf("Opponent: %s%nWhat will you do?%n", opponentPokemon); System.out.printf("b: battle" + "%nh: heal or revive" - + "%nt: throw pokeball" + + "%nt: throw poke ball" + "%nc: change pokemon" + "%nf: flee" + "%nv: view my pokemon" @@ -121,7 +121,7 @@ public class Game { List loadedUsersPokemon = loadPokemon("user.save"); Inventory loadedInventory = loadInventory("inventory.save"); if (loadedPokemon == null || loadedUsersPokemon == null || loadedInventory == null) { - System.out.println("One or more savefiles seem corrupt or missing. Please delete, create or fix the affected file(s)."); + System.out.println("One or more save files seem corrupt or missing. Please delete, create or fix the affected file(s)."); } else { availableOpponentPokemon = loadedPokemon; player.setPokemon(loadedUsersPokemon); @@ -219,7 +219,7 @@ public class Game { AbstractPokeBall currentPokeBall = player.getInventory().getChosenPokeBall(); if (currentPokeBall == null) { in.nextLine(); - System.out.println("Invalid pokeball."); + System.out.println("Invalid poke ball."); } else { boolean captured = currentPokeBall.use(opponentPokemon, availableOpponentPokemon, player); player.getInventory().addItem(currentPokeBall, -1); @@ -230,7 +230,7 @@ public class Game { } } } else { - System.out.println("You have used all your pokeballs."); + System.out.println("You have used all your poke balls."); } } diff --git a/src/main/java/items/Item.java b/src/main/java/items/Item.java index 978712c..f33deeb 100644 --- a/src/main/java/items/Item.java +++ b/src/main/java/items/Item.java @@ -9,7 +9,7 @@ import java.util.List; public abstract class Item { final String name; final String description; - static List availableItems = new ArrayList<>(); + static final List availableItems = new ArrayList<>(); /** * Instantiates a new item diff --git a/src/main/java/pokemon/Pokemon.java b/src/main/java/pokemon/Pokemon.java index 01958cc..1184f2a 100644 --- a/src/main/java/pokemon/Pokemon.java +++ b/src/main/java/pokemon/Pokemon.java @@ -144,7 +144,7 @@ public class Pokemon { System.out.printf("%s was caught.%n", this.name); return true; } else { - System.out.printf("%s escaped from the pokeball.%n", this.name); + System.out.printf("%s escaped from the poke ball.%n", this.name); return false; } }