SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

code refactoring for visibility

Browse source
This commit is contained in:
unurled 2024-03-18 20:39:28 +01:00
parent f70b335264
commit cff22c8f18
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
2 changed files with 53 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1 +1 @@
sonar.gradle.skipCompile=true systemProp.sonar.gradle.skipCompile=true

15
src/main/java/me/unurled/sacredrealms/sr/components/combat/CombatManager.java
View file

@ -99,14 +99,12 @@ public class CombatManager extends Manager {
d.sendMessage(comp("<red>You missed!")); d.sendMessage(comp("<red>You missed!"));
return; return;
} }
} else if (luck > 0 && luck < 1000) { } else if (luck > 0 && luck < 1000 && RANDOM.nextBoolean()) {
// chance of critical hit // chance of critical hit
if (RANDOM.nextBoolean()) {
d.playSound(d, Sound.ENTITY_PLAYER_ATTACK_CRIT, 1.0f, 1.0f); d.playSound(d, Sound.ENTITY_PLAYER_ATTACK_CRIT, 1.0f, 1.0f);
// damage * 2 // damage * 2
damage = damage * 2; damage = damage * 2;
} }
}
// apply damage // apply damage
if (historyMobDamage.containsKey(entity.getUniqueId())) { if (historyMobDamage.containsKey(entity.getUniqueId())) {
@ -150,9 +148,8 @@ public class CombatManager extends Manager {
spawnIndicator(entity, false, damage); spawnIndicator(entity, false, damage);
// TODO: check for status effects (apply status effects depending item of damager) // TODO: check for status effects (apply status effects depending item of damager)
} }
} else if (entity instanceof Player player) { } else if (entity instanceof Player player && damager instanceof Mob mob) {
// damager is not player // damager is not player
if (damager instanceof Mob mob) {
// get equipment of damager // get equipment of damager
EntityEquipment equipment = mob.getEquipment(); EntityEquipment equipment = mob.getEquipment();
Double dStrength = Items.getTotalAttribute(equipment, Attribute.STRENGTH); Double dStrength = Items.getTotalAttribute(equipment, Attribute.STRENGTH);
@ -186,14 +183,12 @@ public class CombatManager extends Manager {
player.sendMessage(comp("<red>You dodged!")); player.sendMessage(comp("<red>You dodged!"));
return; return;
} }
} else if (luck > 0 && luck < 1000) { } else if (luck > 0 && luck < 1000 && RANDOM.nextBoolean()) {
// chance of critical hit // chance of critical hit
if (RANDOM.nextBoolean()) {
player.playSound(player, Sound.ENTITY_PLAYER_ATTACK_CRIT, 1.0f, 1.0f); player.playSound(player, Sound.ENTITY_PLAYER_ATTACK_CRIT, 1.0f, 1.0f);
// damage * 2 // damage * 2
damage = damage * 2; damage = damage * 2;
} }
}
// apply damage // apply damage
player.damage(damage); player.damage(damage);
@ -213,8 +208,4 @@ public class CombatManager extends Manager {
// TODO: check for status effects (apply status effects depending item of damager) // TODO: check for status effects (apply status effects depending item of damager)
} }
} }
}
/*@EventHandler
public void onDamage(EntityDamageEvent e) {}*/
} }