projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

Added glancing blow combat roll #65

Browse Source
This commit is contained in:
Ziggy
2020-11-24 21:23:44 +01:00
parent 1e6a039dab
commit 4f0f47f061
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandAttack.java
View File

@@ -108,11 +108,11 @@ enum CombatCommandAttack implements CombatCommandHitType {
// Play dodge animation on the creature that's dodging for everyone that can see the creature
target.sendObservers(new Animation(targetObjectId, "dodge"));
} else if (isAttackGlanced(source, creatureTarget)) {
info.setGlancing(true);
}
}
// TODO single target only offence rolls for source
doCombat(source, targets, weapon, info, command);
}
@@ -195,8 +195,9 @@ enum CombatCommandAttack implements CombatCommandHitType {
// The armor of the target will mitigate some of the damage
armorMitigate(info, damageType, target, command);
// TODO block roll for defender
// TODO Critical hit roll for attacker
if (info.isGlancing()) {
handleGlancingBlow(info, target);
}
// End rolls
int targetHealth = target.getHealth();
@@ -235,6 +236,20 @@ enum CombatCommandAttack implements CombatCommandHitType {
info.setFinalDamage(currentDamage);
}
private static void handleGlancingBlow(AttackInfo info, SWGObject target) {
int finalDamage = info.getFinalDamage();
// Glancing blows cause only 40% damage to be applied
finalDamage *= 0.4;
info.setFinalDamage(finalDamage);
// Show Glancing flytext above the object that rolled a glancing blow
ShowFlyText glancingFlyText = new ShowFlyText(target.getObjectId(), new StringId("combat_effects", "glancing_blow"), ShowFlyText.Scale.MEDIUM, new RGB(0, 160, 0));
target.sendSelf(glancingFlyText);
}
private static int getArmor(DamageType damageType, CreatureObject creature) {
switch (damageType) {
case KINETIC: return creature.getSkillModValue("kinetic");
@@ -304,6 +319,24 @@ enum CombatCommandAttack implements CombatCommandHitType {
return roll <= dodgeChance; // If dodge chance is 25%, then the roll should be between 0 and 25 (both inclusive)
}
private static boolean isAttackGlanced(CreatureObject source, CreatureObject target) {
double glanceChance = target.getSkillModValue("display_only_glancing_blow") / 100d;
WeaponObject sourceEquippedWeapon = source.getEquippedWeapon();
WeaponType weaponType = sourceEquippedWeapon.getType();
if (weaponType.isMelee()) {
glanceChance += target.getSkillModValue("expertise_glancing_blow_melee");
}
if (weaponType.isRanged()) {
glanceChance += target.getSkillModValue("expertise_glancing_blow_ranged");
}
double roll = ThreadLocalRandom.current().nextDouble(100); // Generate number between 0 and 100
return roll <= glanceChance; // If glance chance is 25%, then the roll should be between 0 and 25 (both inclusive)
}
private static boolean isAttackDevastating(CreatureObject source, CombatCommand command) {
if (command.getPercentAddFromWeapon() == 0) {
// If this ability doesn't use weapon damage it does not qualify for a devastation roll

1
src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java
View File

@@ -96,6 +96,7 @@ public class SkillModService extends Service {
skillModAdjusters.put("expertise_innate_protection_kinetic", new SingleModAdjustFunction("kinetic"));
skillModAdjusters.put("expertise_innate_protection_energy", new SingleModAdjustFunction("energy"));
skillModAdjusters.put("expertise_saber_block", new SingleModAdjustFunction("display_only_parry", 100));
skillModAdjusters.put("expertise_glancing_blow_all", new SingleModAdjustFunction("display_only_glancing_blow", 100));
}
@Override