projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-08-27 16:56:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge holocore/quality_assurance into quality_assurance

Browse Source 
Conflicts:
	cfg/nge.cfg
	src/services/commands/CommandService.java
This commit is contained in:
Mads Boddum
2016-10-14 16:21:14 +02:00
parent 545aaf53be f2535603f1
commit ecd99ef33b
23 changed files with 510 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatManager.java
+89 -9
View File
@@ -41,7 +41,10 @@ import network.packets.swg.zone.object_controller.ShowFlyText.Scale;
import network.packets.swg.zone.object_controller.combat.CombatAction;
import intents.chat.ChatCommandIntent;
import intents.combat.CreatureKilledIntent;
import intents.combat.DeathblowIntent;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.Future;
import resources.Posture;
import resources.PvpFaction;
import resources.PvpFlag;
@@ -69,17 +72,25 @@ public class CombatManager extends Manager {
private final Map<Long, CombatCreature> inCombat;
private final Set<CreatureObject> regeneratingHealthCreatures; // Only allowed outside of combat
private final Set<CreatureObject> regeneratingActionCreatures; // Always allowed
private final Map<CreatureObject, Future<?>> incapacitatedCreatures;
private final Random random;
private final CorpseService corpseService;
private final CombatXpService combatXpService;
private ScheduledExecutorService executor;
public CombatManager() {
registerForIntent(DeathblowIntent.TYPE);
inCombat = new HashMap<>();
regeneratingHealthCreatures = new HashSet<>();
regeneratingActionCreatures = new HashSet<>();
incapacitatedCreatures = new HashMap<>();
random = new Random();
corpseService = new CorpseService();
combatXpService = new CombatXpService();
addChildService(corpseService);
addChildService(combatXpService);
}
@Override
@@ -111,8 +122,10 @@ public class CombatManager extends Manager {
@Override
public void onIntentReceived(Intent i) {
if (i instanceof ChatCommandIntent)
processChatCommand((ChatCommandIntent) i);
switch(i.getType()) {
case ChatCommandIntent.TYPE: processChatCommand((ChatCommandIntent) i); break;
case DeathblowIntent.TYPE: procesDeathblow((DeathblowIntent) i); break;
}
}
private void periodicChecks() {
@@ -254,7 +267,9 @@ public class CombatManager extends Manager {
enterCombat(target);
target.addDefender(source);
source.addDefender(target);
// Note: This will not kill anyone
addWeaponDamage(source, command, info);
if (target.getHealth() <= info.getDamage())
doCreatureDeath(target, source);
else
@@ -320,7 +335,7 @@ public class CombatManager extends Manager {
incapacitatePlayer(killedCreature);
} else {
// This is just a plain ol' NPC. Die!
killCreature(killedCreature);
killCreature(killer, killedCreature);
}
exitCombat(killedCreature);
@@ -334,7 +349,16 @@ public class CombatManager extends Manager {
Log.i(this, "%s was incapacitated", incapacitatedPlayer);
// Once the incapacitation counter expires, revive them.
executor.schedule(() -> reviveCreature(incapacitatedPlayer), incapacitationCounter, TimeUnit.SECONDS);
synchronized(incapacitatedCreatures) {
incapacitatedCreatures.put(incapacitatedPlayer, executor.schedule(() -> expireIncapacitation(incapacitatedPlayer), incapacitationCounter, TimeUnit.SECONDS));
}
}
private void expireIncapacitation(CreatureObject incapacitatedPlayer) {
synchronized(incapacitatedCreatures) {
incapacitatedCreatures.remove(incapacitatedPlayer);
reviveCreature(incapacitatedPlayer);
}
}
private void reviveCreature(CreatureObject revivedCreature) {
@@ -360,10 +384,45 @@ public class CombatManager extends Manager {
Log.i(this, "% was revived", revivedCreature);
}
private void killCreature(CreatureObject killedCreature) {
killedCreature.setPosture(Posture.DEAD);
Log.i(this, "%s was killed", killedCreature);
new CreatureKilledIntent(killedCreature).broadcast();
private void killCreature(CreatureObject killer, CreatureObject corpse) {
corpse.setPosture(Posture.DEAD);
Log.i(this, "%s was killed", corpse);
new CreatureKilledIntent(killer, corpse).broadcast();
}
private void procesDeathblow(DeathblowIntent i) {
CreatureObject killer = i.getKiller();
CreatureObject corpse = i.getCorpse();
// Only deathblowing players is allowed!
if (!corpse.isPlayer()) {
return;
}
// They must be enemies
if (!corpse.isEnemy(killer)) {
return;
}
// The target of the deathblow must be incapacitated!
if (corpse.getPosture() != Posture.INCAPACITATED) {
return;
}
// If they're deathblown while incapacitated, their incapacitation expiration timer should cancel
synchronized (incapacitatedCreatures) {
Future<?> incapacitationTimer = incapacitatedCreatures.remove(corpse);
if (incapacitationTimer != null) {
if (incapacitationTimer.cancel(false)) { // If the task is running, let them get back up
killCreature(killer, corpse);
Log.i(this, "%s was deathblown by %s", corpse, killer);
}
} else {
// Can't happen with the current code, but in case it's ever refactored...
Log.e(this, "Incapacitation timer for player %s being deathblown unexpectedly didn't exist!", "");
}
}
}
private boolean handleStatus(CreatureObject source, CombatStatus status) {
@@ -396,6 +455,16 @@ public class CombatManager extends Manager {
} else if ((tangibleTarget.getPvpFlags() & PvpFlag.ATTACKABLE.getBitmask()) == 0)
return CombatStatus.INVALID_TARGET;
if(target instanceof CreatureObject) {
CreatureObject creature = (CreatureObject) target;
switch(creature.getPosture()) {
case DEAD:
case INCAPACITATED:
return CombatStatus.INVALID_TARGET;
}
}
CombatStatus status;
switch (c.getAttackType()) {
case AREA:
@@ -432,6 +501,17 @@ public class CombatManager extends Manager {
return CombatStatus.SUCCESS;
}
private void addWeaponDamage(CreatureObject source, CombatCommand command, AttackInfoLight info) {
int abilityDamage = info.getDamage();
WeaponObject weapon = source.getEquippedWeapon();
int minDamage = weapon.getMinDamage();
int weaponDamage = random.nextInt((weapon.getMaxDamage() - minDamage) + 1) + minDamage;
weaponDamage *= command.getPercentAddFromWeapon();
info.setDamage(abilityDamage + weaponDamage);
}
private void showFlyText(TangibleObject obj, String text, Scale scale, Color c, ShowFlyText.Flag ... flags) {
obj.sendSelf(new ShowFlyText(obj.getObjectId(), text, scale, new RGB(c), flags));
}