Skip to content

Commit 824ca1f

Browse files
committed
Updating files to newer version.
1 parent c0221f0 commit 824ca1f

36 files changed

+455
-1003
lines changed

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/DeltaGame2.iml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DeltaGame2.iml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
</content>
8+
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="sourceFolder" forTests="false" />
10+
<orderEntry type="library" name="simplegraphics" level="project" />
11+
</component>
12+
</module>

DevelopmentOrganization.md

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,40 @@
1-
== Description<br />
2-
To better organize our coding, lets set how and what we need to code in lists:
3-
4-
1. TODO: Functionality we want to implement to our game
5-
2. DOING: Functionality that we are working on
6-
3. DONE: Functionality that is already finished and implemented.
7-
8-
How to represent<br />
9-
#number - Functionality Name - Description - Coder Name
10-
11-
== TODO
12-
1. Game - Definition of positions, random creation - DeltaTeam
13-
3. Game Init - Creation of objects - DeltaTeam
14-
4. Game Start - Start movements - DeltaTeam
15-
16-
== DOING
17-
1. Game Objects - Factories, Types - Flavio, Tiago
18-
2. Game Logic - Start, Init, object creation - Andre
19-
3. Game Init - Creation of grid, creation of players - Andre
20-
4. KeyboardEngine Logic - Missing speed increase/decrease, shooting - Andre, Ricardo
21-
5. Player Logic - Added some main abstract methods - Flavio
22-
6. Enemy Logic - Added some main abstract methods - Flavio
23-
7. Graphics - Defining graphics for game - Monica
24-
8. Menu - Programming and Menu - Ricardo, Tiago
25-
9. Graphics - Adapting and editing graphics - Tiago, Monica
26-
27-
== DONE
28-
1. Game map Creation - Map grid was created and executed - Andre
29-
2. File Structure - Directory and file organization - DeltaTeam
1+
== Description<br />
2+
To better organize our coding, lets set how and what we need to code in lists:
3+
4+
1. TODO: Functionality we want to implement to our game
5+
2. DOING: Functionality that we are working on
6+
3. DONE: Functionality that is already finished and implemented.
7+
8+
How to represent<br />
9+
#number - Functionality Name - Description - Coder Name
10+
11+
== TODO
12+
1. Menu - Merge to branch -DeltaTeam
13+
2. Keyboard - Add diagonal movement - DeltaTeam
14+
3. Extra Feature - Add limit to player max speed base by level - DeltaTeam
15+
4. Extra Feature - Player max speed bonus for over limit speed - DeltaTeam
16+
5. Score Board - Implement score board for player - DeltaTeam
17+
6. Collision - If zombie hits player character, the player dies - DeltaTeam
18+
7. Collision - Zombie hits the wall its game over - DeltaTeam
19+
8. Collision - Player shoots enemy dies, take him out ot the screen - DeltaTeam
20+
21+
== DOING
22+
1. KeyboardEngine Logic - Missing speed increase/decrease (done), shooting - Andre, Ricardo
23+
2. Menu - Programming and Menu - Ricardo, Tiago
24+
3. Presentation - Plan and develop presentation for sale of game - Ricardo, Flavio
25+
4. Code Cleaning - Clean code, remove deprecated folders and files, add comments to methods - DeltaTeam
26+
5. Collision - Adding helpers methods and logic - Ricardo, Flavio, Tiago
27+
28+
== DONE
29+
1. Game map Creation - Map grid was created and executed - Andre
30+
2. File Structure - Directory and file organization - DeltaTeam
31+
3. Game Objects - Factories, Types - Flavio, Tiago
32+
4. Game Logic - Start, Init, object creation - Andre
33+
5. Game Init - Creation of grid, creation of players - Andre
34+
6. Player Logic - Added some main abstract methods - Flavio
35+
7. Enemy Logic - Added some main abstract methods - Flavio
36+
8. Graphics - Defining graphics for game - Monica
37+
9. Graphics - Adapting and editing graphics - Tiago, Monica
38+
10. Game Start - Start movements - Andre
39+
11. Game - Definition of positions, random creation - Andre
40+
12. Game Init - Creation of objects - DeltaTeam

