Skip to content

Commit

Permalink
adds more damned letters
Browse files Browse the repository at this point in the history
  • Loading branch information
ericoporto committed Jan 27, 2019
1 parent 2bb4a44 commit cd5ba63
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Game.agf
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@
<StartX>38</StartX>
<StartY>286</StartY>
<UniformMovementSpeed>True</UniformMovementSpeed>
<MovementSpeed>4</MovementSpeed>
<MovementSpeed>5</MovementSpeed>
<MovementSpeedX>3</MovementSpeedX>
<MovementSpeedY>0</MovementSpeedY>
<AnimationDelay>1</AnimationDelay>
Expand Down
10 changes: 9 additions & 1 deletion Gameatic.asc
Original file line number Diff line number Diff line change
Expand Up @@ -232,26 +232,34 @@ void ChompEnemy(Character * enemy){
}

void DoChompOrHit(Character * enemy){
if(isDogWithBonne()){
dogTookEnemyHit();
return;
}

if((cDog.Loop == 1 && (cDog.Moving == false && !KeyboardMovement.Moving() )) &&
(enemy.DestinationX == destination_left && enemy.Moving)){
// dog is stopped looking left &
// enemy is going left

dogTookEnemyHit();
return;

} else if((cDog.Loop != 1 && (cDog.Moving == false && !KeyboardMovement.Moving() )) &&
(enemy.DestinationX == destination_right && enemy.Moving)){
// dog is stopped looking right &
// enemy is going right

dogTookEnemyHit();
return;
} else if((cDog.Loop == 1 && (cDog.Moving == false || KeyboardMovement.Moving() ))){

ChompEnemy(enemy);
return;
} else if((cDog.Loop != 1 && (cDog.Moving == false || KeyboardMovement.Moving() ))){

ChompEnemy(enemy);
return;
}
}

Expand Down Expand Up @@ -330,7 +338,7 @@ void dealWithEnemy2(Character * enemy2){

} else {
if(t_enemy2_whenToStartThrow[enemy2.ID] == null ){
t_enemy2_whenToStartThrow[enemy2.ID] = Timer.StartRT(2.0, eOnce);
t_enemy2_whenToStartThrow[enemy2.ID] = Timer.StartRT(0.5+IntToFloat(Random(8))*0.1, eOnce);
}


Expand Down
4 changes: 2 additions & 2 deletions LetterController.asc
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ void repeatedly_execute_always(){
while(i<NLETTERS){
if(doFallLetter[i] != null && doFallLetter[i].EvtExpired){
if(FallLetter_dir[i] == eDirectionLeft){
ar_letter[i].TweenPosition(0.8, ar_letter[i].x-GAMEW+40, ar_letter[i].y+210, eEaseLinearTween, eNoBlockTween);
ar_letter[i].TweenPosition(0.9, ar_letter[i].x-GAMEW+40, ar_letter[i].y+220, eEaseLinearTween, eNoBlockTween);
} else {
ar_letter[i].TweenPosition(0.8, ar_letter[i].x+GAMEW-40, ar_letter[i].y+210, eEaseLinearTween, eNoBlockTween);
ar_letter[i].TweenPosition(0.9, ar_letter[i].x+GAMEW-40, ar_letter[i].y+220, eEaseLinearTween, eNoBlockTween);
}
doFallLetter[i] = null;
}
Expand Down

0 comments on commit cd5ba63

Please sign in to comment.