projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-12 04:13:07 -04:00
Code Issues Projects Releases Wiki Activity

Added PvP support

Browse Source
This commit is contained in:
Mads Boddum
2016-09-16 04:11:41 +02:00
parent 7935f6619a
commit 0c3ad8f4e0
4 changed files with 107 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/faction/FactionService.java
+19 -19
View File
@@ -36,6 +36,7 @@ import network.packets.swg.zone.UpdatePvpStatusMessage;
import network.packets.swg.zone.chat.ChatSystemMessage;
import network.packets.swg.zone.chat.ChatSystemMessage.SystemChatType;
import intents.FactionIntent;
import intents.PlayerEventIntent;
import resources.PvpFaction;
import resources.PvpFlag;
import resources.PvpStatus;
@@ -62,20 +63,8 @@ public final class FactionService extends Service {
@Override
public void onIntentReceived(Intent i) {
if(i instanceof FactionIntent) {
FactionIntent fi = (FactionIntent) i;
switch(fi.getUpdateType()) {
case FACTIONUPDATE:
handleTypeChange(fi);
break;
case STATUSUPDATE:
handleStatusChange(fi);
break;
case FLAGUPDATE:
handleFlagChange(fi.getTarget());
break;
}
switch(i.getType()) {
case FactionIntent.TYPE: handleFactionIntent((FactionIntent) i); break;
}
}
@@ -94,6 +83,20 @@ public final class FactionService extends Service {
return super.terminate() && success;
}
private void handleFactionIntent(FactionIntent i) {
switch (i.getUpdateType()) {
case FACTIONUPDATE:
handleTypeChange(i);
break;
case STATUSUPDATE:
handleStatusChange(i);
break;
case FLAGUPDATE:
handleFlagChange(i.getTarget());
break;
}
}
private void sendSystemMessage(TangibleObject target, String message) {
target.getOwner().sendPacket(new ChatSystemMessage(SystemChatType.SCREEN_AND_CHAT, message));
}
@@ -218,11 +221,8 @@ public final class FactionService extends Service {
private int getPvpBitmask(TangibleObject object1, TangibleObject object2) {
int pvpBitmask = 0;
// They CAN be enemies if they're not from the same faction and neither of them are neutral
if (object1.getPvpFaction() != object2.getPvpFaction() && object2.getPvpFaction() != PvpFaction.NEUTRAL) {
if (object1.getPvpStatus() == PvpStatus.SPECIALFORCES && object2.getPvpStatus() == PvpStatus.SPECIALFORCES) {
pvpBitmask |= PvpFlag.AGGRESSIVE.getBitmask() | PvpFlag.ATTACKABLE.getBitmask();
}
if(object1.isEnemy(object2)) {
pvpBitmask |= PvpFlag.AGGRESSIVE.getBitmask() | PvpFlag.ATTACKABLE.getBitmask();
}
return pvpBitmask;