Permalink
Browse files

Merge branch 'master' of

git@github.com:dhill3/SoftwareEngineeringProject.git
  • Loading branch information...
2 parents 773424d + cf640c8 commit f7955b764988021c93306d6d70b1c529bb9b9cc2 @dhill3 dhill3 committed Feb 19, 2013
Showing with 1,216 additions and 768 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 SoftwareEngineeringProject/.gitignore
  3. +0 −13 SoftwareEngineeringProject/.settings/org.eclipse.jdt.core.prefs
  4. +0 −5 SoftwareEngineeringProject/.settings/org.eclipse.jdt.ui.prefs
  5. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/Dawn_LeftFootForeward.png
  6. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/Dawn_RightFootForeward.png
  7. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/Dawn_StandingForeward.png
  8. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/Grass.png
  9. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/TallGrass.png
  10. BIN SoftwareEngineeringProject/bin/16x16_TerrainImages/Trainer_RightStep.png
  11. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/SoftwareEngineeringProject/BattleStatsTest.class
  12. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/SoftwareEngineeringProject/EffectDataBaseTest.class
  13. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/SoftwareEngineeringProject/PokeInfoTest.class
  14. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/SoftwareEngineeringProject/PokemonTest.class
  15. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/SoftwareEngineeringProject/TestLocation.class
  16. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Area.class
  17. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/BattleStats.class
  18. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Effect.class
  19. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/EffectDataBase.class
  20. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Flooring.class
  21. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/InteractionSpace.class
  22. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Location.class
  23. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Map.class
  24. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Player.class
  25. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/PokeInfo.class
  26. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/PokeType.class
  27. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Pokedex.class
  28. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/PokedexEntry.class
  29. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Pokemon.class
  30. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Status.class
  31. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Structure.class
  32. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Stuff.class
  33. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/TempGUI$1.class
  34. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/TempGUI$2.class
  35. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/TempGUI.class
  36. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/TempMapPanel$1.class
  37. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/TempMapPanel.class
  38. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/Terrain.class
  39. BIN SoftwareEngineeringProject/bin/edu/ycp/cs320/fokemon/main.class
  40. +28 −28 SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/EffectDataBaseTest.java
  41. +82 −82 SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokeInfoTest.java
  42. +0 −4 SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokemonTest.java
  43. BIN SoftwareEngineeringProject/src/16x16_TerrainImages/Dawn_RightFootForeward.png
  44. +24 −22 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/Area.java
  45. +13 −13 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/Flooring.java
  46. +17 −17 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/InteractionSpace.java
  47. +7 −7 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/Structure.java
  48. +6 −6 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/Stuff.java
  49. +62 −62 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/TempGUI.java
  50. +140 −140 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon → GUI}/TempMapPanel.java
  51. +45 −0 SoftwareEngineeringProject/src/MoveClasses/Effect.java
  52. +63 −0 SoftwareEngineeringProject/src/MoveClasses/EffectDataBase.java
  53. +32 −32 SoftwareEngineeringProject/src/{edu/ycp/cs320/fokemon/Effect.java → MoveClasses/EffectType.java}
  54. +82 −0 SoftwareEngineeringProject/src/MoveClasses/Move.java
  55. +25 −0 SoftwareEngineeringProject/src/MoveClasses/MoveDataBase.java
  56. +12 −0 SoftwareEngineeringProject/src/MoveClasses/MoveName.java
  57. +100 −0 SoftwareEngineeringProject/src/PokedexTest'.csv
  58. +0 −62 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/EffectDataBase.java
  59. +0 −9 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Map.java
  60. +91 −91 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/PokeInfo.java
  61. +16 −13 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/PokeType.java
  62. +62 −9 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Pokedex.java
  63. +214 −27 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/PokedexEntry.java
  64. +30 −75 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Pokemon.java
  65. +41 −36 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Terrain.java
  66. +22 −15 SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/main.java