GamePlan.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
Game Objectives
2-
- Code cadets(CCs) avoid to get caught by the Master coders(MCs).
3-
- If Mc's get through the line on the left the game ends.
4-
5-
Map Design:
6-
- 16 columns (cols), 8 rows, cellsize 60;
7-
8-
Characters:
9-
- Enemy- MC's,
10-
- Good Guys- Code Cadets;
11-
12-
- At the start of every game, a random cadet is spawned(drawn);
13-
- Every 3 seconds a random MC is spawned(Create a counter for delay);
14-
- Mc's walk horizontally (cols);
15-
- Code cadets walk vertically (rows);
16-
- Code cadets will shoot code lines at MCs (Maybe their health will lower with everyshot or just get oneshot.)
17-
- Everytimes you kill an MC you get points the higher points you have the lower the delay counter to spawn MCs.
18-
19-
EDIT - André - Features add:
20-
- 5 Fighters - Based on Delta Team
21-
- Each fighter as a special "weapon". Ex. can heal another cadet, can froze mc.
1+
Game Objectives
2+
- Code cadets(CCs) avoid to get caught by the Master coders(MCs).
3+
- If Mc's get through the line on the left the game ends.
4+
5+
Map Design:
6+
- 16 columns (cols), 8 rows, cellsize 60;
7+
8+
Characters:
9+
- Enemy- MC's,
10+
- Good Guys- Code Cadets;
11+
12+
- At the start of every game, a random cadet is spawned(drawn);
13+
- Every 3 seconds a random MC is spawned(Create a counter for delay);
14+
- Mc's walk horizontally (cols);
15+
- Code cadets walk vertically (rows);
16+
- Code cadets will shoot code lines at MCs (Maybe their health will lower with everyshot or just get oneshot.)
17+
- Everytimes you kill an MC you get points the higher points you have the lower the delay counter to spawn MCs.
18+
19+
EDIT - André - Features add:
20+
- 5 Fighters - Based on Delta Team
21+
- Each fighter as a special "weapon". Ex. can heal another cadet, can froze mc.

Tips.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
=== Para criar clone no vosso pc
2-
1. Criar directorio no vosso pc
3-
2. Dentro do directorio executar na powershell: git clone https://github.com/Wemago/DeltaGame.git
4-
5-
Usar o git no pc<br />
6-
Dentro do directorio no vosso pc<br />
7-
8-
Para enviar
9-
1. git status
10-
2. git add . (este ponto e necessario)
11-
3. git commit -m "inserir mensagem aqui"
12-
4. git push origin SUBSTITUIR_PELO_NOME_DO_BRANCH
13-
14-
Para receber
15-
1. git pull origin master
16-
17-
Para Branch
18-
1. https://gist.github.com/nanusdad/7e516743e5e709073f7e
19-
20-
=== Markdown<br />
21-
O github usa Markdown para indentação de texto, fica aqui um pequeno tutorial em como usar
22-
23-
1. https://www.markdownguide.org/basic-syntax/
24-
2. Ficheiro markdown tem extensao .md
25-
26-
Cheat Sheets
27-
1. https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
28-
2. https://guides.github.com/features/mastering-markdown/
29-
30-
Para aceder a branches de colegas:
31-
git fetch (vai buscar todos os branches remotos, mas quando fazes git branch não aparece)
32-
git checkout nomedobranch (muda para o branch que quer e fica guardado no git branch)
1+
=== Para criar clone no vosso pc
2+
1. Criar directorio no vosso pc
3+
2. Dentro do directorio executar na powershell: git clone https://github.com/Wemago/DeltaGame.git
4+
5+
Usar o git no pc<br />
6+
Dentro do directorio no vosso pc<br />
7+
8+
Para enviar
9+
1. git status
10+
2. git add . (este ponto e necessario)
11+
3. git commit -m "inserir mensagem aqui"
12+
4. git push origin SUBSTITUIR_PELO_NOME_DO_BRANCH
13+
14+
Para receber
15+
1. git pull origin master
16+
17+
Para Branch
18+
1. https://gist.github.com/nanusdad/7e516743e5e709073f7e
19+
20+
=== Markdown<br />
21+
O github usa Markdown para indentação de texto, fica aqui um pequeno tutorial em como usar
22+
23+
1. https://www.markdownguide.org/basic-syntax/
24+
2. Ficheiro markdown tem extensao .md
25+
26+
Cheat Sheets
27+
1. https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
28+
2. https://guides.github.com/features/mastering-markdown/
29+
30+
Para aceder a branches de colegas:
31+
git fetch (vai buscar todos os branches remotos, mas quando fazes git branch não aparece)
32+
git checkout nomedobranch (muda para o branch que quer e fica guardado no git branch)

org/academiadecodigo/gitbusters/Main.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.academiadecodigo.gitbusters;
22

3+
import org.academiadecodigo.gitbusters.engine.Game;
4+
35
public class Main {
46

57
public static void main(String[] args) {

0 commit comments

Comments
 (0)