Merge branch 'main' into sistemaUsuario

Legion 501.iml

@@ -9,5 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="json-20240303" level="project" />
+    <orderEntry type="library" name="json-20240304" level="project" />
   </component>
 </module>

src/entities/BulletManager.java

@@ -7,9 +7,6 @@
 import java.awt.*;
 import java.util.ArrayList;
 
-import static utilz.Constants.EnemyConstants.DEAD;
-import static utilz.Constants.EnemyConstants.HIT;
-import static utilz.Constants.PlayerConstants.EXPLODE;
 import static utilz.HelpMethods.DetectCollision;
 
 public class BulletManager implements IRenderable {
@@ -18,6 +15,7 @@ public class BulletManager implements IRenderable {
     public ArrayList<Bullet> bulletPlayerArr = new ArrayList<>(); // Arraylist con las balas
     public ArrayList<Bullet> bulletAlienArr = new ArrayList<>(); // Arraylist con las balas
     private float bulletSpeed = 5.0f; // Velocidad de la bala
+    private boolean updatingBullets = false;
 
     // ====================> CONSTRUCTOR <====================
     public BulletManager(Playing playing) {
@@ -79,6 +77,13 @@ public void createBullet() {
         bulletPlayerArr.add(bullet);
     }
 
+    public void clearBullets() {
+        updatingBullets = true; // Activar flag de pausa
+        bulletPlayerArr.clear();
+        bulletAlienArr.clear();
+        updatingBullets = false; // Desactivar flag al terminar
+    }
+
     /** createBulletAlien() ==> Crea una bala en el Enemigo */
     public <T extends Enemy> void createBulletAlien(T alien) {
         Bullet bullet = new Bullet(
@@ -92,7 +97,9 @@ public <T extends Enemy> void createBulletAlien(T alien) {
 
     /** Interface IRenderable */
     public void update(){
-        move();
+        if (!updatingBullets) {
+            move();
+        }
     }
 
     public void draw(Graphics g){

src/entities/EnemyManager.java

@@ -40,6 +40,10 @@ public void setAlienVelocityX(float alienVelocityX) {
         this.alienVelocityX = alienVelocityX;
     }
 
+    public int getRemainingAliens() {
+        return getEnemies().size();
+    }
+
     // ====================> METODOS <====================
     /** move() ==> Se encarga de mover la ubicacion de los aliens1. */
     public void move(){
@@ -150,7 +154,6 @@ public void createAliens() {
                 }
             }
         }
-        playing.alienCount = enemies.size(); // Actualizamos el contador total de aliens
     }
 
     /** spawnAlien() ==> Crea una instancia de un alien específico según el tipo dado. */

src/gameState/Login.java

@@ -4,6 +4,8 @@
 import exceptions.NonexistentUserException;
 import main.Game;
 import main.GamePanel;
+import static utilz.LoadSave.*;
+import utilz.LoadSave;
 import users.User;
 
 import javax.swing.*;
@@ -45,8 +47,8 @@ public void initUI(){
         quitButton = new JButton("Quit");
         userIDField = new JTextField();
         userPasswordField = new JPasswordField();
-        userIDLabel = new JLabel("User name:");
-        userPasswordLabel = new JLabel("Password:");
+        userIDLabel = new JLabel("");
+        userPasswordLabel = new JLabel("");
 
         backButton.setText("Register");
 
@@ -131,14 +133,9 @@ public void update() {
 
     @Override
     public void draw(Graphics g) {
-        // Titulo
-        g.setFont(new Font("Console", Font.BOLD, 70));
-        g.setColor(Color.WHITE);
-        g.drawString("Legion 501", 50, 150);
-        g.setFont(new Font("Console", Font.BOLD, 40));
-        g.setColor(Color.GRAY);
-        g.drawString("Login", 170, 230);
-
+      // Fondo y Titulo
+        LoadSave.drawTitleBackgroud(g,LOGIN_BACKGROUD);
+
         if(showMessage || showMessage2){
             g.setFont(new Font("Console", Font.BOLD, 12));
             g.setColor(Color.RED);
@@ -149,7 +146,12 @@ public void draw(Graphics g) {
                 g.drawString("Nombre de usuario y/o contraseña incorrectos.", Game.GAME_WIDTH/2-100, 405);
             }
         }
-
+
+        // Textos
+        g.setColor(Color.WHITE);
+        g.setFont(new Font("Console", Font.BOLD, 25));
+        g.drawString("Username", 180, 340);
+        g.drawString("Password", 180, 440);
     }
 }
 

src/gameState/Menu.java

@@ -2,10 +2,14 @@
 
 import main.Game;
 import ui.MenuButton;
+import utilz.LoadSave;
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+
+import static utilz.LoadSave.*;
 
 /**
  * Menu ==>
@@ -26,10 +30,10 @@ public Menu(Game game) {
 
     // ====================> METODOS <====================
     private void loadButtons() {
-        buttons[0] = new MenuButton(Game.GAME_WIDTH / 2, (int) (150*Game.SCALE),0,GameState.PLAYING); // Primero (y = 150)
+        buttons[0] = new MenuButton(Game.GAME_WIDTH / 2, (int) (170*Game.SCALE),0,GameState.PLAYING); // Primero (y = 150)
+        buttons[3] = new MenuButton(Game.GAME_WIDTH / 2, (int) (240*Game.SCALE),3,GameState.RANKING); // Segundo (y = 230)
         buttons[1] = new MenuButton(Game.GAME_WIDTH / 2, (int) (310*Game.SCALE),1,GameState.OPTIONS); // Tercero (y = 310)
-        buttons[2] = new MenuButton(Game.GAME_WIDTH / 2, (int) (390*Game.SCALE),2,GameState.QUIT); // Cuarto (y = 390)
-        buttons[3] = new MenuButton(Game.GAME_WIDTH / 2, (int) (230*Game.SCALE),3,GameState.RANKING); // Segundo (y = 230)
+        buttons[2] = new MenuButton(Game.GAME_WIDTH / 2, (int) (380*Game.SCALE),2,GameState.LOGIN); // Cuarto (y = 390)
         // La yPos, se debe editar manualmente y le agregamos al final a que state pertene el boton
     }
 
@@ -49,10 +53,8 @@ public void update() {
 
     @Override
     public void draw(Graphics g) {
-        //"Titulo" medio feo
-        g.setColor(Color.WHITE);
-        g.setFont(new Font("Console", Font.BOLD, 60));
-        g.drawString("Legion 501", 70, 100);
+        // Fondo y Titulo
+        LoadSave.drawTitleBackgroud(g,MENU_BACKGROUD);
 
         for(MenuButton mb : buttons) {
             mb.draw(g);