Releasing a ghost pet will destroy it, with no chance of recovery. Do you wish to continue?
+
+ myGump.AddXMFHTMLGump(55, 90, 75, 20, 1011011, false, false ); // CONTINUE
+ myGump.AddButton( 20, 90, 0xFA5, 0xFA7, 1, 0, 1 );
+
+ myGump.AddXMFHTMLGump(170, 90, 75, 20, 1011012, false, false ); // CANCEL
+ myGump.AddButton( 135, 90, 0xFA5, 0xFA7, 1, 0, 0 );
+ myGump.Send( pUser );
+ myGump.Free();
+
+ pUser.SetTempTag( "petSerial", pet.serial );
+ return false;
+ }
+ return true;
+}
+
+function onDropItemOnNpc( pDropper, pPet, iFood )
+{
+ if( pPet.GetTag( "isPetDead" ) == true )
+ {
+ iFood.Refresh()
+ return 0;
+ }
+
+ if( enablePetBondingViaFood && !pPet.GetTag( "bondingStarted" ))
+ {
+ StartBonding( pDropper, pPet );
+ }
+ iFood.Refresh()
+ return 1;
+}
+
+function StartBonding( pUser, pPet )
+{
+ if( !enablePetBondingViaFood )
+ {
+ return;
+ }
+ else
+ {
+ var tameSkillRequired = pPet.skillToTame;
+ var pUserTameSkill = pUser.baseskills.animaltaming;
+
+ if( tameSkillRequired <= 291 || pUserTameSkill >= tameSkillRequired )
+ {
+ if( !pPet.GetTag( "bondingStarted" ))
+ {
+ pPet.SetTag( "bondingStarted", true );
+ pPet.SetTag( "bondingPlayer", pUser.serial );
+
+ var bondingDelay = 604800000; // 7 days in milliseconds
+ pPet.StartTimer( bondingDelay, 42, 3107 );
+ }
+ }
+ else
+ {
+ pUser.socket.SysMessage( GetDictionaryEntry( 19313, pUser.socket.language ));// Your pet cannot form a bond with you until your animal taming ability has risen.
+ }
+ }
+}
+
+function onTimer( timerObj, timerID )
+{
+ if( timerID == 32 )
+ {
+ if( !timerObj.GetTag( "isPetDead" ))
+ {// Pet has been resurrected, stop checking.
+ return;
+ }
+
+ var petOwner = timerObj.owner;
+ if( !ValidateObject( petOwner ))
+ {
+ timerObj.Delete();
+ return;
+ }
+
+ var playTimeAtDeath = parseInt( timerObj.GetTag( "playTimeAtDeath" ));
+ var currentPlayTime = petOwner.playTime;
+ var hoursPlayedSinceDeath = ( currentPlayTime - playTimeAtDeath ) / 60;
+
+ if( hoursPlayedSinceDeath >= 24 ) // 24 hours of playtime since death
+ {
+ petOwner.RemoveFollower( timerObj );
+ petOwner.controlSlotsUsed = Math.max( 0, petOwner.controlSlotsUsed - timerObj.controlSlots );
+
+ Console.Log(
+ "Pet [" + timerObj.name + "] (Serial: " + timerObj.serial.toString() +
+ ") owned by " + petOwner.name + " (Serial: " + petOwner.serial.toString() +
+ ") was auto-deleted after 24 hours of active character playtime without resurrection." );
+
+ timerObj.Delete();
+ }
+ else
+ {
+ // Recheck again in 30 minutes
+ timerObj.StartTimer( 30 * 60 * 1000, 32, 3107 );
+ }
+ }
+ if( timerID == 33 )
+ {
+ // Fallback: force delete if pet is still dead after 7 real days
+ if( !timerObj.GetTag( "isPetDead" ))
+ return;
+
+ var petOwner = timerObj.owner;
+ if( ValidateObject( petOwner ))
+ {
+ petOwner.RemoveFollower( timerObj );
+ petOwner.controlSlotsUsed = Math.max( 0, petOwner.controlSlotsUsed - timerObj.controlSlots );
+ }
+
+ Console.Log(
+ "Pet [" + timerObj.name + "] (Serial: " + timerObj.serial.toString() +
+ ") was force-deleted after 7 days of inactivity." );
+
+ timerObj.Delete();
+ }
+ if( timerID == 42 )
+ {
+ timerObj.SetTag( "isBondedPet", true );
+ timerObj.Refresh();
+
+ var ownerSerial = timerObj.GetTag( "bondingPlayer" );
+ if( ownerSerial )
+ {
+ var owner = CalcCharFromSer( ownerSerial );
+ if (ValidateObject( owner ))
+ {
+ owner.socket.SysMessage( GetDictionaryEntry( 19308, owner.socket.language )); // Your pet has bonded with you!
+ }
+ }
+ timerObj.SetTag( "bondingStarted", null );
+ timerObj.SetTag( "bondingPlayer", null );
+ }
+}
+
+function onGumpPress( pSock, pButton, gumpData )
+{
+ var pUser = pSock.currentChar;
+ var petSerial = CalcCharFromSer( pUser.GetTempTag( "petSerial" ));
+ if( pButton == 1 )
+ {
+ // Remove pet as an active follower
+ pUser.RemoveFollower( petSerial );
+ // Reduce control slots in use for player by amount occupied by pet that was stabled
+ pUser.controlSlotsUsed = Math.max( 0, pUser.controlSlotsUsed - petSerial.controlSlots );
+ Console.Log( pUser.name + " (Serial: " + pUser.serial.toString() + ") released dead pet [" + petSerial.name + "] (Serial: " + petSerial.serial.toString() + ")" );
+ petSerial.Delete();
+ }
+}
+
+function _restorecontext_() {}
\ No newline at end of file
diff --git a/data/js/npc/pets/static_horse.js b/data/js/npc/pets/static_horse.js
index 1d165e9ef..8e565c1eb 100644
--- a/data/js/npc/pets/static_horse.js
+++ b/data/js/npc/pets/static_horse.js
@@ -6,6 +6,7 @@ var maxControlSlots = GetServerSetting( "MaxControlSlots" );
// maxFollowers only comes into play if maxControlSlots is set to 0 in UOX.INI
var maxFollowers = GetServerSetting( "MaxFollowers" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
// Runs before purchase is validated by server
function onBuyFromVendor( pSock, vendor, iBought, numItemsBought )
@@ -82,6 +83,12 @@ function onUseChecked( pUser, iUsed )
// make pet follow owner by default
nSpawned.Follow( pUser );
+ if( petBondingEnabled > 0 )
+ {
+ nSpawned.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, nSpawned );
+ }
+
// make a sound
pUser.SoundEffect( 0x0215, true );
diff --git a/data/js/npc/pets/static_llama.js b/data/js/npc/pets/static_llama.js
index 50270bd41..747c72a11 100644
--- a/data/js/npc/pets/static_llama.js
+++ b/data/js/npc/pets/static_llama.js
@@ -6,6 +6,7 @@ var maxControlSlots = GetServerSetting( "MaxControlSlots" );
// maxFollowers only comes into play if maxControlSlots is set to 0 in UOX.INI
var maxFollowers = GetServerSetting( "MaxFollowers" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
// Runs before purchase is validated by server
function onBuyFromVendor( pSock, vendor, iBought, numItemsBought )
@@ -65,6 +66,12 @@ function onUseChecked( pUser, iUsed )
// make pet follow owner by default
nSpawned.Follow( pUser );
+ if( petBondingEnabled > 0 )
+ {
+ nSpawned.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, nSpawned );
+ }
+
// make a sound
pUser.SoundEffect( 0x0215, true );
diff --git a/data/js/npc/pets/static_ostard.js b/data/js/npc/pets/static_ostard.js
index a5753b9be..d0772e465 100644
--- a/data/js/npc/pets/static_ostard.js
+++ b/data/js/npc/pets/static_ostard.js
@@ -6,6 +6,7 @@ var maxControlSlots = GetServerSetting( "MaxControlSlots" );
// maxFollowers only comes into play if maxControlSlots is set to 0 in UOX.INI
var maxFollowers = GetServerSetting( "MaxFollowers" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
// Runs before purchase is validated by server
function onBuyFromVendor( pSock, vendor, iBought, numItemsBought )
@@ -97,6 +98,12 @@ function onUseChecked( pUser, iUsed )
// make pet follow owner by default
nSpawned.Follow( pUser );
+
+ if( petBondingEnabled > 0 )
+ {
+ nSpawned.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, nSpawned );
+ }
// make a sound
pUser.SoundEffect( 0x0215, true );
diff --git a/data/js/npc/pets/static_packhorse.js b/data/js/npc/pets/static_packhorse.js
index 1b5ef0498..feb7336aa 100644
--- a/data/js/npc/pets/static_packhorse.js
+++ b/data/js/npc/pets/static_packhorse.js
@@ -6,6 +6,7 @@ var maxControlSlots = GetServerSetting( "MaxControlSlots" );
// maxFollowers only comes into play if maxControlSlots is set to 0 in UOX.INI
var maxFollowers = GetServerSetting( "MaxFollowers" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
// Runs before purchase is validated by server
function onBuyFromVendor( pSock, vendor, iBought, numItemsBought )
@@ -64,6 +65,12 @@ function onUseChecked( pUser, iUsed )
// make pet follow owner by default
nSpawned.Follow( pUser );
+
+ if( petBondingEnabled > 0 )
+ {
+ nSpawned.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, nSpawned );
+ }
// make a sound
pUser.SoundEffect( 0x0215, true );
diff --git a/data/js/npc/pets/static_packllama.js b/data/js/npc/pets/static_packllama.js
index 36cea89de..754d4777a 100644
--- a/data/js/npc/pets/static_packllama.js
+++ b/data/js/npc/pets/static_packllama.js
@@ -7,6 +7,8 @@ var maxControlSlots = GetServerSetting( "MaxControlSlots" );
// maxFollowers only comes into play if maxControlSlots is set to 0 in UOX.INI
var maxFollowers = GetServerSetting( "MaxFollowers" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
+
// Runs before purchase is validated by server
function onBuyFromVendor( pSock, vendor, iBought, numItemsBought )
{
@@ -64,6 +66,12 @@ function onUseChecked( pUser, iUsed )
// make pet follow owner by default
nSpawned.Follow( pUser );
+
+ if( petBondingEnabled > 0 )
+ {
+ nSpawned.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, nSpawned );
+ }
// make a sound
pUser.SoundEffect( 0x0215, true );
diff --git a/data/js/server/network/0xbf_sendnpcghostmode.js b/data/js/server/network/0xbf_sendnpcghostmode.js
new file mode 100644
index 000000000..3d877a60c
--- /dev/null
+++ b/data/js/server/network/0xbf_sendnpcghostmode.js
@@ -0,0 +1,17 @@
+// Sends a packet to toggle ghost mode appearance for an NPC on the client.
+// Typically used to make dead pets or NPCs appear as transparent ghosts without affecting game logic.
+function SendNpcGhostMode( pSock, unknownFlag, petSerial, ghostFlag )
+{
+ var pkt = new Packet(); // Create a new packet
+ pkt.ReserveSize( 11 ); // Reserve 11 bytes of space
+
+ pkt.WriteByte( 0, 0xBF ); // Packet ID: Extended command
+ pkt.WriteShort( 1, 11 ); // Total packet length
+ pkt.WriteShort( 3, 0x19 ); // Subcommand: 0x19 (SendNpcGhostMode)
+ pkt.WriteByte( 5, unknownFlag ); // Unknown/extra flag (often 0)
+ pkt.WriteLong( 6, petSerial ); // Pet serial
+ pkt.WriteByte( 10, ghostFlag ); // Ghost flag (1 = Ghost, 0 = not Ghost)
+
+ pSock.Send( pkt ); // Send packet to client
+ pkt.Free(); // Free memory
+}
\ No newline at end of file
diff --git a/data/js/skill/healing.js b/data/js/skill/healing.js
index d605b3b51..03387f29e 100644
--- a/data/js/skill/healing.js
+++ b/data/js/skill/healing.js
@@ -185,40 +185,89 @@ function onCallback1( socket, ourObj )
let healTimer = 0;
let healTimerID = -1;
let anatSkill = mChar.skills.anatomy;
+ let loreSkill = mChar.skills.animallore;
let triggerBonusCure = false;
let affectedByMortalStrike = ourObj.GetTempTag( "blockHeal" );
- if( ourObj.dead ) // Resurrection
+ if( ourObj.dead || ourObj.GetTag( "isPetDead" )) // Resurrection
{
if( ourObj.region.id == 42 ) // Khaldun, resurrection not allowed
{
socket.SysMessage( "The veil of death in this area is too strong and resists thy efforts to restore life." );
return;
}
- else if( healSkill >= 800 && anatSkill >= 800 )
+ else if( ourObj.GetTag( "isBondedPet" ))
{
- // Resurrecting takes between 8 - 10 seconds depending on dexterity
- if( coreShardEra >= EraStringToNum( "uor" ))
+ // Resurrection of bonded pet
+ // Must have at least 80.0 Vet and 80.0 Lore
+ if( healSkill >= 800 && loreSkill >= 800 )
{
- // UOR introduced dexterity as a modifier for healing timer
- healTimer = 10000 - (( mChar.dexterity / 50 ) * 1000 );
- }
- else// if( coreShardEra >= EraStringToNum( "t2a" ))
- {
- // T2A (Publish May 25, 1999), resurrecting "now" takes 10 seconds flat
- healTimer = 10000;
+ let isOwner = ourObj.owner;
+ let isFriend = false;
+ let friendList = ourObj.GetFriendList();
+
+ for( let i = 0; i < friendList.length; i++ )
+ {
+ if( ValidateObject( friendList[i] ) && friendList[i] == mChar )
+ {
+ isFriend = true;
+ break;
+ }
+ }
+ if( isOwner || isFriend )
+ {
+ // Resurrecting takes between 8 - 10 seconds depending on dexterity
+ if( coreShardEra >= EraStringToNum( "uor" ))
+ {
+ // UOR introduced dexterity as a modifier for healing timer
+ healTimer = 10000 - (( mChar.dexterity / 50 ) * 1000 );
+ }
+ else// if( coreShardEra >= EraStringToNum( "t2a" ))
+ {
+ // T2A (Publish May 25, 1999), resurrecting "now" takes 10 seconds flat
+ healTimer = 10000;
+ }
+
+ healTimerID = 0; // Resurrect
+ }
+ else
+ {
+ socket.SysMessage( GetDictionaryEntry( 19304, socket.language ));// Only pets bonded with their owner can be resurrected..
+ }
}
- /*else
+ else
{
- // Did original UO have a different resurrect timer than T2A?
- // ???
- }*/
-
- healTimerID = 0; // Resurrect
+ socket.SysMessage( GetDictionaryEntry( 19303, socket.language ));// You are not skilled enough to resurrect that pet.
+ return;
+ }
}
else
{
- socket.SysMessage( GetDictionaryEntry( 1493, socket.language )); // You are not skilled enough to resurrect.
- return;
+ if( healSkill >= 800 && anatSkill >= 800 )
+ {
+ // Resurrecting takes between 8 - 10 seconds depending on dexterity
+ if( coreShardEra >= EraStringToNum( "uor" ))
+ {
+ // UOR introduced dexterity as a modifier for healing timer
+ healTimer = 10000 - (( mChar.dexterity / 50 ) * 1000 );
+ }
+ else// if( coreShardEra >= EraStringToNum( "t2a" ))
+ {
+ // T2A (Publish May 25, 1999), resurrecting "now" takes 10 seconds flat
+ healTimer = 10000;
+ }
+ /*else
+ {
+ // Did original UO have a different resurrect timer than T2A?
+ // ???
+ }*/
+
+ healTimerID = 0; // Resurrect
+ }
+ else
+ {
+ socket.SysMessage( GetDictionaryEntry( 1493, socket.language )); // You are not skilled enough to resurrect.
+ return;
+ }
}
}
else if( ourObj.poison > 0 || ourObj.GetTempTag( "doBleed" )) // Cure Poison/Bleed
@@ -576,7 +625,7 @@ function onTimer( mChar, timerID )
switch ( timerID )
{
case 0: // Resurrect
- if( !ourObj.dead )
+ if( !ourObj.dead && !ourObj.GetTag( "isPetDead" ) )
{
socket.SysMessage( GetDictionaryEntry( 9085, socket.language )); // The target is not dead.
break;
@@ -610,8 +659,25 @@ function onTimer( mChar, timerID )
}
else
{
+ if( ourObj.GetTag( "isPetDead" ))
+ {
+ var now = GetCurrentClock();
+ var deathTime = parseInt( ourObj.GetTempTag( "bondedPetDeathTime" )) || 0;
+ var waitTime = 10 * 60 * 1000; // 10 minutes in ms
+
+ if(( now - deathTime ) < waitTime)
+ {
+ socket.SysMessage( GetDictionaryEntry( 19340, pSock.language )); // That creatures spirit lacks cohesion. Try again in a few minutes.
+ return;
+ }
- if( coreShardEra >= EraStringToNum( "aos" ))
+ ResurrectBondedPet( socket, ourObj );
+ ourObj.StaticEffect( 0x376A, 10, 16 );
+ ourObj.SoundEffect( 0x214, true );
+ socket.SysMessage( GetDictionaryEntry( 19306, socket.language )); // You successfully resurrected the pet!
+ resResult = 1;
+ }
+ else if( coreShardEra >= EraStringToNum( "aos" ))
{
ourObj.frozen = true;
ourObj.SetTempTag( "ResurrectingHealer", mChar.serial.toString() );
@@ -903,6 +969,22 @@ function onTimer( mChar, timerID )
}
}
+function ResurrectBondedPet( socket, deadPet )
+{
+ var petsAI = deadPet.GetTag( "PetAI" );
+ var petsHue = deadPet.GetTag( "PetHue" );
+
+ TriggerEvent( 3108, "SendNpcGhostMode", socket, 0, deadPet.serial, 0 );
+ deadPet.StaticEffect( 0x376A, 10, 16 );
+ deadPet.SoundEffect( 0x214, true );
+ deadPet.aitype = petsAI;
+ deadPet.colour = petsHue;
+ deadPet.target = null;
+ deadPet.atWar = false;
+ deadPet.attacker = null;
+ deadPet.SetTag( "isPetDead", false );
+}
+
function onGumpPress( socket, pButton, gumpData )
{
var resurrectTarg = socket.currentChar;
diff --git a/data/js/skill/taming.js b/data/js/skill/taming.js
index 2b4341bb1..b2298a284 100644
--- a/data/js/skill/taming.js
+++ b/data/js/skill/taming.js
@@ -10,6 +10,7 @@ const maxFollowers = GetServerSetting( "MaxFollowers" );
const maxPetOwners = GetServerSetting( "MaxPetOwners" );
const maxTimesTamed = 5; // The maximum number of times a pet can be tamed (by different players)
const checkPetControlDifficulty = GetServerSetting( "CheckPetControlDifficulty" );
+const petBondingEnabled = GetServerSetting( "PetBondingEnabled" );
function onSkill( pUser, objType, skillUsed )
{
@@ -179,6 +180,11 @@ function CheckTameSuccess( pUser, toTame )
toTame.aitype = 0;
toTame.tamed = true;
toTame.loyalty = 25; // start at 25 out of 100
+ if( petBondingEnabled )
+ {
+ toTame.AddScriptTrigger( 3107 );//Add bonding script trigger
+ TriggerEvent( 3107, "StartBonding", pUser, toTame );
+ }
var hasBeenOwner = toTame.HasBeenOwner( pUser );
if( checkPetControlDifficulty && hasBeenOwner )
diff --git a/data/uox.ini b/data/uox.ini
index fbb956dbb..07e115fb0 100644
--- a/data/uox.ini
+++ b/data/uox.ini
@@ -233,6 +233,7 @@ CHECKPETCONTROLDIFFICULTY=1
PETLOYALTYGAINONSUCCESS=1
PETLOYALTYLOSSONFAILURE=3
PETLOYALTYRATE=900
+PETBONDINGENABLED=0
}
[speedup]
diff --git a/docs/jsdocs.html b/docs/jsdocs.html
index c6148ced8..2bb4f39ee 100644
--- a/docs/jsdocs.html
+++ b/docs/jsdocs.html
@@ -3301,6 +3301,43 @@
onResurrect
diff --git a/source/CPacketSend.cpp b/source/CPacketSend.cpp
index fcc95d6ea..73550bac4 100644
--- a/source/CPacketSend.cpp
+++ b/source/CPacketSend.cpp
@@ -8203,6 +8203,28 @@ void CPToolTip::CopyCharData( CChar& mChar, size_t &totalStringLen )
}
}
+ // Is character tame/bonded?
+ if( mChar.IsNpc() && mChar.IsTamed() && !cwmWorldState->creatures[mChar.GetId()].IsHuman() )
+ {
+ TAGMAPOBJECT petBond = mChar.GetTag( "isBondedPet" );
+ if( petBond.m_IntValue == 1 )
+ {
+ // Bonded
+ tempEntry.stringNum = 1042971; // ~1_NOTHING~
+ tempEntry.ourText = oldstrutil::format( "%s", Dictionary->GetEntry( 19334, tSock->Language() ).c_str() ); // [Bonded]
+ tempEntry.sortOrder = 12;
+ FinalizeData( tempEntry, totalStringLen );
+ }
+ else
+ {
+ // Tame
+ tempEntry.stringNum = 1042971; // ~1_NOTHING~
+ tempEntry.ourText = oldstrutil::format( "%s", Dictionary->GetEntry( 19333, tSock->Language() ).c_str() ); // [Tame]
+ tempEntry.sortOrder = 12;
+ FinalizeData( tempEntry, totalStringLen );
+ }
+ }
+
// Is character Guarded?
if( mChar.IsGuarded() )
{
diff --git a/source/CResponse.cpp b/source/CResponse.cpp
index 612cf8d17..96031ceff 100644
--- a/source/CResponse.cpp
+++ b/source/CResponse.cpp
@@ -783,6 +783,18 @@ bool CPetReleaseResponse::Handle( CSocket *mSock, CChar *mChar, CChar *petNpc )
{
if( Npcs->CanControlPet( mChar, petNpc, true, false ))
{
+ std::vector scriptTriggers = petNpc->GetScriptTriggers();
+ for( auto scriptTrig : scriptTriggers )
+ {
+ cScript *toExecute = JSMapping->GetScript( scriptTrig );
+ if( toExecute )
+ {
+ SI08 retStatus = toExecute->OnReleasePet( mChar, petNpc );
+ if( retStatus == 0 )
+ return false;
+ }
+ }
+
// Reduce player's control slot usage by the amount of control slots taken up by the pet
mChar->SetControlSlotsUsed( std::max( 0, mChar->GetControlSlotsUsed() - petNpc->GetControlSlots() ));
@@ -842,6 +854,12 @@ bool CPetAttackResponse::Handle( CSocket *mSock, CChar *mChar, CChar *petNpc )
std::string npcName = GetNpcDictName( petNpc, mSock, NRS_SYSTEM );
if( saidAll || FindString( ourText, oldstrutil::upper( npcName )))
{
+ TAGMAPOBJECT deadPet = petNpc->GetTag( "isPetDead" );
+ if( deadPet.m_IntValue == 1 )
+ {
+ mSock->SysMessage( 19302 );// The dead pet cannot attack.
+ return true;
+ }
if( Npcs->CanControlPet( mChar, petNpc, false, true ))
{
Npcs->StopPetGuarding( petNpc );
diff --git a/source/Changelog.txt b/source/Changelog.txt
index 88ba928bb..3706774f5 100644
--- a/source/Changelog.txt
+++ b/source/Changelog.txt
@@ -1,3 +1,14 @@
+09/07/2025 - Xuri
+ Added [Tame] and [Bonded] to character tooltips of tame/bonded animals and updated Dictionary files
+ Updated .AddRadio() and .AddCheckbox() Gump Methods to support 32-bit unsigned int for the buttonID
+
+05/07/2025 - Dragon Slayer
+ Updated Addmenu with all the missing npcs (Ratmen/lizardman/Se Npcs/Vet)
+ Fixed PoisonedBy missing on world save tags.
+ Fixed Spiders Icons in Addmenu.
+ Added Vet Spawns thru out the worlds.
+ Fixed Sound on Shadow fiend ( creatures.dfn )
+
04/07/2025 - Xuri
Fixed an issue with poison damage in combat where the poison resist of the attacker was checked instead of that of the defender
Fixed an issue where the poison details in tooltip of an item would only be visible when equipped, and not visible when kept in backpack
@@ -208,6 +219,17 @@
Bump the types for the timer from the uint32_t to uint64_t and encapsulate behind a TVAL type definition.
According to the C++ reference, chrono should support at least 45 bits of accuracy for milliseconds.
This gives a 1115 year wraparound.
+
+18/05/2025 - Dragon Slayer
+ Added support for pet bonding system similar to OSI mechanics
+ Pets now track bonding status using 'isBondedPet' tag
+ Bonding begins when player tames a tameable pet that meets taming skill requirements,
+ Pets become bonded after 7 days (604800000 ms) of loyalty to their owner,
+ Bonded pets no longer delete on death, but enter ghost state,
+ Added packet 'SendNpcGhostMode( pSock, unknownFlag, serial, ghostFlag )' to trigger bonded ghost appearance,
+ New JS event hook: onReleasePet( pTamer, pPet )
+ Triggered when a player releases a controlled pet,
+ Can be used to reset bonded status or perform cleanup.
14/05/2025 - Xuri
Fixed an issue where integer division and rounding of values could lead to skill gains not being visible to player
diff --git a/source/SEFunctions.cpp b/source/SEFunctions.cpp
index b405f7652..7d3d59571 100644
--- a/source/SEFunctions.cpp
+++ b/source/SEFunctions.cpp
@@ -5382,6 +5382,9 @@ JSBool SE_GetServerSetting( JSContext *cx, [[maybe_unused]] JSObject *obj, uintN
case 381: // POISONCORROSIONSYSTEM
*rval = BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->PoisonCorrosionSystem() );
break;
+ case 382: // PETBONDINGENABLED
+ *rval = BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->PetBondingEnabled() );
+ break;
default:
ScriptError( cx, "GetServerSetting: Invalid server setting name provided" );
return false;
diff --git a/source/UOXJSMethods.cpp b/source/UOXJSMethods.cpp
index 62dd071d9..21471efbf 100644
--- a/source/UOXJSMethods.cpp
+++ b/source/UOXJSMethods.cpp
@@ -570,7 +570,7 @@ JSBool CGump_AddCheckbox( JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
UI16 gImage = 0;
UI16 gImageChk = 0;
SI16 initState = 0;
- SI16 relay = 0;
+ UI32 relay = 0;
if( argc == 5 )
{
@@ -579,7 +579,7 @@ JSBool CGump_AddCheckbox( JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
gImage = static_cast( JSVAL_TO_INT( argv[2] ));
gImageChk = gImage + 1;
initState = static_cast( JSVAL_TO_INT( argv[3] ));
- relay = static_cast( JSVAL_TO_INT( argv[4] ));
+ relay = static_cast( JSVAL_TO_INT( argv[4] ));
}
else
{
@@ -588,7 +588,7 @@ JSBool CGump_AddCheckbox( JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
gImage = static_cast( JSVAL_TO_INT( argv[2] ));
gImageChk = static_cast( JSVAL_TO_INT( argv[3] ));
initState = static_cast( JSVAL_TO_INT( argv[4] ));
- relay = static_cast( JSVAL_TO_INT( argv[5] ));
+ relay = static_cast( JSVAL_TO_INT( argv[5] ));
}
SEGump_st *gList = static_cast( JS_GetPrivate( cx, obj ));
@@ -599,7 +599,7 @@ JSBool CGump_AddCheckbox( JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
return JS_FALSE;
}
- gList->one->push_back( oldstrutil::format( "checkbox %i %i %u %u %i %i", tL, tR, gImage, gImageChk, initState, relay ));
+ gList->one->push_back( oldstrutil::format( "checkbox %i %i %u %u %i %u", tL, tR, gImage, gImageChk, initState, relay ));
return JS_TRUE;
}
@@ -1373,7 +1373,7 @@ JSBool CGump_AddRadio( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, [[
UI16 gImage = 0;
UI16 gImageChk = 0;
SI16 initialState = 0;
- SI16 relay = 0;
+ UI32 relay = 0;
if( argc == 5 )
{
@@ -1382,7 +1382,7 @@ JSBool CGump_AddRadio( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, [[
gImage = static_cast( JSVAL_TO_INT( argv[2] ));
gImageChk = gImage + 1;
initialState = static_cast( JSVAL_TO_INT( argv[3] ));
- relay = static_cast( JSVAL_TO_INT( argv[4] ));
+ relay = static_cast( JSVAL_TO_INT( argv[4] ));
}
else
{
@@ -1391,7 +1391,7 @@ JSBool CGump_AddRadio( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, [[
gImage = static_cast( JSVAL_TO_INT( argv[2] ));
gImageChk = static_cast( JSVAL_TO_INT( argv[3] ));
initialState = static_cast( JSVAL_TO_INT( argv[4] ));
- relay = static_cast( JSVAL_TO_INT( argv[5] ));
+ relay = static_cast( JSVAL_TO_INT( argv[5] ));
}
@@ -1402,7 +1402,7 @@ JSBool CGump_AddRadio( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, [[
return JS_FALSE;
}
- gList->one->push_back( oldstrutil::format( "radio %i %i %u %u %i %i", tL, tR, gImage, gImageChk, initialState, relay ));
+ gList->one->push_back( oldstrutil::format( "radio %i %i %u %u %i %u", tL, tR, gImage, gImageChk, initialState, relay ));
return JS_TRUE;
}
diff --git a/source/ai.cpp b/source/ai.cpp
index 9c7b5e3e8..6b86ef53d 100644
--- a/source/ai.cpp
+++ b/source/ai.cpp
@@ -49,6 +49,13 @@ bool IsValidAttackTarget( CChar& mChar, CChar *cTarget )
}
}
+ // Dead (bonded) pets are not valid
+ TAGMAPOBJECT deadPet = cTarget->GetTag( "isPetDead" );
+ if( deadPet.m_IntValue == 1 )
+ {
+ return false;
+ }
+
// Targets on character's combat ignore list are not valid
if( mChar.CheckCombatIgnore( cTarget->GetSerial() ))
{
diff --git a/source/cBaseObject.cpp b/source/cBaseObject.cpp
index 1120e092e..fd7b9744b 100644
--- a/source/cBaseObject.cpp
+++ b/source/cBaseObject.cpp
@@ -2478,6 +2478,10 @@ bool CBaseObject::HandleLine( std::string &UTag, std::string &data )
{
poisoned = oldstrutil::value( data );
}
+ else if( UTag == "POISONEDBY" )
+ {
+ poisonedBy = oldstrutil::value( data );
+ }
else
{
rValue = false;
diff --git a/source/cChar.cpp b/source/cChar.cpp
index d94a5ddf0..ba901a555 100644
--- a/source/cChar.cpp
+++ b/source/cChar.cpp
@@ -628,8 +628,9 @@ void CChar::DoHunger( CSocket *mSock )
}
else if( IsTamed() && GetTamedHungerRate() > 0 )
{
+ TAGMAPOBJECT deadPet = GetTag( "isPetDead" );
// Handle hunger for pets
- if( !WillHunger() || GetMounted() || GetStabled() )
+ if( !WillHunger() || GetMounted() || GetStabled() || deadPet.m_IntValue == 1 )
return;
// Pets don't hunger if owner is offline
diff --git a/source/cScript.cpp b/source/cScript.cpp
index b568bd058..4a11a4c5a 100644
--- a/source/cScript.cpp
+++ b/source/cScript.cpp
@@ -1668,6 +1668,37 @@ SI08 cScript::OnDecay( CItem *decaying )
return TryParseJSVal( rval );
}
+//o------------------------------------------------------------------------------------------------o
+//| Function - cScript::OnReleasePet()
+//| Purpose - Script trigger for when a player tries to release a pet
+//o------------------------------------------------------------------------------------------------o
+SI08 cScript::OnReleasePet( CChar *owner, CChar *pet )
+{
+ const SI08 RV_NOFUNC = -1;
+ if( !ValidateObject( owner ) || !ValidateObject( pet ))
+ return RV_NOFUNC;
+
+ if( !ExistAndVerify( seOnReleasePet, "onReleasePet" ))
+ return RV_NOFUNC;
+
+ jsval params[2], rval;
+ JSObject *ownerObj = JSEngine->AcquireObject( IUE_CHAR, owner, runTime );
+ JSObject *petObj = JSEngine->AcquireObject( IUE_CHAR, pet, runTime );
+
+ params[0] = OBJECT_TO_JSVAL( ownerObj );
+ params[1] = OBJECT_TO_JSVAL( petObj );
+
+ JSBool retVal = JS_CallFunctionName( targContext, targObject, "onReleasePet", 2, params, &rval );
+
+ if( retVal == JS_FALSE )
+ {
+ SetEventExists( seOnReleasePet, false );
+ return RV_NOFUNC;
+ }
+
+ return TryParseJSVal( rval );
+}
+
//o------------------------------------------------------------------------------------------------o
//| Function - cScript::OnLeaving()
//o------------------------------------------------------------------------------------------------o
diff --git a/source/cScript.h b/source/cScript.h
index 59f1b4376..276ac5899 100644
--- a/source/cScript.h
+++ b/source/cScript.h
@@ -122,7 +122,8 @@ enum ScriptEvent
seOnContextMenuSelect,
seOnWarModeToggle,
seOnSpecialMove,
- seOnFacetChange
+ seOnFacetChange,
+ seOnReleasePet
};
struct SEGump_st
@@ -314,6 +315,7 @@ class cScript
SI08 OnSoldToVendor( CSocket *targSock, CChar *objVendor, CBaseObject *objItemSold, UI16 numItemsSold );
SI08 OnHouseCommand( CSocket *targSock, CMultiObj *multiObj, UI08 targId );
SI08 OnMakeItem( CSocket *mSock, CChar *objChar, CItem *objItem, UI16 createEntryId );
+ SI08 OnReleasePet( CChar *owner, CChar *pet );
// Critical handler type stuff
bool IsFiring( void );
diff --git a/source/cServerData.cpp b/source/cServerData.cpp
index 494630ea4..96346640a 100644
--- a/source/cServerData.cpp
+++ b/source/cServerData.cpp
@@ -401,7 +401,8 @@ const std::map CServerData::uox3IniCaseValue
{"ELFMAXWEIGHTBONUS"s, 378},
{"GARGOYLEMAXWEIGHTBONUS"s, 379},
{"MAXNPCAGGRORANGE"s, 380},
- {"POISONCORROSIONSYSTEM"s, 381}
+ {"POISONCORROSIONSYSTEM"s, 381},
+ {"PETBONDINGENABLED"s, 382}
};
constexpr auto MAX_TRACKINGTARGETS = 128;
constexpr auto SKILLTOTALCAP = 7000;
@@ -444,7 +445,7 @@ constexpr auto BIT_ITEMDECAYINHOUSES = UI32( 32 );
constexpr auto BIT_PAPERDOLLGUILDBUTTON = UI32( 33 );
constexpr auto BIT_ATTSPEEDFROMSTAMINA = UI32( 34 );
constexpr auto BIT_SHOWDAMAGENUMBERS = UI32( 35 );
-// 37 free!
+constexpr auto BIT_PETBONDINGENABLED = UI32( 37 );
constexpr auto BIT_EXTENDEDSTARTINGSTATS = UI32( 38 );
constexpr auto BIT_EXTENDEDSTARTINGSKILLS = UI32( 39 );
constexpr auto BIT_ASSISTANTNEGOTIATION = UI32( 40 );
@@ -882,6 +883,7 @@ auto CServerData::ResetDefaults() -> void
MaxControlSlots( 0 ); // Default to 0, which is equal to off
MaxFollowers( 5 );
MaxPetOwners( 10 );
+ PetBondingEnabled( false );
ToolUseLimit( true );
ToolUseBreak( true );
ItemRepairDurabilityLoss( true );
@@ -1456,6 +1458,20 @@ auto CServerData::BuildSystemTimeValue( cSD_TID timerId ) const -> TIMERVAL
return BuildTimeValue( static_cast( SystemTimer( timerId )));
}
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::PetBondingEnabled()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets status of server accouncements for players connecting/disconnecting
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::PetBondingEnabled() const -> bool
+{
+ return boolVals.test( BIT_PETBONDINGENABLED );
+}
+auto CServerData::PetBondingEnabled( bool newVal ) -> void
+{
+ boolVals.set( BIT_PETBONDINGENABLED, newVal );
+}
+
//o------------------------------------------------------------------------------------------------o
//| Function - CServerData::SystemTimer()
//o------------------------------------------------------------------------------------------------o
@@ -5546,6 +5562,7 @@ auto CServerData::SaveIni( const std::string &filename ) -> bool
ofsOutput << "PETLOYALTYGAINONSUCCESS=" << static_cast( GetPetLoyaltyGainOnSuccess() ) << '\n';
ofsOutput << "PETLOYALTYLOSSONFAILURE=" << static_cast( GetPetLoyaltyLossOnFailure() ) << '\n';
ofsOutput << "PETLOYALTYRATE=" << SystemTimer( tSERVER_LOYALTYRATE ) << '\n';
+ ofsOutput << "PETBONDINGENABLED=" << ( PetBondingEnabled() ? 1 : 0 ) << '\n';
ofsOutput << "}" << '\n';
ofsOutput << '\n' << "[speedup]" << '\n' << "{" << '\n';
@@ -7227,6 +7244,9 @@ auto CServerData::HandleLine( const std::string& tag, const std::string& value )
case 381: // POISONCORROSIONSYSTEM
PoisonCorrosionSystem(( static_cast( std::stoi( value, nullptr, 0 )) == 1 ));
break;
+ case 382: // PETBONDINGENABLED
+ PetBondingEnabled(( static_cast( std::stoi( value, nullptr, 0 )) == 1 ));
+ break;
default:
rValue = false;
break;
diff --git a/source/cServerData.h b/source/cServerData.h
index 0d1009d01..9a8d315a4 100644
--- a/source/cServerData.h
+++ b/source/cServerData.h
@@ -576,6 +576,8 @@ class CServerData
SI16 MaxStealthMovement() const;
auto MaxStaminaMovement( SI16 value ) -> void;
SI16 MaxStaminaMovement() const;
+ auto PetBondingEnabled( bool setting ) -> void;
+ auto PetBondingEnabled() const -> bool;
auto SystemTimer( cSD_TID timerId, UI16 value ) -> void;
auto SystemTimer( cSD_TID timerId ) const -> UI16;
TIMERVAL BuildSystemTimeValue( cSD_TID timerId ) const;
diff --git a/source/cSocket.cpp b/source/cSocket.cpp
index c406e199e..b68e58cbd 100644
--- a/source/cSocket.cpp
+++ b/source/cSocket.cpp
@@ -2191,7 +2191,15 @@ void CSocket::ShowCharName( CChar *i, bool showSer )
{
if( i->IsTamed() && ValidateObject( i->GetOwnerObj() ) && !cwmWorldState->creatures[i->GetId()].IsHuman() )
{
- charName += " (tame) ";
+ TAGMAPOBJECT petBond = i->GetTag( "isBondedPet" );
+ if( petBond.m_IntValue == 1 )
+ {
+ charName += " " + Dictionary->GetEntry( 19335, Language() ); // (bonded)
+ }
+ else
+ {
+ charName += " " + Dictionary->GetEntry( 19336, Language() ); // (tame)
+ }
}
// Show NPC title over their head?
@@ -2205,15 +2213,15 @@ void CSocket::ShowCharName( CChar *i, bool showSer )
// Show (invulnerable) tags over the heads of invulnerable characters?
if( i->IsInvulnerable() && cwmWorldState->ServerData()->ShowInvulnerableTagOverhead() )
{
- charName += " (invulnerable)";
+ charName += " " + Dictionary->GetEntry( 19337, Language() ); // (invulnerable)
}
if( i->IsFrozen() )
{
- charName += " (frozen) ";
+ charName += " " + Dictionary->GetEntry( 19338, Language() ); // (frozen)
}
if( i->IsGuarded() )
{
- charName += " (guarded)";
+ charName += " " + Dictionary->GetEntry( 19339, Language() ); // (guarded)
}
if( i->GetGuildNumber() != -1 && !i->IsIncognito() && !i->IsDisguised() )
{
diff --git a/source/npcs.cpp b/source/npcs.cpp
index c7def6289..03f7955f1 100644
--- a/source/npcs.cpp
+++ b/source/npcs.cpp
@@ -2126,6 +2126,15 @@ void CCharStuff::FinalizeTransfer( CChar *petChar, CChar *srcChar, CChar *targCh
// Update control slots used for both old and new owners
srcChar->SetControlSlotsUsed( std::max(0, srcChar->GetControlSlotsUsed() - petChar->GetControlSlots() ));
targChar->SetControlSlotsUsed( std::clamp( targChar->GetControlSlotsUsed() + petChar->GetControlSlots(), 0, 255 ));
+
+ // Remove Pet Bonding if its Bonded
+ TAGMAPOBJECT petBond = petChar->GetTag( "isBondedPet" );
+ if( petBond.m_IntValue == 1 )
+ {
+ petBond.m_IntValue = 0;
+ petChar->SetTag( "isBondedPet", petBond );
+ petChar->RemoveScriptTrigger( 3107 );// petbonding.js
+ }
}
//o------------------------------------------------------------------------------------------------o
@@ -2177,6 +2186,15 @@ void CCharStuff::ReleasePet( CChar *pet )
default:
break;
}
+
+ // Remove Bonding if its Bonded
+ TAGMAPOBJECT petBond = pet->GetTag( "isBondedPet" );
+ if( petBond.m_IntValue == 1 )
+ {
+ petBond.m_IntValue = 0;
+ pet->SetTag( "isBondedPet", petBond );
+ pet->RemoveScriptTrigger( 3107 );// petbonding.js
+ }
}
//o------------------------------------------------------------------------------------------------o
diff --git a/source/targeting.cpp b/source/targeting.cpp
index 142492ad0..42e0c2030 100644
--- a/source/targeting.cpp
+++ b/source/targeting.cpp
@@ -1230,6 +1230,13 @@ void TransferTarget( CSocket *s )
return;
}
+ TAGMAPOBJECT deadPet = petChar->GetTag( "isPetDead" );
+ if( deadPet.m_IntValue == 1 )
+ {
+ s->SysMessage( 19301 ); // You may not trade a dead pet.
+ return;
+ }
+
if( cwmWorldState->ServerData()->YoungPlayerSystem() )
{
if( !mChar->IsNpc() && mChar->GetAccount().wFlags.test( AB_FLAGS_YOUNG ) && !targChar->GetAccount().wFlags.test( AB_FLAGS_YOUNG ))
diff --git a/source/uox3.cpp b/source/uox3.cpp
index d1cf8a015..380cb06b9 100644
--- a/source/uox3.cpp
+++ b/source/uox3.cpp
@@ -1266,6 +1266,13 @@ auto PassiveHealthRegen( CChar &mChar, UI16 maxHP ) -> SI32
if( mChar.GetHP() < maxHP )
{
+ TAGMAPOBJECT deadPet = mChar.GetTag( "isPetDead" );
+ if( deadPet.m_IntValue == 1 )
+ {
+ // If the pet is dead, we don't want to regen health for the owner
+ return nextHealthRegen;
+ }
+
if( !cwmWorldState->ServerData()->HungerSystemEnabled() || ( mChar.GetHunger() > 0 )
|| ( !Races->DoesHunger( mChar.GetRace() ) && (( cwmWorldState->ServerData()->SystemTimer( tSERVER_HUNGERRATE ) == 0) || mChar.IsNpc() )))
{