Version Alpha v0.2.2

LittleWhole · May 23, 2022 · 0f471f8 · 0f471f8
1 parent 0b02a03
commit 0f471f8
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 25 deletions.
diff --git a/out/production/Threnody/core/Constants.class b/out/production/Threnody/core/Constants.class
diff --git a/out/production/Threnody/entities/units/Unit.class b/out/production/Threnody/entities/units/Unit.class
diff --git a/out/production/Threnody/entities/units/player/Player.class b/out/production/Threnody/entities/units/player/Player.class
diff --git a/out/production/Threnody/gamestates/BattleState.class b/out/production/Threnody/gamestates/BattleState.class
diff --git a/out/production/Threnody/gamestates/Game.class b/out/production/Threnody/gamestates/Game.class
diff --git a/out/production/Threnody/gamestates/LoadingScreen.class b/out/production/Threnody/gamestates/LoadingScreen.class
diff --git a/src/combat/artes/elemental/AquaLimit.java b/src/combat/artes/elemental/AquaLimit.java
@@ -10,12 +10,11 @@
 
 public class AquaLimit extends Arte {
 
-    public static final String name = "Aqua Limit";
-    public static final ArteType arteType = ArteType.ELEMENTAL;
-    public static final ElementType element = ElementType.WATER;
-
     public AquaLimit(PlayableCharacter owner) {
         super(owner);
+        name = "Aqua Limit";
+        arteType = ArteType.ELEMENTAL;
+        element = ElementType.WATER;
     }
 
     @Override

diff --git a/src/combat/artes/elemental/DualTheSol.java b/src/combat/artes/elemental/DualTheSol.java
@@ -10,12 +10,11 @@
 
 public class DualTheSol extends Arte {
 
-    public static final String name = "Dual the Sol";
-    public static final ArteType arteType = ArteType.ELEMENTAL;
-    public static final ElementType element = ElementType.LIGHT;
-
     public DualTheSol(PlayableCharacter owner) {
         super(owner);
+        name = "Dual the Sol";
+        arteType = ArteType.ELEMENTAL;
+        element = ElementType.LIGHT;
     }
 
     @Override

diff --git a/src/combat/artes/elemental/RendingGale.java b/src/combat/artes/elemental/RendingGale.java
@@ -10,12 +10,12 @@
 
 public class RendingGale extends Arte {
 
-    public static final String name = "Rending Gale";
-    public static final ArteType arteType = ArteType.ELEMENTAL;
-    public static final ElementType element = ElementType.WIND;
 
     public RendingGale(PlayableCharacter owner) {
         super(owner);
+        name = "Rending Gale";
+        arteType = ArteType.ELEMENTAL;
+        element = ElementType.WIND;
     }
 
     @Override

diff --git a/src/combat/artes/martial/DragonFang.java b/src/combat/artes/martial/DragonFang.java
@@ -13,8 +13,8 @@ public class DragonFang extends Arte {
 
     public DragonFang(PlayableCharacter owner) throws SlickException {
         super(owner);
-        String name = "Dragon Fang";
-        ArteType arteType = ArteType.MARTIAL;
+        name = "Dragon Fang";
+        arteType = ArteType.MARTIAL;
         this.sprite = new Image("res/martialCard.png");
     }
 

diff --git a/src/combat/artes/martial/ImpactCross.java b/src/combat/artes/martial/ImpactCross.java
@@ -13,8 +13,8 @@ public class ImpactCross extends Arte {
 
     public ImpactCross(PlayableCharacter owner) throws SlickException {
         super(owner);
-        String name = "Impact Cross";
-        ArteType arteType = ArteType.MARTIAL;
+        name = "Impact Cross";
+        arteType = ArteType.MARTIAL;
         this.sprite = new Image("res/martialCard.png");
     }
 

diff --git a/src/combat/artes/mystic/Expiation.java b/src/combat/artes/mystic/Expiation.java
@@ -13,8 +13,8 @@ public class Expiation extends MysticArte {
 
     public Expiation(PlayableCharacter owner) throws SlickException {
         super(owner);
-        String name = "Expiation";
-        ArteType arteType = ArteType.MYSTIC;
+        name = "Expiation";
+        arteType = ArteType.MYSTIC;
         this.sprite = new Image("res/mysticCard.png");
     }
 

diff --git a/src/combat/artes/mystic/InnumerableWounds.java b/src/combat/artes/mystic/InnumerableWounds.java
@@ -13,8 +13,8 @@ public class InnumerableWounds extends MysticArte {
 
     public InnumerableWounds(PlayableCharacter owner) throws SlickException {
         super(owner);
-        String name = "Innumerable Wounds";
-        ArteType arteType = ArteType.MYSTIC;
+        name = "Innumerable Wounds";
+        arteType = ArteType.MYSTIC;
         this.sprite = new Image("res/mysticCard.png");
     }
 

diff --git a/src/combat/artes/mystic/TrillionDrive.java b/src/combat/artes/mystic/TrillionDrive.java
@@ -13,8 +13,8 @@ public class TrillionDrive extends MysticArte {
 
     public TrillionDrive(PlayableCharacter owner) throws SlickException {
         super(owner);
-        String name = "Trillion Drive";
-        ArteType arteType = ArteType.MYSTIC;
+        name = "Trillion Drive";
+        arteType = ArteType.MYSTIC;
         this.sprite = new Image("res/mysticCard.png");
     }
 

diff --git a/src/core/Constants.java b/src/core/Constants.java
@@ -2,7 +2,7 @@
 
 public final class Constants {
 
-    public static final String VERSION = "Alpha v0.2.0";
+    public static final String VERSION = "Alpha v0.2.2";
 
     public static final class LevelingConstants {
         public static final int MAX_LEVEL = 100;

diff --git a/src/entities/units/player/Player.java b/src/entities/units/player/Player.java
@@ -52,7 +52,6 @@ public Player(Coordinate pos) throws SlickException {
         this.sheet = new SpriteSheet("res/experimentalCharacter.png", 256, 512);
         this.sprite = sheet.getSprite(0,0);
         this.character = new Sigur();
-        this.stats = new PlayerStats();
         this.arteDeck = new ArrayList<>();
         for(int i = 0; i < 20; i++) {
             arteDeck.add(new SonicSlash(character));
@@ -97,7 +96,6 @@ public void update(StateBasedGame sbg, Unit u, Game g) throws SlickException {
         this.position.updatePosition(dx,dy);
         this.dx = 0;
         this.dy = 0;
-        this.stats.level=this.character.getLevel();
         if(getHitBox().intersects(u.getHitBox()) && Game.time >= Game.battleCooldown) {
             sbg.enterState(Main.BATTLE_ID);
         }

diff --git a/src/gamestates/BattleState.java b/src/gamestates/BattleState.java
@@ -103,7 +103,7 @@ public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException {
         gc.getGraphics().setFont(new TrueTypeFont(new java.awt.Font("Bahnschrift", java.awt.Font.PLAIN, 20), true));
         gc.getGraphics().setBackground(new Color(100, 100, 100));
 
-        //Random temp = new Random();
+        //var temp = new Random();
 
         /*for (var i = 0; i < 100; i++) {
             damageNumbers.add(new DamageNumber(temp.nextInt(0, 3000), temp.nextInt(0, 1920), temp.nextInt(0, 1080)));