View
@@ -0,0 +1 @@
+/bin//SoftwareEngineeringProject
@@ -0,0 +1 @@
+/bin/
@@ -1,17 +1,4 @@
eclipse.preferences.version=1
-<<<<<<< HEAD
-=======
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=_
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
->>>>>>> refs/remotes/tpowell/master
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
Deleted file not rendered
Deleted file not rendered
Binary file not shown.
@@ -1,28 +1,28 @@
-package edu.ycp.cs320.SoftwareEngineeringProject;
-
-import junit.framework.TestCase;
-import edu.ycp.cs320.fokemon.EffectDataBase;
-import edu.ycp.cs320.fokemon.Pokemon;
-
-public class EffectDataBaseTest extends TestCase {
- // TODO - define test fixture objects
- private Pokemon A;
- private Pokemon B;
- private int EffectIndex;
-
-
- @Override
- protected void setUp() throws Exception {
- // TODO - create test fixture objects
- A=new Pokemon(1, 1, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, "A");
- B=new Pokemon(1,1, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, EffectIndex, "B");
- EffectIndex=1;
- A.setBaseAtk(12);
- }
-
- // TODO - add test methods
- public void testMoveEffect() throws Exception {
- //EffectDataBase.moveEffect(A, B, EffectIndex);
- assertEquals(10,A.getBaseAtk());
- }
-}
+package edu.ycp.cs320.SoftwareEngineeringProject;
+
+import MoveClasses.EffectDataBase;
+import junit.framework.TestCase;
+import edu.ycp.cs320.fokemon.Pokemon;
+
+public class EffectDataBaseTest extends TestCase {
+ // TODO - define test fixture objects
+ private Pokemon A;
+ private Pokemon B;
+ private int EffectIndex;
+
+
+ @Override
+ protected void setUp() throws Exception {
+ // TODO - create test fixture objects
+ A=new Pokemon(1, 1);
+ B=new Pokemon(1,1);
+ EffectIndex=1;
+ A.setBaseAtk(12);
+ }
+
+ // TODO - add test methods
+ public void testMoveEffect() throws Exception {
+ //EffectDataBase.moveEffect(A, B, EffectIndex);
+ assertEquals(10,A.getBaseAtk());
+ }
+}
@@ -1,82 +1,82 @@
-package edu.ycp.cs320.SoftwareEngineeringProject;
-
-import edu.ycp.cs320.fokemon.PokeInfo;
-import edu.ycp.cs320.fokemon.PokeType;
-import junit.framework.TestCase;
-
-
-public class PokeInfoTest extends TestCase {
- // TODO - define test fixture objects
- private PokeInfo a;
- private PokeInfo b;
-
-
- @Override
- protected void setUp() throws Exception {
- // TODO - create test fixture objects
- a = new PokeInfo(1, 2, "Mew","a", false, PokeType.NORMAL, 10, 3);
- b = new PokeInfo(2, 3, "Mewtwo","b", true, PokeType.FIRE, 11, 4);
- }
-
- // TODO - add test methods
- public void testGetType() throws Exception {
- assertEquals(PokeType.NORMAL, a.getType());
- assertEquals(PokeType.FIRE, b.getType());
- }
- public void testGetPokeID() throws Exception {
- assertEquals(1, a.getPokeID());
- assertEquals(2, b.getPokeID());
- }
- public void testGetPlayerID() throws Exception {
- assertEquals(2, a.getPlayerID());
- assertEquals(3, b.getPlayerID());
- }
- public void testGetPokemonName() throws Exception {
- assertEquals("Mew", a.getPokeName());
- assertEquals("Mewtwo", b.getPokeName());
- }
- public void testGetNickName() throws Exception {
- assertEquals("a", a.getNickname());
- assertEquals("b", b.getNickname());
- }
- public void testGetXp() throws Exception {
- assertEquals(3, a.getXp());
- assertEquals(4, b.getXp());
- }
- public void testGetLvl() throws Exception {
- assertEquals(10, a.getLvl());
- assertEquals(11, b.getLvl());
- }
- public void testGetGender() throws Exception {
- assertFalse(a.getGender());
- assertTrue(b.getGender());
- }
-
- public void testGetSetters() throws Exception {
- a.setGender(true);
- assertTrue(a.getGender());
-
- a.setLvl(1);
- assertEquals(1, a.getLvl());
-
- a.setNickname("tyrone");
- assertEquals("tyrone", a.getNickname());
-
- a.setPlayerID(12);
- assertEquals(12,a.getPlayerID());
-
- a.setPokeID(12);
- assertEquals(12,a.getPokeID());
-
- a.setType(PokeType.ROCK);
- assertEquals(PokeType.ROCK, a.getType());
-
- a.setLvl(5);
- assertEquals(5,a.getLvl());
-
- a.setXp(40);
- assertEquals(40,a.getXp());
- }
-
-
-}
+package edu.ycp.cs320.SoftwareEngineeringProject;
+
+import edu.ycp.cs320.fokemon.PokeInfo;
+import edu.ycp.cs320.fokemon.PokeType;
+import junit.framework.TestCase;
+
+
+public class PokeInfoTest extends TestCase {
+ // TODO - define test fixture objects
+ private PokeInfo a;
+ private PokeInfo b;
+
+
+ @Override
+ protected void setUp() throws Exception {
+ // TODO - create test fixture objects
+ a = new PokeInfo(1, 2, "Mew","a", false, PokeType.NORMAL, 10, 3);
+ b = new PokeInfo(2, 3, "Mewtwo","b", true, PokeType.FIRE, 11, 4);
+ }
+
+ // TODO - add test methods
+ public void testGetType() throws Exception {
+ assertEquals(PokeType.NORMAL, a.getType());
+ assertEquals(PokeType.FIRE, b.getType());
+ }
+ public void testGetPokeID() throws Exception {
+ assertEquals(1, a.getPokeID());
+ assertEquals(2, b.getPokeID());
+ }
+ public void testGetPlayerID() throws Exception {
+ assertEquals(2, a.getPlayerID());
+ assertEquals(3, b.getPlayerID());
+ }
+ public void testGetPokemonName() throws Exception {
+ assertEquals("Mew", a.getPokeName());
+ assertEquals("Mewtwo", b.getPokeName());
+ }
+ public void testGetNickName() throws Exception {
+ assertEquals("a", a.getNickname());
+ assertEquals("b", b.getNickname());
+ }
+ public void testGetXp() throws Exception {
+ assertEquals(3, a.getXp());
+ assertEquals(4, b.getXp());
+ }
+ public void testGetLvl() throws Exception {
+ assertEquals(10, a.getLvl());
+ assertEquals(11, b.getLvl());
+ }
+ public void testGetGender() throws Exception {
+ assertFalse(a.getGender());
+ assertTrue(b.getGender());
+ }
+
+ public void testGetSetters() throws Exception {
+ a.setGender(true);
+ assertTrue(a.getGender());
+
+ a.setLvl(1);
+ assertEquals(1, a.getLvl());
+
+ a.setNickname("tyrone");
+ assertEquals("tyrone", a.getNickname());
+
+ a.setPlayerID(12);
+ assertEquals(12,a.getPlayerID());
+
+ a.setPokeID(12);
+ assertEquals(12,a.getPokeID());
+
+ a.setType(PokeType.ROCK);
+ assertEquals(PokeType.ROCK, a.getType());
+
+ a.setLvl(5);
+ assertEquals(5,a.getLvl());
+
+ a.setXp(40);
+ assertEquals(40,a.getXp());
+ }
+
+
+}
@@ -19,10 +19,6 @@ public void setUp() throws Exception {
//bulbasaur = new Pokemon(4, 15, 48, 13, 21, 84, 41, 8, 64, 32, 14, 64, 1, 197482, "Bulbasaur");
//charmander = new Pokemon(57, 65, 71, 14, 61, 48, 32, 47, 46, 48, 74, 14, 4, 154789, "Charmander");
- squirtle = new Pokemon(10, 12, 15, 6, 3, 17, 49, 15, 32, 84, 71, 31, 7, 154494, "Squirtle");
- bulbasaur = new Pokemon(4, 15, 48, 13, 21, 84, 41, 8, 64, 32, 14, 64, 1, 197482, "Bulbasaur");
- charmander = new Pokemon(57, 65, 71, 14, 61, 48, 32, 47, 46, 48, 74, 14, 4, 154789, "Charmander");
-
}
@Test
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,22 +1,24 @@
-package edu.ycp.cs320.fokemon;
-
-public class Area {
- int HEIGHT = 30;
- int WIDTH = 60;
-
- Terrain[][] terrain = new Terrain[WIDTH][HEIGHT];
-
- public Area(){ //
- for(int width = 0; width<WIDTH; width++){
- for(int height = 0; height<HEIGHT; height++){
-
- if(width==0||height==0||width==WIDTH||height==HEIGHT){
- terrain[width][height]= new Terrain(Flooring.Grass, null, null, null, null, null);
- }else{
- terrain[width][height]= new Terrain(Flooring.Grass, null, null, null, null, null);
- }
- }
- }
- }
-}
-
+package GUI;
+
+import edu.ycp.cs320.fokemon.Terrain;
+
+public class Area {
+ int HEIGHT = 30;
+ int WIDTH = 60;
+
+ Terrain[][] terrain = new Terrain[WIDTH][HEIGHT];
+
+ public Area(){ //
+ for(int width = 0; width<WIDTH; width++){
+ for(int height = 0; height<HEIGHT; height++){
+
+ if(width==0||height==0||width==WIDTH||height==HEIGHT){
+ terrain[width][height]= new Terrain(Flooring.Grass, null, null, null, null, null);
+ }else{
+ terrain[width][height]= new Terrain(Flooring.Grass, null, null, null, null, null);
+ }
+ }
+ }
+ }
+
+}
@@ -1,13 +1,13 @@
-package edu.ycp.cs320.fokemon;
-
-import java.awt.Image;
-
-import javax.swing.ImageIcon;
-
-public enum Flooring {
- Grass,
- Water,
- Ground,
- Sand;
-
-}
+package GUI;
+
+import java.awt.Image;
+
+import javax.swing.ImageIcon;
+
+public enum Flooring {
+ Grass,
+ Water,
+ Ground,
+ Sand;
+
+}
@@ -1,18 +1,18 @@
-package edu.ycp.cs320.fokemon;
-
-public enum InteractionSpace {
- MovementBlocked,
- MovementAllowed,
- TriggerTrainerBattle,
- TriggerChangeArea;
-
- public boolean isMovable(InteractionSpace interactionSpace){
- switch(interactionSpace){
- case MovementAllowed: return true;
- case MovementBlocked: return false;
- default:
- return false;
- }
- }
-
+package GUI;
+
+public enum InteractionSpace {
+ MovementBlocked,
+ MovementAllowed,
+ TriggerTrainerBattle,
+ TriggerChangeArea;
+
+ public boolean isMovable(InteractionSpace interactionSpace){
+ switch(interactionSpace){
+ case MovementAllowed: return true;
+ case MovementBlocked: return false;
+ default:
+ return false;
+ }
+ }
+
}
@@ -1,7 +1,7 @@
-package edu.ycp.cs320.fokemon;
-
-public enum Structure {
- PokeCenter,
- PokeMart,
- Rock;
-}
+package GUI;
+
+public enum Structure {
+ PokeCenter,
+ PokeMart,
+ Rock;
+}
Oops, something went wrong.

0 comments on commit f7955b7

Please sign in to comment.