Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Content Update #1750

Merged
merged 3 commits into from
Jan 17, 2025
Merged

Content Update #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd88952
Added a sound when using shuttle
Undercova Jan 16, 2025
c4ba8be
Updated sounds for special cases when transferring items
Undercova Jan 16, 2025
abc1152
Updated travel sound
Undercova Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/com/projectswg/holocore/resources/gameplay/world/travel/TravelHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import com.projectswg.common.data.encodables.oob.StringId
import com.projectswg.common.data.location.Location
import com.projectswg.common.data.location.Terrain
import com.projectswg.common.network.packets.swg.zone.PlanetTravelPointListResponse.PlanetTravelPoint
import com.projectswg.common.network.packets.swg.zone.PlayClientEffectObjectMessage
import com.projectswg.common.network.packets.swg.zone.PlayMusicMessage
import com.projectswg.holocore.intents.support.global.chat.SystemMessageIntent
import com.projectswg.holocore.intents.support.objects.DestroyObjectIntent
import com.projectswg.holocore.intents.support.objects.ObjectCreatedIntent
Expand Down Expand Up @@ -176,6 +178,8 @@ class TravelHelper {
} else {
Log.i("%s/%s is traveling from %s to %s", player.username, traveler.objectName, nearestPoint.name, destinationPoint)
teleportAndDestroyTicket(destinationPoint, ticket, traveler)
val playClientEffectObjectMessage = PlayClientEffectObjectMessage("clienteffect/transport_hitground.cef", "", player.creatureObject.objectId, "")
player.creatureObject.sendObservers(playClientEffectObjectMessage)
}
}

Expand Down
36 changes: 20 additions & 16 deletions ...m/projectswg/holocore/resources/support/global/commands/callbacks/TransferItemCallback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class TransferItemCallback : ICmdCallback {
// There must always be a target for transfer
if (target == null) {
SystemMessageIntent(player, "@container_error_message:container29").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

Expand All @@ -61,7 +61,7 @@ class TransferItemCallback : ICmdCallback {
// You can't transfer your own creature
if (actor == target) {
SystemMessageIntent(player, "@container_error_message:container17").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

Expand All @@ -74,28 +74,28 @@ class TransferItemCallback : ICmdCallback {
// Lookup failed, their client gave us an object ID that isn't mapped to an object
if (newContainer == null || oldContainer == null) {
SystemMessageIntent(player, "@container_error_message:container15").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

// You can't add something to itself
if (target == newContainer) {
SystemMessageIntent(player, "@container_error_message:container02").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

// You can't move an object to a container that it's already inside
if (oldContainer === newContainer) {
SystemMessageIntent(player, "@container_error_message:container11").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

// A container can only be the child of another container if the other container has a larger volume
if (newContainer.containerType == 2 && target.containerType == 2 && target.maxContainerSize >= newContainer.maxContainerSize) {
SystemMessageIntent(player, "@container_error_message:container12").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

Expand All @@ -107,7 +107,7 @@ class TransferItemCallback : ICmdCallback {

if (specificSkillIsRequired && !actor.hasSkill(reqSkill)) {
SystemMessageIntent(player, "@error_message:insufficient_skill").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}
}
Expand All @@ -122,6 +122,7 @@ class TransferItemCallback : ICmdCallback {
if (lightsaberInventory != null) {
if (isMissingColorCrystal(lightsaberInventory)) {
broadcastPersonal(player, "@jedi_spam:lightsaber_no_color")
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}
}
Expand All @@ -134,14 +135,14 @@ class TransferItemCallback : ICmdCallback {
val requiredCommand = armorCategory.requiredCommand
if (!actor.hasCommand(requiredCommand)) {
SystemMessageIntent(player, "@error_message:insufficient_skill").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}
}
// Check the players level, if they're too low of a level, don't allow them to wear it
if (actor.level < target.requiredCombatLevel) {
SystemMessageIntent(player, "@base_player:level_too_low").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

Expand All @@ -161,16 +162,19 @@ class TransferItemCallback : ICmdCallback {

if (!isColorCrystal(target) && !isPowerCrystal(target)) {
broadcastPersonal(player, "@jedi_spam:saber_not_crystal")
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

if (!isTuned(target)) {
broadcastPersonal(player, "@jedi_spam:saber_crystal_not_tuned")
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

if (!isTunedByUs(actor, target)) {
broadcastPersonal(player, "@jedi_spam:saber_crystal_not_owner")
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}

Expand All @@ -188,6 +192,7 @@ class TransferItemCallback : ICmdCallback {
newContainerParent.elementalValue = baseWeaponMaxDamage * target.lightsaberColorCrystalDamagePercent / 100
} else {
broadcastPersonal(player, "@jedi_spam:saber_already_has_color")
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
return
}
}
Expand Down Expand Up @@ -225,28 +230,28 @@ class TransferItemCallback : ICmdCallback {

ContainerResult.CONTAINER_FULL -> {
SystemMessageIntent(player, "@container_error_message:container03").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_danger_message.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}

ContainerResult.NO_PERMISSION -> {
SystemMessageIntent(player, "@container_error_message:container08").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}

ContainerResult.SLOT_NO_EXIST -> {
SystemMessageIntent(player, "@container_error_message:container06").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}

ContainerResult.SLOT_OCCUPIED -> {
SystemMessageIntent(player, "@container_error_message:container04").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}
}
} catch (e: NumberFormatException) {
// Lookup failed, their client gave us an object ID that couldn't be parsed to a long
SystemMessageIntent(player, "@container_error_message:container15").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}
}

Expand Down Expand Up @@ -363,7 +368,7 @@ class TransferItemCallback : ICmdCallback {
companion object {
private fun sendNotEquippable(player: Player) {
SystemMessageIntent(player, "@base_player:cannot_use_item").broadcast()
player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
player.sendPacket(PlayMusicMessage(0, "sound/ui_dialog_warning.snd", 1, false))
}

private fun isSpeciesAllowedToWearItem(actor: CreatureObject, tangibleTarget: TangibleObject): Boolean {
Expand Down Expand Up @@ -394,7 +399,6 @@ class TransferItemCallback : ICmdCallback {
// The equipped weapon must now be set to the default weapon, which happens inside CreatureObject.setEquippedWeapon()
actor.equippedWeapon = null
}
actor.sendSelf(PlayMusicMessage(0, "sound/pl_all_draw_item.snd", 1, false))
}
}
}
Loading