projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Added effects for medic Bacta Bomb and Bacta Grenade

Browse Source
This commit is contained in:
Ziggy
2020-03-29 12:02:18 +02:00
parent 7571fdc852
commit ae5af75ab2
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pswgcommon
+1 -1
Submodule pswgcommon updated: abffe06102...dc734c6556
src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandHeal.java
+17 -1
View File
@@ -35,6 +35,8 @@ import com.projectswg.common.data.encodables.oob.OutOfBandPackage;
import com.projectswg.common.data.encodables.oob.ProsePackage;
import com.projectswg.common.data.encodables.oob.StringId;
import com.projectswg.common.data.location.Location;
import com.projectswg.common.network.packets.SWGPacket;
import com.projectswg.common.network.packets.swg.zone.PlayClientEffectLocMessage;
import com.projectswg.common.network.packets.swg.zone.PlayClientEffectObjectMessage;
import com.projectswg.common.network.packets.swg.zone.object_controller.ShowFlyText;
import com.projectswg.common.network.packets.swg.zone.object_controller.ShowFlyText.Scale;
@@ -157,7 +159,21 @@ enum CombatCommandHeal implements CombatCommandHitType {
OutOfBandPackage oobp = new OutOfBandPackage(new ProsePackage("StringId", new StringId("healing", "heal_fly"), "DI", difference, "TO", attribName));
ShowFlyText flyText = new ShowFlyText(healed.getObjectId(), oobp, Scale.MEDIUM, new RGB(46, 139, 87), ShowFlyText.Flag.IS_HEAL);
PlayClientEffectObjectMessage effect = new PlayClientEffectObjectMessage("appearance/pt_heal.prt", "root", healed.getObjectId(), "");
String commandName = combatCommand.getName();
SWGPacket effect;
if (commandName.startsWith("me_bacta_bomb_")) {
SWGObject healedParent = healed.getParent();
long cellId = healedParent != null ? healedParent.getObjectId() : 0;
effect = new PlayClientEffectLocMessage("clienteffect/bacta_bomb.cef", healed.getTerrain(), healed.getLocation().getPosition(), cellId, 0, "");
} else if (commandName.startsWith("me_bacta_grenade_")) {
SWGObject healedParent = healed.getParent();
long cellId = healedParent != null ? healedParent.getObjectId() : 0;
effect = new PlayClientEffectLocMessage("clienteffect/bacta_grenade.cef", healed.getTerrain(), healed.getLocation().getPosition(), cellId, 0, "");
} else {
effect = new PlayClientEffectObjectMessage("appearance/pt_heal.prt", "root", healed.getObjectId(), "");
}
// TODO doesn't look like a heal in the combat log