From eeba30ea6d2885fc00e52f57ad6b2d1eb3c85860 Mon Sep 17 00:00:00 2001
From: Renan <renan_moreira@usp.br>
Date: Fri, 27 Jun 2025 14:21:28 -0300
Subject: [PATCH 1/3] Teste de enemy na Main

Signed-off-by: renanrodriguesmoreira@hotmail.com <renanrodriguesmoreira@hotmail.com>
---
 .idea/workspace.xml              | 26 +++++++++++++++++++------
 Engine/gameEngine.java           | 33 +++++++++++++++++++++++++-------
 Entities/EnemyModels/Enemy1.java |  4 ++--
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c14274b..73e83c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="67a9810f-65d4-431e-9cdb-748ec5e1f32f" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/Entities/BackGround.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Entities/Star.java" afterDir="false" />
+    <list default="true" id="67a9810f-65d4-431e-9cdb-748ec5e1f32f" name="Changes" comment="Criação de entidade Star e BackGround">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Engine/gameEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/Engine/gameEngine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Entities/Entity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Entity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Entities/GameElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/GameElement.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utils/Point2D.java" beforeDir="false" afterPath="$PROJECT_DIR$/utils/Point2D.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/EnemyModels/Enemy1.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/EnemyModels/Enemy1.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,6 +22,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="PREVIOUS_COMMIT_AUTHORS">
+      <list>
+        <option value="Renan &lt;renan_moreira@usp.br&gt;" />
+      </list>
+    </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
         <entry key="$PROJECT_DIR$" value="main" />
@@ -69,6 +70,15 @@
       <option name="presentableId" value="Default" />
       <updated>1751025906004</updated>
     </task>
+    <task id="LOCAL-00001" summary="Criação de entidade Star e BackGround">
+      <option name="closed" value="true" />
+      <created>1751036876834</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1751036876834</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -82,4 +92,8 @@
       </map>
     </option>
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Criação de entidade Star e BackGround" />
+    <option name="LAST_COMMIT_MESSAGE" value="Criação de entidade Star e BackGround" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/Engine/gameEngine.java b/Engine/gameEngine.java
index 5767f32..7f7cb60 100644
--- a/Engine/gameEngine.java
+++ b/Engine/gameEngine.java
@@ -105,8 +105,13 @@ public void run() {
 		long [] enemy1_nextShoot = new long[10];				// instantes do próximo tiro
 		double enemy1_radius = 9.0;						// raio (tamanho do inimigo 1)
 		long nextEnemy1 = currentTime + 2000;					// instante em que um novo inimigo 1 deve aparecer
-		
-		ArrayList<Enemy1> enemy1List = new ArrayList<>(10);
+
+		//utiliza as clases criadas -- y está fora da tela ---tem que descomentar as outras partes para funcinar
+		int NumEnemys = 10;
+		ArrayList<Enemy1> enemy1List = new ArrayList<>();
+		for(int i = 0; i < NumEnemys; i++){
+			enemy1List.add(new Enemy1(Math.random() * (GameLib.WIDTH - 20.0) + 10.0, -10, 0));
+		}
 
 		/* variáveis dos inimigos tipo 2 */
 
@@ -342,9 +347,15 @@ public void run() {
 					}
 				}
 			}
-			
+
+
 			/* inimigos tipo 1 */
