diff --git a/src/resources/common/Forager.java b/src/resources/common/Forager.java index 000d8886..71874a78 100644 --- a/src/resources/common/Forager.java +++ b/src/resources/common/Forager.java @@ -29,6 +29,7 @@ import java.util.Vector; import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import main.NGECore; +import resources.datatables.DisplayType; import resources.datatables.Options; import resources.loot.LootGroup; import resources.objects.creature.CreatureObject; @@ -346,10 +347,10 @@ public class Forager { goon.setOptions(Options.ATTACKABLE, true); AIActor actor = (AIActor) goon.getAttachment("AI"); actor.addDefender(forager); - forager.sendSystemMessage("@foraging/forage_enemy:" + barkString,(byte) 0); - //OutOfBand oob = new OutOfBand(new ProsePackage("@foraging/forage_enemy",barkString)); - OutOfBand oob = new OutOfBand(new ProsePackage("@jawa_trader","cant_understand")); - forager.sendSystemMessage("@jawa_trader:cant_understand",(byte) 0); + forager.sendSystemMessage("@foraging/forage_enemy:" + barkString, DisplayType.Broadcast); + //OutOfBand oob = OutOfBand.ProsePackage("@foraging/forage_enemy:" + barkString)); + OutOfBand oob = OutOfBand.ProsePackage("@jawa_trader:cant_understand"); + forager.sendSystemMessage("@jawa_trader:cant_understand", DisplayType.Broadcast); NGECore.getInstance().chatService.spatialChat(goon, forager, "", (short)0x0, (short)0x0, 1, oob); } @@ -423,8 +424,8 @@ public class Forager { actor.addDefender(owner); barkString = "bark_"+map.getAttachment("MapSTFName"); - owner.sendSystemMessage("@treasure_map/treasure_map:" + barkString,(byte) 0); - OutOfBand oob = new OutOfBand(new ProsePackage("@treasure_map/treasure_map",barkString)); + owner.sendSystemMessage("@treasure_map/treasure_map:" + barkString, DisplayType.Broadcast); + OutOfBand oob = OutOfBand.ProsePackage("@treasure_map/treasure_map:" + barkString); NGECore.getInstance().chatService.spatialChat(guard, owner, "", (short)0x0, (short)0x0, 1, oob); return guard; } diff --git a/src/resources/objectives/BountyMissionObjective.java b/src/resources/objectives/BountyMissionObjective.java index 6c6dcff1..fa102f8f 100644 --- a/src/resources/objectives/BountyMissionObjective.java +++ b/src/resources/objectives/BountyMissionObjective.java @@ -37,7 +37,6 @@ import engine.resources.scene.Quaternion; import main.NGECore; import resources.common.BountyListItem; import resources.common.OutOfBand; -import resources.common.ProsePackage; import resources.common.SpawnPoint; import resources.datatables.DisplayType; import resources.objects.creature.CreatureObject; @@ -92,7 +91,7 @@ public class BountyMissionObjective extends MissionObjective { String message = "@mission/mission_bounty_informant:target_hard_" + Integer.toString(new Random().nextInt(4) + 1); - CommPlayerMessage comm = new CommPlayerMessage(player.getObjectId(), new OutOfBand(new ProsePackage(message))); + CommPlayerMessage comm = new CommPlayerMessage(player.getObjectId(), OutOfBand.ProsePackage(message)); comm.setTime(2000); switch (bountyTarget.getFaction()) { case "neutral": @@ -187,7 +186,7 @@ public class BountyMissionObjective extends MissionObjective { CreatureObject hunter = (CreatureObject) core.objectService.getObject(id); if (hunter != null) { - hunter.sendSystemMessage(new OutOfBand(new ProsePackage("@bounty_hunter:bounty_failed_hunter", "TT", getMissionObject().getGrandparent().getObjectId())), DisplayType.Broadcast); + hunter.sendSystemMessage(OutOfBand.ProsePackage("@bounty_hunter:bounty_failed_hunter", "TT", getMissionObject().getGrandparent().getObjectId()), DisplayType.Broadcast); hunter.getSlottedObject("datapad").viewChildren(hunter, true, false, new Traverser() { @Override public void process(SWGObject item) { diff --git a/src/resources/objectives/DeliveryMissionObjective.java b/src/resources/objectives/DeliveryMissionObjective.java index 7d5f029b..96f9b583 100644 --- a/src/resources/objectives/DeliveryMissionObjective.java +++ b/src/resources/objectives/DeliveryMissionObjective.java @@ -24,7 +24,7 @@ package resources.objectives; import engine.resources.scene.Point3D; import main.NGECore; import resources.common.OutOfBand; -import resources.common.ProsePackage; +import resources.datatables.DisplayType; import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import resources.objects.tangible.TangibleObject; @@ -103,7 +103,7 @@ public class DeliveryMissionObjective extends MissionObjective { player.addBankCredits(reward); - player.sendSystemMessage(new OutOfBand(new ProsePackage("@mission/mission_generic:success_w_amount", reward)), (byte) 0); + player.sendSystemMessage(OutOfBand.ProsePackage("@mission/mission_generic:success_w_amount", reward), DisplayType.Broadcast); abort(core, player); diff --git a/src/services/bazaar/BazaarService.java b/src/services/bazaar/BazaarService.java index dfd59f9f..75f3e3f4 100644 --- a/src/services/bazaar/BazaarService.java +++ b/src/services/bazaar/BazaarService.java @@ -39,6 +39,7 @@ import engine.resources.service.INetworkRemoteEvent; import resources.common.Opcodes; import resources.common.OutOfBand; import resources.common.ProsePackage; +import resources.datatables.DisplayType; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.intangible.IntangibleObject; @@ -674,14 +675,12 @@ public class BazaarService implements INetworkDispatch { core.objectService.destroyObject(item); if(vendor.getTemplate().contains("terminal_bazaar")) { - ProsePackage prose = new ProsePackage("base_player", "sale_fee"); int salesFee = SALES_FEE; if(premium) salesFee *= 5; player.setBankCredits(player.getBankCredits() - salesFee); - prose.setDiInteger(salesFee); - player.sendSystemMessage(new OutOfBand(prose), (byte) 0); + player.sendSystemMessage(OutOfBand.ProsePackage("@base_player:sale_fee", salesFee), DisplayType.Broadcast); } if(auction) { diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 0db0d0e2..d73f7eff 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -44,7 +44,6 @@ import resources.buffs.Buff; import resources.buffs.DamageOverTime; import resources.common.FileUtilities; import resources.common.OutOfBand; -import resources.common.ProsePackage; import resources.datatables.DisplayType; import resources.datatables.Options; import resources.datatables.Elemental; @@ -827,9 +826,9 @@ public class CombatService implements INetworkDispatch { target.setIncapTask(incapTask); core.buffService.addBuffToCreature(target, "incapWeaken", target); if(target.getSlottedObject("ghost") != null && attacker.getSlottedObject("ghost") != null) { - target.sendSystemMessage(new OutOfBand(new ProsePackage("base_player", "prose_victim_incap", attacker.getCustomName())), (byte) 0); - attacker.sendSystemMessage(new OutOfBand(new ProsePackage("base_player", "prose_target_incap", target.getCustomName())), (byte) 0); - } else {target.sendSystemMessage(new OutOfBand(new ProsePackage("base_player", "prose_victim_incap", "@" + attacker.getStfFilename() + ":" + attacker.getStfName())), (byte) 0); } + target.sendSystemMessage(OutOfBand.ProsePackage("@base_player:prose_victim_incap", "TT", attacker.getCustomName()), DisplayType.Broadcast); + attacker.sendSystemMessage(OutOfBand.ProsePackage("@base_player:prose_target_incap", "TT", target.getCustomName()), DisplayType.Broadcast); + } else {target.sendSystemMessage(OutOfBand.ProsePackage("@base_player:prose_victim_incap", "TT", "@" + attacker.getStfFilename() + ":" + attacker.getStfName()), DisplayType.Broadcast); } return; } else if(target.getHealth() - damage <= 0 && target.getAttachment("AI") != null) { synchronized(target.getMutex()) { @@ -1020,14 +1019,9 @@ public class CombatService implements INetworkDispatch { if (mission != null && mission.getBountyMarkId() == target.getObjectID()) { - ProsePackage attackerPp = new ProsePackage("bounty_hunter", "bounty_success_hunter", target.getCustomName()); - attackerPp.setToCustomString("his"); // TODO: Genders - attackerPp.setDiInteger(mission.getCreditReward()); - attacker.sendSystemMessage(new OutOfBand(attackerPp), DisplayType.Broadcast); + attacker.sendSystemMessage(OutOfBand.ProsePackage("@bounty_hunter:bounty_success_hunter", mission.getCreditReward(), "TT", target.getCustomName(), "TO", target.getObjectID()), DisplayType.Broadcast); - ProsePackage targetPp = new ProsePackage ("bounty_hunter", "bounty_success_hunter", attacker.getCustomName()); - targetPp.setDiInteger(mission.getCreditReward()); - target.sendSystemMessage(new OutOfBand(targetPp), DisplayType.Broadcast); + target.sendSystemMessage(OutOfBand.ProsePackage("@bounty_hunter:bounty_success_hunter", mission.getCreditReward(), "TT", attacker.getCustomName()), DisplayType.Broadcast); core.missionService.handleMissionComplete(attacker, mission); } @@ -1038,13 +1032,9 @@ public class CombatService implements INetworkDispatch { if (mission != null && mission.getBountyMarkId() == attacker.getObjectID()) { - ProsePackage attackerPp = new ProsePackage("bounty_hunter", "bounty_failed_target", target.getCustomName()); - attackerPp.setToCustomString("his"); // TODO: Genders - attackerPp.setDiInteger(mission.getCreditReward()); - attacker.sendSystemMessage(new OutOfBand(attackerPp), DisplayType.Broadcast); + attacker.sendSystemMessage(OutOfBand.ProsePackage("@bounty_hunter:bounty_failed_target", mission.getCreditReward(), "TT", target.getCustomName(), "TO", target.getObjectID()), DisplayType.Broadcast); - ProsePackage targetPp = new ProsePackage ("bounty_hunter", "bounty_failed_hunter", attacker.getCustomName()); - target.sendSystemMessage(new OutOfBand(targetPp), DisplayType.Broadcast); + target.sendSystemMessage(OutOfBand.ProsePackage("@bounty_hunter:bounty_failed_hunter", "TT", attacker.getCustomName()), DisplayType.Broadcast); core.missionService.handleMissionAbort(target, mission); } @@ -1064,9 +1054,9 @@ public class CombatService implements INetworkDispatch { target.setTurnRadius(0); if (attacker.getSlottedObject("ghost") != null) - target.sendSystemMessage(new OutOfBand(new ProsePackage("base_player", "prose_victim_dead", attacker.getCustomName())), (byte) 0); + target.sendSystemMessage(OutOfBand.ProsePackage("@base_player:prose_victim_dead", "TT", attacker.getCustomName()), DisplayType.Broadcast); else - target.sendSystemMessage(new OutOfBand(new ProsePackage("base_player", "prose_victim_dead", "@" + attacker.getStfFilename() + ":" + attacker.getStfName())), (byte) 0); + target.sendSystemMessage(OutOfBand.ProsePackage("@base_player:prose_victim_dead", "TT", "@" + attacker.getStfFilename() + ":" + attacker.getStfName()), DisplayType.Broadcast); core.playerService.sendCloningWindow(target, attacker.getSlottedObject("ghost") != null); }