Merge branch 'arttmp' into arthaud

This commit is contained in:
Stève Oriol 2021-05-29 13:16:43 +02:00
commit 39a7eb9521
2 changed files with 12 additions and 6 deletions

View File

@ -9,14 +9,14 @@ class MisileGuides {
MisileGuides(int xt,int yt,String misilet,float timet) { MisileGuides(int xt,int yt,String misilet,float timet) {
x = xt; x = xt;
y = yStart = yt; y = yt;
time = timet; time = timet;
misile = loadImage(misilet); misile = loadImage(misilet);
} }
void guide(int xv, int yv) { void guide() {
if (x < xv) { if (x < ship.x) {
while(x < xv){ while(x < ship.x){
y -= 6; y -= 6;
x += 6; x += 6;
} }

View File

@ -13,6 +13,7 @@ SoundFile sonExposion;
SoundFile sonCollision; SoundFile sonCollision;
SoundFile sonLaser_boss; SoundFile sonLaser_boss;
boolean d = true;
boolean test = false; boolean test = false;
int largeur = 1600; int largeur = 1600;
int hauteur = 900; int hauteur = 900;
@ -77,7 +78,7 @@ void setup() {
//création du boss //création du boss
boss = new Boss(5, "vaiseau_enemi.png", 800, 171, 8); boss = new Boss(5, "vaiseau_enemi.png", 800, 171, 8);
//on crée le ship //on crée le ship
ship = new Ship(x, y, 3, img_ship); ship = new Ship(x, y, 999999, img_ship);
//on crée des ennemis //on crée des ennemis
for (int i = 0; i<nombreEnemi; i++) { for (int i = 0; i<nombreEnemi; i++) {
@ -222,6 +223,11 @@ void setup() {
} }
if (boss.pv == 0){
MisileGuides [] d = new MisileGuides[0];
d[d] = new Misile (100+(j*150), k*100, misileMechant1, time);
//d[0].affiche_et_mets_a_jour_le_missile_guides();
}
//if ( nombreEnemiReste == 0 && boss_pv == 0) { //if ( nombreEnemiReste == 0 && boss_pv == 0) {