-			
+
+			//Utilizando as clases criadas
+			/*for (int i = 0; i < enemy1List.size(); i++){
+				enemy1List.get(i).update(delta);
+			}*/
+
 			for(int i = 0; i < enemy1_states.length; i++){
 				
 				if(enemy1_states[i] == EXPLODING){
@@ -357,7 +368,7 @@ public void run() {
 				
 				if(enemy1_states[i] == ACTIVE){
 					
-					/* verificando se inimigo saiu da tela */
+					/* verificando se inimigo saiu da tela*/
 					if(enemy1_Y[i] > GameLib.HEIGHT + 10) {
 						
 						enemy1_states[i] = INACTIVE;
@@ -571,11 +582,13 @@ public void run() {
 			
 			/* desenhando plano fundo distante */
 
+			backGround.draw(delta); //função que desenha o plano de fundo
+
 			//GameLib.setColor(Color.DARK_GRAY);
 			//background2_count +=  background2_speed* delta;
 			
 			//for(int i = 0; i < background2_X.length; i++){
-				backGround.draw(delta);
+
 				//GameLib.fillRect(background2_X[i], (background2_Y[i] + background2_count) % GameLib.HEIGHT, 2, 2);
 			//}
 			
@@ -627,7 +640,13 @@ public void run() {
 			}
 			
 			/* desenhando inimigos (tipo 1) */
-			
+
+			/*utiliza as classes criadas
+			for(int i = 0; i < enemy1List.size(); i++){
+				enemy1List.get(i).draw();
+			}*/
+
+
 			for(int i = 0; i < enemy1_states.length; i++){
 				
 				if(enemy1_states[i] == EXPLODING){
diff --git a/Entities/EnemyModels/Enemy1.java b/Entities/EnemyModels/Enemy1.java
index f213041..6318ef4 100644
--- a/Entities/EnemyModels/Enemy1.java
+++ b/Entities/EnemyModels/Enemy1.java
@@ -17,7 +17,7 @@ public Enemy1(double x, double y, long when){
         RV = 0;
         nextShot = now + 500;
         color= Color.CYAN;
-        setState(EntityState.INACTIVE);
+        setState(EntityState.ACTIVE);
     }
 
     public void update(long delta/*, Player player*/){
@@ -36,7 +36,7 @@ public void update(long delta/*, Player player*/){
             }
             else {
                 setX(getX() + VX * Math.cos(angle) * delta);
-                setY(getY() + VX * Math.sin(angle) * delta * (-1.0) );
+                setY(getY() + VY * Math.sin(angle) * delta * (-1.0) );
                 angle += RV * delta;
 
                 if(now > nextShot/* && Y < player.getY()*/){

From ff5ef99be5ee694dc97356781264a708147bff64 Mon Sep 17 00:00:00 2001
From: Renan <renan_moreira@usp.br>
Date: Fri, 27 Jun 2025 17:52:06 -0300
Subject: [PATCH 2/3] =?UTF-8?q?Atualiza=C3=A7=C3=B5es=20de=20Porjetil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Renan <renan_moreira@usp.br>
---
 .idea/workspace.xml              | 91 ++++++++++++++++++--------------
 Engine/gameEngine.java           |  9 ++--
 Entities/BackGround.java         |  4 +-
 Entities/Enemy.java              |  9 +++-
 Entities/EnemyModels/Enemy1.java | 44 ++++++++-------
 Entities/Entity.java             | 24 +++------
 Entities/GameElement.java        |  4 +-
 Entities/Player.java             | 27 +++++++---
 Entities/Projectile.java         | 20 ++++---
 Entities/ProjectilePlayer.java   | 24 +++++++++
 Entities/Star.java               |  2 +-
 utils/Point2D.java               |  2 +-
 12 files changed, 158 insertions(+), 102 deletions(-)
 create mode 100644 Entities/ProjectilePlayer.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73e83c2..1d00a7e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,23 +4,24 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="67a9810f-65d4-431e-9cdb-748ec5e1f32f" name="Changes" comment="Criação de entidade Star e BackGround">
+    <list default="true" id="5622e1ec-7ae7-4c10-b4a0-b21d84b53e70" name="Changes" comment="gitignore">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Engine/gameEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/Engine/gameEngine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/BackGround.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/BackGround.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/Enemy.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Enemy.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Entities/EnemyModels/Enemy1.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/EnemyModels/Enemy1.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/Entity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Entity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/GameElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/GameElement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Player.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/Projectile.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Projectile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entities/Star.java" beforeDir="false" afterPath="$PROJECT_DIR$/Entities/Star.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utils/Point2D.java" beforeDir="false" afterPath="$PROJECT_DIR$/utils/Point2D.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="Git.Settings">
     <option name="PREVIOUS_COMMIT_AUTHORS">
       <list>
@@ -29,54 +30,54 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="main" />
+        <entry key="$PROJECT_DIR$" value="reestrutura_Classes_IsaAlan" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
-  "lastFilter": {
-    "state": "OPEN",
-    "assignee": "RenanMoreir"
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;RenanMoreir&quot;
   }
-}]]></component>
-  <component name="GithubPullRequestsUISettings"><![CDATA[{
-  "selectedUrlAndAccountId": {
-    "url": "https://github.com/hartynelldev/epcoutinho.git",
-    "accountId": "82a65683-b5af-4d84-b34f-43e0e21d6d49"
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/hartynelldev/epcoutinho.git&quot;,
+    &quot;accountId&quot;: &quot;5494bfdd-b544-41ea-b9ca-3ffbc9f6d31c&quot;
   }
-}]]></component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 3
-}]]></component>
-  <component name="ProjectId" id="2z5fYrTyHowZth4m3dfzxgNKupV" />
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 3
+}</component>
+  <component name="ProjectId" id="2z30TQvlzneBW2AYiv4zU1KiaZE" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.Main.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "git-widget-placeholder": "reestrutura__Classes__IsaAlan"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.Main.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;reestrutura__Classes__IsaAlan&quot;
   }
-}]]></component>
+}</component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="67a9810f-65d4-431e-9cdb-748ec5e1f32f" name="Changes" comment="" />
-      <created>1751025906004</created>
+      <changelist id="5622e1ec-7ae7-4c10-b4a0-b21d84b53e70" name="Changes" comment="" />
+      <created>1750944458954</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1751025906004</updated>
+      <updated>1750944458954</updated>
     </task>
