Skip to content

Feature3/pokemon battle #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-mordan wants to merge 13 commits into
base: development
Choose a base branch
from
Open

Feature3/pokemon battle #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f46d492
keith is awesome
j-mordan Jul 11, 2021
758d61f
random moves done
j-mordan Jul 18, 2021
94efb57
pokemon battle ip
j-mordan Sep 19, 2021
58443ed
pokemon battle ip
j-mordan Sep 19, 2021
78ff103
done
j-mordan Oct 3, 2021
7b0ad8c
done
j-mordan Oct 3, 2021
bccfca0
pokemon 2's types are being copied into pokemon 1's types
j-mordan Oct 9, 2021
e04beea
pokemon 2's types are being copied to pokemon 1's types
j-mordan Oct 9, 2021
5cc4ebf
fixed type copying bug
j-mordan Oct 17, 2021
e8c9660
added speed, made it repeat on end battle
j-mordan Oct 23, 2021
5e18a18
made only damage moves available, bot finished
j-mordan Oct 30, 2021
23d564a
pull request next week
j-mordan Oct 31, 2021
d7eba96
help embed
j-mordan Nov 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
10 changes: 7 additions & 3 deletions src/main/java/org/jointheleague/discord_bot_example/Bot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ public void connect(boolean printInvite) {
api.addMessageCreateListener(list);
helpListener.addHelpEmbed(list.getHelpEmbed());

MazeGame maze = new MazeGame(channelName);
api.addMessageCreateListener(maze);
helpListener.addHelpEmbed(maze.getHelpEmbed());
//MazeGame maze = new MazeGame(channelName);
//api.addMessageCreateListener(maze);
//helpListener.addHelpEmbed(maze.getHelpEmbed());

MarsPictures marsPictures = new MarsPictures(channelName);
api.addMessageCreateListener(marsPictures);
Expand Down Expand Up @@ -128,6 +128,10 @@ public void connect(boolean printInvite) {
api.addMessageCreateListener(poker);
helpListener.addHelpEmbed(poker.getHelpEmbed());

PokemonBattle pokemonBattle=new PokemonBattle(channelName);
api.addMessageCreateListener(pokemonBattle);
helpListener.addHelpEmbed(pokemonBattle.getHelpEmbed());

CovidCaseGetter covid = new CovidCaseGetter(channelName);
api.addMessageCreateListener(covid);
helpListener.addHelpEmbed(covid.getHelpEmbed());
Expand Down
Loading