MiauRizius/JGame2D
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

added knockback to monsters

Browse Source
This commit is contained in:
Maurice
2025-12-12 23:45:57 +01:00
parent 2e73a012d1
commit 1d6f53a70e
8 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/de/miaurizius/jgame2d/core/UI.java
View File

@@ -344,13 +344,13 @@ public class UI {
x = getCenteredX(text); x = getCenteredX(text);
y += panel.tileSize*4; y += panel.tileSize*4;
graphics2d.drawString(text, x, y); graphics2d.drawString(text, x, y);
if(commandNum == 0) graphics2d.drawString(">", x-panel.tileSize, y); if(commandNum == 0) graphics2d.drawString(">", x-panel.tileSize, y);
text = "Return to title"; text = "Return to title";
x = getCenteredX(text); x = getCenteredX(text);
y += 55; y += 55;
graphics2d.drawString(text, x, y); graphics2d.drawString(text, x, y);
if(commandNum == 1) graphics2d.drawString(">", x-panel.tileSize, y); if(commandNum == 1) graphics2d.drawString(">", x-panel.tileSize, y);
} }
private void drawTransitionScreen() { private void drawTransitionScreen() {
transCounter++; transCounter++;

1
src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
View File

@@ -151,6 +151,7 @@ public class KeyHandler implements KeyListener {
} }
if(panel.ui.commandNum == 1) { if(panel.ui.commandNum == 1) {
panel.gameState = GameState.TITLE; panel.gameState = GameState.TITLE;
panel.ui.commandNum = 0;
panel.restart(); panel.restart();
panel.stopMusic(); panel.stopMusic();
} }

54
src/de/miaurizius/jgame2d/entity/Entity.java
View File

@@ -41,16 +41,19 @@ public class Entity {
public boolean hpBarOn; public boolean hpBarOn;
public boolean consumable; public boolean consumable;
public boolean onPath; public boolean onPath;
public boolean knockback;
// COUNTER // COUNTER
public int spriteCounter; public int spriteCount;
public int actionLock; public int actionLock;
public int invincibleCount; public int invincibleCount;
int dyingCount; int dyingCount;
int hpBarCounter; int hpBarCount;
int knockbackCount;
// CHARACTER ATTRIBUTES // CHARACTER ATTRIBUTES
public EntityType type; public EntityType type;
public int defaultSpeed;
public String name; public String name;
public int speed; public int speed;
public int maxLife; public int maxLife;
@@ -79,6 +82,7 @@ public class Entity {
public int useCost; public int useCost;
public int value; public int value;
public int price; public int price;
public int knockbackVal;
public Entity(GamePanel panel) { public Entity(GamePanel panel) {
this.panel = panel; this.panel = panel;
@@ -86,24 +90,48 @@ public class Entity {
// DEFAULT // DEFAULT
public void update() { public void update() {
setAction(); if(knockback) {
checkCollision(); checkCollision();
if(collisionOn) {
knockbackCount = 0;
knockback = false;
speed = defaultSpeed;
return;
}
if(!collisionOn) { switch(panel.player.direction) {
switch (direction) {
case UP -> worldY -= speed; case UP -> worldY -= speed;
case DOWN -> worldY += speed; case DOWN -> worldY += speed;
case LEFT ->worldX -= speed; case LEFT ->worldX -= speed;
case RIGHT -> worldX += speed; case RIGHT -> worldX += speed;
} }
knockbackCount++;
if(knockbackCount != 10) return;
knockback = false;
knockbackCount = 0;
speed = defaultSpeed;
} else {
setAction();
checkCollision();
if(!collisionOn) {
switch (direction) {
case UP -> worldY -= speed;
case DOWN -> worldY += speed;
case LEFT ->worldX -= speed;
case RIGHT -> worldX += speed;
}
}
} }
spriteCounter++; spriteCount++;
if(spriteCounter > 24) { if(spriteCount > 24) {
if(spriteNum == 1) spriteNum = 2; if(spriteNum == 1) spriteNum = 2;
else if(spriteNum == 2) spriteNum = 1; else if(spriteNum == 2) spriteNum = 1;
else spriteNum = 0; else spriteNum = 0;
spriteCounter = 0; spriteCount = 0;
} }
// INVINCIBLE COUNTER // INVINCIBLE COUNTER
@@ -132,9 +160,9 @@ public class Entity {
graphics2d.setColor(new Color(255, 0, 30)); graphics2d.setColor(new Color(255, 0, 30));
graphics2d.fillRect(screenX, screenY-5, (int) ((double) panel.tileSize/maxLife)*life, 10); graphics2d.fillRect(screenX, screenY-5, (int) ((double) panel.tileSize/maxLife)*life, 10);
hpBarCounter++; hpBarCount++;
if(hpBarCounter > 600) { //bar disappears after 10 seconds if(hpBarCount > 600) { //bar disappears after 10 seconds
hpBarCounter = 0; hpBarCount = 0;
hpBarOn = false; hpBarOn = false;
} }
} }
@@ -142,7 +170,7 @@ public class Entity {
// DRAW ENTITY // DRAW ENTITY
if(invincible) { if(invincible) {
hpBarOn = true; hpBarOn = true;
hpBarCounter = 0; hpBarCount = 0;
changeOpacity(graphics2d, 0.4f); changeOpacity(graphics2d, 0.4f);
} }
if(dying) dyingAnimation(graphics2d); if(dying) dyingAnimation(graphics2d);

37
src/de/miaurizius/jgame2d/entity/Player.java
View File

@@ -4,7 +4,6 @@ import de.miaurizius.jgame2d.core.*;
import de.miaurizius.jgame2d.core.enums.Direction; import de.miaurizius.jgame2d.core.enums.Direction;
import de.miaurizius.jgame2d.core.enums.EntityType; import de.miaurizius.jgame2d.core.enums.EntityType;
import de.miaurizius.jgame2d.core.enums.GameState; import de.miaurizius.jgame2d.core.enums.GameState;
import de.miaurizius.jgame2d.core.enums.Map;
import de.miaurizius.jgame2d.core.handlers.KeyHandler; import de.miaurizius.jgame2d.core.handlers.KeyHandler;
import de.miaurizius.jgame2d.entity.item.ShieldWoodObj; import de.miaurizius.jgame2d.entity.item.ShieldWoodObj;
import de.miaurizius.jgame2d.entity.item.SwordNormalObj; import de.miaurizius.jgame2d.entity.item.SwordNormalObj;
@@ -95,18 +94,18 @@ public class Player extends Entity {
if(keyH.spacePressed && !attackCancel) { if(keyH.spacePressed && !attackCancel) {
panel.playSE(7); panel.playSE(7);
attacking = true; attacking = true;
spriteCounter = 0; spriteCount = 0;
} }
attackCancel = false; attackCancel = false;
panel.keyH.spacePressed = false; panel.keyH.spacePressed = false;
spriteCounter++; spriteCount++;
if(spriteCounter > 12) { if(spriteCount > 12) {
if(spriteNum == 1) spriteNum = 2; if(spriteNum == 1) spriteNum = 2;
else if(spriteNum == 2) spriteNum = 1; else if(spriteNum == 2) spriteNum = 1;
else spriteNum = 0; else spriteNum = 0;
spriteCounter = 0; spriteCount = 0;
} }
} }
@@ -168,9 +167,9 @@ public class Player extends Entity {
} }
public void attacking() { public void attacking() {
if(attackCancel) return; if(attackCancel) return;
spriteCounter++; spriteCount++;
if(spriteCounter <= 5) spriteNum = 1; if(spriteCount <= 5) spriteNum = 1;
if(spriteCounter > 5 && spriteCounter <= 25) { if(spriteCount > 5 && spriteCount <= 25) {
spriteNum = 2; spriteNum = 2;
int currentWorldX = worldX; int currentWorldX = worldX;
int currentWorldY = worldY; int currentWorldY = worldY;
@@ -187,7 +186,7 @@ public class Player extends Entity {
solidArea.height = attackArea.height; solidArea.height = attackArea.height;
int monsterIndex = panel.collisionH.checkEntity(this, panel.monster[panel.currentMap.getIndex()]); int monsterIndex = panel.collisionH.checkEntity(this, panel.monster[panel.currentMap.getIndex()]);
damageMonster(monsterIndex, attack); damageMonster(monsterIndex, attack, currentWeapon.knockbackVal);
int iTileIndex = panel.collisionH.checkEntity(this, panel.iTile[panel.currentMap.getIndex()]); int iTileIndex = panel.collisionH.checkEntity(this, panel.iTile[panel.currentMap.getIndex()]);
interactTile(iTileIndex); interactTile(iTileIndex);
@@ -198,13 +197,13 @@ public class Player extends Entity {
solidArea.height = solidAreaHeight; solidArea.height = solidAreaHeight;
} }
if(spriteCounter > 25) { if(spriteCount > 25) {
spriteNum = 1; spriteNum = 1;
spriteCounter = 0; spriteCount = 0;
attacking = false; attacking = false;
} }
} }
public void damageMonster(int index, int attack) { public void damageMonster(int index, int attack, int knockbackVal) {
if(index == 999) return; if(index == 999) return;
if(panel.monster[panel.currentMap.getIndex()][index].invincible) return; if(panel.monster[panel.currentMap.getIndex()][index].invincible) return;
@@ -212,6 +211,7 @@ public class Player extends Entity {
if(damage > 0) { if(damage > 0) {
panel.playSE(5); panel.playSE(5);
if(knockbackVal > 0) knockback(panel.monster[panel.currentMap.getIndex()][index], knockbackVal);
panel.monster[panel.currentMap.getIndex()][index].life -= damage; panel.monster[panel.currentMap.getIndex()][index].life -= damage;
panel.monster[panel.currentMap.getIndex()][index].invincible = true; panel.monster[panel.currentMap.getIndex()][index].invincible = true;
} }
@@ -224,6 +224,12 @@ public class Player extends Entity {
checkLevelUp(); checkLevelUp();
} }
} }
public void knockback(Entity entity, int knockbackVal) {
entity.direction = direction;
entity.speed += knockbackVal;
entity.knockback = true;
}
public void interactTile(int index) { public void interactTile(int index) {
if(index == 999 || !panel.iTile[panel.currentMap.getIndex()][index].destructible || panel.iTile[panel.currentMap.getIndex()][index].invincible) return; if(index == 999 || !panel.iTile[panel.currentMap.getIndex()][index].destructible || panel.iTile[panel.currentMap.getIndex()][index].invincible) return;
if(!panel.iTile[panel.currentMap.getIndex()][index].meetItemReq(this)) return; if(!panel.iTile[panel.currentMap.getIndex()][index].meetItemReq(this)) return;
@@ -294,11 +300,8 @@ public class Player extends Entity {
worldX = panel.tileSize * 23; worldX = panel.tileSize * 23;
worldY = panel.tileSize * 21; worldY = panel.tileSize * 21;
// worldX = panel.tileSize * 12; defaultSpeed = 4;
// worldY = panel.tileSize * 12; speed = defaultSpeed;
// panel.currentMap = Map.HUT;
speed = 4;
direction = Direction.DOWN; direction = Direction.DOWN;
// PLAYER STATUS (1 heart = 2 lives) // PLAYER STATUS (1 heart = 2 lives)

1
src/de/miaurizius/jgame2d/entity/item/AxeObj.java
View File

@@ -14,6 +14,7 @@ public class AxeObj extends Entity {
weaponType = EntityType.WeaponType.AXE; weaponType = EntityType.WeaponType.AXE;
down1 = initEntitySprites("/objects/axe"); down1 = initEntitySprites("/objects/axe");
price = 50; price = 50;
knockbackVal = 10;
attackValue = 2; attackValue = 2;
attackArea.width = 30; attackArea.width = 30;

1
src/de/miaurizius/jgame2d/entity/item/SwordNormalObj.java
View File

@@ -15,6 +15,7 @@ public class SwordNormalObj extends Entity {
weaponType = EntityType.WeaponType.SWORD; weaponType = EntityType.WeaponType.SWORD;
down1 = initEntitySprites("objects/sword_normal"); down1 = initEntitySprites("objects/sword_normal");
price = 50; price = 50;
knockbackVal = 2;
attackValue = 1; attackValue = 1;
attackArea.width = 36; attackArea.width = 36;

3
src/de/miaurizius/jgame2d/entity/monster/GreenSlimeMON.java
View File

@@ -17,7 +17,8 @@ public class GreenSlimeMON extends Entity {
super(panel); super(panel);
type = EntityType.MONSTER; type = EntityType.MONSTER;
name = "green-slime"; name = "green-slime";
speed = 1; defaultSpeed = 1;
speed = defaultSpeed;
maxLife = 4; maxLife = 4;
life = maxLife; life = maxLife;
attack = 5; attack = 5;

9
src/de/miaurizius/jgame2d/entity/projectile/Projectile.java
View File

@@ -8,6 +8,7 @@ import de.miaurizius.jgame2d.entity.Entity;
public class Projectile extends Entity { public class Projectile extends Entity {
Entity user; Entity user;
//TODO: parry projectiles: https://youtu.be/8KitXuxcuqI?list=PL_QPQmz5C6WUF-pOQDsbsKbaBZqXj4qSq&t=75
public Projectile(GamePanel panel) { public Projectile(GamePanel panel) {
super(panel); super(panel);
@@ -27,7 +28,7 @@ public class Projectile extends Entity {
if(user.type == EntityType.PLAYER) { if(user.type == EntityType.PLAYER) {
int monsterIndex = panel.collisionH.checkEntity(this, panel.monster[panel.currentMap.getIndex()]); int monsterIndex = panel.collisionH.checkEntity(this, panel.monster[panel.currentMap.getIndex()]);
if(monsterIndex != 999) { if(monsterIndex != 999) {
panel.player.damageMonster(monsterIndex, attack); panel.player.damageMonster(monsterIndex, attack, knockbackVal);
generateParticle(user.projectile, panel.monster[panel.currentMap.getIndex()][monsterIndex]); generateParticle(user.projectile, panel.monster[panel.currentMap.getIndex()][monsterIndex]);
alive = false; alive = false;
} }
@@ -54,12 +55,12 @@ public class Projectile extends Entity {
return; return;
} }
spriteCounter++; spriteCount++;
if(spriteCounter > 12) { if(spriteCount > 12) {
if(spriteNum == 1) spriteNum = 2; if(spriteNum == 1) spriteNum = 2;
else if(spriteNum == 2) spriteNum = 1; else if(spriteNum == 2) spriteNum = 1;
else spriteNum = 0; else spriteNum = 0;
spriteCounter = 0; spriteCount = 0;
} }
} }