-    <task id="LOCAL-00001" summary="Criação de entidade Star e BackGround">
+    <task id="LOCAL-00001" summary="gitignore">
       <option name="closed" value="true" />
-      <created>1751036876834</created>
+      <created>1750955205362</created>
       <option name="number" value="00001" />
       <option name="presentableId" value="LOCAL-00001" />
       <option name="project" value="LOCAL" />
-      <updated>1751036876834</updated>
+      <updated>1750955205362</updated>
     </task>
     <option name="localTasksCounter" value="2" />
     <servers />
@@ -86,14 +87,26 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="origin/reestrutura_Classes_IsaAlan" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
           </value>
         </entry>
       </map>
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Criação de entidade Star e BackGround" />
-    <option name="LAST_COMMIT_MESSAGE" value="Criação de entidade Star e BackGround" />
+    <MESSAGE value="gitignore" />
+    <option name="LAST_COMMIT_MESSAGE" value="gitignore" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Engine/gameEngine.java b/Engine/gameEngine.java
index 7f7cb60..314e927 100644
--- a/Engine/gameEngine.java
+++ b/Engine/gameEngine.java
@@ -110,8 +110,9 @@ public void run() {
 		int NumEnemys = 10;
 		ArrayList<Enemy1> enemy1List = new ArrayList<>();
 		for(int i = 0; i < NumEnemys; i++){
-			enemy1List.add(new Enemy1(Math.random() * (GameLib.WIDTH - 20.0) + 10.0, -10, 0));
+			enemy1List.add(new Enemy1(Math.random() * (GameLib.WIDTH - 20.0) + 10.0, -10, 0, currentTime));
 		}
+		enemy1List.add(null);
 
 		/* variáveis dos inimigos tipo 2 */
 
@@ -131,7 +132,7 @@ public void run() {
 
 		ArrayList<Enemy2> enemy2List = new ArrayList<>(10);
 		/* variáveis dos projéteis lançados pelos inimigos (tanto tipo 1, quanto tipo 2) */
-		
+
 		int [] e_projectile_states = new int[200];				// estados
 		double [] e_projectile_X = new double[200];				// coordenadas x
 		double [] e_projectile_Y = new double[200];				// coordenadas y
@@ -483,8 +484,8 @@ public void run() {
 								
 				if(free < enemy1_states.length){
 
-					enemy1List.add(new Enemy1(Math.random() * (GameLib.WIDTH - 20.0) + 10.0,-10.0,10));
-					enemy1List.get(0).draw();
+					//enemy1List.add(new Enemy1(Math.random() * (GameLib.WIDTH - 20.0) + 10.0,-10.0,10));
+					enemy1List.get(0).draw(0);
 					enemy1_X[free] = Math.random() * (GameLib.WIDTH - 20.0) + 10.0;
 					enemy1_Y[free] = -10.0;
 					enemy1_V[free] = 0.20 + Math.random() * 0.15;
diff --git a/Entities/BackGround.java b/Entities/BackGround.java
index 681afa6..a06bdd1 100644
--- a/Entities/BackGround.java
+++ b/Entities/BackGround.java
@@ -30,12 +30,12 @@ public void draw(long delta){
         star2.getFirst().count += star2.getFirst().VY * delta;
         for(int i = 0; i < star2.size(); i++){
             star2.get(i).count += star2.get(i).VY * delta;
-            star2.get(i).draw();
+            star2.get(i).draw(0);
         }
         GameLib.setColor(star1.getFirst().getColor());
         for(int i = 0; i < star1.size(); i++){
             star1.get(i).count += star1.get(i).VY * delta;
-            star1.get(i).draw();
+            star1.get(i).draw(0);
         }
     }
 }
diff --git a/Entities/Enemy.java b/Entities/Enemy.java
index 2781db1..a10620c 100644
--- a/Entities/Enemy.java
+++ b/Entities/Enemy.java
@@ -20,6 +20,11 @@ public void spaw(long currentTime){
         }
     }
 
+    //Sobreescrita do metodo canShoot de Entity
+    public boolean canShoot(long currentTime, GameElement ent){
+        return currentTime > nextShot && getY() < ent.getY() && getState() == EntityState.ACTIVE;
+    }
+
 
     public void collide(GameElement element, long currentTime){
         if(getState() == EntityState.ACTIVE){
@@ -32,9 +37,9 @@ public void collide(GameElement element, long currentTime){
         }
     }
 
-    public void draw(){
+    public void draw(long currentTime){
         if(getState() == EntityState.EXPLODING){
-            explode(10);
+            explode(10, currentTime);
         }
         if(getState() == EntityState.ACTIVE){
             GameLib.setColor(color);
diff --git a/Entities/EnemyModels/Enemy1.java b/Entities/EnemyModels/Enemy1.java
index 6318ef4..2735a62 100644
--- a/Entities/EnemyModels/Enemy1.java
+++ b/Entities/EnemyModels/Enemy1.java
@@ -2,44 +2,49 @@
 
 import Engine.GameLib;
 import Entities.Enemy;
+import Entities.GameElement;
 import Entities.Projectile;
 import utils.EntityState;
 
+import javax.lang.model.type.NullType;
 import java.awt.*;
 
 public class Enemy1 extends Enemy {
 
-    public Enemy1(double x, double y, long when){
+
+
+    public Enemy1(double x, double y, long when, long currentTime){
         super(x, y, when, 9.0);
         VX = 0;
         VY = 0.20 + Math.random() * 0.15;
         angle = (3 * Math.PI) / 2;
         RV = 0;
-        nextShot = now + 500;
+        ShootingSpeed = 500;
+        nextShot = currentTime + ShootingSpeed;
         color= Color.CYAN;
         setState(EntityState.ACTIVE);
     }
 
-    public void update(long delta/*, Player player*/){
+    public void update(long delta, long currentTime){
         if(getState() == EntityState.EXPLODING){
 
-            if(now > explosionEnd){
+            if(currentTime > explosionEnd){
                 setState(EntityState.DESTROY);
             }
         }
 
-        if(getState() == EntityState.ACTIVE){
+        if(getState() == EntityState.ACTIVE) {
 
             /* verificando se inimigo saiu da tela */
-            if(getY() > GameLib.HEIGHT + 10) {
+            if (getY() > GameLib.HEIGHT + 10) {
                 setState(EntityState.DESTROY);
-            }
-            else {
+            } else {
                 setX(getX() + VX * Math.cos(angle) * delta);
-                setY(getY() + VY * Math.sin(angle) * delta * (-1.0) );
+                setY(getY() + VY * Math.sin(angle) * delta * (-1.0));
                 angle += RV * delta;
-
-                if(now > nextShot/* && Y < player.getY()*/){
+            }
+        }
+                //if(now > nextShot/* && Y < player.getY()*/){
 
 
                     //efetua o proximo disparo
@@ -56,24 +61,25 @@ public void update(long delta/*, Player player*/){
                         enemy1_nextShoot[i] = (long) (currentTime + 200 + Math.random() * 500);
                     }
                      */
-                }
-            }
-        }
+
+
+
     }
 
     //Provavlemente esse metodo retornara alguma coisa
-    public void shot(){
-
-        Projectile project = new Projectile(getX(),getY(), radius, Math.cos(angle) * 0.45,Math.sin(angle) * 0.45 * (-1.0) );
+    public Projectile shot(long currentTime, GameElement ent){
 
+        if(canShoot(currentTime, ent)){
+            nextShot = currentTime + ShootingSpeed;
+            return new Projectile(getX(),getY(), 2.0, Math.cos(angle) * 0.45,Math.sin(angle) * 0.45 * (-1.0), Color.RED );
+        }
+        return null;
         //Inimigo1 e Inimigo2: super(enemy.getX(), enemy.getY(), radius);
         // Inimigo1: VX = Math.cos(enemy.getAngle()) * 0.45; VY = Math.sin(enemy.getAngle()) * 0.45 * (-1.0);
         // o tiro vai ser parte do inimigo, mas o inimigo vai chamar/criar uma classe de projétil c o construtor de projetil. Se vc quiser, pode criar 2 subclasses de projetil, uma o projetil base e uma outra q quando chega em um pedaco da tela (o fim se pa) explode em outros projeteis (pro boss e pros powerup w vo usa). mas ai e opcional sepa, tu escolhe, so acho q vale a pena ter mais q 1 tipo de projetil
         //teoricamente quem vai controlar porjetil seria GameEnge
         //mas a arrayList ficaria aonde ?
         //no codigo original ele não controla isso, pra ele todos os projeteis são a mesma coisa
-
-
     }
 
 }
diff --git a/Entities/Entity.java b/Entities/Entity.java
index 5e5e392..f39e887 100644
--- a/Entities/Entity.java
+++ b/Entities/Entity.java
@@ -6,6 +6,7 @@
 public abstract class Entity extends GameElement {
     protected double explosionStart;			// instante do início da explosão
     protected double explosionEnd;				// instante do final da explosão
+    protected int ShootingSpeed = 100;
     protected long nextShot;             		// instante a partir do qual pode haver um próximo tiro
 
 
@@ -13,13 +14,12 @@ public Entity(double x, double y, double radius) {
         super(x,y,radius);
         explosionStart = 0;
         explosionEnd = 0;
-        nextShot = now;
     }
 
-    public void explode(int explosionTime){
+    public void explode(int explosionTime, long currentTime){
         setState(EntityState.EXPLODING);
-        explosionStart = now;
-        explosionEnd = now + 2000;
+        explosionStart = currentTime;
+        explosionEnd = currentTime + 2000;
         double alpha = (System.currentTimeMillis() - explosionStart) / (explosionEnd - explosionStart);
         GameLib.drawExplosion(getX(), getY(), alpha);
     }
@@ -29,21 +29,11 @@ public double collideTo(GameElement collider) {
         double dy = this.getY() - collider.getY();
         return Math.sqrt(dx * dx + dy * dy);
     }
-    public abstract void update(long delta);
-
-    //Somente uma ideia de como vai ficar
-    public void collide(){
-
-    }
-
-    private void collideShot(){
-
-    }
-
-    private void  collideEnemy(){
 
+    public boolean canShoot(long currentTime){
+        return currentTime > nextShot && getState() == EntityState.ACTIVE;
     }
 
-    //talvez eu coloque o shot aqui
+    public abstract void update(long delta, long currentTime);
 
 }
\ No newline at end of file
diff --git a/Entities/GameElement.java b/Entities/GameElement.java
index 50e00e7..4d9311d 100644
--- a/Entities/GameElement.java
+++ b/Entities/GameElement.java
@@ -21,7 +21,7 @@ public abstract class GameElement extends Point2D {
     protected double angle;     				    // ângulos (indicam direção do movimento)
 	protected double RV;                            // velocidades de rotação
 
-    protected long now = System.currentTimeMillis();
+//    protected long now = System.currentTimeMillis();
     protected Color color;
 
     public GameElement(double x, double y, double radius){
@@ -49,5 +49,5 @@ public void setColor(Color color){
     }
     public Color getColor(){return color;}
 
-    public abstract void draw();
+    public abstract void draw(long currentTime);
 }
diff --git a/Entities/Player.java b/Entities/Player.java
index 40315aa..f3bb0b3 100644
--- a/Entities/Player.java
+++ b/Entities/Player.java
@@ -8,7 +8,6 @@
 
 public class Player extends Entity{
 
-    protected int playerShootingSpeed = 100;
 
     public Player(double x, double y, double radius){
         super(x, y, radius);
@@ -18,10 +17,10 @@ public Player(double x, double y, double radius){
     }
 
     public void setShootingSpeed(int shootingSpeed){
-        playerShootingSpeed = shootingSpeed;
+        ShootingSpeed = shootingSpeed;
     }
 
-    public void update(long delta) {
+    public void update(long delta, long currentTime) {
         if (getState() != EntityState.EXPLODING) {
             if (GameLib.iskeyPressed(GameLib.KEY_UP)) setY(getY() - delta * VY);
             if (GameLib.iskeyPressed(GameLib.KEY_DOWN)) setY(getY() + delta * VY);
@@ -29,18 +28,30 @@ public void update(long delta) {
             if (GameLib.iskeyPressed(GameLib.KEY_RIGHT)) setX(getX()+- delta * VX);
 
             if (GameLib.iskeyPressed(GameLib.KEY_CONTROL)) {
-                if (now > nextShot) {
+                if (currentTime > nextShot) {
                     // DAR TIRO
-                    nextShot = now + playerShootingSpeed;
+                    nextShot = currentTime + ShootingSpeed;
                 }
             }
         } else {
-            if (now > explosionEnd) {
+            if (currentTime > explosionEnd) {
                 setState(EntityState.ACTIVE);
             }
         }
     }
 
+    public Projectile shoot(long currentTime){
+        if (GameLib.iskeyPressed(GameLib.KEY_CONTROL) && canShoot(currentTime)){
+            nextShot = currentTime + ShootingSpeed;
+            //não sei se esta certo os valores
+            return new ProjectilePlayer(getX(),getY() - 2 * radius, radius, VX, VY, Color.GREEN);
+        }
+        return null;
+
+        //Player: super(player.getX(), player.getY() - 2 * player.getRadius(), radius);
+        // Player: VX = vx; VY = vy;
+    }
+
     public void collide(GameElement element, long currentTime){
         if(getState() == EntityState.ACTIVE){
             double dist = collideTo(element);
@@ -52,9 +63,9 @@ public void collide(GameElement element, long currentTime){
         }
     }
 
-    public void draw() {
+    public void draw(long currentTime) {
         if (getState() == EntityState.EXPLODING) {
-            explode(2000);
+            explode(2000, currentTime);
         } else {
             GameLib.setColor(color);
             GameLib.drawPlayer(getX(), getY(), radius);
diff --git a/Entities/Projectile.java b/Entities/Projectile.java
index c031fbf..4edd90b 100644
--- a/Entities/Projectile.java
+++ b/Entities/Projectile.java
@@ -1,13 +1,17 @@
 package Entities;
 import java.awt.Color;
+
+import Engine.GameLib;
 import Entities.Entity;
 import utils.EntityState;
 
 public class Projectile  extends Entity{
     //disparo do player
 
-    public Projectile(double x, double y, double radius, double vx, double vy) {
+    //Implementar
+    public Projectile(double x, double y, double radius, double vx, double vy, Color cor) {
         super(x, y, radius);
+        color = cor;
         //variações de super:
         //Player: super(player.getX(), player.getY() - 2 * player.getRadius(), radius);
         //Inimigo1 e Inimigo2: super(enemy.getX(), enemy.getY(), radius);
@@ -23,21 +27,23 @@ public Projectile(double x, double y, double radius, double vx, double vy) {
 
     }
 
-    public void update(long delta) {
+    public void update(long delta, long currentTime) {
         if(state == EntityState.ACTIVE){
 
             /* verificando se projétil saiu da tela */
             if(getY() < 0) {
-
-                //projectile_states[i] = INACTIVE;
+                setState(EntityState.DESTROY);
             }
             else {
                 setX(getX() + VX * delta);
                 setY(getY() + VY * delta);
             }
         }
-    } //tentantdo comitar/
-    public void draw() {
-
+    }
+    public void draw(long currentTime) {
+        if(getState() == EntityState.ACTIVE){
+            GameLib.setColor(color);
+            GameLib.drawCircle(getX(), getY(), radius);
+        }
     }
 }
\ No newline at end of file
diff --git a/Entities/ProjectilePlayer.java b/Entities/ProjectilePlayer.java
new file mode 100644
index 0000000..e87f856
--- /dev/null
+++ b/Entities/ProjectilePlayer.java
@@ -0,0 +1,24 @@
+package Entities;
+
+import Engine.GameLib;
+import utils.EntityState;
+
+import java.awt.*;
+
+public class ProjectilePlayer extends Projectile{
+
+    public ProjectilePlayer(double x, double y, double radius, double vx, double vy, Color cor) {
+        super(x, y, radius, vx ,vy, cor);
+    }
+
+    //sobreescrita do draw de Projectile
+    public void draw(long currentTime) {
+        if(getState() == EntityState.ACTIVE){
+
+            GameLib.setColor(color);
+            GameLib.drawLine(getX(), getY() - 5, getX(), getY() + 5);
+            GameLib.drawLine(getX() - 1, getY() - 3, getX()- 1, getY() + 3);
+            GameLib.drawLine(getX() + 1, getY() - 3, getX() + 1, getY() + 3);
+        }
+    }
+}
diff --git a/Entities/Star.java b/Entities/Star.java
index fbfead3..6d0090c 100644
--- a/Entities/Star.java
+++ b/Entities/Star.java
@@ -14,7 +14,7 @@ public Star(double speed, Color cor ){
         color = cor;
     }
 
-    public void draw(){
+    public void draw(long currentTime){
         GameLib.fillRect(getX(), (getY() + count) % GameLib.HEIGHT, 2, 2);
     }
 }
diff --git a/utils/Point2D.java b/utils/Point2D.java
index a9bd522..186847a 100644
--- a/utils/Point2D.java
+++ b/utils/Point2D.java
@@ -28,7 +28,7 @@ public Point2D() {
     }
 
     // Methods
-    public abstract void draw();
+    public abstract void draw(long currentTime);
 
     // Getters e Setters
 

From 7154dd45763a61ab6faebff8c0d674f7115fda6b Mon Sep 17 00:00:00 2001
From: Renan <renan_moreira@usp.br>
Date: Fri, 27 Jun 2025 22:32:17 -0300
Subject: [PATCH 3/3] Enemy2

---
 Entities/EnemyModels/Enemy1.java |  2 -
 Entities/EnemyModels/Enemy2.java | 87 +++++++++++++++++++++++++++++++-
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/Entities/EnemyModels/Enemy1.java b/Entities/EnemyModels/Enemy1.java
index 2735a62..9df3695 100644
--- a/Entities/EnemyModels/Enemy1.java
+++ b/Entities/EnemyModels/Enemy1.java
@@ -11,8 +11,6 @@
 
 public class Enemy1 extends Enemy {
 
-
-
     public Enemy1(double x, double y, long when, long currentTime){
         super(x, y, when, 9.0);
         VX = 0;
diff --git a/Entities/EnemyModels/Enemy2.java b/Entities/EnemyModels/Enemy2.java
index 1a0a2a7..211541a 100644
--- a/Entities/EnemyModels/Enemy2.java
+++ b/Entities/EnemyModels/Enemy2.java
@@ -1,4 +1,89 @@
 package Entities.EnemyModels;
 
-public class Enemy2 {
+import Engine.GameLib;
+import Entities.Enemy;
+import Entities.GameElement;
+import Entities.Projectile;
+import utils.EntityState;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+public class Enemy2 extends Enemy {
+    protected static long same;
+
+    public Enemy2(double x, double y, long when, long currentTime){
+        super(x,y,when,12.0);
+        same = when;
+        VX = 0.42;
+        angle = (3 * Math.PI) / 2;
+        RV = 0;
+        setState(EntityState.INACTIVE);
+        //teoricamente -- para um mesmo inimigo 2 só que vai spownar depois
+        if(when == same){
+            spawTime = when + 120;
+        }
+    }
+
+
+    public void update(long delta, long currentTime) {
+        if(getState() == EntityState.EXPLODING){
+
+            if(currentTime > explosionEnd){
+                setState(EntityState.DESTROY);
+            }
+        }
+        if(getState() == EntityState.ACTIVE){
+            if (getY() > GameLib.HEIGHT + 10) {
+                setState(EntityState.DESTROY);
+            } else {
+
+                double previousY = getY();
+
+                setX(getX() + VX * Math.cos(angle) * delta);
+                setY(getY() + VY * Math.sin(angle) * delta * (-1.0));
+                angle += RV * delta;
+
+                double threshold = GameLib.HEIGHT * 0.30;
+
+                if(previousY < threshold && getY() >= threshold) {
+
+                    if(getX() < GameLib.WIDTH / 2) RV = 0.003;
+                    else RV = -0.003;
+                }
+            }
+        }
+
+    }
+
+    public boolean canShoot(long currentTime, GameElement ent){
+
+        if(RV > 0 && Math.abs(angle - 3 * Math.PI) < 0.05){
+
+            RV = 0.0;
+            angle = 3 * Math.PI;
+            return true;
+        }
+
+        if(RV < 0 && Math.abs(angle) < 0.05){
+
+            RV = 0.0;
+            angle = 0.0;
+            return true;
+        }
+
+        return false;
+        // return currentTime > nextShot && getY() < ent.getY() && getState() == EntityState.ACTIVE;
+    }
+
+    public Projectile shot(long currentTime, GameElement ent,double angles){
+
+        double a = angles + Math.random() * Math.PI/6 - Math.PI/12;
+        double vx = Math.cos(a) * 0.3;
+        double vy = Math.sin(a) * 0.3;
+
+        return new Projectile(getX(),getY(),2.0,vx,vy, Color.RED);
+    }
+
 }
+