projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Fixed static spawns, added travel terminal and collector spawns, fixed galaxy population status, added combat commands for every profession

Browse Source
This commit is contained in:
Light2
2013-08-31 17:34:30 +02:00
parent cfa5ea5a43
commit 471852dc3c
10 changed files with 1168 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+2 -11
View File
@@ -49,16 +49,7 @@ public class CombatService implements INetworkDispatch {
public CombatService(NGECore core) {
this.core = core;
core.commandService.registerCombatCommand("rangedshotrifle");
core.commandService.registerCombatCommand("rangedshotpistol");
core.commandService.registerCombatCommand("rangedshotlightrifle");
core.commandService.registerCombatCommand("rangedshot");
core.commandService.registerCombatCommand("meleehit");
core.commandService.registerCombatCommand("saberhit");
core.commandService.registerCombatCommand("fs_sweep_7");
core.commandService.registerCombatCommand("fs_dm_7");
core.commandService.registerCombatCommand("fs_dm_cc_6");
core.commandService.registerCombatCommand("fs_ae_dm_cc_6");
CombatCommands.registerCommands(core);
}
@Override
@@ -188,7 +179,7 @@ public class CombatService implements INetworkDispatch {
int armorAbsorbed = (int) (damageBeforeArmor - damage);
if(mitigationType == HitType.BLOCK) {
float blockValue = (attacker.getSkillMod("strength_modified").getBase() * attacker.getSkillMod("combat_block_value").getBase()) / 2 + 25;
float blockValue = (attacker.getSkillMod("strength_modified").getBase() + attacker.getSkillMod("combat_block_value").getBase()) / 2 + 25;
damage -= blockValue;
}