Skip to content

Commit

Permalink
managed to merge with cody
Browse files Browse the repository at this point in the history
  • Loading branch information
@maloney626
maloney626 committed Apr 4, 2013
1 parent f4a455d commit a25cf1e
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 84 deletions.
165 changes: 92 additions & 73 deletions SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/BattleView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ public class BattleView extends Composite{
static int height;
static int width;
// Indices
int key;
int key = 0;
int commandOptionsIndex = 0;
int index;

int index = 0;
int messageIndex = 0;
int turnIndex = 0;

TempBattle test;

Expand Down Expand Up @@ -111,8 +112,8 @@ public BattleView(){
//Add HP Bars
playerHPBar = new HealthBarWidget();
opponentHPBar = new HealthBarWidget();
FokemonUI.panel.add(playerHPBar.hpBarCanvas, width/2 - hpBarWidth/2 - 120, height/2 - 12 - 120);
FokemonUI.panel.add(opponentHPBar.hpBarCanvas, width/2 - hpBarWidth/2 + 120, height/2 - 12 - 120);
FokemonUI.panel.add(playerHPBar.hpBarCanvas, width/2 - hpBarWidth/2 - 120, height/2 - 15 - 120);
FokemonUI.panel.add(opponentHPBar.hpBarCanvas, width/2 - hpBarWidth/2 + 120, height/2 - 15 - 120);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);

// Instantiate Images since Pokemon class in not ready yet
Expand All @@ -123,21 +124,21 @@ public BattleView(){
//Instantiate Battle
test = new TempBattle();

battleBackBufferContext.setFillStyle(CssColor.make("rgba(255,211,255,0.1)"));
battleBackBufferContext.setFillStyle(CssColor.make("rgba(224,224,224,0.1)"));

onPokemonShift();
initHandlers();

}
void doUpdate() {
// update the back canvas, set to fron canvas
// update the back canvas, set to front canvas
draw(battleBackBufferContext, battleContext);

}
void onPokemonShift(){
updatePokemonLabels();
updatePokemonImages();
}

public void draw(Context2d context, Context2d front) {
//context.save();
context.fillRect(0, 0, width, height);
Expand All @@ -151,7 +152,6 @@ public void draw(Context2d context, Context2d front) {
//context.restore();
front.drawImage(context.getCanvas(), 0, 0);
}

void initHandlers() {
KeyPressHandler wasdHandler = new KeyPressHandler() {
@Override
Expand Down Expand Up @@ -188,7 +188,6 @@ public void onKeyPress(KeyPressEvent event) {
handleOptionSelect(index);
break;
}
//setBattleAnnouncement(test.getBattle().getBattleMessage());
//System.out.println(key); //For Debug
}
};
Expand All @@ -209,7 +208,9 @@ void setFightOptions(){ // Shows Pokemon Moves
commandOptions.clear();
commandOptionsIndex = 1;
for(int i=0; i<test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getMoves().size(); i++){
commandOptions.addItem(test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getMove(i).getMoveName().toString());
commandOptions.addItem(test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getMove(i).getMoveName().name +
" " + test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getMove(i).getCurPP()+
"/" + test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getMove(i).getMaxPP());
}
commandOptions.setFocus(true);
commandOptions.setItemSelected(0, true);
Expand Down Expand Up @@ -258,25 +259,62 @@ void switchToNextScreen(){
break;
}
break;
case 1: // FIGHT Screen; Trigger Move
//handleFightOption(index);
handleTurn1(index);
switchToNextScreen();
commandOptionsIndex = 2;
break;
case 2:
handleTurn2();
switchToNextScreen();
commandOptionsIndex = 3;
case 1: // FIGHT SCREEN ... Trigger Move
handleTurn(index,TurnChoice.MOVE);
break;
case 3:
handleTurn3();
setBattleOptions();
case 2: // Pokemon Screen ... Trigger Move
handleTurn(index,TurnChoice.SWITCH);
break;
}
System.out.println(test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getStats().getCurHp());

}
void handleTurn(int userMoveIndex, TurnChoice userTurnChoice){
switch(turnIndex){
case 0: // TURN 1 SCREEN ... Message from Turn 1 Printing
if(messageIndex==0){
handleTurn1(index,userTurnChoice);
switchToNextScreen();
}
if(messageIndex<test.getBattle().getBattleMessage().size()){ //While there is still a message to be displayed
setBattleAnnouncement(test.getBattle().getBattleMessage(), messageIndex); // Display message
messageIndex++; //Move on too next message
}else{ // When no more messages to be displayed
messageIndex=0; //reset message index
handleTurn2(); // Trigger turn 2 (Slower Pokemon)
switchToNextScreen(); // remain at next screen
turnIndex = 1; // Switch to Turn 2 Case
}
break;
case 1: // Turn 2 case
if(messageIndex<test.getBattle().getBattleMessage().size()){ //While there is still a message to be displayed
setBattleAnnouncement(test.getBattle().getBattleMessage(), messageIndex); // Display message
messageIndex++; //Move on too next message
}else{ // When no more messages to be displayed
messageIndex=0; // Reset message index
handleTurn3(); // Trigger turn 3 (Post Battle Damage and Announcements)
if(test.getBattle().getBattleMessage().size()!=0){
setBattleAnnouncement(test.getBattle().getBattleMessage(),messageIndex);
turnIndex = 2;
}else{
messageIndex=0; // Reset message index
turnIndex = 0;
setBattleOptions(); // Return to Cattle Options for next turn
}
}
break;
case 2: // Turn 3 Case
if(messageIndex<test.getBattle().getBattleMessage().size()){ //While there is still a message to be displayed
setBattleAnnouncement(test.getBattle().getBattleMessage(), messageIndex); // Display message
messageIndex++; //Move on too next message
}else{ // When no more messages to be displayed
messageIndex=0; //reset message index
setBattleOptions(); // Return to Cattle Options for next turn
}
turnIndex=0;
break;
}
}
void incrementSelectedCommandOption(){
if(commandOptions.getSelectedIndex()<commandOptions.getItemCount()-1){
commandOptions.setItemSelected(commandOptions.getSelectedIndex()+1, true);
Expand All @@ -287,11 +325,10 @@ void decrementSelectedCommandOption(){
commandOptions.setItemSelected(commandOptions.getSelectedIndex()-1, true);
}
}
public void setBattleAnnouncement(ArrayList<String> announcement, int stringInd){
if(announcement.size()>stringInd){
battleAnnouncementBox.setText(announcement.get(stringInd));
public void setBattleAnnouncement(ArrayList<String> announcement, int index){
if(index<announcement.size()){
battleAnnouncementBox.setText(announcement.get(index));
}

}
void updatePlayerHPLabel(){
//Initialize Label widget if not already
Expand All @@ -306,35 +343,37 @@ void updatePokemonLabels(){
if(playerPokemonName==null){
playerPokemonName = new Label();
FokemonUI.panel.add(playerPokemonName, width/2 - hpBarWidth/2 - 120, height/2 - 12 - 140);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
}
playerPokemonName.setText(test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getInfo().getNickname());
playerPokemonName.setText(test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getInfo().getNickname() + " Lv" + test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getInfo().getLvl());
// Player Battling Pokemon
if(opponentPokemonName==null){
opponentPokemonName = new Label();
FokemonUI.panel.add(opponentPokemonName, width/2 - hpBarWidth/2 + 120, height/2 - 12 - 140);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
}
opponentPokemonName.setText(test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getInfo().getNickname());
opponentPokemonName.setText(test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getInfo().getNickname() + " Lv" + test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getInfo().getLvl());
}
void updatePokemonImages(){
// Player Battling Pokemon

playerPokemon = new Image(img2.getUrl());//This should set to a pokemons ID specific Image
playerPokemon = new Image("PokemonSprites/" + test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getInfo().getPokeName() + ".png");//This should set to a pokemons ID specific Image
playerPokemon.setVisible(false);
FokemonUI.panel.add(playerPokemon);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
playerPokemon.addLoadHandler(new LoadHandler() {
@Override
public void onLoad(LoadEvent event) {
FokemonUI.panel.remove(playerPokemon);

FokemonUI.panel.remove(playerPokemon);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
FokemonUI.panel.add(playerPokemon, width/2 - img2.getWidth()/2 - 120, height/2 - img2.getHeight() - 10);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
playerPokemon.setVisible(true);
}
});

// Opponent Battling Pokemon

opponentPokemon = new Image(img3.getUrl());//This should set to a pokemons ID specific Image
opponentPokemon = new Image("PokemonSprites/" + test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getInfo().getPokeName() + ".png");//This should set to a pokemons ID specific Image
opponentPokemon.setVisible(false);
FokemonUI.panel.add(opponentPokemon);
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
Expand All @@ -348,15 +387,13 @@ public void onLoad(LoadEvent event) {
});
FokemonUI.panel.getElement().getStyle().setPosition(Position.RELATIVE);
}

void updatePokemonStatus(){
void updatePokemonStatus(){

// Player
if(playerStatusAilments==null){
playerStatusAilments = new Image();
FokemonUI.panel.add(playerStatusAilments, width/2 - hpBarWidth/2 - 120 - 34, height/2 - 22 - 110);
FokemonUI.panel.add(playerStatusAilments, width/2 - hpBarWidth/2 - 120 - 34, height/2 - 25 - 110);
}

switch(test.getBattle().getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getStats().getStatus()){
case BRN:
playerStatusAilments.setUrl("StatusAilments/Burn.png");
Expand Down Expand Up @@ -392,7 +429,7 @@ void updatePokemonStatus(){
//Opponent
if(opponentStatusAilments==null){
opponentStatusAilments = new Image();
FokemonUI.panel.add(opponentStatusAilments, width/2 + hpBarWidth/2 + 120 + 3, height/2 - 22 - 110);
FokemonUI.panel.add(opponentStatusAilments, width/2 + hpBarWidth/2 + 120 + 3, height/2 - 25 - 110);
}

switch(test.getBattle().getOpponent().getTeam(test.getOpp().getCurrentPokemonIndex()).getStats().getStatus()){
Expand Down Expand Up @@ -427,49 +464,31 @@ void updatePokemonStatus(){
}
opponentStatusAilments.setPixelSize(32, 11);
}
void handleTurn1(int moveIndex){
void handleTurn1(int moveIndex, TurnChoice userChoice){
test.getUser().setMoveIndex(moveIndex);
//test.getUser().setMoveIndex(0);
test.getOpp().setMoveIndex(0);
test.getUser().setChoice(TurnChoice.MOVE);
test.getUser().setChoice(userChoice);
test.getOpp().setChoice(TurnChoice.MOVE);
//test.getBattle().Turn();
test.getBattle().Turn(1);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
setBattleAnnouncement(test.getBattle().getBattleMessage(),messageIndex);
if(userChoice.equals(TurnChoice.SWITCH)){
onPokemonShift();
}
}
void handleTurn2(){
void handleTurn2(){
test.getBattle().Turn(2);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
setBattleAnnouncement(test.getBattle().getBattleMessage(),messageIndex);
messageIndex++;
}
void handleTurn3(){
void handleTurn3(){
test.getBattle().Turn(3);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
}

void handleFightOption(int moveIndex){
test.getUser().setMoveIndex(moveIndex);
//test.getUser().setMoveIndex(0);
test.getOpp().setMoveIndex(0);
test.getUser().setChoice(TurnChoice.MOVE);
test.getOpp().setChoice(TurnChoice.MOVE);
//test.getBattle().Turn();
test.getBattle().Turn(1);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
test.getBattle().Turn(2);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
test.getBattle().Turn(3);
updatePokemonStatus();
setBattleAnnouncement(test.getBattle().getBattleMessage(),0);
//System.out.println(test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getStats().getCurHp());
//test.getUser().getTeam(test.getUser().getCurrentPokemonIndex()).getStats().setStatus(Status.PSN);
//test.getOpp().getTeam(test.getOpp().getCurrentPokemonIndex()).getStats().setStatus(Status.FRZ);
updatePokemonStatus();
setBattleOptions();
updatePokemonStatus();
if(test.getBattle().getBattleMessage().size()!=0){
setBattleAnnouncement(test.getBattle().getBattleMessage(),messageIndex);
}
messageIndex++;
}
}

Expand Down
3 changes: 1 addition & 2 deletions SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/MapView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public void draw(Context2d context, Context2d front) {
if(areaList[player.getPlayerLocation().getAreaArrayIndex()].terrain[height][width].flooring.img!=null){
img = areaList[player.getPlayerLocation().getAreaArrayIndex()].terrain[height][width].flooring.img;
context.drawImage((ImageElement) img.getElement().cast(), 16*height, 16*width);

}
}
}
Expand Down Expand Up @@ -131,7 +130,7 @@ public void draw(Context2d context, Context2d front) {
front.drawImage(context.getCanvas(), 0, 0);
}

void initHandlers() {
void initHandlers() {
KeyPressHandler wasdHandler = new KeyPressHandler() {
@Override
public void onKeyPress(KeyPressEvent event) {
Expand Down
2 changes: 1 addition & 1 deletion SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/Battle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public void Turn(int turnNumber){
if(canAttack==true){
battleMessage.add(userPoke.getInfo().getNickname()+" used "+userPoke.getMove(turnPlayer.getMoveIndex()).getMoveName().toString()+". ");
attack(userPoke,oppPoke,userPoke.getMove(turnPlayer.getMoveIndex()));
EffectDataBase.moveEffect(userPoke, oppPoke, userPoke.getMove(turnPlayer.getMoveIndex()).getEffect());
battleMessage.addAll(EffectDataBase.moveEffect(userPoke, oppPoke, userPoke.getMove(turnPlayer.getMoveIndex()).getEffect()));
userPoke.getMove(turnPlayer.getMoveIndex()).setCurPP(userPoke.getMove(turnPlayer.getMoveIndex()).getCurPP()-1);
}
break;
Expand Down
15 changes: 10 additions & 5 deletions ...ngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/EffectDataBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,36 @@ public static ArrayList<String> moveEffect(Pokemon Attacker, Pokemon Defender, A
case NONE: //no effect
break;
case PARALYZE: //Paralyzed
if(Defender.getStats().getStatus()==Status.NRM)
if(Defender.getStats().getStatus()==Status.NRM){
Defender.getStats().setStatus(Status.PRL);
battleMessage.add(Defender.getInfo().getNickname()+" was paralyzed. ");
}
break;
case POISON: //Poisoned
if(Defender.getStats().getStatus()==Status.NRM)
if(Defender.getStats().getStatus()==Status.NRM){
Defender.getStats().setStatus(Status.PSN);
battleMessage.add(Defender.getInfo().getNickname()+" was poisoned. ");
}
break;
case SLEEP: //Sleep
if(Defender.getStats().getStatus()==Status.NRM)
if(Defender.getStats().getStatus()==Status.NRM){
Defender.getStats().setStatus(Status.SLP);
//Defender.getTempBattleStats().setSLPCount(effect.get(i).getMagnitude());
Defender.getTempBattleStats().setSLPCount(rand.nextInt(2)+2);
battleMessage.add(Defender.getInfo().getNickname()+" fell asleep. ");
}
break;
case BURN: //Burn
if(Defender.getStats().getStatus()==Status.NRM)
if(Defender.getStats().getStatus()==Status.NRM){
Defender.getStats().setStatus(Status.BRN);
battleMessage.add(Defender.getInfo().getNickname()+" was burned. ");
}
break;
case FREEZE: //Freeze
if(Defender.getStats().getStatus()==Status.NRM)
if(Defender.getStats().getStatus()==Status.NRM){
Defender.getStats().setStatus(Status.FRZ);
battleMessage.add(Defender.getInfo().getNickname()+" was frozen solid. ");
}
break;
case KO: //Death
Defender.getStats().setCurHp(0);
Expand Down
3 changes: 0 additions & 3 deletions SoftwareEngineeringProject/war/FokemonUI.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,5 @@
<h1>GWT Canvas Demo</h1>
<div id="canvasholder"></div>
<br/>
<span id="source">
<a href="http://code.google.com/p/gwtcanvasdemo/source/browse/#svn%2Ftrunk%2Fsrc%2Fcom%2Fgoogle%2Fgwt%2Fgwtcanvasdemo%2Fclient">View the source</a>
</span>
</body>
</html>

0 comments on commit a25cf1e

Please sign in to comment.