uox3/source/uox3.cpp

4469 lines
151 KiB
C++
Raw Permalink Normal View History

//o------------------------------------------------------------------------------------------------o
/*
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
Ultima Offline eXperiment III (UOX3)
UO Server Emulation Program
0.99.4x Fixed an issue where the color of NPC corpse names would not always match up with the NPC's flag color Fixed a bug where the baseRange and maxRange properties of ranged weapons would not get saved to world files. These values are now saved in the format of RANGE=baseRange,maxRange Changed the way items are added to containers, to ensure that the order in which the items are displayed to the player always reflects the order in which they were added; now the most recent item added/moved in a container will always be rendered on top of older items. Made adjustments to how items are randomly added to containers; should use more of a given container gump's available area now Exposed Item property to JS engine, which contains serial of the creator of an item: .creator // contains serial of the creator of an item. If set, maker's marks will show up in the item's tooltip Fixed an issue where JS engine would lose track of script context if one script used CreateDFNItem() or SpawnNPC() functions and the new objects had events that triggered upon creation. UOX3 now restores the original script context at the tail end of these functions. Added new JS Event to allow inserting custom tooltip text for objects, which will be displayed in tooltips right after the object name. Any text returned from the event will be displayed, and the text can make use of the same HTML tags as gumps to make changes to color, font, etc. onTooltip( myObj ) // Triggers for objects right before the object's tooltip properties are sent to client Updated 'tweak and 'set commands to refresh item being modified if movable state of item changes, so the change is reflected in nearby clients Fixed an issue with NPC vendors and items bought from players not being properly removed from the vendor's "bought container" when players buy them again Ported Item Identification skill from code to JS (js/skill/itemid.js) and removed hard-coded version Implemented magic item generator in JS (js/item/magic_item.js). When this script is attached to an NPC, it has a chance to generate magic weapons, armors, wands/staffs and rings as loot on the NPC's corpse when slain. The chance of getting quality magical items increases with the fame level of the NPC in question. The types of magical items generated follows the pattern of such items as implemented in UO prior to the AoS expansion. Examples: exceedingly accurate war hammer of vanquishing substantial, accurate axe of power and Daemon's Breath silver long sword massive platemail arms of Protection metal shield of defense durable ringmail tunic of guarding All magic items have a chance to have spell effects attached (with rings/wands being guaranteed to have these), with a limited amount of charges available. For weapons, these effects activate on successful hits in combat, while for armors they activate on equip, and then periodically as long as the item is worn. Rings and wands/staffs have to be manually activated and targeted - with the exception of rings of invisibility, which activate the moment you equip them! Related scripts: js/item/magic_armor_equipeffects.js js/item/magic_weapon_accbonus.js js/item/magic_weapon_equip.js js/item/magic_weapon_spell_attack.js The magic item loot generation script has been attached to a number of different NPCs, all of which now have a chance to drop magic items as loot when defeated. A bonus magical item - the glacial staff - has also been implemented (js/item/magic_glacial_staff.js), and has a chance to drop as loot from Giant Ice Serpents! Fixed an issue with CustomTarget where the target message would not be displayed if the cursorType parameter was provided Fixed bug with 'rename command, which referenced a non-existing variable that caused a script crash Added additional object properties to 'get and 'set commands: .shouldSave // Determines if an item should be saved in worldfiles or not .baseRange // Determines the base range of a ranged weapon, less than which it becomes less effective .maxRange // Determines the max range of a ranged weapon, beyond which it cannot reach its target The feature that allows stats like Strength, Dexterity and Intelligence to provide bonuses to skill checks has been turned into a UOX.INI setting, which is disabled by default. The bonuses have also been nerfed; they will no longer contribute more to the success of a skill check than the actual skill being checked! STATSAFFECTSKILLCHECKS=0/1 // If enabled, stats can provide bonuses to skill checks based on the weighting for those stats as setup in dfndata/skills/skills.dfn Updated damage tracking code to include the type of damage that was dealt (PHYSICAl vs HEAT vs COLD, etc) Updated Character JS Method Damage() to include a new parameter that can specify the type of damage that was dealt to the character. The new parameter must always be included if other optional parameters are used. Note that updates might be required for scripts making use of this method.Updated syntax: .Damage( amount ) .Damage( amount, damageType ) .Damage( amount, damageType, attacker ) .Damage( amount, damageType, attacker, doRepsys ) Supported damageTypes: PHYSICAL = 1 LIGHT = 2 RAIN = 3 COLD = 4 HEAT = 5 LIGHTNING = 6 // magic damage POISON = 7 SNOW = 8 Updated JS Event OnDamage to include an additional parameter that describes the type of damage that was dealt. New syntax: onDamage( damaged, attacker, damageValue, damageType ) Updated JS Event OnSpellTarget to allow rejecting a spell being cast on a target by returning a value of 2 from the script Split the character priv flag for magic reflection into a temporary one (one-time magic reflection spell) and a permanent one (innate permanent reflection ability). The temporary effect is put in place by Magic Reflection spell, and is removed after a successful spell reflect. The permanent one is an innate ability of a character and is not removed even after a spell is reflected. Added new Character JS property to get/set state of a character's permanent magic reflect ability: .permanentMagicReflect // 0 = disable, 1 = enable Added special abilities/effects for the following NPCs: Acid Elementals now have a chance to damage the melee weapons of their attackers Dull Copper Elementals now explode on death Shadow Iron Elemental is immune to targeted spell damage Copper Elementals have permanent magic reflect, and reflect some physical damage back at their attacker Bronze Elementals deal passive area damage to nearby players every 5 to 10 seconds Valorite Elementals have permanent magic reflect, reflect some physical damage back at their attacker Snow/Ice Elementals deal passive area damage to nearby players every 5 to 10 seconds Lava Serpents deal passive area damage to nearby players every 5 to 10 seconds Phoenixes deal passive area damage to nearby players every 5 to 10 seconds Pixies have a chance to cast a random spell upon receiving a death blow: Bless (target) Curse (target) Explosion (target) Greater Poison (target) Greater Heal (self, prevents death) Ethereal Warriors will now resurrect dead players with positive karma Ethereal Warriors now have a chance to drain target's health, stamina or mana on hit Fire Breath special ability added to the following NPCs, with the random ability damage scaling with the NPCs current health: Hell Cat, 5 to 8 dmg at max health Fire Steed, 6 to 9 dmg at max health Hell Hounds, 8 to 11 dmg at max health Lava Lizard, 8 to 11 dmg at max health Predator Hell Cat, 9 to 14 dmg at max health Sea Serpent, 11 to 17 dmg at max health Swamp Dragon, 15 to 22 dmg at max health Armored Swamp Dragon, 15 to 22 dmg at max health Fire Gargoyle, 20 to 30 dmg at max health Deep Sea Serpent, 21 to 32 dmg at max health Serpentine Dragon, 22 to 32 dmg at max health Drake (Gray), 22 to 32 dmg at max health Drake (Red), 22 to 32 dmg at max health Nightmare, 26 to 39 dmg at max health Dark Steed, 26 to 39 dmg at max health Silver Steed, 26 to 39 dmg at max health Kraken, 39 to 59 dmg at max health Dragon (Red), 41 to 62 dmg at max health Dragon (Gray), 41 to 62 dmg at max health Shadow Wyrm, 50 to 75 dmg at max health Reptalon, 51 to 77 dmg at max health Skeletal Dragon, 52 to 77 dmg at max health Ancient Wyrm, 60 to 90 dmg at max health Update stats, skills and loot for all currently implemented NPCs Removed an ancient piece of code that prevented corpses from being generated for various elementals and blade spirits on death. This was originally put in place because these creatures had no corpses, and would replace it with a backpack instead, but these creatures now all have corpses in all client versions supported by UOX3 Updated potions script (js/item/potion.js) with updated formula for amount of hitpoints healed by healing potions, and added restrictions for using them when at full health and/or if poisoned (Dragon Slayer) Fixed a bug where creatures (and humans, if FORCENEWANIMATIONPACKET was disabled in uox.ini) would play animations with wrong frame count, causing the animations to either freeze for a few frames at the end, or get cut off a couple of frames early Implemented bonus hit chance for Archery skill, based on mention of such a bonus in Publish 5 patch notes and related UO House of Commons chat. This has been exposed as a UOX.INI setting where this bonus can be tweaked: ARCHERYHITBONUS=10 // Bonus hit chance for Archery skill added to regular hit chance in combat. Defaults to 10% Implemented optional extra delay between moving and being able to shoot with ranged weapons in combat (in addition to whatever delay is there due to speed of the ranged weapon). This is exposed as a UOX.INI setting: ARCHERYSHOOTDELAY=0.5 // Minimum delay in seconds from a player stops moving until they can start to fire their ranged weapon. Defaults to 0.5s Fixed a bug where players who never entered combat mode could fire ranged weapons while moving Updated Add-menu with some improvements for usability: Menu now directly on the Objects (previously "Shard") tab for quicker access, with a small welcome text and quick-link button for UOX3 docs Settings tab contains some (persistent, will be saved with character) options for how the Add-menu behaves, along with a few quick-access buttons to some useful commands. Available options: Option to add chosen item at specific location instead of in GM's backpack Option to add chosen item repeatedly until cancelled Option to automatically reopen Add-menu on last menu that was open when a selection is made Option to force decayable state of all added items to either off (doesn't decay), on (decays) or nothing (use item default) Option to force movable state of all added items to either off (not movable), on (movable) or nothing (use item default) Added a Home button at the bottom of the menu, that takes the user back to the front page of the Add-menu regardless of which menu page they're on Updated Character/Socket JS Method SysMessage() with an optional parameter to specify the color used to display the system message. Updated syntax: .SysMessage( "Text" ) // Display "Text" to user as a system message with default system message color from ini .SysMessage( "Text %s %s", txtArg1, txtArg2 ) // Display "Text" to player with string arguments injected into text .SysMessage( txtColor, "Text" ) // Display "Text" to user with a specified color .SysMessage( txtColor, "Text %s %s", txtArg1, txtArg2 ) // Combination of text color, text and string arguments Fixed a bug where hair/beard items could show up inside corpses Fixed a bug where items could sometimes vanish (visually) from containers when bouncing back because player was not able to pick them up Fixed a bug where players would be unable to pick up a freely movable item from a locked down container Updated handling of item bouncing on pickup to use UOX3 dictionary messages instead of hard-coded client messages Added support for new Dictionary language: dictionary.POL - Polish (SERVERLANGUAGE=8 in uox.ini, or client language 83 if SERVERLANGUAGE is set to 0) Added taming restrictions for Unicorn, Ki-Rin and Cu Sidhe (js/skill/taming.js) Added modification of some creatures stats after they've been tamed (js/skill/taming.js) Added restrictions for who can ride certain creatures (Unicorn, Ki-Rin, Cu Sidhe) Updated words of power for Meteor Swarm spell to follow the same logic as other spells using Kal (Summon): Kal Des Flam Ylem Added new Item/Character JS Methods to get/set temporary custom tags which don't persist across worldsaves (or across reconnects, for players): .GetTempTag( "tagName" ) .SetTempTag( "tagName", tagValue ) When applying HPMAX, STAMINAMAX AND MANAMAX DFN tags to new NPCs, their current HP, STAMINA and MANA properties will now be automatically updated to match Fixed a server crash caused by empty speech messages sent from certain clients Fixed a bug that prevented teleport locations in Felucca/Trammel from working properly Updated calculations in code for duration and damage of existing poison strengths (1 - Lesser, 2 - Normal, 3 - Greater, 4 - Deadly) to match with ~Publish 15 (LBR/pre-AoS), and added another poison strength for monster usage (5 - Lethal) The strength of the Poison and Poison Field spells is now based on the average of the caster's Magery and Poisoning skills, the distance from the target (Poison spell only) and the target's Resisting Spells skill. If caster is further away than 2 tiles from target, the poison strength always equals Lesser Poison, otherwise the following rules apply: If caster's combined skill is higher than 100.0, poison strength equals Greater Poison, with 5% chance of Deadly Poison (if Poison spell) or Deadly Poison (if Poison Field spell) If caster's combined skill is higher than 70.2, poison strength equals Greater Poison If caster's combined skill is higher than 30.2, poison strength equals Normal Poison If caster's combined skill is 30.2 or lower, poison strength equals Lesser Poison If target resists spell, poison strength is reduced by 1 level, unless it's already at the lowest level Fixed an issue that would would let players move faster than they should have been allowed to Fixed misc issues with Party System: Mana and Stamina should now update for Party Members when added to the party, when going in/out of range and when their stats update while in range Players who get disconnected or relog should now find themselves back in the same party they were in previously Added system messages to inform party members about updates to their party, and to let invited players know they've successfully joined a party (or rejoined, if relogging) World saves now operate on the principle of only saving changes done since the last world save. Combined with the fact that NPCs in UOX3 are only active if there are players in the same/neighbouring map regions, shard owners may expect to see a decrease in world save times ranging from ~11% to ~99%, depending on how active and how spread out their player base is. If no changes have taken place since last save, saves are virtually instantaneous!
2021-09-20 21:35:17 +08:00
Copyright 1998 - 2021 by UOX3 contributors
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
Copyright 1997, 98 by Marcus Rating (Cironian)
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
* In addition to that license, if you are running this program or modified *
* versions of it on a public system you HAVE TO make the complete source of *
* the version used by you available or provide people with a location to *
* download it. *
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
You can contact the author by sending email to <cironian@stratics.com>.
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
*/
//o------------------------------------------------------------------------------------------------o
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
#include <chrono>
#include <random>
#include <thread>
2022-06-08 21:32:35 -04:00
#include <cstdlib>
2022-06-11 07:55:06 -04:00
#include <filesystem>
2022-06-11 14:48:07 -04:00
#include <optional>
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
#include <numeric>
2022-02-25 10:57:06 -05:00
#include "uox3.h"
Added: -JS Get/Set "vulnerable" handlers for character properties (Abaddon) -willHunger with Get/Set HungerStatus() wrappers to CChar class (can now selectively stop a character/creature from continuing to hunger) -JS Get/Set "willhunger" handlers for character properties Changed: Linux compile fixes (thanks Malketh) Hash.h warning fixed (thanks Philantrop) Fixes to getRootPack() and getPackOwner() Removed many #includes from the global scope, including them in the specific files that need them This should greatly reduce compile time and filesize, along with the need to recompile after altering most headers Removed the linux ifdefs around typedefd function declarations, this should work with gcc 3.2 Moved global loading functions into a new cFileIO() class to take them out of global scope Fixed an issue causing items to not be sent to the client (thanks Malketh) Moved some global structs into the CWorldMain class Fixed a bug causing a crash on character / item creation Moved all effects stuff into its own class to take it out of global scope Changed the variable CChar::region to CChar::regionNum to avoid conflicts with the cTownRegion region[] indexes Moved getbestskill(), isHuman(), and inDungeon() into the CChar class to remove them from global scope Took npcSimpleAttackTarget() out of global scope Rewrote restock() to make use of restockNPC() Changed the typedef'd iterator in hash.h to HASHITERATOR to kill a Linux warning Renamed cEffects::soundeffect() to PlaySound() and removed unneeded overloads Fixed a bug causing executebatch to be set with locationcount data Rewrote cEffects::bgsound() Documented sounds.cpp Misc minor cleanups / fixes Removed: sendItemsInRange() (CChar::Teleport() does the same thing) Many #includes that were not being used deathMenu() respawnnow() and moved all of its code into command_respawn() one instance of cEffects::scpSoundEffect() and renamed the other to PlaySound() 3/13/2003 Changed Fixed an issue allowing the server to not have a dictionary.ZRO (which would cause a crash when a dictionary entry was called with no language) Fixed an issue causing the server to puke when it attempted a restart Moved SpawnRandomItem() into cItem class Moved SpawnRandomMonster() into cCharHandle class Broke necro.dfn into fishing.dfn and digging.dfn Made better use of SpawnRandomItem() and SpawnRandomMonster() 3/12/2003 Added: CPOpenGump and CPSpeech packet class to remove some global vars (Note these are pretty basic classes and someone with a better understanding of how we handle sending/recieving packets could probably expand these to make better use of them) Changed: Moved many global vars into the CWorldMain() class Cleaned ResetVars() in uox3.cpp as ResetDefaults() in CWorldMain() now handles much of that Added a check to ensure text wasn't sent twice in talking(), should fix double-speech Cleaned up cmdtable.cpp removing a couple duplicate entries, etc Changed target() to only require 4 values (as the first two were always 0 and 1) Removed many unneeded typedefs and globals Went through cServerData() and noted unused server.ini entries Moved title1(), title2(), and title3() to cClick.cpp since that is their only usage, made use of MAX_TITLE to ensure we wouldn't overrun the buffers, and renamed them matching what title they were 3/11/2003 Changed: Fixed a potentially very serious bugs with how containers were being set upon loading the world Fixed possible re-adding of weight to containers and characters at load Fixed a bug causing equipped items that were not weapons to take damage in combat Minor cleanups / warning fixes / Linux compatability issues (punt) 3/7/2003 Overhauls/Additions/Major Changes Changed: Tweaks/Object Conversions/Misc Small Changes Changed: Changed CItem::Get/SetLayer() to a UI08 Fixed a bug in speech causing you to see your own text twice Fixed a nasty crash bug
2003-03-23 10:18:02 +00:00
#include "weight.h"
#include "books.h"
#include "cGuild.h"
#include "combat.h"
#include "msgboard.h"
#include "townregion.h"
#include "cWeather.hpp"
#include "movement.h"
#include "cRaces.h"
#include "cServerDefinitions.h"
#include "skills.h"
Added: -JS Get/Set "vulnerable" handlers for character properties (Abaddon) -willHunger with Get/Set HungerStatus() wrappers to CChar class (can now selectively stop a character/creature from continuing to hunger) -JS Get/Set "willhunger" handlers for character properties Changed: Linux compile fixes (thanks Malketh) Hash.h warning fixed (thanks Philantrop) Fixes to getRootPack() and getPackOwner() Removed many #includes from the global scope, including them in the specific files that need them This should greatly reduce compile time and filesize, along with the need to recompile after altering most headers Removed the linux ifdefs around typedefd function declarations, this should work with gcc 3.2 Moved global loading functions into a new cFileIO() class to take them out of global scope Fixed an issue causing items to not be sent to the client (thanks Malketh) Moved some global structs into the CWorldMain class Fixed a bug causing a crash on character / item creation Moved all effects stuff into its own class to take it out of global scope Changed the variable CChar::region to CChar::regionNum to avoid conflicts with the cTownRegion region[] indexes Moved getbestskill(), isHuman(), and inDungeon() into the CChar class to remove them from global scope Took npcSimpleAttackTarget() out of global scope Rewrote restock() to make use of restockNPC() Changed the typedef'd iterator in hash.h to HASHITERATOR to kill a Linux warning Renamed cEffects::soundeffect() to PlaySound() and removed unneeded overloads Fixed a bug causing executebatch to be set with locationcount data Rewrote cEffects::bgsound() Documented sounds.cpp Misc minor cleanups / fixes Removed: sendItemsInRange() (CChar::Teleport() does the same thing) Many #includes that were not being used deathMenu() respawnnow() and moved all of its code into command_respawn() one instance of cEffects::scpSoundEffect() and renamed the other to PlaySound() 3/13/2003 Changed Fixed an issue allowing the server to not have a dictionary.ZRO (which would cause a crash when a dictionary entry was called with no language) Fixed an issue causing the server to puke when it attempted a restart Moved SpawnRandomItem() into cItem class Moved SpawnRandomMonster() into cCharHandle class Broke necro.dfn into fishing.dfn and digging.dfn Made better use of SpawnRandomItem() and SpawnRandomMonster() 3/12/2003 Added: CPOpenGump and CPSpeech packet class to remove some global vars (Note these are pretty basic classes and someone with a better understanding of how we handle sending/recieving packets could probably expand these to make better use of them) Changed: Moved many global vars into the CWorldMain() class Cleaned ResetVars() in uox3.cpp as ResetDefaults() in CWorldMain() now handles much of that Added a check to ensure text wasn't sent twice in talking(), should fix double-speech Cleaned up cmdtable.cpp removing a couple duplicate entries, etc Changed target() to only require 4 values (as the first two were always 0 and 1) Removed many unneeded typedefs and globals Went through cServerData() and noted unused server.ini entries Moved title1(), title2(), and title3() to cClick.cpp since that is their only usage, made use of MAX_TITLE to ensure we wouldn't overrun the buffers, and renamed them matching what title they were 3/11/2003 Changed: Fixed a potentially very serious bugs with how containers were being set upon loading the world Fixed possible re-adding of weight to containers and characters at load Fixed a bug causing equipped items that were not weapons to take damage in combat Minor cleanups / warning fixes / Linux compatability issues (punt) 3/7/2003 Overhauls/Additions/Major Changes Changed: Tweaks/Object Conversions/Misc Small Changes Changed: Changed CItem::Get/SetLayer() to a UI08 Fixed a bug in speech causing you to see your own text twice Fixed a nasty crash bug
2003-03-23 10:18:02 +00:00
#include "commands.h"
#include "cSpawnRegion.h"
#include "wholist.h"
#include "cMagic.h"
#include "PageVector.h"
#include "speech.h"
#include "cVersionClass.h"
#include "ssection.h"
Added: -JS Get/Set "vulnerable" handlers for character properties (Abaddon) -willHunger with Get/Set HungerStatus() wrappers to CChar class (can now selectively stop a character/creature from continuing to hunger) -JS Get/Set "willhunger" handlers for character properties Changed: Linux compile fixes (thanks Malketh) Hash.h warning fixed (thanks Philantrop) Fixes to getRootPack() and getPackOwner() Removed many #includes from the global scope, including them in the specific files that need them This should greatly reduce compile time and filesize, along with the need to recompile after altering most headers Removed the linux ifdefs around typedefd function declarations, this should work with gcc 3.2 Moved global loading functions into a new cFileIO() class to take them out of global scope Fixed an issue causing items to not be sent to the client (thanks Malketh) Moved some global structs into the CWorldMain class Fixed a bug causing a crash on character / item creation Moved all effects stuff into its own class to take it out of global scope Changed the variable CChar::region to CChar::regionNum to avoid conflicts with the cTownRegion region[] indexes Moved getbestskill(), isHuman(), and inDungeon() into the CChar class to remove them from global scope Took npcSimpleAttackTarget() out of global scope Rewrote restock() to make use of restockNPC() Changed the typedef'd iterator in hash.h to HASHITERATOR to kill a Linux warning Renamed cEffects::soundeffect() to PlaySound() and removed unneeded overloads Fixed a bug causing executebatch to be set with locationcount data Rewrote cEffects::bgsound() Documented sounds.cpp Misc minor cleanups / fixes Removed: sendItemsInRange() (CChar::Teleport() does the same thing) Many #includes that were not being used deathMenu() respawnnow() and moved all of its code into command_respawn() one instance of cEffects::scpSoundEffect() and renamed the other to PlaySound() 3/13/2003 Changed Fixed an issue allowing the server to not have a dictionary.ZRO (which would cause a crash when a dictionary entry was called with no language) Fixed an issue causing the server to puke when it attempted a restart Moved SpawnRandomItem() into cItem class Moved SpawnRandomMonster() into cCharHandle class Broke necro.dfn into fishing.dfn and digging.dfn Made better use of SpawnRandomItem() and SpawnRandomMonster() 3/12/2003 Added: CPOpenGump and CPSpeech packet class to remove some global vars (Note these are pretty basic classes and someone with a better understanding of how we handle sending/recieving packets could probably expand these to make better use of them) Changed: Moved many global vars into the CWorldMain() class Cleaned ResetVars() in uox3.cpp as ResetDefaults() in CWorldMain() now handles much of that Added a check to ensure text wasn't sent twice in talking(), should fix double-speech Cleaned up cmdtable.cpp removing a couple duplicate entries, etc Changed target() to only require 4 values (as the first two were always 0 and 1) Removed many unneeded typedefs and globals Went through cServerData() and noted unused server.ini entries Moved title1(), title2(), and title3() to cClick.cpp since that is their only usage, made use of MAX_TITLE to ensure we wouldn't overrun the buffers, and renamed them matching what title they were 3/11/2003 Changed: Fixed a potentially very serious bugs with how containers were being set upon loading the world Fixed possible re-adding of weight to containers and characters at load Fixed a bug causing equipped items that were not weapons to take damage in combat Minor cleanups / warning fixes / Linux compatability issues (punt) 3/7/2003 Overhauls/Additions/Major Changes Changed: Tweaks/Object Conversions/Misc Small Changes Changed: Changed CItem::Get/SetLayer() to a UI08 Fixed a bug in speech causing you to see your own text twice Fixed a nasty crash bug
2003-03-23 10:18:02 +00:00
#include "cHTMLSystem.h"
#include "CGump.h"
#include "CJSMapping.h"
Added: -JS Get/Set "vulnerable" handlers for character properties (Abaddon) -willHunger with Get/Set HungerStatus() wrappers to CChar class (can now selectively stop a character/creature from continuing to hunger) -JS Get/Set "willhunger" handlers for character properties Changed: Linux compile fixes (thanks Malketh) Hash.h warning fixed (thanks Philantrop) Fixes to getRootPack() and getPackOwner() Removed many #includes from the global scope, including them in the specific files that need them This should greatly reduce compile time and filesize, along with the need to recompile after altering most headers Removed the linux ifdefs around typedefd function declarations, this should work with gcc 3.2 Moved global loading functions into a new cFileIO() class to take them out of global scope Fixed an issue causing items to not be sent to the client (thanks Malketh) Moved some global structs into the CWorldMain class Fixed a bug causing a crash on character / item creation Moved all effects stuff into its own class to take it out of global scope Changed the variable CChar::region to CChar::regionNum to avoid conflicts with the cTownRegion region[] indexes Moved getbestskill(), isHuman(), and inDungeon() into the CChar class to remove them from global scope Took npcSimpleAttackTarget() out of global scope Rewrote restock() to make use of restockNPC() Changed the typedef'd iterator in hash.h to HASHITERATOR to kill a Linux warning Renamed cEffects::soundeffect() to PlaySound() and removed unneeded overloads Fixed a bug causing executebatch to be set with locationcount data Rewrote cEffects::bgsound() Documented sounds.cpp Misc minor cleanups / fixes Removed: sendItemsInRange() (CChar::Teleport() does the same thing) Many #includes that were not being used deathMenu() respawnnow() and moved all of its code into command_respawn() one instance of cEffects::scpSoundEffect() and renamed the other to PlaySound() 3/13/2003 Changed Fixed an issue allowing the server to not have a dictionary.ZRO (which would cause a crash when a dictionary entry was called with no language) Fixed an issue causing the server to puke when it attempted a restart Moved SpawnRandomItem() into cItem class Moved SpawnRandomMonster() into cCharHandle class Broke necro.dfn into fishing.dfn and digging.dfn Made better use of SpawnRandomItem() and SpawnRandomMonster() 3/12/2003 Added: CPOpenGump and CPSpeech packet class to remove some global vars (Note these are pretty basic classes and someone with a better understanding of how we handle sending/recieving packets could probably expand these to make better use of them) Changed: Moved many global vars into the CWorldMain() class Cleaned ResetVars() in uox3.cpp as ResetDefaults() in CWorldMain() now handles much of that Added a check to ensure text wasn't sent twice in talking(), should fix double-speech Cleaned up cmdtable.cpp removing a couple duplicate entries, etc Changed target() to only require 4 values (as the first two were always 0 and 1) Removed many unneeded typedefs and globals Went through cServerData() and noted unused server.ini entries Moved title1(), title2(), and title3() to cClick.cpp since that is their only usage, made use of MAX_TITLE to ensure we wouldn't overrun the buffers, and renamed them matching what title they were 3/11/2003 Changed: Fixed a potentially very serious bugs with how containers were being set upon loading the world Fixed possible re-adding of weight to containers and characters at load Fixed a bug causing equipped items that were not weapons to take damage in combat Minor cleanups / warning fixes / Linux compatability issues (punt) 3/7/2003 Overhauls/Additions/Major Changes Changed: Tweaks/Object Conversions/Misc Small Changes Changed: Changed CItem::Get/SetLayer() to a UI08 Fixed a bug in speech causing you to see your own text twice Fixed a nasty crash bug
2003-03-23 10:18:02 +00:00
#include "cScript.h"
#include "cEffects.h"
#include "teffect.h"
#include "CPacketSend.h"
#include "classes.h"
#include "cThreadQueue.h"
#include "regions.h"
#include "magic.h"
#include "jail.h"
#include "Dictionary.h"
#include "ObjectFactory.h"
#include "PartySystem.h"
#include "CJSEngine.h"
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
#include "StringUtility.hpp"
2022-02-25 10:57:06 -05:00
#include "EventTimer.hpp"
#include <atomic>
#if PLATFORM == WINDOWS
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
#include <process.h>
#include <conio.h>
#endif
2022-06-11 07:55:06 -04:00
//o------------------------------------------------------------------------------------------------o
// Global variables
//o------------------------------------------------------------------------------------------------o
std::thread cons;
std::thread netw;
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
std::chrono::time_point<std::chrono::system_clock> current;
std::mt19937 generator;
std::random_device rd; // Will be used to obtain a seed for the random number engine
2022-06-08 21:32:35 -04:00
using namespace std::string_literals;
//o------------------------------------------------------------------------------------------------o
// These should be atomic, for another day
//o------------------------------------------------------------------------------------------------o
bool isWorldSaving = false;
bool conThreadCloseOk = false;
bool netpollthreadclose = false;
auto saveOnShutdown = false;
//o------------------------------------------------------------------------------------------------o
// Classes we will use
//o------------------------------------------------------------------------------------------------o
CConsole Console; // non pointer class, has initialize
// Non depdendent class
auto aWorld = CWorldMain();
auto aDictionary = CDictionaryContainer(); // no startup
auto aCombat = CHandleCombat(); // No dependency, startup
auto aItems = cItem(); // No startup, no dependency
auto aNpcs = CCharStuff(); // nodependency, no startup
auto aSkills = CSkills(); // no ddependency, no startup
auto aWeight = CWeight(); // no dependency, no startup
auto aMagic = CMagic(); // No dependent, no startup
2022-06-22 08:55:12 -04:00
auto aRaces = cRaces(); // no dependent, no startup
2022-06-22 07:35:21 -04:00
auto aWeather = cWeatherAb(); // no dependent, no startup
auto aMovement = CMovement(); // No dependent, no startup
auto aWhoList = CWhoList(); // no dependent, no startup
auto aOffList = CWhoList(false); // no dependent, no startup
auto aBooks = CBooks(); // no dependent, no startup
auto aGMQueue = PageVector("GM Queue"); // no dependent, no startup
auto aCounselorQueue = PageVector("Counselor Queue"); // no dependent, no startup
auto aJSMapping = CJSMapping(); // nodepend, no startup
auto aEffects = cEffects(); // No dependnt, no startup
auto aHTMLTemplates = cHTMLTemplates(); // no depend, no startup
auto aGuildSys = CGuildCollection(); // no depend, no startup
auto aJailSys = CJailSystem(); // no depend, no startup
// Dependent or have startup()
auto aSpeechSys = CSpeechQueue(); // has startup
auto aJSEngine = CJSEngine(); // has startup
auto aFileLookup = CServerDefinitions(); // has startup
auto aCommands = CCommands(); // Restart resets commands, maybe no dependency
auto aMap = CMulHandler(); // replaced
auto aNetwork = CNetworkStuff(); // Maybe dependent, has startup
auto aMapRegion = CMapHandler(); // Dependent (Map->) , has startup
auto aAccounts = cAccountClass(); // no dpend, use SetPath
2022-06-22 06:57:13 -04:00
2022-06-22 07:35:21 -04:00
//o------------------------------------------------------------------------------------------------o
// FileIO Pre-Declarations
//o------------------------------------------------------------------------------------------------o
void LoadCustomTitle( void );
void LoadSkills( void );
void LoadSpawnRegions( void );
void LoadRegions( void );
void LoadTeleportLocations( void );
void LoadCreatures( void );
void LoadPlaces( void );
//o------------------------------------------------------------------------------------------------o
// Misc Pre-Declarations
//o------------------------------------------------------------------------------------------------o
void RestockNPC( CChar& i, bool stockAll );
void ClearTrades( void );
void SysBroadcast( const std::string& txt );
void MoveBoat( UI08 dir, CBoatObj *boat );
0.99.6d Cleaned up an issue with last commit where wrong npclists were used in some spawn regions Made a few additional adjustments to the new spawn regions in Lost Lands/New Haven Included more changes related to poison updates that should've been in previous commit (like the complete UOX.INI support for POISONCORROSIONSYSTEM setting) Adjusted region setup for New Haven to set the individual "building" regions within as a sub-region of the main town (regions.dfn) Fixed an issue where the displayed HP of an equipped item would not update correctly Further updates to convert timers 32-bit to 64-bit. This affects and addresses some potential issues with: Character creation/NPC guild-join timestamps, NPC movement, combat timers, idle timeouts, item decay, spellcasting Added support for new JS Events that can trigger from global script, and can be used to store persistent custom entries in players' paperdoll profiles: onProfileRequest( socket, profileOwnerChar ) - Triggers when client requests data for a paperdoll profile onProfileUpdate( socket, updatedText ) - Triggers when client sends updated data from paperdoll profile Added two new helper functions in code that allows faster (but very slightly less accurate) distance checks between two points: GetApproxDist( Point3_st a, Point3_st b ) GetApproxDist( CBaseObject *a, CBaseObject *b ) Improved pathfinding for NPCs attempting to follow another character, by adopting a system of weighted variables to help the NPC determine when to recalculate the path vs when to stick with the old, combined with faster distance checks via GetApproxDist(). The end result of this is faster, smarter and more responsive NPC followers and NPC opponents in combat. The variables influencing this include: how far the target has moved from last pathfind target location, whether NPC is heading in the overall right direction or not, time since last path calculation and some small randomization to avoid edge case jitters. Updated default command levels in commands.dfn, code and scripts to support the Seer role and make space for some custom roles. These are the new defaults as listed in commands.dfn, which should not be changed as they are linked to specific enums in code. Do take note that this might invalidate command levels for existing GMs/Seers/Counselors, who might need another round of 'make gm/seer/cns from an admin: ADMIN - command level 10 GM - command level 9 SEER - command level 7 CNS - command level 4 PLAYER - command level 0 Updated how UOX3 makes use of the account-level flags 0x2000 (Seer) and 0x4000 (Counselor). If either of these flags are set on an account, all new characters created on the accounts will automatically receive the relevant command privileges. Fixed an issue with 'wholist command that prevented admin characters from seeing characters with lower privilege levels in the list (js/commands/wholist.js) Fixed an issue with hiding/GM hide that prevented admin characters from seeing hidden characters with lower privilege levels in the world UOX3 now includes the cross-platform, header-only utf8cpp library found at https://github.com/nemtrif/utfcpp and freely available under Boost Software License v1.0. The immediate use-case for this is in code right now is to better handle strings related to custom paperdoll profiles, but will also look to make more heavy use of this in future updates
2025-06-28 22:37:42 +08:00
bool DecayItem( CItem& toDecay, const TIMERVAL nextDecayItems, const TIMERVAL nextDecayItemsInHouses );
void CheckAI( CChar& mChar );
//o------------------------------------------------------------------------------------------------o
// Internal Pre-Declares
//o------------------------------------------------------------------------------------------------o
#if PLATFORM == WINDOWS
2022-06-08 10:38:16 -04:00
BOOL WINAPI exit_handler( DWORD dwCtrlType );
#else
2022-06-08 10:38:16 -04:00
void app_stopped(int sig);
#endif
auto EndMessage( SI32 x ) -> void;
auto InitClasses() -> void;
auto InitMultis() -> void;
auto DisplayBanner() -> void;
auto CheckConsoleKeyThread() -> void;
2022-06-08 10:38:16 -04:00
auto DoMessageLoop() -> void;
auto StartInitialize( CServerData &server_data ) -> void;
auto InitOperatingSystem() -> std::optional<std::string>;
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
auto AdjustInterval( std::chrono::milliseconds interval, std::chrono::milliseconds maxTimer ) -> std::chrono::milliseconds;
2022-06-08 21:32:35 -04:00
//o------------------------------------------------------------------------------------------------o
//| Function - main()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Main UOX startup
//o------------------------------------------------------------------------------------------------o
auto main( SI32 argc, char *argv[] ) ->int
{
2022-06-08 10:38:16 -04:00
UI32 tempSecs, tempMilli, tempTime;
UI32 loopSecs, loopMilli;
2022-06-08 21:32:35 -04:00
TIMERVAL uiNextCheckConn = 0;
2022-06-11 07:55:06 -04:00
// We are going to do some fundmental checks, that if fail, we will bail out before
// setting up
auto configFile = std::string( "uox.ini" );
if( argc > 1 )
{
configFile = argv[1];
2022-06-11 07:55:06 -04:00
}
2022-06-22 09:13:10 -04:00
auto status = InitOperatingSystem();
if( status.has_value() )
{
std::cerr << status.value() << std::endl;
2022-06-11 07:55:06 -04:00
return EXIT_FAILURE;
}
// Ok, we probably want the Console now
Console.Initialize();
Console.Start( oldstrutil::format( "%s v%s.%s (%s)", CVersionClass::GetProductName().c_str(), CVersionClass::GetVersion().c_str(), CVersionClass::GetBuild().c_str(), OS_STR ));
Console.PrintSectionBegin();
Console << "UOX Server start up!" << myendl << "Welcome to " << CVersionClass::GetProductName() << " v" << CVersionClass::GetVersion() << "." << CVersionClass::GetBuild() << " (" << OS_STR << ")" << myendl;
Console.PrintSectionBegin();
// We are going to load some of our basic data, if that goes ok, we then initialize classes, data, network
// and the classes
Console << "Processing INI Settings ";
if( !std::filesystem::exists( std::filesystem::path( configFile )))
{
Console.Error( configFile.empty() ? "Cannot find UOX3 ini file." : oldstrutil::format( "Cannot find UOX3 ini file: %s", configFile.c_str() ));
2022-06-21 23:00:23 -04:00
return EXIT_FAILURE;
}
auto serverdata = CServerData();
if( !serverdata.Load( configFile ))
{
Console.Error( configFile.empty() ? "Error loading UOX3 ini file." : oldstrutil::format( "Error loading UOX3 ini file: %s", configFile.c_str() ));
return EXIT_FAILURE;
}
Console.PrintDone();
// Start/Initalize classes, data, network
StartInitialize( serverdata );
2023-07-08 14:25:04 -04:00
2022-06-08 21:32:35 -04:00
// Main Loop
Console.PrintSectionBegin();
EVENT_TIMER( stopwatch, EVENT_TIMER_OFF );
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
// Initiate APS - Adaptive Performance System
// Tracks simulation cycles over time and adjusts how often NPC AI/Pathfinding is updated as
// necessary to keep shard performance and responsiveness to player input at acceptable levels
auto apsPerfThreshold = cwmWorldState->ServerData()->APSPerfThreshold(); // Performance threshold from ini, 0 disables APS feature
2023-07-08 14:25:04 -04:00
[[maybe_unused]] int avgSimCycles = 0;
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
UI16 apsMovingAvgOld = 0;
const int maxSimCycleSamples = 10; // Max number of samples for moving average
std::vector<int> simCycleSamples; // Store simulation cycle measurements for moving average
// Fetch step value used by APS to gradually adjust delay in NPC AI/movement checking
const std::chrono::milliseconds apsDelayStep = std::chrono::milliseconds( cwmWorldState->ServerData()->APSDelayStep() );
// Fetch max cap for delay introduced into loop by APS for checking NPC AI/movement stuff
const std::chrono::milliseconds apsDelayMaxCap = std::chrono::milliseconds( cwmWorldState->ServerData()->APSDelayMaxCap() );
// Setup initial values for apsDelay
std::chrono::milliseconds apsDelay = std::chrono::milliseconds( 0 );
std::chrono::time_point<std::chrono::system_clock> adaptivePerfTimer = std::chrono::system_clock::now() + apsDelay;
2023-07-08 14:25:04 -04:00
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
// Set the interval for APS evaluation and adjustment, and set initial timestamp for first evaluation
const std::chrono::milliseconds evaluationInterval = std::chrono::milliseconds( cwmWorldState->ServerData()->APSInterval() );
std::chrono::time_point<std::chrono::system_clock> nextEvaluationTime = std::chrono::system_clock::now() + evaluationInterval;
Small update Fixed an issue with an internal movement check that prevented characters from moving in valid map areas in Felucca/Trammel from X 6144 to X 7168 Fixed an issue where .instanceID property was misspelled in 'xgo GM command script, causing characters to be teleported to an out of bounds area where they would no longer be saved (js/commands/targeting/x.js) Added some additional error-checking to .Teleport()/.SetLocation() JS Method to prevent script-accidents from sending characters out of bounds. Updated Poisoning skill to add poison-charges to weapons being poisoned. Charges are consumed when applying poison in combat (js/skill/poisoning.js) Updated combat code to consume poison-charges if a poisoned weapon is used to poison an opponent Updated shoplists for Blacksmiths and Weaponsmiths - they now buy/sell longswords (dfndata/items/shoplist.dfn) Updated MageShopping shoplist for mage vendors - they now buy/sell mass curse scrolls (dfndata/items/shoplist.dfn) Added new Spawn Region DFN tag that can specify which era or eras of UO (Multiple comma-separated entries supported) a given spawn region is valid for. Spawn region not valid for core shard era will be ignored. Syntax: ERAS=UO,T2A,UOR,LBR,AOS,SE,ML,SA,HS,TOL Added new Spawn Region DFN tag that allows using another spawn region as a "parent". All properties of this parent will be inherited except for these, which are ignored: ERAS, NPCLIST, ITEMLIST, NPC and ITEM. Syntax for new tag: GET=# // Inherit a specified spawn region Added spawn region for animal trainer vendor in Vesper stable Added spawn region for fur trader/tanner vendors in The Best Hides of Britain Added spawn region for spinner vendor in The Lord's Clothier's and The Right Fit shops in Britain Added spawn region for tanner NPC to Nujel'm Tannery (and fixed leatherworker spawn region for same area) Added spawn regions for banker NPCs in East Bank of Britain, First Bank of Moonglow, Jhelom Bank and Jeweler, Bank of Skara Brae Added spawn regions for stables, tailor and blacksmith inside Castle British Added spawn regions for mage shops, mage guilds and farm houses in Moonglow Added spawn regions for misc vendors and townfolk in multiple cities Added spawn regions for Fire Island Updated spawn regions for Dagger Isle/Ice Island Added spawn regions for forests and jungles in southern Britannia and on various islands including Bucc's Den, Moonglow, Serpent's Hold, and misc unpopulated islands Added spawn regions for area east of Skara Brae, around Hedge Maze and south of Britain Added spawn regions for wandering healers outside every dungeon entrance in Britannia and Lost Lands Re-integrated ocean spawn regions for ocean creatures (dolphin, walrus, water elemental, sea serpent) from the original community-based spawn file Added reagent spawns in overworld spawn regions in Britannia/Lost Lands Added special reagent spawns in swamp areas Added additional overworld spawn regions in Britannia/Lost Lands Added spawn regions for Khaldun dungeon that spawn some new and some old NPCs: Old: Zombies, skeletons, skeletal mages, skeletal knights, ancient liches New: Cursed (and named) NPCs, shadowfiends, zealots of khaldun (knights/summoners), tentacles of the harrower Updated size and positions of some existing overworld spawn regions Fixed incorrect spawn region size for small island south of Trinsic Added switch/door puzzle functionality in Khaldun dungeon using new switch/door combo script (js/item/dungeons/switch_door_combo.js) Added "smart objects" in Khaldun dungeon that activate when you come close enough (js/item/dungeons/smart_activate_item.js) Added teleport locations within Khaldun dungeon (js/teleport.scp) Added custom AIs to existing NPC spawning in Khaldun dungeon: Ancient Lich (summons other undead, and can turn into one of them for disguise) Added DFN entries for new NPCs spawning in Khaldun dungeon, some with custom AIs: [tentacles_of_the_harrower] -> Tentacles of the Harrower (life steal) [shadowfiend] -> Shadowfiends (seek out and reveal hidden players) [zealot_knight]/[zealot_summoner] -> Zealots of Khaldun (turn into undead on death, male/female variants) [cursed] -> Cursed (male/female variants) [spectralarmor] -> Spectral Armor Added DFN entries for new (named) NPCs spawning in Khaldun dungeon: [lysander_gathenwale] -> Lysander Gathenwale [grimmoch_drummel] -> Grimmoch Drummel [morg_bergen] -> Morg Bergen [tavara_sewel] -> Tavara Sewel Added new NPC DFN entries: [leatherworker] -> alias for male/female leatherworker vendors [mapmaker] -> alias for male/female mapmaker vendors Added new Race DFN entries: [RACE 29] -> Cursed (enemies of RACE 30) [RACE 30] -> Zealots (enemies of RACE 29) Added new book DFN entries for Khaldun journals of Lysander, Tavara and Grimmoch - available as loot from the respective NPCs (dfndata/misc/books.dfn and dfndata/items/misc/books.dfn) Added 25% chance for hit-animations and hit-SFX to play for targets in combat, instead of playing every time - can get very spammy Monsters with actual weapons equipped (like Ophidian Enforcer with Halberd/Bardiche) will now get appropriate combat SFX for hitting with that weapon Updated Healing skill to base cure/resurrection skill requirements on the calculated skill, rather than base skill (js/skill/healing.js) Fixed an issue where healing with bandages and dying in the process would not properly reset the healing-related tags and skills used Updated healing script to show a resurrection confirmation menu for players targeted with bandages for resurrect (js/skill/healing.js) All skill usage states now reset on death, to prevent cases of players being "busy" while trying to use skills that got stuck due to script bugs. The 'regspawn GM command now supports a new parameter called "max". Updated command syntax: 'regspawn # // perform a single respawn cycle in a specific spawn region 'regspawn all // perform a single respawn cycle across all spawn regions 'regspawn max // respawn ALL spawn regions to MAX capacity in one go Added new UOX.INI setting that determines the maximum range at which NPCs can initiate attacks on players/NPCs (the old MAXRANGE=10 setting now instead defines max range at which players can initiate attacks on players/NPCs): MAXNPCAGGRORANGE=10 Optimized performance by significantly reducing the number of line-of-sight checks performed by characters, especially in combat scenarios, or when evaluating potential targets for NPC AIs. The amount of checks done is also affected by the new ini setting for max aggro range. Fixed an issue where both NPC and player characters would instantly drop one hunger level (from 6 to 5) upon creation since hungerrate was not initialized until after first hunger-event Updated character priv property from UI16 to UI32, and added a new flag that determines if fame/karma title is hidden for character: HIDEFAMEKARMATITLE (0x10000) NPCs will no longer aggro other NPCs if the Z difference between them is greater or equal to 20 (i.e. they're on different floors), unless both are using ranged weapons and both are in range Fixed an issue where players could get discounts from shopkeepers even though neither player nor shopkeeper were members of a NPC guild (js/npc/ai/shopkeeper.js) Fixed an issue where the "premium" a player would get when selling items to a shopkeeper in the same NPC guild as them would be 110% extra on top of the item's value, instead of the intended 10% (js/npc/ai/shopkeeper.js) (Thanks, cobrag0318!) Added missing tall straw hat to tailoring crafting scripts (Thanks, Dragon Slayer!) Improved error reporting during compilation of individual scripts being reloaded - will now show more context and line number onCombatEnd JS Event now also triggers when NPCs ignore their target and/or evade during combat Updated 'decorate command to support saving/loading custom tags on items for world templates. These are stored after a @ symbol in the world template, each custom tag separated by a | symbol, and with each custom tag saved using this syntax: key$type$value Updated resource-harvesting scripts to use script-specific global (const) variables, to avoid interference between different scripts (js/server/resource/*) Added new resource-harvesting scripts and added spawn regions for these in fields on farms all over Britannia/Lost Lands cabbages (js/server/resource/cabbages.js) canteloupes (js/server/resource/canteloupes.js) carrots (js/server/resource/carrots.js) garlic (js/server/resource/garlic.js) gourds (js/server/resource/gourds.js) honeydew melons (js/server/resource/honeydewmelon.js) onions (js/server/resource/onions.js) pumpkins (js/server/resource/pumpkins.js) squashes (js/server/resource/squashes.js) turnips (js/server/resource/turnips.js) watermelons (js/server/resource/watermelon.js) Updated CSpawnRegion::FindItemSpotToSpawn() function in cSpawnRegion.cpp to prevent duplicate spawning of exact same item in exact same location Updated sectionid of all potion and scroll aliases to match main item, so they'll get correctly picked up by NPC shopkeepers (dfndata/items/magic/potions.dfn and scrolls.dfn) Specified sectionid for backpacks, so it also gets applied to packs added using the alias [backpack] (dfndata/items/misc/provisions.dfn) Fixed a code issue that prevented players from selling empty containers to NPC shopkeepers willing to buy such containers Fixed an issue where field-spells (wall of stone, poison field, etc) would ignore dynamic/static items that should block these Fixed an issue where field-spells could be cast into houses from the outside by standing next to a wall and targeting self Fixed a War/Peace-mode desync between client and server by having server always notify client (using war-toggle packet) when the "at war" flag is toggled for player character Fixed an issue with hiding skill that wouldn't allow player to hide after having acquired self as target in combat (through spellcasting, for instance) (Thanks, Dragon Slayer!) Fixed an issue where mana/reagents were consumed and skillcheck performed before all spellcast-validations had succeeded, resulting in the occasional loss of reagents/mana when spellcasting was disallowed (code and js/magic/clumsy.js and level1targ.js) Fixed an issue with lack of criminal-flagging for casting of hostile spells scripted in JS (clumsy, magic arrow, feeblemind) vs blue targets (js/magic/clumsy.js and level1targ.js) Fixed some issues with Line-of-Sight checking code that returned incorrect results, which amongst other things affected spellcasting in areas with uneven terrain Fixed some issues with movement code and climbing of ladders, in particular the rope ladder in the 2-story log cabin. Code now sets a "is climbing" flag when character steps onto a rope ladder, and uses that to help resolve some edge cases, and then unsets it when they step off. Renamed section headers of some map-items in DFNs from "locationname" to "locationnamemap" for clarity (example: "britain" to "britainmap") Fixed broken "map wrapping" when sailing to edges of map in Felucca or Trammel Fixed a server crash related to attempts at reading data from invalid map tiles
2025-06-27 08:40:02 +08:00
bool isApsActive = false;
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
// Core server loop
while( cwmWorldState->GetKeepRun() )
{
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
std::this_thread::sleep_for( std::chrono::milliseconds( cwmWorldState->GetPlayersOnline() ? 5 : 90 ));
if( cwmWorldState->ServerProfile()->LoopTimeCount() >= 1000 )
{
2022-06-08 21:32:35 -04:00
cwmWorldState->ServerProfile()->LoopTimeCount( 0 );
cwmWorldState->ServerProfile()->LoopTime( 0 );
}
cwmWorldState->ServerProfile()->IncLoopTimeCount();
2022-06-08 21:32:35 -04:00
StartMilliTimer( loopSecs, loopMilli );
if( cwmWorldState->ServerProfile()->NetworkTimeCount() >= 1000 )
{
2022-06-08 21:32:35 -04:00
cwmWorldState->ServerProfile()->NetworkTimeCount( 0 );
cwmWorldState->ServerProfile()->NetworkTime( 0 );
}
2022-06-08 10:38:16 -04:00
2022-06-08 21:32:35 -04:00
StartMilliTimer( tempSecs, tempMilli );
EVENT_TIMER_RESET( stopwatch );
2022-06-08 21:32:35 -04:00
if( uiNextCheckConn <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 21:32:35 -04:00
// Cut lag on CheckConn by not doing it EVERY loop.
Network->CheckConnections();
uiNextCheckConn = BuildTimeValue( 1.0 );
2022-06-08 21:32:35 -04:00
}
Network->CheckMessages();
EVENT_TIMER_NOW( stopwatch, Complete net checkmessages, EVENT_TIMER_KEEP );
2022-06-08 21:32:35 -04:00
tempTime = CheckMilliTimer( tempSecs, tempMilli );
cwmWorldState->ServerProfile()->IncNetworkTime( tempTime );
cwmWorldState->ServerProfile()->IncNetworkTimeCount();
if( cwmWorldState->ServerProfile()->TimerTimeCount() >= 1000 )
{
2022-06-08 21:32:35 -04:00
cwmWorldState->ServerProfile()->TimerTimeCount( 0 );
cwmWorldState->ServerProfile()->TimerTime( 0 );
}
StartMilliTimer( tempSecs, tempMilli );
cwmWorldState->CheckTimers();
cwmWorldState->SetUICurrentTime( GetClock() );
2022-06-08 21:32:35 -04:00
tempTime = CheckMilliTimer( tempSecs, tempMilli );
cwmWorldState->ServerProfile()->IncTimerTime( tempTime );
cwmWorldState->ServerProfile()->IncTimerTimeCount();
if( cwmWorldState->ServerProfile()->AutoTimeCount() >= 1000 )
{
2022-06-08 21:32:35 -04:00
cwmWorldState->ServerProfile()->AutoTimeCount( 0 );
cwmWorldState->ServerProfile()->AutoTime( 0 );
}
StartMilliTimer( tempSecs, tempMilli );
if( !cwmWorldState->GetReloadingScripts() )
{
//auto stopauto = EventTimer();
EVENT_TIMER( stopauto, EVENT_TIMER_OFF );
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
std::chrono::time_point<std::chrono::system_clock> currentTime = std::chrono::system_clock::now();
if( apsPerfThreshold == static_cast<UI16>( 0 ) || apsDelay == std::chrono::milliseconds(0) || currentTime >= adaptivePerfTimer )
{
// Check autotimers if the APS feature is disabled, if there's no delay, or if timer has expired
cwmWorldState->CheckAutoTimers();
// Set timer for next update, if apsDelay is higher than 0
if( apsDelay > std::chrono::milliseconds( 0 ))
{
adaptivePerfTimer = std::chrono::system_clock::now() + apsDelay;
}
}
EVENT_TIMER_NOW( stopauto, CheckAutoTimers only, EVENT_TIMER_CLEAR );
2022-06-08 21:32:35 -04:00
}
tempTime = CheckMilliTimer( tempSecs, tempMilli );
cwmWorldState->ServerProfile()->IncAutoTime( tempTime );
cwmWorldState->ServerProfile()->IncAutoTimeCount();
StartMilliTimer( tempSecs, tempMilli );
EVENT_TIMER_RESET( stopwatch );
2022-06-08 21:32:35 -04:00
Network->ClearBuffers();
EVENT_TIMER_NOW( stopwatch, Delta for ClearBuffers, EVENT_TIMER_CLEAR );
2022-06-08 21:32:35 -04:00
tempTime = CheckMilliTimer( tempSecs, tempMilli );
cwmWorldState->ServerProfile()->IncNetworkTime( tempTime );
tempTime = CheckMilliTimer( loopSecs, loopMilli );
cwmWorldState->ServerProfile()->IncLoopTime( tempTime );
EVENT_TIMER_RESET( stopwatch );
2022-06-08 21:32:35 -04:00
DoMessageLoop();
EVENT_TIMER_NOW( stopwatch, Delta for DoMessageLoop, EVENT_TIMER_CLEAR );
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
// Check if it's time for evaluation and adjustment
std::chrono::time_point<std::chrono::system_clock> currentTime = std::chrono::system_clock::now();
if( apsPerfThreshold > static_cast<UI16>( 0 ) && currentTime >= nextEvaluationTime )
{
// Get simulation cycles count
auto simCycles = ( 1000.0 * ( 1.0 / static_cast<R32>( static_cast<R32>( cwmWorldState->ServerProfile()->LoopTime() ) / static_cast<R32>( cwmWorldState->ServerProfile()->LoopTimeCount() ))));
// Store last X simCycle samples
simCycleSamples.push_back( simCycles );
// Limit the number of samples kept to X
if( simCycleSamples.size() > maxSimCycleSamples )
{
simCycleSamples.erase( simCycleSamples.begin() );
}
int sum = std::accumulate( simCycleSamples.begin(), simCycleSamples.end(), 0 );
UI16 apsMovingAvg = static_cast<UI16>( sum / simCycleSamples.size() );
if( apsMovingAvg < apsPerfThreshold )
{
// Performance is below threshold...
if( apsMovingAvg <= apsMovingAvgOld && apsDelay < apsDelayMaxCap )
{
// ... and dropping, or stable at low performance! DO SOMETHING...
apsDelay = apsDelay + apsDelayStep;
#if defined( UOX_DEBUG_MODE )
Console << "Performance below threshold! Increasing adaptive performance timer: " << apsDelay.count() << "ms" << "\n";
Small update Fixed an issue with an internal movement check that prevented characters from moving in valid map areas in Felucca/Trammel from X 6144 to X 7168 Fixed an issue where .instanceID property was misspelled in 'xgo GM command script, causing characters to be teleported to an out of bounds area where they would no longer be saved (js/commands/targeting/x.js) Added some additional error-checking to .Teleport()/.SetLocation() JS Method to prevent script-accidents from sending characters out of bounds. Updated Poisoning skill to add poison-charges to weapons being poisoned. Charges are consumed when applying poison in combat (js/skill/poisoning.js) Updated combat code to consume poison-charges if a poisoned weapon is used to poison an opponent Updated shoplists for Blacksmiths and Weaponsmiths - they now buy/sell longswords (dfndata/items/shoplist.dfn) Updated MageShopping shoplist for mage vendors - they now buy/sell mass curse scrolls (dfndata/items/shoplist.dfn) Added new Spawn Region DFN tag that can specify which era or eras of UO (Multiple comma-separated entries supported) a given spawn region is valid for. Spawn region not valid for core shard era will be ignored. Syntax: ERAS=UO,T2A,UOR,LBR,AOS,SE,ML,SA,HS,TOL Added new Spawn Region DFN tag that allows using another spawn region as a "parent". All properties of this parent will be inherited except for these, which are ignored: ERAS, NPCLIST, ITEMLIST, NPC and ITEM. Syntax for new tag: GET=# // Inherit a specified spawn region Added spawn region for animal trainer vendor in Vesper stable Added spawn region for fur trader/tanner vendors in The Best Hides of Britain Added spawn region for spinner vendor in The Lord's Clothier's and The Right Fit shops in Britain Added spawn region for tanner NPC to Nujel'm Tannery (and fixed leatherworker spawn region for same area) Added spawn regions for banker NPCs in East Bank of Britain, First Bank of Moonglow, Jhelom Bank and Jeweler, Bank of Skara Brae Added spawn regions for stables, tailor and blacksmith inside Castle British Added spawn regions for mage shops, mage guilds and farm houses in Moonglow Added spawn regions for misc vendors and townfolk in multiple cities Added spawn regions for Fire Island Updated spawn regions for Dagger Isle/Ice Island Added spawn regions for forests and jungles in southern Britannia and on various islands including Bucc's Den, Moonglow, Serpent's Hold, and misc unpopulated islands Added spawn regions for area east of Skara Brae, around Hedge Maze and south of Britain Added spawn regions for wandering healers outside every dungeon entrance in Britannia and Lost Lands Re-integrated ocean spawn regions for ocean creatures (dolphin, walrus, water elemental, sea serpent) from the original community-based spawn file Added reagent spawns in overworld spawn regions in Britannia/Lost Lands Added special reagent spawns in swamp areas Added additional overworld spawn regions in Britannia/Lost Lands Added spawn regions for Khaldun dungeon that spawn some new and some old NPCs: Old: Zombies, skeletons, skeletal mages, skeletal knights, ancient liches New: Cursed (and named) NPCs, shadowfiends, zealots of khaldun (knights/summoners), tentacles of the harrower Updated size and positions of some existing overworld spawn regions Fixed incorrect spawn region size for small island south of Trinsic Added switch/door puzzle functionality in Khaldun dungeon using new switch/door combo script (js/item/dungeons/switch_door_combo.js) Added "smart objects" in Khaldun dungeon that activate when you come close enough (js/item/dungeons/smart_activate_item.js) Added teleport locations within Khaldun dungeon (js/teleport.scp) Added custom AIs to existing NPC spawning in Khaldun dungeon: Ancient Lich (summons other undead, and can turn into one of them for disguise) Added DFN entries for new NPCs spawning in Khaldun dungeon, some with custom AIs: [tentacles_of_the_harrower] -> Tentacles of the Harrower (life steal) [shadowfiend] -> Shadowfiends (seek out and reveal hidden players) [zealot_knight]/[zealot_summoner] -> Zealots of Khaldun (turn into undead on death, male/female variants) [cursed] -> Cursed (male/female variants) [spectralarmor] -> Spectral Armor Added DFN entries for new (named) NPCs spawning in Khaldun dungeon: [lysander_gathenwale] -> Lysander Gathenwale [grimmoch_drummel] -> Grimmoch Drummel [morg_bergen] -> Morg Bergen [tavara_sewel] -> Tavara Sewel Added new NPC DFN entries: [leatherworker] -> alias for male/female leatherworker vendors [mapmaker] -> alias for male/female mapmaker vendors Added new Race DFN entries: [RACE 29] -> Cursed (enemies of RACE 30) [RACE 30] -> Zealots (enemies of RACE 29) Added new book DFN entries for Khaldun journals of Lysander, Tavara and Grimmoch - available as loot from the respective NPCs (dfndata/misc/books.dfn and dfndata/items/misc/books.dfn) Added 25% chance for hit-animations and hit-SFX to play for targets in combat, instead of playing every time - can get very spammy Monsters with actual weapons equipped (like Ophidian Enforcer with Halberd/Bardiche) will now get appropriate combat SFX for hitting with that weapon Updated Healing skill to base cure/resurrection skill requirements on the calculated skill, rather than base skill (js/skill/healing.js) Fixed an issue where healing with bandages and dying in the process would not properly reset the healing-related tags and skills used Updated healing script to show a resurrection confirmation menu for players targeted with bandages for resurrect (js/skill/healing.js) All skill usage states now reset on death, to prevent cases of players being "busy" while trying to use skills that got stuck due to script bugs. The 'regspawn GM command now supports a new parameter called "max". Updated command syntax: 'regspawn # // perform a single respawn cycle in a specific spawn region 'regspawn all // perform a single respawn cycle across all spawn regions 'regspawn max // respawn ALL spawn regions to MAX capacity in one go Added new UOX.INI setting that determines the maximum range at which NPCs can initiate attacks on players/NPCs (the old MAXRANGE=10 setting now instead defines max range at which players can initiate attacks on players/NPCs): MAXNPCAGGRORANGE=10 Optimized performance by significantly reducing the number of line-of-sight checks performed by characters, especially in combat scenarios, or when evaluating potential targets for NPC AIs. The amount of checks done is also affected by the new ini setting for max aggro range. Fixed an issue where both NPC and player characters would instantly drop one hunger level (from 6 to 5) upon creation since hungerrate was not initialized until after first hunger-event Updated character priv property from UI16 to UI32, and added a new flag that determines if fame/karma title is hidden for character: HIDEFAMEKARMATITLE (0x10000) NPCs will no longer aggro other NPCs if the Z difference between them is greater or equal to 20 (i.e. they're on different floors), unless both are using ranged weapons and both are in range Fixed an issue where players could get discounts from shopkeepers even though neither player nor shopkeeper were members of a NPC guild (js/npc/ai/shopkeeper.js) Fixed an issue where the "premium" a player would get when selling items to a shopkeeper in the same NPC guild as them would be 110% extra on top of the item's value, instead of the intended 10% (js/npc/ai/shopkeeper.js) (Thanks, cobrag0318!) Added missing tall straw hat to tailoring crafting scripts (Thanks, Dragon Slayer!) Improved error reporting during compilation of individual scripts being reloaded - will now show more context and line number onCombatEnd JS Event now also triggers when NPCs ignore their target and/or evade during combat Updated 'decorate command to support saving/loading custom tags on items for world templates. These are stored after a @ symbol in the world template, each custom tag separated by a | symbol, and with each custom tag saved using this syntax: key$type$value Updated resource-harvesting scripts to use script-specific global (const) variables, to avoid interference between different scripts (js/server/resource/*) Added new resource-harvesting scripts and added spawn regions for these in fields on farms all over Britannia/Lost Lands cabbages (js/server/resource/cabbages.js) canteloupes (js/server/resource/canteloupes.js) carrots (js/server/resource/carrots.js) garlic (js/server/resource/garlic.js) gourds (js/server/resource/gourds.js) honeydew melons (js/server/resource/honeydewmelon.js) onions (js/server/resource/onions.js) pumpkins (js/server/resource/pumpkins.js) squashes (js/server/resource/squashes.js) turnips (js/server/resource/turnips.js) watermelons (js/server/resource/watermelon.js) Updated CSpawnRegion::FindItemSpotToSpawn() function in cSpawnRegion.cpp to prevent duplicate spawning of exact same item in exact same location Updated sectionid of all potion and scroll aliases to match main item, so they'll get correctly picked up by NPC shopkeepers (dfndata/items/magic/potions.dfn and scrolls.dfn) Specified sectionid for backpacks, so it also gets applied to packs added using the alias [backpack] (dfndata/items/misc/provisions.dfn) Fixed a code issue that prevented players from selling empty containers to NPC shopkeepers willing to buy such containers Fixed an issue where field-spells (wall of stone, poison field, etc) would ignore dynamic/static items that should block these Fixed an issue where field-spells could be cast into houses from the outside by standing next to a wall and targeting self Fixed a War/Peace-mode desync between client and server by having server always notify client (using war-toggle packet) when the "at war" flag is toggled for player character Fixed an issue with hiding skill that wouldn't allow player to hide after having acquired self as target in combat (through spellcasting, for instance) (Thanks, Dragon Slayer!) Fixed an issue where mana/reagents were consumed and skillcheck performed before all spellcast-validations had succeeded, resulting in the occasional loss of reagents/mana when spellcasting was disallowed (code and js/magic/clumsy.js and level1targ.js) Fixed an issue with lack of criminal-flagging for casting of hostile spells scripted in JS (clumsy, magic arrow, feeblemind) vs blue targets (js/magic/clumsy.js and level1targ.js) Fixed some issues with Line-of-Sight checking code that returned incorrect results, which amongst other things affected spellcasting in areas with uneven terrain Fixed some issues with movement code and climbing of ladders, in particular the rope ladder in the 2-story log cabin. Code now sets a "is climbing" flag when character steps onto a rope ladder, and uses that to help resolve some edge cases, and then unsets it when they step off. Renamed section headers of some map-items in DFNs from "locationname" to "locationnamemap" for clarity (example: "britain" to "britainmap") Fixed broken "map wrapping" when sailing to edges of map in Felucca or Trammel Fixed a server crash related to attempts at reading data from invalid map tiles
2025-06-27 08:40:02 +08:00
#else
if( !isApsActive )
{
isApsActive = true;
Console << "Performance below threshold. Adaptive Performance System enabled.\n";
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
#endif
}
// If performance is below, but increasing, wait and see before reacting
}
else
{
// Performance exceeds threshold...
if( apsDelay >= apsDelayStep )
{
// ... reduce timer for snappier NPC AI/movement/etc.
apsDelay = apsDelay - apsDelayStep;
#if defined( UOX_DEBUG_MODE )
Console << "Performance exceeds threshold. Decreasing adaptive performance timer: " << apsDelay.count() << "ms" << "\n";
Small update Fixed an issue with an internal movement check that prevented characters from moving in valid map areas in Felucca/Trammel from X 6144 to X 7168 Fixed an issue where .instanceID property was misspelled in 'xgo GM command script, causing characters to be teleported to an out of bounds area where they would no longer be saved (js/commands/targeting/x.js) Added some additional error-checking to .Teleport()/.SetLocation() JS Method to prevent script-accidents from sending characters out of bounds. Updated Poisoning skill to add poison-charges to weapons being poisoned. Charges are consumed when applying poison in combat (js/skill/poisoning.js) Updated combat code to consume poison-charges if a poisoned weapon is used to poison an opponent Updated shoplists for Blacksmiths and Weaponsmiths - they now buy/sell longswords (dfndata/items/shoplist.dfn) Updated MageShopping shoplist for mage vendors - they now buy/sell mass curse scrolls (dfndata/items/shoplist.dfn) Added new Spawn Region DFN tag that can specify which era or eras of UO (Multiple comma-separated entries supported) a given spawn region is valid for. Spawn region not valid for core shard era will be ignored. Syntax: ERAS=UO,T2A,UOR,LBR,AOS,SE,ML,SA,HS,TOL Added new Spawn Region DFN tag that allows using another spawn region as a "parent". All properties of this parent will be inherited except for these, which are ignored: ERAS, NPCLIST, ITEMLIST, NPC and ITEM. Syntax for new tag: GET=# // Inherit a specified spawn region Added spawn region for animal trainer vendor in Vesper stable Added spawn region for fur trader/tanner vendors in The Best Hides of Britain Added spawn region for spinner vendor in The Lord's Clothier's and The Right Fit shops in Britain Added spawn region for tanner NPC to Nujel'm Tannery (and fixed leatherworker spawn region for same area) Added spawn regions for banker NPCs in East Bank of Britain, First Bank of Moonglow, Jhelom Bank and Jeweler, Bank of Skara Brae Added spawn regions for stables, tailor and blacksmith inside Castle British Added spawn regions for mage shops, mage guilds and farm houses in Moonglow Added spawn regions for misc vendors and townfolk in multiple cities Added spawn regions for Fire Island Updated spawn regions for Dagger Isle/Ice Island Added spawn regions for forests and jungles in southern Britannia and on various islands including Bucc's Den, Moonglow, Serpent's Hold, and misc unpopulated islands Added spawn regions for area east of Skara Brae, around Hedge Maze and south of Britain Added spawn regions for wandering healers outside every dungeon entrance in Britannia and Lost Lands Re-integrated ocean spawn regions for ocean creatures (dolphin, walrus, water elemental, sea serpent) from the original community-based spawn file Added reagent spawns in overworld spawn regions in Britannia/Lost Lands Added special reagent spawns in swamp areas Added additional overworld spawn regions in Britannia/Lost Lands Added spawn regions for Khaldun dungeon that spawn some new and some old NPCs: Old: Zombies, skeletons, skeletal mages, skeletal knights, ancient liches New: Cursed (and named) NPCs, shadowfiends, zealots of khaldun (knights/summoners), tentacles of the harrower Updated size and positions of some existing overworld spawn regions Fixed incorrect spawn region size for small island south of Trinsic Added switch/door puzzle functionality in Khaldun dungeon using new switch/door combo script (js/item/dungeons/switch_door_combo.js) Added "smart objects" in Khaldun dungeon that activate when you come close enough (js/item/dungeons/smart_activate_item.js) Added teleport locations within Khaldun dungeon (js/teleport.scp) Added custom AIs to existing NPC spawning in Khaldun dungeon: Ancient Lich (summons other undead, and can turn into one of them for disguise) Added DFN entries for new NPCs spawning in Khaldun dungeon, some with custom AIs: [tentacles_of_the_harrower] -> Tentacles of the Harrower (life steal) [shadowfiend] -> Shadowfiends (seek out and reveal hidden players) [zealot_knight]/[zealot_summoner] -> Zealots of Khaldun (turn into undead on death, male/female variants) [cursed] -> Cursed (male/female variants) [spectralarmor] -> Spectral Armor Added DFN entries for new (named) NPCs spawning in Khaldun dungeon: [lysander_gathenwale] -> Lysander Gathenwale [grimmoch_drummel] -> Grimmoch Drummel [morg_bergen] -> Morg Bergen [tavara_sewel] -> Tavara Sewel Added new NPC DFN entries: [leatherworker] -> alias for male/female leatherworker vendors [mapmaker] -> alias for male/female mapmaker vendors Added new Race DFN entries: [RACE 29] -> Cursed (enemies of RACE 30) [RACE 30] -> Zealots (enemies of RACE 29) Added new book DFN entries for Khaldun journals of Lysander, Tavara and Grimmoch - available as loot from the respective NPCs (dfndata/misc/books.dfn and dfndata/items/misc/books.dfn) Added 25% chance for hit-animations and hit-SFX to play for targets in combat, instead of playing every time - can get very spammy Monsters with actual weapons equipped (like Ophidian Enforcer with Halberd/Bardiche) will now get appropriate combat SFX for hitting with that weapon Updated Healing skill to base cure/resurrection skill requirements on the calculated skill, rather than base skill (js/skill/healing.js) Fixed an issue where healing with bandages and dying in the process would not properly reset the healing-related tags and skills used Updated healing script to show a resurrection confirmation menu for players targeted with bandages for resurrect (js/skill/healing.js) All skill usage states now reset on death, to prevent cases of players being "busy" while trying to use skills that got stuck due to script bugs. The 'regspawn GM command now supports a new parameter called "max". Updated command syntax: 'regspawn # // perform a single respawn cycle in a specific spawn region 'regspawn all // perform a single respawn cycle across all spawn regions 'regspawn max // respawn ALL spawn regions to MAX capacity in one go Added new UOX.INI setting that determines the maximum range at which NPCs can initiate attacks on players/NPCs (the old MAXRANGE=10 setting now instead defines max range at which players can initiate attacks on players/NPCs): MAXNPCAGGRORANGE=10 Optimized performance by significantly reducing the number of line-of-sight checks performed by characters, especially in combat scenarios, or when evaluating potential targets for NPC AIs. The amount of checks done is also affected by the new ini setting for max aggro range. Fixed an issue where both NPC and player characters would instantly drop one hunger level (from 6 to 5) upon creation since hungerrate was not initialized until after first hunger-event Updated character priv property from UI16 to UI32, and added a new flag that determines if fame/karma title is hidden for character: HIDEFAMEKARMATITLE (0x10000) NPCs will no longer aggro other NPCs if the Z difference between them is greater or equal to 20 (i.e. they're on different floors), unless both are using ranged weapons and both are in range Fixed an issue where players could get discounts from shopkeepers even though neither player nor shopkeeper were members of a NPC guild (js/npc/ai/shopkeeper.js) Fixed an issue where the "premium" a player would get when selling items to a shopkeeper in the same NPC guild as them would be 110% extra on top of the item's value, instead of the intended 10% (js/npc/ai/shopkeeper.js) (Thanks, cobrag0318!) Added missing tall straw hat to tailoring crafting scripts (Thanks, Dragon Slayer!) Improved error reporting during compilation of individual scripts being reloaded - will now show more context and line number onCombatEnd JS Event now also triggers when NPCs ignore their target and/or evade during combat Updated 'decorate command to support saving/loading custom tags on items for world templates. These are stored after a @ symbol in the world template, each custom tag separated by a | symbol, and with each custom tag saved using this syntax: key$type$value Updated resource-harvesting scripts to use script-specific global (const) variables, to avoid interference between different scripts (js/server/resource/*) Added new resource-harvesting scripts and added spawn regions for these in fields on farms all over Britannia/Lost Lands cabbages (js/server/resource/cabbages.js) canteloupes (js/server/resource/canteloupes.js) carrots (js/server/resource/carrots.js) garlic (js/server/resource/garlic.js) gourds (js/server/resource/gourds.js) honeydew melons (js/server/resource/honeydewmelon.js) onions (js/server/resource/onions.js) pumpkins (js/server/resource/pumpkins.js) squashes (js/server/resource/squashes.js) turnips (js/server/resource/turnips.js) watermelons (js/server/resource/watermelon.js) Updated CSpawnRegion::FindItemSpotToSpawn() function in cSpawnRegion.cpp to prevent duplicate spawning of exact same item in exact same location Updated sectionid of all potion and scroll aliases to match main item, so they'll get correctly picked up by NPC shopkeepers (dfndata/items/magic/potions.dfn and scrolls.dfn) Specified sectionid for backpacks, so it also gets applied to packs added using the alias [backpack] (dfndata/items/misc/provisions.dfn) Fixed a code issue that prevented players from selling empty containers to NPC shopkeepers willing to buy such containers Fixed an issue where field-spells (wall of stone, poison field, etc) would ignore dynamic/static items that should block these Fixed an issue where field-spells could be cast into houses from the outside by standing next to a wall and targeting self Fixed a War/Peace-mode desync between client and server by having server always notify client (using war-toggle packet) when the "at war" flag is toggled for player character Fixed an issue with hiding skill that wouldn't allow player to hide after having acquired self as target in combat (through spellcasting, for instance) (Thanks, Dragon Slayer!) Fixed an issue where mana/reagents were consumed and skillcheck performed before all spellcast-validations had succeeded, resulting in the occasional loss of reagents/mana when spellcasting was disallowed (code and js/magic/clumsy.js and level1targ.js) Fixed an issue with lack of criminal-flagging for casting of hostile spells scripted in JS (clumsy, magic arrow, feeblemind) vs blue targets (js/magic/clumsy.js and level1targ.js) Fixed some issues with Line-of-Sight checking code that returned incorrect results, which amongst other things affected spellcasting in areas with uneven terrain Fixed some issues with movement code and climbing of ladders, in particular the rope ladder in the 2-story log cabin. Code now sets a "is climbing" flag when character steps onto a rope ladder, and uses that to help resolve some edge cases, and then unsets it when they step off. Renamed section headers of some map-items in DFNs from "locationname" to "locationnamemap" for clarity (example: "britain" to "britainmap") Fixed broken "map wrapping" when sailing to edges of map in Felucca or Trammel Fixed a server crash related to attempts at reading data from invalid map tiles
2025-06-27 08:40:02 +08:00
#else
if( apsDelay.count() == 0 )
{
Console << "Performance above threshold. Adaptive Performance System disabled.\n";
isApsActive = false;
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
#endif
}
}
// Update previous moving average
apsMovingAvgOld = apsMovingAvg;
// Adjust the interval based on the timer value
std::chrono::milliseconds adjustedInterval = AdjustInterval( evaluationInterval, apsDelay );
// Update the next evaluation time
nextEvaluationTime = currentTime + adjustedInterval;
}
2022-06-08 21:32:35 -04:00
}
// Shutdown/Cleanup
SysBroadcast( "The server is shutting down." );
2022-06-08 21:32:35 -04:00
Console << "Closing sockets...";
netpollthreadclose = true;
///HERE
Network->SockClose();
Console.PrintDone();
#if PLATFORM == WINDOWS
SetConsoleCtrlHandler( exit_handler, true );
#endif
if( cwmWorldState->GetWorldSaveProgress() != SS_SAVING )
{
2022-06-08 21:32:35 -04:00
isWorldSaving = true;
do
{
2022-06-08 21:32:35 -04:00
cwmWorldState->SaveNewWorld( true );
} while( cwmWorldState->GetWorldSaveProgress() == SS_SAVING );
isWorldSaving = false;
}
cwmWorldState->ServerData()->SaveIni();
2022-06-08 21:32:35 -04:00
#if PLATFORM == WINDOWS
SetConsoleCtrlHandler( exit_handler, false );
#endif
Console.Log( "Server Shutdown!\n=======================================================================\n" , "server.log" );
2022-06-08 21:32:35 -04:00
conThreadCloseOk = true; // This will signal the console thread to close
2022-06-08 21:32:35 -04:00
Shutdown( 0 );
// Will never reach this, as Shutdown "exits"
return EXIT_SUCCESS;
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
// Scaling function to adjust the interval based on the timer value
auto AdjustInterval( std::chrono::milliseconds interval, std::chrono::milliseconds maxTimer ) -> std::chrono::milliseconds
{
double scaleFactor = static_cast<double>(maxTimer.count()) / interval.count();
double adjustmentFactor = 0.25; // Adjust this factor to control the rate of adjustment
long long adjustedCount = static_cast<long long>(interval.count() * (1.0 + scaleFactor * adjustmentFactor));
return std::chrono::milliseconds(adjustedCount);
}
//o------------------------------------------------------------------------------------------------o
2022-06-11 07:55:06 -04:00
// Initialize the network
//o------------------------------------------------------------------------------------------------o
auto InitOperatingSystem() -> std::optional<std::string>
{
2022-06-11 07:55:06 -04:00
// Startup Winsock2(windows) or signal handers (unix)
#if PLATFORM == WINDOWS
WSADATA wsaData;
WORD wVersionRequested = MAKEWORD( 2, 2 );
SI32 err = WSAStartup( wVersionRequested, &wsaData );
if( err )
{
2022-06-11 14:59:16 -04:00
return "Winsock 2.2 not found on your system!"s;
2022-06-11 07:55:06 -04:00
}
#else
// Protection from server-shutdown during mid-worldsave
signal( SIGINT, app_stopped );
2022-06-11 07:55:06 -04:00
signal( SIGPIPE, SIG_IGN ); // This appears when we try to write to a broken network connection
#endif
return {};
}
2022-06-08 21:32:35 -04:00
//o------------------------------------------------------------------------------------------------o
2022-06-08 21:32:35 -04:00
// Startup and Initialization
//o------------------------------------------------------------------------------------------------o
auto StartInitialize( CServerData &serverdata ) -> void
{
saveOnShutdown = false;
2022-06-08 21:32:35 -04:00
// Let's measure startup time
auto startupStartTime = std::chrono::high_resolution_clock::now();
cwmWorldState = &aWorld;
cwmWorldState->SetServerData( serverdata );
Console << "Initializing and creating class pointers... " << myendl;
InitClasses();
cwmWorldState->SetUICurrentTime( GetClock() );
2022-06-08 21:32:35 -04:00
Console.PrintSectionBegin();
cwmWorldState->ServerData()->LoadTime();
Console << "Loading skill advancement ";
LoadSkills();
Console.PrintDone();
// Moved BulkStartup here, dunno why that function was there...
Console << "Loading dictionaries... " << myendl;
Console.PrintBasedOnVal( Dictionary->LoadDictionaries( cwmWorldState->ServerData()->Directory( CSDDP_DICTIONARIES )) >= 0 );
Console << "Loading teleport ";
LoadTeleportLocations();
Console.PrintDone();
Console << "Loading GoPlaces ";
LoadPlaces();
Console.PrintDone();
generator = std::mt19937( rd() ); // Standard mersenne_twister_engine seeded with rd()
auto packetSection = JSMapping->GetSection( SCPT_PACKET );
for( const auto &[id, ourScript] : packetSection->collection() )
{
if( ourScript )
{
ourScript->ScriptRegistration( "Packet" );
}
}
2022-06-22 09:13:10 -04:00
Skills->Load();
Console << "Loading Spawn Regions ";
LoadSpawnRegions();
Console.PrintDone();
2022-06-08 10:38:16 -04:00
Console << "Loading Regions ";
LoadRegions();
Console.PrintDone();
Magic->LoadScript();
Console << "Loading Races ";
Races->Load();
Console.PrintDone();
2022-06-08 21:32:35 -04:00
Console << "Loading Weather ";
Weather->Load();
Weather->NewDay();
Weather->NewHour();
Console.PrintDone();
Console << "Loading Commands " << myendl;
Commands->Load();
Console.PrintDone();
2022-06-08 21:32:35 -04:00
// Rework that...
Console << "Loading World now ";
MapRegion->Load();
2022-06-08 21:32:35 -04:00
Console << "Loading Guilds ";
GuildSys->Load();
Console.PrintDone();
Console.PrintSectionBegin();
Console << "Clearing all trades ";
ClearTrades();
Console.PrintDone();
InitMultis();
cwmWorldState->SetStartTime( cwmWorldState->GetUICurrentTime() );
cwmWorldState->SetEndTime( 0 );
cwmWorldState->SetLClock( 0 );
// no longer Que, because that's taken care of by PageVector
Console << "Initializing Jail system ";
JailSys->ReadSetup();
JailSys->ReadData();
Console.PrintDone();
Console << "Initializing Status system ";
HTMLTemplates->Load();
Console.PrintDone();
Console << "Loading custom titles ";
LoadCustomTitle();
Console.PrintDone();
Console << "Loading temporary Effects ";
Effects->LoadEffects();
Console.PrintDone();
Console << "Loading creatures ";
LoadCreatures();
Console.PrintDone();
Console << "Starting World Timers ";
cwmWorldState->SetTimer( tWORLD_LIGHTTIME, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_WEATHER ));
cwmWorldState->SetTimer( tWORLD_NEXTNPCAI, BuildTimeValue( cwmWorldState->ServerData()->CheckNpcAISpeed() ));
cwmWorldState->SetTimer( tWORLD_NEXTFIELDEFFECT, BuildTimeValue( 0.5 ));
cwmWorldState->SetTimer( tWORLD_SHOPRESTOCK, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_SHOPSPAWN ));
cwmWorldState->SetTimer( tWORLD_PETOFFLINECHECK, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_PETOFFLINECHECK ));
Console.PrintDone();
DisplayBanner();
Console << "Loading Accounts ";
Accounts->Load();
Console.PrintDone();
Console.Log( "-=Server Startup=-\n=======================================================================", "server.log" );
Console << "Creating and Initializing Console Thread ";
cons = std::thread( &CheckConsoleKeyThread );
Console.PrintDone();
// Shows information about IPs and ports being listened on
Console.TurnYellow();
auto externalIP = cwmWorldState->ServerData()->ExternalIP();
if( externalIP != "" && externalIP != "localhost" && externalIP != "127.0.0.1" )
{
Console << "UOX: listening for incoming connections on External/WAN IP: " << externalIP.c_str() << myendl;
}
auto deviceIPs = ip4list_t::available();
for( auto &entry : deviceIPs.ips() )
{
switch( entry.type() )
{
case Ip4Addr_st::ip4type_t::lan:
Console << "UOX: listening for incoming connections on LAN IP: " << entry.description() << myendl;
break;
case Ip4Addr_st::ip4type_t::local:
Console << "UOX: listening for incoming connections on Local IP: " << entry.description() << myendl;
break;
case Ip4Addr_st::ip4type_t::wan:
Console << "UOX: listening for incoming connections on WAN IP: " << entry.description() << myendl;
break;
default:
Console << "UOX: listening for incoming connections on IP: " << entry.description() << myendl;
break;
}
}
Console.TurnNormal();
// we've really finished loading here
cwmWorldState->SetLoaded( true );
// Get a second timestamp for startup time
auto startupEndTime = std::chrono::high_resolution_clock::now();
// Calculate startup time in milliseconds
auto startupDuration = std::chrono::duration_cast<std::chrono::milliseconds>( startupEndTime - startupStartTime ).count();
Console.TurnGreen();
Console << "UOX: Startup Completed in " << static_cast<R32>( startupDuration ) / 1000 << " seconds." << myendl;
Console.TurnNormal();
}
2022-06-08 21:32:35 -04:00
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
// Most things after this point, should be in different files, not in uox3.cpp.
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
// Signal and exit handers
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
#if PLATFORM == WINDOWS
//o------------------------------------------------------------------------------------------------o
//| Function - exit_handler()
//| app_stopped()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Prevent closing of console via CTRL+C/or CTRL+BREAK keys during worldsaves
//o------------------------------------------------------------------------------------------------o
BOOL WINAPI exit_handler( DWORD dwCtrlType )
{
switch( dwCtrlType )
{
2022-06-08 10:38:16 -04:00
case CTRL_C_EVENT:
case CTRL_BREAK_EVENT:
case CTRL_CLOSE_EVENT:
std::cout << std::endl << "World save in progress - closing UOX3 before it completes may result in corrupted save data!" << std::endl;
// Shutdown of the application will only be halted for as long as the exit_handler is doing something,
// so do some non-work while isWorldSaving is true to prevent shutdown during save
while( isWorldSaving == true )
{
Sleep( 0 );
}
2022-06-08 10:38:16 -04:00
return true;
default:
return false;
}
2022-06-08 10:38:16 -04:00
}
#else
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
// These first two, should be removed. We should fix the error
//o------------------------------------------------------------------------------------------------o
auto illinst( SI32 x = 0 ) -> void
{
SysBroadcast( "Fatal Server Error! Bailing out - Have a nice day!" );
Console.Error( "Illegal Instruction Signal caught - attempting shutdown" );
EndMessage( x );
2022-06-08 10:38:16 -04:00
}
auto aus( [[maybe_unused]] SI32 signal ) -> void
{
Console.Error( "Server crash averted! Floating point exception caught." );
2022-06-08 10:38:16 -04:00
}
void app_stopped( [[maybe_unused]] int sig )
2022-06-08 10:38:16 -04:00
{
// function called when signal is received.
if( isWorldSaving == false )
{
2022-06-08 10:38:16 -04:00
cwmWorldState->SetKeepRun( false );
}
}
2022-06-08 10:38:16 -04:00
#endif
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
// Spawn related
//o------------------------------------------------------------------------------------------------o
//o------------------------------------------------------------------------------------------------o
//| Function - UnloadSpawnRegions()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Unload spawn regions on server shutdown or when reloading spawn regions
//o------------------------------------------------------------------------------------------------o
auto UnloadSpawnRegions() -> void
{
for( auto &[regionnum, spawnregion] : cwmWorldState->spawnRegions )
{
if( spawnregion )
{
2022-06-08 10:38:16 -04:00
// Iterate over list of spawned characters and delete them if no player has tamed them/hired them
std::vector<CChar *> toDelete;
2022-06-08 10:38:16 -04:00
auto spawnedCharsList = spawnregion->GetSpawnedCharsList();
for( const auto &cCheck : spawnedCharsList->collection() )
{
if( ValidateObject( cCheck ))
{
if( !ValidateObject( cCheck->GetOwnerObj() ))
{
toDelete.push_back( cCheck );
2022-06-10 08:12:58 -04:00
}
}
}
std::for_each( toDelete.begin(), toDelete.end(), []( CChar *entry )
{
entry->Delete();
});
2022-06-08 10:38:16 -04:00
// Iterate over list of spawned items and delete them if no player has picked them up
std::vector<CItem *> toIDelete;
2022-06-08 10:38:16 -04:00
auto spawnedItemsList = spawnregion->GetSpawnedItemsList();
for( const auto &iCheck : spawnedItemsList->collection() )
{
if( ValidateObject( iCheck ))
{
if( iCheck->GetContSerial() != INVALIDSERIAL || !ValidateObject( iCheck->GetOwnerObj() ))
{
toIDelete.push_back( iCheck );
2022-06-10 08:12:58 -04:00
}
}
}
std::for_each( toIDelete.begin(), toIDelete.end(), []( CItem *entry )
{
entry->Delete();
});
2022-06-08 10:38:16 -04:00
delete spawnregion;
2003-03-05 02:29:44 +00:00
}
}
2022-06-08 10:38:16 -04:00
cwmWorldState->spawnRegions.clear();
}
//o------------------------------------------------------------------------------------------------o
//| Function - UnloadRegions()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Unload town regions on server shutdown or when reloading town regions
//o------------------------------------------------------------------------------------------------o
auto UnloadRegions() -> void
{
2022-10-24 23:42:16 +08:00
std::for_each( cwmWorldState->townRegions.begin(), cwmWorldState->townRegions.end(), []( const std::pair<UI16, CTownRegion *> &entry )
{
if( entry.second )
{
delete entry.second;
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
2022-06-08 10:38:16 -04:00
});
cwmWorldState->townRegions.clear();
}
//o------------------------------------------------------------------------------------------------o
//| Function - DoMessageLoop()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Watch for messages thrown by UOX
//o------------------------------------------------------------------------------------------------o
auto DoMessageLoop() -> void
{
2022-06-10 08:12:58 -04:00
// Grab all the data in the queue
auto messages = messageLoop.BulkData();
while( !messages.empty() )
{
2022-06-10 08:12:58 -04:00
auto tVal = messages.front();
messages.pop();
switch( tVal.actualMessage )
{
case MSG_SHUTDOWN: cwmWorldState->SetKeepRun( false ); break;
case MSG_COUNT: break;
case MSG_WORLDSAVE: cwmWorldState->SetOldTime( 0 ); break;
case MSG_PRINT: Console << tVal.data << myendl; break;
case MSG_RELOADJS:
JSEngine->Reload();
2022-06-08 10:38:16 -04:00
JSMapping->Reload();
Console.PrintDone();
Commands->Load();
break;
case MSG_CONSOLEBCAST: SysBroadcast( tVal.data ); break;
case MSG_PRINTDONE: Console.PrintDone(); break;
2022-06-10 08:12:58 -04:00
case MSG_PRINTFAILED: Console.PrintFailed(); break;
case MSG_SECTIONBEGIN: Console.PrintSectionBegin(); break;
2022-06-08 10:38:16 -04:00
case MSG_RELOAD:
if( !cwmWorldState->GetReloadingScripts() )
{
2022-06-08 10:38:16 -04:00
cwmWorldState->SetReloadingScripts( true );
switch( tVal.data[0] )
{
2022-06-10 08:12:58 -04:00
case '0': cwmWorldState->ServerData()->Load(); break; // Reload INI file
case '1': Accounts->Load(); break; // Reload accounts
case '2': // Reload regions/TeleportLocations
UnloadRegions();
2022-06-08 10:38:16 -04:00
LoadRegions();
LoadTeleportLocations();
break;
case '3': // Reload spawn regions
// Also requires reloading spawn region DFN data
FileLookup->Reload( spawn_def );
UnloadSpawnRegions();
LoadSpawnRegions();
break;
2022-06-10 08:12:58 -04:00
case '4': Magic->LoadScript(); break; // Reload spells
case '5': // Reload commands
JSMapping->Reload( SCPT_COMMAND );
Commands->Load();
break;
case '6': // Reload DFNs
FileLookup->Reload();
2022-06-08 10:38:16 -04:00
LoadCreatures();
LoadCustomTitle();
LoadSkills();
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
Races->Load();
2022-06-08 10:38:16 -04:00
LoadPlaces();
Skills->Load(); break;
case '7': // Reload JS
JSEngine->Reload();
2022-06-08 10:38:16 -04:00
JSMapping->Reload();
Console.PrintDone();
Commands->Load();
Skills->Load(); break;
case '8': // Reload HTML
HTMLTemplates->Unload();
HTMLTemplates->Load(); break;
2022-06-08 10:38:16 -04:00
}
cwmWorldState->SetReloadingScripts( false );
}
break;
case MSG_UNKNOWN:
default: Console.Error( "Unknown message type" ); break;
}
}
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
// Threads
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//o------------------------------------------------------------------------------------------------o
//| Function - NetworkPollConnectionThread()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Watch for new connections
//o------------------------------------------------------------------------------------------------o
auto NetworkPollConnectionThread() -> void
{
2022-06-08 10:38:16 -04:00
messageLoop << "Thread: NetworkPollConnection has started";
netpollthreadclose = false;
while( !netpollthreadclose )
{
2022-06-08 10:38:16 -04:00
Network->CheckConnections();
Network->CheckLoginMessage();
std::this_thread::sleep_for( std::chrono::milliseconds( 20 ));
}
2022-06-08 10:38:16 -04:00
messageLoop << "Thread: NetworkPollConnection has Closed";
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckConsoleKeyThread()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Listen for key inputs in server console
//o------------------------------------------------------------------------------------------------o
auto CheckConsoleKeyThread() -> void
{
2022-06-08 10:38:16 -04:00
messageLoop << "Thread: CheckConsoleThread has started";
Console.Registration();
conThreadCloseOk = false;
while( !conThreadCloseOk )
{
2022-06-08 10:38:16 -04:00
Console.Poll();
std::this_thread::sleep_for( std::chrono::milliseconds( 500 ));
}
2022-06-08 10:38:16 -04:00
messageLoop << "Thread: CheckConsoleKeyThread Closed";
}
//o------------------------------------------------------------------------------------------------o
// Misc other functions
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//o------------------------------------------------------------------------------------------------o
//| Function - IsOnline()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check if the socket owning character c is still connected
//o------------------------------------------------------------------------------------------------o
auto IsOnline( CChar& mChar ) -> bool
{
auto rValue = false;
if( !mChar.IsNpc() )
{
CAccountBlock_st& actbTemp = mChar.GetAccount();
if( actbTemp.wAccountIndex != AB_INVALID_ID )
{
if( actbTemp.dwInGame == mChar.GetSerial() )
{
rValue = true;
}
2022-06-08 10:38:16 -04:00
}
if( !rValue )
{
for( auto &tSock : Network->connClients )
{
if( tSock->CurrcharObj() == &mChar )
{
rValue = true;
2022-06-08 10:38:16 -04:00
break;
}
}
}
}
return rValue;
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - UpdateStats()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Updates object's stats
//o------------------------------------------------------------------------------------------------o
auto UpdateStats( CBaseObject *mObj, UI08 x, bool skipStatWindowUpdate = false ) -> void
{
for( auto &tSock : FindNearbyPlayers( mObj ))
{
if( tSock->LoginComplete() )
{
2022-06-08 10:38:16 -04:00
// Normalize stats if we're updating our stats for other players
auto normalizeStats = true;
if( !skipStatWindowUpdate && tSock->CurrcharObj()->GetSerial() == mObj->GetSerial() )
{
tSock->StatWindow( mObj );
2022-06-08 10:38:16 -04:00
normalizeStats = false;
}
// Prepare the stat update packet
CPUpdateStat toSend(( *mObj ), x, normalizeStats );
2022-06-08 10:38:16 -04:00
// Send the stat update packet
tSock->Send( &toSend );
}
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - CollectGarbage()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Deletes objects in the Deletion Queue
//o------------------------------------------------------------------------------------------------o
auto CollectGarbage() -> void
{
2022-06-08 10:38:16 -04:00
Console << "Performing Garbage Collection...";
2022-10-24 23:42:16 +08:00
auto objectsDeleted = UI32( 0 );
std::for_each( cwmWorldState->deletionQueue.begin(), cwmWorldState->deletionQueue.end(), [&objectsDeleted]( std::pair<CBaseObject*, UI32> entry )
{
if( entry.first )
{
if( entry.first->IsFree() && entry.first->IsDeleted() )
{
Console.Warning( "Invalid object found in Deletion Queue" );
}
else
{
ObjectFactory::GetSingleton().DestroyObject( entry.first );
2022-06-08 10:38:16 -04:00
++objectsDeleted;
}
2003-03-05 02:29:44 +00:00
}
2022-06-08 10:38:16 -04:00
});
2022-06-08 10:38:16 -04:00
cwmWorldState->deletionQueue.clear();
2022-06-08 10:38:16 -04:00
Console << " Removed " << objectsDeleted << " objects";
2022-06-08 10:38:16 -04:00
JSEngine->CollectGarbage();
Console.PrintDone();
}
//o------------------------------------------------------------------------------------------------o
//| Function - MountCreature()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Mount a ridable creature
//|
//| Changes - 09/22/2002 - Unhide players when mounting horses etc.
//o------------------------------------------------------------------------------------------------o
auto MountCreature( CSocket *sockPtr, CChar *s, CChar *x ) -> void
{
if( s->IsOnHorse() )
return;
//No mounting horses for gargoyles!
if( s->GetId() == 0x029A || s->GetId() == 0x029B )
{
sockPtr->SysMessage( 1798 ); // You cannot mount.
return;
}
if( !ObjInRange( s, x, DIST_NEXTTILE ))
return;
if( x->GetOwnerObj() == s || Npcs->CheckPetFriend( s, x ) || s->IsGM() )
{
if( !cwmWorldState->ServerData()->CharHideWhileMounted() )
{
s->ExposeToView();
}
s->SetOnHorse( true );
auto c = Items->CreateItem( nullptr, s, 0x0915, 1, x->GetSkin(), OT_ITEM );
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
auto xName = GetNpcDictName( x, sockPtr, NRS_SYSTEM );
c->SetName( xName );
c->SetDecayable( false );
c->SetLayer( IL_MOUNT );
if( cwmWorldState->creatures[x->GetId()].MountId() != 0 )
{
c->SetId( cwmWorldState->creatures[x->GetId()].MountId() );
}
else
{
c->SetId( 0x3E00 );
}
if( !c->SetCont( s ))
{
s->SetOnHorse( false ); // let's get off our horse again
c->Delete();
return;
2022-06-08 10:38:16 -04:00
}
else
2022-06-08 10:38:16 -04:00
{
for( auto &tSock : FindNearbyPlayers( s ))
{
s->SendWornItems( tSock );
}
if( x->GetTarg() ) // zero out target, under all circumstances
{
x->SetTarg( nullptr );
if( x->IsAtWar() )
{
x->ToggleCombat();
}
2022-06-08 10:38:16 -04:00
}
if( ValidateObject( x->GetAttacker() ))
{
x->GetAttacker()->SetTarg( nullptr );
2022-06-08 10:38:16 -04:00
}
x->SetFrozen( true );
x->SetMounted( true );
x->SetInvulnerable( true );
x->SetLocation( 7000, 7000, 0 );
2022-06-08 10:38:16 -04:00
c->SetTempVar( CITV_MOREX, x->GetSerial() );
if( x->GetTimer( tNPC_SUMMONTIME ) != 0 )
{
c->SetDecayTime( x->GetTimer( tNPC_SUMMONTIME ));
}
}
}
else
{
sockPtr->SysMessage( 1214 ); // You don't own that creature.
}
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - DismountCreature()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Dismount a ridable creature
//o------------------------------------------------------------------------------------------------o
auto DismountCreature( CChar *s ) -> void
{
if( ValidateObject( s ))
{
2022-06-08 10:38:16 -04:00
auto ci = s->GetItemAtLayer( IL_MOUNT );
if( ValidateObject( ci ) && !ci->IsFree() )
{
2022-06-08 10:38:16 -04:00
s->SetOnHorse( false );
auto tMount = CalcCharObjFromSer( ci->GetTempVar( CITV_MOREX ));
if( ValidateObject( tMount ))
{
2022-06-08 10:38:16 -04:00
tMount->SetLocation( s );
tMount->SetFrozen( false );
tMount->SetMounted( false );
tMount->SetInvulnerable( false );
if( ci->GetDecayTime() != 0 )
{
2022-06-08 10:38:16 -04:00
tMount->SetTimer( tNPC_SUMMONTIME, ci->GetDecayTime() );
}
2022-06-08 10:38:16 -04:00
tMount->SetDir( s->GetDir() );
tMount->SetVisible( VT_VISIBLE );
Support for feature negotiation with assist tools Added support for feature negotiation with Razor, AssistUO and other assistant tools that support this feature via new UOX.INI settings: ASSISTANTNEGOTIATION=0 // If enabled (1), sends a request (packet 0xF0) to negotiate features with assistant tools upon login. Defaults to (0) KICKONASSISTANTSILENCE=0 // If enabled (1), disconnects clients that don't respond (with packet 0xF0) to request via assistant tool within 30 seconds. Defaults to (0) Added new section at bottom of UOX.INI to allow shard admins to control which assistant features get disabled: [disabled assistant features] { AF_FILTERWEATHER=0 // Weather Filter AF_FILTERLIGHT=0 // Light Filter AF_SMARTTARGET=0 // Smart Last Target AF_RANGEDTARGET=0 // Range Check Last Target AF_AUTOOPENDOORS=0 // Automatically Open Doors AF_DEQUIPONCAST=0 // Unequip Weapon on spell cast AF_AUTOPOTIONEQUIP=0 // Un/Re-equip weapon on potion use AF_POISONEDCHECKS=0 // Block heal If poisoned/Macro IIf Poisoned condition/Heal or Cure self AF_LOOPEDMACROS=0 // Disallow Looping macros, For loops, and macros that call other macros AF_USEONCEAGENT=0 // The use once agent AF_RESTOCKAGENT=0 // The restock agent AF_SELLAGENT=0 // The sell agent AF_BUYAGENT=0 // The buy agent AF_POTIONHOTKEYS=0 // All potion hotkeys AF_RANDOMTARGETS=0 // All random target hotkeys (Not target next, last target, target self) AF_CLOSESTTARGETS=0 // All closest target hotkeys AF_OVERHEADHEALTH=0 // Health and Mana/Stam messages shown over player's heads AF_AUTOLOOTAGENT=0 // (AssistUO only) The autoloot agent AF_BONECUTTERAGENT=0 // (AssistUO only) The bone cutter agent AF_JSCRIPTMACROS=0 // (AssistUO only) Javascript macro engine AF_AUTOREMOUNT=0 // (AssistUO only) Auto remount after dismount AF_ALL=0 // All features }
2020-08-11 02:06:23 +08:00
}
2022-06-08 10:38:16 -04:00
ci->Delete();
if( ValidateObject( tMount ))
{
std::vector<UI16> scriptTriggers = tMount->GetScriptTriggers();
for( auto &i : scriptTriggers )
{
cScript *toExecute = JSMapping->GetScript( i );
if( toExecute != nullptr )
{
toExecute->OnDismount( s, tMount );
}
}
}
}
}
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - EndMessage()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Global message players with shutdown message
//o------------------------------------------------------------------------------------------------o
auto EndMessage( [[maybe_unused]] SI32 x ) -> void
{
x = 0; // Really, then why take a parameter?
const TIMERVAL iGetClock = cwmWorldState->GetUICurrentTime();
if( cwmWorldState->GetEndTime() < iGetClock )
{
cwmWorldState->SetEndTime( iGetClock );
}
SysBroadcast( oldstrutil::format( Dictionary->GetEntry( 1209 ), (( cwmWorldState->GetEndTime() - iGetClock ) / 1000 ) / 60 )); // Server going down in %i minutes!
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - CallGuards()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Used when a character calls "Guards" Will look for a criminal
//| first checking for anyone attacking him. If no one is attacking
//| him it will look for any people nearby who are criminal or
//| murderers
//o------------------------------------------------------------------------------------------------o
auto CallGuards( CChar *mChar ) -> void
{
if( ValidateObject( mChar ) && mChar->GetRegion()->IsGuarded() && cwmWorldState->ServerData()->GuardsStatus() )
{
2022-06-08 10:38:16 -04:00
auto attacker = mChar->GetAttacker();
if( ValidateObject( attacker ))
{
if( !attacker->IsDead() && ( attacker->IsCriminal() || attacker->IsMurderer() ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Can only be called on criminals for the first 10 seconds of receiving the criminal flag
if( !attacker->IsMurderer() && attacker->IsCriminal() && mChar->GetTimer( tCHAR_CRIMFLAG ) - cwmWorldState->GetUICurrentTime() <= 10 )
{
// Too late!
return;
}
if( CharInRange( mChar, attacker ))
{
2022-06-08 10:38:16 -04:00
Combat->SpawnGuard( mChar, attacker, attacker->GetX(), attacker->GetY(), attacker->GetZ() );
return;
Support for feature negotiation with assist tools Added support for feature negotiation with Razor, AssistUO and other assistant tools that support this feature via new UOX.INI settings: ASSISTANTNEGOTIATION=0 // If enabled (1), sends a request (packet 0xF0) to negotiate features with assistant tools upon login. Defaults to (0) KICKONASSISTANTSILENCE=0 // If enabled (1), disconnects clients that don't respond (with packet 0xF0) to request via assistant tool within 30 seconds. Defaults to (0) Added new section at bottom of UOX.INI to allow shard admins to control which assistant features get disabled: [disabled assistant features] { AF_FILTERWEATHER=0 // Weather Filter AF_FILTERLIGHT=0 // Light Filter AF_SMARTTARGET=0 // Smart Last Target AF_RANGEDTARGET=0 // Range Check Last Target AF_AUTOOPENDOORS=0 // Automatically Open Doors AF_DEQUIPONCAST=0 // Unequip Weapon on spell cast AF_AUTOPOTIONEQUIP=0 // Un/Re-equip weapon on potion use AF_POISONEDCHECKS=0 // Block heal If poisoned/Macro IIf Poisoned condition/Heal or Cure self AF_LOOPEDMACROS=0 // Disallow Looping macros, For loops, and macros that call other macros AF_USEONCEAGENT=0 // The use once agent AF_RESTOCKAGENT=0 // The restock agent AF_SELLAGENT=0 // The sell agent AF_BUYAGENT=0 // The buy agent AF_POTIONHOTKEYS=0 // All potion hotkeys AF_RANDOMTARGETS=0 // All random target hotkeys (Not target next, last target, target self) AF_CLOSESTTARGETS=0 // All closest target hotkeys AF_OVERHEADHEALTH=0 // Health and Mana/Stam messages shown over player's heads AF_AUTOLOOTAGENT=0 // (AssistUO only) The autoloot agent AF_BONECUTTERAGENT=0 // (AssistUO only) The bone cutter agent AF_JSCRIPTMACROS=0 // (AssistUO only) Javascript macro engine AF_AUTOREMOUNT=0 // (AssistUO only) Auto remount after dismount AF_ALL=0 // All features }
2020-08-11 02:06:23 +08:00
}
}
2003-03-05 02:29:44 +00:00
}
2022-06-08 10:38:16 -04:00
auto toCheck = MapRegion->GetMapRegion( mChar );
if( toCheck )
{
auto regChars = toCheck->GetCharList();
for( const auto &tempChar : regChars->collection() )
{
if( ValidateObject( tempChar ))
{
if( !tempChar->IsDead() && ( tempChar->IsCriminal() || tempChar->IsMurderer() ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Can only be called on criminals for the first 10 seconds of receiving the criminal flag
if( !tempChar->IsMurderer() && tempChar->IsCriminal() && mChar->GetTimer( tCHAR_CRIMFLAG ) - cwmWorldState->GetUICurrentTime() <= 10 )
{
// Too late!
return;
}
if( CharInRange( tempChar, mChar ))
{
Combat->SpawnGuard( mChar, tempChar, tempChar->GetX(), tempChar->GetY(), tempChar->GetZ() );
break;
}
2022-06-08 10:38:16 -04:00
}
}
}
}
2022-06-08 10:38:16 -04:00
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - CallGuards()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Used when a character calls guards on another character, will
//| ensure that character is not dead and is either a criminal or
//| murderer, and that he is in visual range of the victim, will
//| then spawn a guard to take care of the criminal.
//o------------------------------------------------------------------------------------------------o
auto CallGuards( CChar *mChar, CChar *targChar ) -> void
{
if( ValidateObject( mChar ) && ValidateObject( targChar ))
{
if( mChar->GetRegion()->IsGuarded() && cwmWorldState->ServerData()->GuardsStatus() )
{
if( !targChar->IsDead() && ( targChar->IsCriminal() || targChar->IsMurderer() ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Can only be called on criminals for the first 10 seconds of receiving the criminal flag
if( !targChar->IsMurderer() && targChar->IsCriminal() && mChar->GetTimer( tCHAR_CRIMFLAG ) - cwmWorldState->GetUICurrentTime() <= 10 )
{
// Too late!
return;
}
if( CharInRange( mChar, targChar ))
{
2022-06-08 10:38:16 -04:00
Combat->SpawnGuard( mChar, targChar, targChar->GetX(), targChar->GetY(), targChar->GetZ() );
2022-06-10 08:12:58 -04:00
}
2022-06-08 10:38:16 -04:00
}
}
2022-06-08 10:38:16 -04:00
}
}
//o------------------------------------------------------------------------------------------------o
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
//| Function - PassiveHealthRegen()
//o------------------------------------------------------------------------------------------------o
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
//| Purpose - Perform passive health regeneration for character
//o------------------------------------------------------------------------------------------------o
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
auto PassiveHealthRegen( CChar &mChar, UI16 maxHP ) -> SI32
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
SI32 nextHealthRegen = static_cast<SI32>( cwmWorldState->ServerData()->SystemTimer( tSERVER_HITPOINTREGEN ) * 1000 ); // next health regen time
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
if( mChar.GetHP() < maxHP )
{
2025-05-18 15:05:38 -05:00
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;
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
if( !cwmWorldState->ServerData()->HungerSystemEnabled() || ( mChar.GetHunger() > 0 )
|| ( !Races->DoesHunger( mChar.GetRace() ) && (( cwmWorldState->ServerData()->SystemTimer( tSERVER_HUNGERRATE ) == 0) || mChar.IsNpc() )))
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Bonus passive hp regen from healing skill
R64 healthRegenBonus = 0;
if( cwmWorldState->ServerData()->HealingAffectHealthRegen() )
{
healthRegenBonus += ( 0.1 * mChar.GetSkill( HEALING ) / 10.0 ); // Max +10 at GM Healing
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Include health regen bonus from character/from items equipped on character
healthRegenBonus += std::min( mChar.GetHealthRegenBonus(), cwmWorldState->ServerData()->HealthRegenCap() ); // Publish 42 (ML) and beyond: capped at 18
// +2 health regen if human, in ML and beyond (on top of cap)
healthRegenBonus += Races->Race( mChar.GetRace() )->HPRegenBonus();
// Also include adjustment to health regen bonus based on hunger level
if( cwmWorldState->ServerData()->HungerSystemEnabled() && cwmWorldState->ServerData()->HungerAffectHealthRegen() )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
auto hungerLvl = mChar.GetHunger();
if( hungerLvl >= 4 )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Add to bonus if character is not hungry; increase bonus more the more full character is
healthRegenBonus += 2.0 * ( static_cast<R32>( hungerLvl ) - 3.0 ); // 4 -> +2, 5 -> +4, 6 -> +6
}
else
{
// Subtract from bonus if character is hungry; decrease bonus more the more hungry character is
healthRegenBonus -= 2.0 * ( 4.0 - static_cast<R32>( hungerLvl )); // 3 -> -2, 2 -> -4, 1 -> -6
2022-06-08 10:38:16 -04:00
}
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// With a health regen timer of 8.0 seconds, Healing skill of 100.0 and hunger level at 6/6 can reduce that to 6.95 seconds
// With 18 (from items) + 2 (race bonus for humans) bonus health regen on top of that, it can be further reduced to 6.5 seconds
nextHealthRegen /= ( 1.0 + ( healthRegenBonus / 100.0 ));
mChar.IncHP( 1 ); // Regardless of bonuses to regen rate, we only increase health by 1 each time
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
}
return nextHealthRegen;
}
//o------------------------------------------------------------------------------------------------o
//| Function - PassiveStaminaRegen()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Perform passive stamina regeneration for character
//o------------------------------------------------------------------------------------------------o
auto PassiveStaminaRegen( CChar &mChar, UI16 maxStam ) -> SI32
{
SI32 nextStamRegen = static_cast<SI32>( cwmWorldState->ServerData()->SystemTimer( tSERVER_STAMINAREGEN ) * 1000 ); // next stamina regen time
auto mStamina = mChar.GetStamina(); // get character's current stamina
if( mStamina < maxStam )
{
// Continue with stamina regen if character is not yet fully parched, or if character is parched but has less than 25% stamina, or if char belongs to race that does not thirst
if( !cwmWorldState->ServerData()->ThirstSystemEnabled() || ( mChar.GetThirst() > 0 )|| (( mChar.GetThirst() == 0) && ( mStamina < static_cast<SI16>( maxStam * 0.25 )))
|| ( !Races->DoesThirst( mChar.GetRace() ) && ( cwmWorldState->ServerData()->SystemTimer( tSERVER_THIRSTRATE ) == 0 || mChar.IsNpc() )))
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
R64 stamRegenBonus = 0;
auto staminaRegenMode = cwmWorldState->ServerData()->StaminaRegenMode();
if( staminaRegenMode >= SREG_AOS ) // AoS and beyond
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
Skills->CheckSkill(( &mChar ), FOCUS, 0, 1000 ); // Check FOCUS for skill gain
stamRegenBonus += ( 0.1 * mChar.GetSkill( FOCUS ) / 10.0 ); // Bonus for focus
}
// Additional bonuses that should still respect cap: vampiric embrace, kirin (animal)
// ...
// Include stamina regen bonus from character/from items equipped on character
stamRegenBonus += std::min( mChar.GetStaminaRegenBonus(), cwmWorldState->ServerData()->StaminaRegenCap() ); // Publish 42 (ML) and beyond: capped at 24
// Additional bonuses beyond cap: skill masteries (rampage)
// ...
// Add stamina regen bonus from races, if setup
stamRegenBonus += Races->Race( mChar.GetRace() )->StamRegenBonus();
// Also include adjustment to health regen bonus based on hunger level
if( cwmWorldState->ServerData()->ThirstSystemEnabled() && cwmWorldState->ServerData()->ThirstAffectStaminaRegen() )
{
auto thirstLvl = mChar.GetThirst();
if( thirstLvl >= 4 )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Add to bonus if character is not thirsty; increase bonus more the more satiated character is
stamRegenBonus += 2.0 * ( static_cast<R32>( thirstLvl ) - 3.0 ); // 4 -> +2, 5 -> +4, 6 -> +6
}
else
{
// Subtract from bonus if character is thirsty; decrease bonus more the more parched character is
stamRegenBonus -= 2.0 * ( 4.0 - static_cast<R32>( thirstLvl )); // 3 -> -2, 2 -> -4, 1 -> -6
}
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// With base regen timer of 0.7 (SA and beyond), and a bonus of 0, the result is 85 stamina per minute
// With base regen timer of 2.5 (prior to SA), and a bonus of 0, the result is 24 stamina per minute
nextStamRegen /= ( 1.0 + ( stamRegenBonus / 100.0 ));
if( staminaRegenMode >= SREG_SA && mChar.IsNpc() && !cwmWorldState->creatures[mChar.GetId()].IsAnimal() ) // SA and beyond
{
// Adjust rate if character is an NPC/monster
nextStamRegen *= 1.95;
}
mChar.IncStamina( 1 ); // Regardless of bonuses to regen rate, we only increase stamina by 1 each time
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
}
return nextStamRegen;
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
//o------------------------------------------------------------------------------------------------o
//| Function - PassiveManaRegen()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Perform passive mana regeneration for character
//o------------------------------------------------------------------------------------------------o
auto PassiveManaRegen( CSocket *mSock, CChar &mChar, UI16 maxMana ) -> SI32
{
SI32 nextManaRegen = static_cast<SI32>( cwmWorldState->ServerData()->SystemTimer( tSERVER_MANAREGEN ) * 1000 ); // 5 seconds for >= ML, 7 seconds for <= SE
R32 armorPenalty = 1;
if( mChar.GetMana() < maxMana )
{
R64 medSkill = mChar.GetSkill( MEDITATION );
R64 focusSkill = mChar.GetSkill( FOCUS );
auto intStat = mChar.GetIntelligence();
auto manaRegenMode = cwmWorldState->ServerData()->ManaRegenMode();
// Mondain's Legacy era and beyond
if( manaRegenMode >= MREG_ML ) // ML and beyond
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
R64 baselineRate = 0.2; // 0.2 mana/sec => 1 mana per 5 seconds
R64 focusBonus = ( focusSkill / 10.0 ) / 200.0;
// Calculate base mana regen from Meditation, Intelligence and GM meditation or not
R64 meditationBonus = (( 0.0075 * ( medSkill / 10.0 )) + ( 0.0025 * intStat )) * ( medSkill >= 1000 ? 1.1 : 1.0 );
if( cwmWorldState->ServerData()->ArmorAffectManaRegen() )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// if CalcDef returns a value higher than 0, character has non-medable armor equipped
if( Combat->CalcDef(( &mChar ), 0, false, PHYSICAL, true, true ) > 0 )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Calculator from stratics lies - it should not remove meditation bonus entirely
// when wearing non-meddable armor, but set it at a fixed 0.1 value instead!
meditationBonus = 0.1;
}
}
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// If meditating, apply additional bonuses
if( mChar.IsMeditating() )
{
// Also double the regen speed if actively meditating
meditationBonus *= 2.0;
}
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Get mana regen bonuses from character, items equipped on character, etc.
// Cap total mana regeneration from equipment based on cap defined in uox.ini
R64 bonusManaRegen = mChar.GetManaRegenBonus();
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Add mana regen bonus from races, if setup
// Publish 65, April 5, 2010, Stygian Abyss expansion
// Gargoyles receive +2 Mana Regeneration which stacks with Meditation and Focus.
bonusManaRegen += Races->Race( mChar.GetRace() )->ManaRegenBonus();
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Add additional bonus mana points here:
// ... Vampiric Embrace (+3 Mana Regen)
// EXAMPLE: if( mChar.GetTransform() == TF_VAMPIRIC ) bonusManaRegen += 3;
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// ... Lich Form
// EXAMPLE: if( mChar.GetTransform() == TF_LICH ) bonusManaRegen += 13;
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
R64 manaRegenCap = static_cast<R64>( cwmWorldState->ServerData()->ManaRegenCap() ); // 30 for ML results in 5.5 after square root operation
if( manaRegenMode >= MREG_KR ) // KR era and beyond
{
// Apply diminishing returns for bonus mana regen points, as introduced in Publish 46
// Treats mana regen cap from uox.ini as a "soft cap" beyond which diminishing returns kick in
if( bonusManaRegen > manaRegenCap )
{
// Low value = slower growth beyond cap
// High value = faster growth beyond cap
R64 growthScale = 0.5;
bonusManaRegen = manaRegenCap + ( growthScale * std::sqrt( bonusManaRegen - manaRegenCap ));
}
}
else
{
// Cap it based on uox.ini
bonusManaRegen = std::min( bonusManaRegen, manaRegenCap );
}
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
bonusManaRegen = sqrt( bonusManaRegen );
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Calculate base for bonus mana regen, from char/items
R64 baseBonusManaRegen = ((((( medSkill / 10.0 ) / 2.0 + ( focusSkill / 10.0 ) / 4.0 ) / 90.0 ) * 0.65 ) + 2.35 );
2024-04-30 13:46:57 -05:00
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Cap the minimum value of this to 0
bonusManaRegen = std::max( static_cast<R64>( 0 ), (( baseBonusManaRegen * bonusManaRegen ) - ( baseBonusManaRegen - 1 )) / 10.0 );
R64 manaPerSecond = ( 0.2 + focusBonus + meditationBonus + bonusManaRegen );
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Scale the baseline time by (baselineRate / totalRate)
nextManaRegen = static_cast<SI32>( std::round( nextManaRegen * ( baselineRate / manaPerSecond )));
mChar.IncMana( 1 );
}
else if( manaRegenMode >= MREG_AOS1 )
{
// Age of Shadows/Samurai Empire
R64 baselineRate = 1.0 / cwmWorldState->ServerData()->SystemTimer( tSERVER_MANAREGEN ); // 1 mana per 7 seconds = 0.1428 mana/sec
R64 intPoints = 0;
R64 medPoints = 0;
R64 focusPoints = 0;
if( manaRegenMode == MREG_AOS1 ) // Early AoS, pre-Pub18
{
// Based on era-contemporary information from https://community.stratics.com/threads/old-faq-update-thread-reference-only.10616/post-128182
intPoints = std::floor( intStat / 38.0 );
medPoints = std::floor(( medSkill / 10.0 ) / 10.0 );
focusPoints = std::floor(( focusSkill / 10.0 ) / 20.0 );
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
else // Late AoS, post-Pub18
{
// Calculate base mana regen from meditation skill, int stat and whether character is GM meditation or not
medPoints = intStat + (( medSkill / 10.0 ) * 3 );
medPoints *= ( medSkill < 1000 ) ? 0.025 : 0.0275;
// Every 20 points in focus is worth 1 mana per 10 seconds (same as 1 mana regen point on items), or 0.1 mana per second
focusPoints = std::floor(( focusSkill / 10.0 ) / 200.0 ) * 0.1;
//focusPoints = (( focusSkill / 10 ) * 0.05 ) * 0.1;
}
if( cwmWorldState->ServerData()->ArmorAffectManaRegen() )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// if CalcDef returns a value higher than 0, character has non-medable armor equipped
if( Combat->CalcDef(( &mChar ), 0, false, PHYSICAL, true, true ) > 0 )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
medPoints = 0;
}
2022-06-08 10:38:16 -04:00
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Grab mana bonuses from character (from equipped items, primarily)
R64 bonusManaRegen = mChar.GetManaRegenBonus();
// Add additional bonus mana points here:
// ... Vampiric Embrace (+3 Mana Regen)
// EXAMPLE: if( mChar.GetTransform() == TF_VAMPIRIC ) bonusManaRegen += 3;
// ... Lich Form
// EXAMPLE: if( mChar.GetTransform() == TF_LICH ) bonusManaRegen += 13;
// Add mana regen bonus from races, if setup
bonusManaRegen += Races->Race( mChar.GetRace() )->ManaRegenBonus();
// Cap regen bonus from items based on ini setting
bonusManaRegen = ( std::min( bonusManaRegen, static_cast<R64>( cwmWorldState->ServerData()->ManaRegenCap() )));
if( manaRegenMode == MREG_AOS1 )
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
R64 totalPoints = intPoints + medPoints + focusPoints + bonusManaRegen + ( mChar.IsMeditating() ? ( medPoints > 13.0 ? 13.0 : medPoints ) : 0.0 );
R64 manaPerSecondRate;
if( totalPoints >= 21 )
{
manaPerSecondRate = 2.0; // 2 mana/sec -> 0.5 sec/mana
}
else if( totalPoints >= 14 )
{
manaPerSecondRate = 4.0 / 3.0; // ~1.33 mana/sec -> 0.75 sec/mana
}
else
{
manaPerSecondRate = 1.0; // 1 mana/sec -> 1.0 sec/mana
}
manaPerSecondRate *= cwmWorldState->ServerData()->SystemTimer( tSERVER_MANAREGEN );
nextManaRegen = ( 1.0 / manaPerSecondRate ) * 1000;
2022-06-08 10:38:16 -04:00
}
else
{
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Add it all up, and double bonus from Meditation if character is actively meditating, but cap it at 13
R64 totalPoints = bonusManaRegen + focusPoints + medPoints + ( mChar.IsMeditating() ? ( medPoints > 13.0 ? 13.0 : medPoints ) : 0.0 );
auto manaPerSec = 0.1 * ( ( baselineRate * 10.0 ) + totalPoints );
nextManaRegen = 1000 / manaPerSec;
}
mChar.IncMana( 1 );
}
else if( manaRegenMode == MREG_LBR ) // LBR and earlier
{
// LBR and below - custom approximation to match up to expected results
UI16 baseArmor = 0;
if( cwmWorldState->ServerData()->ArmorAffectManaRegen() ) // If armor effects mana regeneration...
{
// Calculate base armor character is wearing, excluding medable armor
baseArmor = Combat->CalcDef(( &mChar ), 0, false, PHYSICAL, true, true );
// Cap the base armor used for calculations at 100 just in case
if( baseArmor > 100 )
{
baseArmor = 100;
}
}
// Optional mana regen bonus (usually not part of LBR calculations) from character/equipped items, and races
R64 bonusManaRegen = mChar.GetManaRegenBonus();
bonusManaRegen += Races->Race( mChar.GetRace() )->ManaRegenBonus();
//bonusManaRegen = ( std::min( bonusManaRegen, static_cast<R64>( cwmWorldState->ServerData()->ManaRegenCap() ))) / 10.0;
bonusManaRegen = ( std::min( bonusManaRegen, static_cast<R64>( cwmWorldState->ServerData()->ManaRegenCap() )));
// Normalize values
R64 normalizedInt = std::min( 1.0, ( intStat / 100.0 ));
R64 normalizedMed = std::min( 1.0, ( medSkill / 1000.0 ));
R64 normalizedArmor = std::min( 1.0, ( baseArmor / 65.0 )); // Normalize armor based on a "cap" of 65
R64 normalizedBonus = std::min( 1.0, ( bonusManaRegen / 73.0 ));
// Define weights
R64 intWeight = 0.25; // How much int affects regen time
R64 medWeight = 0.75; // How much med affects regen time
R64 armorWeight = 1.5; // How much armor affects regen time (inversely)
R64 bonusWeight = 0.5; // How much mana regen bonuses affects regen time
// Calculate positive and negative effects based on normalized values and weights
R64 positiveEffect = (( intWeight * normalizedInt ) + ( medWeight * normalizedMed ) + ( bonusWeight * normalizedBonus )) * 6.0;
R64 negativeEffect = ( armorWeight * normalizedArmor ) * 6.0;
// Calculate final time until next mana regen, in seconds
2025-05-10 18:27:06 +08:00
nextManaRegen = (( nextManaRegen / 1000 ) - positiveEffect + negativeEffect ) * 1000;
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
// Increment mana based on the calculated regeneration time
SI32 manaIncrement = mChar.IsMeditating() ? 2 : 1; // double if actively meditating
mChar.IncMana( std::min( manaIncrement, maxMana - mChar.GetMana() ));
}
if( manaRegenMode >= MREG_AOS1 ) // AoS and beyond
{
// Check FOCUS for skill gain for AoS expansions and above
Skills->CheckSkill(( &mChar ), FOCUS, 0, 1000 );
}
// Check Meditation for skill gain ala OSI, as long as player is not actively meditating
if( !mChar.IsMeditating() )
{
Skills->CheckSkill(( &mChar ), MEDITATION, 0, 1000 );
}
if( mChar.GetMana() >= maxMana && mChar.IsMeditating() )
{
if( mSock )
{
mSock->SysMessage( 969 ); // You are at peace.
2003-03-05 02:29:44 +00:00
}
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
mChar.SetMeditating( false );
}
}
return nextManaRegen;
}
//o------------------------------------------------------------------------------------------------o
//| Function - GenericCheck()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Check characters status. Returns true if character was killed
//o------------------------------------------------------------------------------------------------o
auto GenericCheck( CSocket *mSock, CChar& mChar, bool checkFieldEffects, bool doWeather ) -> bool
{
if( !mChar.IsDead() )
{
const auto maxHP = mChar.GetMaxHP();
const auto maxStam = mChar.GetMaxStam();
const auto maxMana = mChar.GetMaxMana();
if( mChar.GetHP() > maxHP )
{
mChar.SetHP( maxHP );
}
if( mChar.GetStamina() > maxStam )
{
mChar.SetStamina( maxStam );
}
if( mChar.GetMana() > maxMana )
{
mChar.SetMana( maxMana );
}
auto hpRegenMode = cwmWorldState->ServerData()->HealthRegenMode();
if( hpRegenMode > 0 && mChar.GetRegen( 0 ) <= cwmWorldState->GetUICurrentTime() )
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
{
// Perform passive health regeneration
auto nextHpRegen = PassiveHealthRegen( mChar, maxHP );
// Set time for next health regen
mChar.SetRegen( cwmWorldState->GetUICurrentTime() + nextHpRegen, 0 );
}
auto staminaRegenMode = cwmWorldState->ServerData()->StaminaRegenMode();
if( staminaRegenMode > 0 && mChar.GetRegen( 1 ) <= cwmWorldState->GetUICurrentTime() )
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
{
// Perform passive stamina regeneration
auto nextStaminaRegen = PassiveStaminaRegen( mChar, maxStam );
// Set time for next stamina regen
mChar.SetRegen( cwmWorldState->GetUICurrentTime() + nextStaminaRegen, 1 );
}
// MANA REGENERATION:Rewrite of passive and active meditation code
auto manaRegenMode = cwmWorldState->ServerData()->ManaRegenMode();
if( manaRegenMode > 0 && mChar.GetRegen( 2 ) <= cwmWorldState->GetUICurrentTime() )
Rework of passive stat regeneration Updated code calculating passive health, stamina and mana regeneration for characters, based on new UOX.INI settings and bonuses from characters/items/races Added three new Character/Item/Race DFN tags to grant bonus health/stamina/mana regeneration: HEALTHREGENBONUS=# // 10 bonus points equates to 0.01 extra hp regen per second, independent of era STAMINAREGENBONUS=# // 10 bonus points equates to 0.05 extra stamina regen per second MANAREGENBONUS=# // 10 bonus point equates to 0.1 extra mana regen per second ...also available as JS Properties: .healthRegenBonus .staminaRegenBonus .manaRegenBonus Updated get/set JS commands to allow getting/setting regen bonuses for health, stamina and mana Updated races.dfn to include default +2 health regen bonus for humans, and +2 mana regen bonus for gargoyles. Added new UOX.INI settings under [Skills and Stats] section: HEALTHREGENMODE=1 // 0 = no passive health regen, 1 = default passive health regen STAMINAREGENMODE=1 // 0 = no passive stamina regen, 1 = default passive stamina regen (LBR or below), 2 = AoS or beyond, 3 = SA and beyond MANAREGENMODE=1 // 0 = no passive mana regen, 1 = default passive mana regen (LBR or below), 2 = AoS (Pub17), 3 = AoS/SE (Pub18 and beyond), 4 = ML, 5 = KR, 6 = SA and beyond HEALTHREGENCAP=# // Max cap for Health Regeneration Bonus stat per character STAMINAREGENCAP=# // Max cap for Stamina Regeneration Bonus stat per character MANAREGENCAP=# // Max cap for Mana Regeneration Bonus stat per character Added new UOX.INI section ([default race bonuses]) with the following new settings for the 3 default playable races (only used if nothing else specified in races.dfn): HUMANHEALTHREGENBONUS=0 // default health regen bonus for human race (2 from ML expansion onwards) HUMANSTAMINAREGENBONUS=0 // default stamina regen bonus for human race HUMANMANAREGENBONUS=0 // default mana regen bonus for human race ELFHEALTHREGENBONUS=0 // default health regen bonus for elf race ELFSTAMINAREGENBONUS=0 // default stamina regen bonus for elf race ELFMANAREGENBONUS=0 // default mana regen bonus for elf race GARGOYLEHEALTHREGENBONUS=0 // default health regen bonus for gargoyle race GARGOYLESTAMINAREGENBONUS=0 // default stamina regen bonus for gargoyle race GARGOYLEMANAREGENBONUS=0 // default mana regen bonus for gargoyle race (2 from SA expansion onwards) Updated UOX3 Documentation with new feature section on Stat Regeneration with details on stat regeneration rules and recommended settings per UO era Added support for Medable armors (have no effect on meditation skill and/or passive regen of mana when worn) and Mage Armors (can turn non-medable armor into medable armor) These properties are defined per armor piece using the first and second bits of the MORE property: MORE=0x1 0x0 0x0 0x0 // Medable Armor MORE=0x0 0x1 0x0 0x0 // Mage Armor The following armor types have been marked as medable by default: leather armor, leather ninja armor, leather samurai armor, leaf armor, gargish cloth armor, gargish leather armor and all hats and masks Updated JS Method .Defense() to support optional fourth and fifth parameters - excludeMedableArmor (true/false) and includeShield (true/false) Updated CalfDef function to support including shields in the calculations, and updated mana regen code to include shields when checking for equipped armor Updated Meditation skill JS script to exclude medable armor from armor check, include shields, and apply different rules for active meditation depending on mana regen mode Updated stat window to include defensive rating of shields (based on Parrying skill) and/or elemental resistances (if enabled in ini) Added a new property to CRace class, which is automatically set and incremented as UOX3 loads in races from races.dfn: raceID Added new Getters/Setters for CRace class to retrieve ID of a specific Race object Updated JS property .id for Race JS Object to return new race ID instead of iterating through list of races to compare race object and return index Reloading DFNs now also reloads Races
2025-04-20 06:05:44 +08:00
{
// Perform passive mana regeneration
auto nextManaRegen = PassiveManaRegen( mSock, mChar, maxMana );
mChar.SetRegen( cwmWorldState->GetUICurrentTime() + nextManaRegen , 2 );
}
2022-06-08 10:38:16 -04:00
}
UOX3 0.99.6-RC4 Fixed an issue that prevented onBuyFromVendor() and onBoughtFromVendor() JS Events from triggering when attached to NPC shopkeepers Fixed an issue with help gump that prevented password management section from working as intended (js/server/misc/helpgump.js) Fixed an issue where UOX3 would fail to load pre-HS multi.mul files Added chess board to Misc->Games add menu (dfndata/items/ItemMenu.bulk.dfn) Fixed an issue with 'move (alias for 'telestuff) command that referenced the wrong variable name (js/commands/targeting/tele.js) When a player is teleported via the GM 'wholist menu, any pets within range are now also brought along for the ride Consolidated error-reporting for JS Functions, Object Methods and Object Properties to provide more context (scriptID, filename, line number) when something goes wrong Added some missing shield IDs (0xA649, 0xA64A, 0xA831, 0xA832) to IsShieldType() function MAXRANGE item property previously only worked for ranged weapons; now it works for melee weapons too, and potentially allows melee weapons with combat range longer than 1 tile MAXRANGE item property can now be used to define max combat range for melee weapons Fixed an issue (non-critical) with .PlaceInPack() JS Method that would cause UOX3 to try adding items marked for deletion to refreshQueue and spam console with errors Added missing AI scripts to summoned Blade Spirits and Energy Vortexes (dfndata/npc/magicsummon.dfn) Fixed an issue with weight calculation for hireling backpacks (js/npc/ai/hireling.js) Fixed an issue with the 'fix command, which would in most cases set character's Z to -1 regardless of location, but now adheres to map elevation instead Fixed an issue with Pack AI (js/npc/ai/pack_ai.js) that prevented pack members from attacking target correctly (thanks Dragon Slayer) Fixed an issue with DoesMapBlock JS Function that incorrectly checked for 6 function arguments, when it actually requires 8 Fixed an issue with DoesDynamicBlock JS Function that incorrectly checked for 8 function arguments, when it actually requires 9 Fixed an issue with runebook script (js/item/runebook.js) that prevented players from being able to use recall charges without having spellbook with spell in inventory Fixed issues with placement of tall items on ground/floor, and with stacking of items in houses Fixed incorrect alias for woodland armor (dfndata/items/gear/armor/other/armor/wood.dfn - thanks Dragon Slayer) Fixed a critical issue with script context sometimes changing while executing a script, because of events in other scripts being triggered. Affected scripts can be safeguarded against this by the addition of a dummy callback function anywhere in the script: function _restorecontext_() {} Fixed an issue with non-animal pets not gaining loyalty when being fed (thanks Dragon Slayer) Added new JS Object Methods for Chars/Items/Multis to fetch list of custom tags associated with object: .GetTagMap() // Gets list of persistent custom tags associated with object .GetTempTagMap() // Gets list of temporary custom tags associated with object Added new JS commands ('GETTAGMAP and 'GETTEMPTAGMAP) that spits out details of custom tags associated with targeted object (js/commands/custom/misc-cmd.js) Added new JS command ('USEITEM) that acts as a short-cut for double-clicking on targeted item (js/commands/custom/misc-cmd.js) Updated 'ADD # and 'ADD ITEM # JS commands to support targeting a container directly and adding the new item inside (js/commands/targeting/add.js) Updated axe script to only perform lumberjacking skill-check when there's still wood available in a given area, and to play appropriate animations for Gargoyle players (js/item/axe.js) Updated script for gameboards to make generated pieces newbiefied so they won't appear on ground if board decays (js/item/gameboards.js) Updated script for stablemasters to avoid relying on global variables (js/npc/ai/stablemaster.js) Updated names of items crafted with runic hammers to include the material name of the hammers used to craft them (js/skill/craft/crafting_complete.js) Fixed a small issue with Detect Hidden skill that would return the wrong message if players found anyone hiding nearby (js/skill/detecthidden.js) Fixed an issue that prevented tile overrides in dfndata/maps/tiles.dfn from loading properly Added entries for a couple of walls with missing no-shoot flags to tile overrides in dfndata/maps/tiles.dfn Updated JS Method .SoundEffect() to support optional third argument (creatureSoundNum) to play creature-defined sounds from dfndata/creatures/creatures.dfn. New syntax: .SoundEffect( soundID, allHear[, creatureSoundNum] ) // 0=SOUND_STARTATTACK, 1=SOUND_IDLE, 2=SOUND_ATTACK, 3=SOUND_DEFEND, 4=SOUND_DIE Added new Character JS Methods: .SetRandomName( nameListID ) // apply a random name from specified namelist to character .FindItemSection( sectionID ) // find item in player's backpack with specified sectionID Added new Socket JS Method: .OpenContainer() // Opens specified container for socket
2023-05-30 01:47:26 +08:00
if( mChar.GetVisible() == VT_INVISIBLE && mChar.GetTimer( tCHAR_INVIS ) <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.ExposeToView();
}
2022-06-08 10:38:16 -04:00
// Take NPC out of EvadeState
if( mChar.IsNpc() && mChar.IsEvading() && mChar.GetTimer( tNPC_EVADETIME ) <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.SetEvadeState( false );
#if defined( UOX_DEBUG_MODE ) && defined( DEBUG_COMBAT )
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
std::string mCharName = GetNpcDictName( &mChar, nullptr, NRS_SYSTEM );
Console.Print( oldstrutil::format( "DEBUG: EvadeTimer ended for NPC (%s, 0x%X, at %i, %i, %i, %i).\n", mCharName.c_str(), mChar.GetSerial(), mChar.GetX(), mChar.GetY(), mChar.GetZ(), mChar.WorldNumber() ));
2022-06-08 10:38:16 -04:00
#endif
}
if( !mChar.IsDead() )
{
2022-06-08 10:38:16 -04:00
// Hunger/Thirst Code
mChar.DoHunger( mSock );
mChar.DoThirst( mSock );
2022-06-08 10:38:16 -04:00
// Loyalty update for pets
mChar.DoLoyaltyUpdate();
if( !mChar.IsInvulnerable() && mChar.GetPoisoned() > 0 )
{
if( mChar.GetTimer( tCHAR_POISONTIME ) <= cwmWorldState->GetUICurrentTime() )
{
if( mChar.GetTimer( tCHAR_POISONWEAROFF ) > cwmWorldState->GetUICurrentTime() )
{
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
std::string mCharName = GetNpcDictName( &mChar, nullptr, NRS_SPEECH );
auto poisonedBy = CalcCharObjFromSer( mChar.GetPoisonedBy() );
switch( mChar.GetPoisoned() )
{
case 1: // Lesser Poison
{
mChar.SetTimer( tCHAR_POISONTIME, BuildTimeValue( 2.0 ));
if( mChar.GetTimer( tCHAR_POISONTEXT ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetTimer( tCHAR_POISONTEXT, BuildTimeValue( 6.0 ));
2022-06-08 10:38:16 -04:00
mChar.TextMessage( nullptr, 1240, EMOTE, 1, mCharName.c_str() ); // * %s looks a bit nauseous *
}
SI16 poisonDmgPercent = RandomNum( 3, 6 ); // 3% to 6% of current health per tick
SI16 poisonDmg = static_cast<SI16>(( mChar.GetHP() * poisonDmgPercent ) / 100 );
[[maybe_unused]] bool retVal = mChar.Damage( std::max( static_cast<SI16>( 3 ), poisonDmg ), POISON, poisonedBy ); // Minimum 3 damage per tick
2022-06-08 10:38:16 -04:00
break;
}
case 2: // Normal Poison
{
mChar.SetTimer( tCHAR_POISONTIME, BuildTimeValue( 3.0 ));
if( mChar.GetTimer( tCHAR_POISONTEXT ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetTimer( tCHAR_POISONTEXT, BuildTimeValue( 10.0 ));
2022-06-08 10:38:16 -04:00
mChar.TextMessage( nullptr, 1241, EMOTE, 1, mCharName.c_str() ); // * %s looks disoriented and nauseous! *
}
SI16 poisonDmgPercent = RandomNum( 4, 8 ); // 4% to 8% of current health per tick
SI16 poisonDmg = static_cast<SI16>(( mChar.GetHP() * poisonDmgPercent ) / 100 );
[[maybe_unused]] bool retVal = mChar.Damage( std::max( static_cast<SI16>( 5 ), poisonDmg ), POISON, poisonedBy ); // Minimum 5 damage per tick
2022-06-08 10:38:16 -04:00
break;
}
case 3: // Greater Poison
{
mChar.SetTimer( tCHAR_POISONTIME, BuildTimeValue( 4.0 ));
if( mChar.GetTimer( tCHAR_POISONTEXT ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetTimer( tCHAR_POISONTEXT, BuildTimeValue( 10.0 ));
2022-06-08 10:38:16 -04:00
mChar.TextMessage( nullptr, 1242, EMOTE, 1, mCharName.c_str() ); // * %s is in severe pain! *
}
SI16 poisonDmgPercent = RandomNum( 8, 12 ); // 8% to 12% of current health per tick
SI16 poisonDmg = static_cast<SI16>(( mChar.GetHP() * poisonDmgPercent ) / 100 );
[[maybe_unused]] bool retVal = mChar.Damage( std::max( static_cast<SI16>( 8 ), poisonDmg ), POISON, poisonedBy ); // Minimum 8 damage per tick
2022-06-08 10:38:16 -04:00
break;
}
case 4: // Deadly Poison
{
mChar.SetTimer( tCHAR_POISONTIME, BuildTimeValue( 5.0 ));
if( mChar.GetTimer( tCHAR_POISONTEXT ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetTimer( tCHAR_POISONTEXT, BuildTimeValue( 10.0 ));
2022-06-08 10:38:16 -04:00
mChar.TextMessage( nullptr, 1243, EMOTE, 1, mCharName.c_str() ); // * %s looks extremely weak and is wrecked in pain! *
}
SI16 poisonDmgPercent = RandomNum( 12, 25 ); // 12% to 25% of current health per tick
SI16 poisonDmg = static_cast<SI16>(( mChar.GetHP() * poisonDmgPercent ) / 100 );
[[maybe_unused]] bool retVal = mChar.Damage( std::max( static_cast<SI16>( 14 ), poisonDmg ), POISON, poisonedBy ); // Minimum 14 damage per tick
2022-06-08 10:38:16 -04:00
break;
}
case 5: // Lethal Poison - Used by monsters only
{
mChar.SetTimer( tCHAR_POISONTIME, BuildTimeValue( 5.0 ));
if( mChar.GetTimer( tCHAR_POISONTEXT ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetTimer( tCHAR_POISONTEXT, BuildTimeValue( 10.0 ));
2022-06-08 10:38:16 -04:00
mChar.TextMessage( nullptr, 1243, EMOTE, 1, mCharName.c_str() ); // * %s looks extremely weak and is wrecked in pain! *
}
SI16 poisonDmgPercent = RandomNum( 25, 50 ); // 25% to 50% of current health per tick
SI16 poisonDmg = static_cast<SI16>(( mChar.GetHP() * poisonDmgPercent ) / 100 );
[[maybe_unused]] bool retVal = mChar.Damage( std::max( static_cast<SI16>( 17 ), poisonDmg ), POISON, poisonedBy ); // Minimum 14 damage per tick
2022-06-08 10:38:16 -04:00
break;
}
default:
Console.Error( " Fallout of switch statement without default. uox3.cpp, GenericCheck(), mChar.GetPoisoned() not within valid range." );
2022-06-08 10:38:16 -04:00
mChar.SetPoisoned( 0 );
mChar.SetPoisonedBy( INVALIDSERIAL );
2022-06-08 10:38:16 -04:00
break;
}
if( mChar.GetHP() < 1 && !mChar.IsDead() )
{
2022-06-08 10:38:16 -04:00
std::vector<UI16> scriptTriggers = mChar.GetScriptTriggers();
for( auto &i : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
cScript *toExecute = JSMapping->GetScript( i );
if( toExecute )
{
2022-06-08 10:38:16 -04:00
SI08 retStatus = toExecute->OnDeathBlow( &mChar, mChar.GetAttacker() );
2022-06-08 10:38:16 -04:00
// -1 == script doesn't exist, or returned -1
// 0 == script returned false, 0, or nothing - don't execute hard code
// 1 == script returned true or 1
if( retStatus == 0 )
return false;
}
}
HandleDeath(( &mChar ), nullptr );
if( mSock )
{
mSock->SysMessage( 1244 ); // The poison has killed you!
2022-06-08 10:38:16 -04:00
}
}
}
}
2022-06-08 10:38:16 -04:00
}
if( mChar.GetTimer( tCHAR_POISONWEAROFF ) <= cwmWorldState->GetUICurrentTime() )
{
if( mChar.GetPoisoned() > 0 )
{
2022-06-08 10:38:16 -04:00
mChar.SetPoisoned( 0 );
mChar.SetPoisonedBy( INVALIDSERIAL );
if( mSock != nullptr )
{
mSock->SysMessage( 1245 ); // The poison has worn off.
2022-06-08 10:38:16 -04:00
}
}
}
}
if( !mChar.GetCanAttack() && mChar.GetTimer( tCHAR_PEACETIMER ) <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.SetCanAttack( true );
if( mSock != nullptr )
{
mSock->SysMessage( 1779 ); // You are no longer affected by peace!
2022-06-08 10:38:16 -04:00
}
}
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Perform maintenance on NPC's list of ignored targets in combat
if( mChar.IsNpc() )
{
mChar.CombatIgnoreMaintenance();
}
// Perform maintenance on character's aggressor flags to clear out expired entries from the list
mChar.AggressorFlagMaintenance();
// Periodically reset permagrey flags if global timer is above 0, otherwise... they're permanent :P
if( cwmWorldState->ServerData()->SystemTimer( tSERVER_PERMAGREYFLAG ) > 0 )
{
mChar.PermaGreyFlagMaintenance();
}
if( mChar.IsCriminal() && mChar.GetTimer( tCHAR_CRIMFLAG ) && mChar.GetTimer( tCHAR_CRIMFLAG ) <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
if( mSock != nullptr )
{
mSock->SysMessage( 1238 ); // You are no longer a criminal.
}
2022-06-08 10:38:16 -04:00
mChar.SetTimer( tCHAR_CRIMFLAG, 0 );
UpdateFlag( &mChar );
}
if( mChar.HasStolen() && mChar.GetTimer( tCHAR_STEALFLAG ) && mChar.GetTimer( tCHAR_STEALFLAG ) <= cwmWorldState->GetUICurrentTime() )
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
{
mChar.SetTimer( tCHAR_STEALFLAG, 0 );
mChar.HasStolen( false );
UpdateFlag( &mChar );
}
if( mChar.GetKills() && mChar.GetTimer( tCHAR_MURDERRATE ) <= cwmWorldState->GetUICurrentTime() )
{
mChar.SetKills( static_cast<SI16>( mChar.GetKills() - 1 ));
if( mChar.GetKills() )
{
mChar.SetTimer( tCHAR_MURDERRATE, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_MURDERDECAY ));
2022-06-08 10:38:16 -04:00
}
else
{
2022-06-08 10:38:16 -04:00
mChar.SetTimer( tCHAR_MURDERRATE, 0 );
}
if( mSock != nullptr && mChar.GetKills() == cwmWorldState->ServerData()->RepMaxKills() )
{
mSock->SysMessage( 1239 ); // You are no longer a murderer.
2022-06-08 10:38:16 -04:00
}
UpdateFlag( &mChar );
}
if( !mChar.IsDead() )
{
if( doWeather )
{
2022-06-08 10:38:16 -04:00
const UI08 curLevel = cwmWorldState->ServerData()->WorldLightCurrentLevel();
LIGHTLEVEL toShow;
if( Races->VisLevel( mChar.GetRace() ) > curLevel )
{
2022-06-08 10:38:16 -04:00
toShow = 0;
}
else
{
toShow = static_cast<UI08>( curLevel - Races->VisLevel( mChar.GetRace() ));
2022-06-08 10:38:16 -04:00
}
if( mChar.IsNpc() )
{
DoLight( &mChar, toShow );
2022-06-08 10:38:16 -04:00
}
else
{
DoLight( mSock, toShow );
}
}
Weather->DoLightEffect( mSock, mChar );
2022-06-08 10:38:16 -04:00
Weather->doWeatherEffect( mSock, mChar, RAIN );
Weather->doWeatherEffect( mSock, mChar, SNOW );
Weather->doWeatherEffect( mSock, mChar, HEAT );
Weather->doWeatherEffect( mSock, mChar, COLD );
Weather->doWeatherEffect( mSock, mChar, STORM );
if( checkFieldEffects )
{
2022-06-08 10:38:16 -04:00
Magic->CheckFieldEffects( mChar );
}
2022-06-08 10:38:16 -04:00
mChar.UpdateDamageTrack();
}
if( mChar.IsDead() )
{
return true;
2022-06-08 10:38:16 -04:00
}
else if( mChar.GetHP() <= 0 )
{
2022-06-08 10:38:16 -04:00
std::vector<UI16> scriptTriggers = mChar.GetScriptTriggers();
for( auto i : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( i );
if( toExecute )
{
2022-06-08 10:38:16 -04:00
auto retStatus = toExecute->OnDeathBlow( &mChar, mChar.GetAttacker() );
2022-06-08 10:38:16 -04:00
// -1 == script doesn't exist, or returned -1
// 0 == script returned false, 0, or nothing - don't execute hard code
// 1 == script returned true or 1
if( retStatus == 0 )
{
2022-06-08 10:38:16 -04:00
return false;
}
}
}
HandleDeath(( &mChar ), nullptr );
2022-06-08 10:38:16 -04:00
return true;
}
return false;
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckPC()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check a PC's status
//o------------------------------------------------------------------------------------------------o
auto CheckPC( CSocket *mSock, CChar& mChar ) -> void
{
2022-06-08 10:38:16 -04:00
Combat->CombatLoop( mSock, mChar );
if( mChar.GetSquelched() == 2 )
{
if( mSock->GetTimer( tPC_MUTETIME ) != 0 && mSock->GetTimer( tPC_MUTETIME ) <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.SetSquelched( 0 );
mSock->SetTimer( tPC_MUTETIME, 0 );
mSock->SysMessage( 1237 ); // You are no longer squelched!
2022-06-08 10:38:16 -04:00
}
}
if( mChar.IsCasting() && !mChar.IsJSCasting() && mChar.GetSpellCast() != -1 )
{
2022-06-08 10:38:16 -04:00
// Casting a spell
auto spellNum = mChar.GetSpellCast();
mChar.SetNextAct( mChar.GetNextAct() - 1 );
if( mChar.GetTimer( tCHAR_SPELLTIME ) <= cwmWorldState->GetUICurrentTime() ) // Spell is complete target it.
Housing Revamp and more Updated JS SysMessage function to accept up to 10 extra, optional arguments, which can be used with dictionary messages that require additional parameters like %s or %i Added new type of house privilege in cMultiObj.cpp to keep track of friends of the multi - HOUSEPRIV_FRIEND - which is stored during worldsaves as one or more Friend=<player serial> tags in house.wsc Added new type of house privilege in cMultiObj.cpp to keep track of guests of the multi - HOUSEPRIV_GUEST - which is stored during worldsaves as one or more Guest=<player serial> tags in house.wsc When items are created for houses upon house placement, a reference to the multi's serial is now stored in the house sign's MORE property to allow easier tracking of which house a particular sign belongs to Added tracking of new, persistent properties for houses via cMultiObj.cpp/h: lockdowns, secure containers, vendors, guests, friends, owners, ban location, public status, number of visits, timestamps Added a multitude of new methods in cMultiObj.cpp/h to assist in improving the functionality of houses Added new tags for houses in house.dfn (default values applied if tag not specified): MAXSECURECONTAINERS=4 - Max amount of secure containers allowed in a multi MAXLOCKDOWNS=256 - Max amount of lockdowns allowed in a multi MAXVENDORS=10 - Max amount of vendors allowed in a multi MAXBANS=50 - Max amount of bans in a multi's ban list MAXFRIENDS=50 - Max amount of friends in a multi's friend list MAXGUESTS=50 - Max amount of guests in a multi's guest list MAXOWNERS=8 - Max amount of owners and co-owners in a multi's owner list MAXTRASHCONTAINERS=1 - Max amount of trash containers allowed in multi SCRIPT=<scriptID> - Assign a JS script-ID directly to a multi FRONTDOOR - indicates that a door is the front door of a house. Cannot be locked in public houses! INTERIORDOOR - indicates that a door is an interior door of a house. Can be locked in public houses. BANX - Location X offset for multi's ban location, if not used, will try to use SE corner of multi instead BANY - Location Y offset for multi's ban location, if not used, will try to use SE corner of multi instead Added JS Event: onHouseCommand( tSock, multiObj, cmdID ) - For handling spoken house commands via JS scripts attached to multi. Updated JS Events: onEntrance() - can now trigger both for multi being entered and/or object entering onLeaving() - can now trigger both for multi being left and/or object entering onSpeech() - can now also trigger for items (in addition to chars) with event & script attached, if UOX.INI setting ITEMSDETECTSPEECH is enabled Added JS Multi methods: .IsBoat() - Returns whether the item (or multi) is a boat .IsOwner( playerToCheck ) - Returns whether a player is the owner of a multi .IsOnOwnerList( playerToCheck ) - Returns whether a player is on the (co-)owner list of a multi .IsOnFriendList( playerToCheck ) - Returns whether a player is on the friend list of a multi .IsOnGuestList( playerToCheck ) - Returns whether a player is on the guest list of a multi .IsOnBanList( playerToCheck ) - Returns whether a player is on the ban list of a multi .AddToFriendList( playertoAdd ) - Adds player to the friend list of a multi .RemoveFromFriendList( playertoRemove ) - Removes player from the friend list of a multi .AddToGuestList( playertoAdd ) - Adds player to the guest list of a multi .RemoveFromGuestList( playertoRemove ) - Removes player from the guest list of a multi .ClearOwnerList() - Clears all entries from a multi's (co-)owner list .ClearFriendList() - Clears all entries from a multi's friend list .ClearGuestList() - Clears all entries from a multi's guest list .ClearBanList() - Clears all entries from a multi's ban list .SecureContainer( itemToSecure ) - Secures a container in a multi .UnsecureContainer( itemToUnsecure ) - Unsecures a container in a multi .IsSecureContainer( itemToCheck ) - Checks if specified item is a secure container in a multi .LockDownItem( itemToLockDown) - Locks down an item in a multi .ReleaseItem( itemToRelease ) - Releases a locked down item in a multi .KillKeys() - Deletes ALL keys associated with a multi .AddTrashCont( itemToAdd ) - Add trash container to multi's list of trash containers .RemoveTrashCont( itemToRemove ) - Remove trash container from multi's list of trash containers Added JS Item (Multi only) properties: .lockdowns - Get the number of lockdowns in a multi .maxLockdowns - Get/Set the max number of lockdowns allowed in a multi .secureContainers - Get the number of secure containers in a multi .maxSecureContainers - Get/Set the max number of secure containers allowed in a multi .trashContainers - Get the number of trash containers in a multi .maxTrashContainers - Get/Set the max number of trash containers allowed in a multi .friends - Get the number of friends in a multi's friend list .maxFriends - Get/Set the max number of friends allowed in a multi's friend list .guests - Get the number of guests in a multi's guest list .maxGuests - Get/Set the max number of guests allowed in a multi's guest list .owners - Get the number of owners in a multi's owner list .maxOwners - Get/Set the max number of owners allowed in a multi's owner list .bans - Get the number of banned players in a multi's ban list .maxBans - Get/Set the max number of banned players allowed in a multi's ban list .vendors - Get the number of player vendors in a multi .maxVendors - Get the max number of player vendors allowed in a multi .deed - Get the item sectionID for deed used to place multi .isPublic - Get/Set the private/public state of a multi .buildTimestamp - Get the timestamp for when the house was originally placed .tradeTimestamp - Get the timestamp for when the house was last traded to another player .banX - Get/Set the ban location X offset for the multi .banY - Get/Set the ban location Y offset for the multi Added JS Character properties: .multi = Get/Set the multi object the character is in .accountNum = Get the account number the character belongs to .housesOwned = Get a count of houses owned by the character .housesCoOwned = Get a count of houses co-owned by the character Updated JS cBaseObject Methods .FirstItem(), .NextItem() and .FinishedItems() to also support iterating through items in multis Updated JS multi Methods .FirstChar(), .NextChar() and .FinishedChars() to support an additional parameter to specify what kind of characters to loop through: "default" or no parameter - all characters inside the multi "owner" - players on multi's owner list "friend" - players on multi's friend list "guest" - players on multi's guest list "banned" - players on multi's ban list Added new INI tags to a new section of uox.ini called [houses] DECAYTIMERINHOUSE=3600 // Decay timer in seconds for non-locked down items inside houses PROTECTPRIVATEHOUSES=1 // Toggles whether private houses will automatically boot unauthorized visitors (1) or not (0) TRACKHOUSESPERACCOUNT=1 // Toggles whether to track (and restrict) house ownership per account (1) or per character (0) MAXHOUSESOWNABLE=1 // Specifies the max amount of houses a player can own per account/char, depending on how house ownership is tracked MAXHOUSESCOOWNABLE=10 // Specifies the max amount of houses a player can co-own per character CANOWNANDCOOWNHOUSES=1 // Toggles whether players can own and co-own houses at the same time COOWNHOUSESONSAMEACCOUNT=1 // Toggles whether characters on same account as house owner will be treated as co-owners Added new INI tags in [settings] section of uox.ini: ITEMSDETECTSPEECH=0 // If enabled, server will search for nearby items with onSpeech JS event running whenever a character speaks. Disabled by default. MAXPLAYERPACKITEMS=125 // Defines max item capacity for player (and NPC) backpacks. Defaults to 125. Moved most of the existing house functionality to JS and expanded upon it to reach feature parity with houses in regular UO around Publish 15/16, with various extras thrown in for good measure and all functionality being customizable: js/server/house/house.js (15000) - handles detection of house commands and characters entering/leaving houses js/server/house/houseSign.js (15001) - contains and handles all house-related gumps/menus and what is shown when players interact with house sign js/server/house/houseCommands.js (15002) - handles functionality of house commands and other functionality such as transfer of ownership, demolishing house, etc. js/server/house/houseDeed.js (15003) - handles initial rules that allow/disallow placement of additional houses for players All house-related menus now fully handled through JS All house commands and other functionality now fully handled through JS Removed redundant hard-coded house functionality Implemented Co-owners, friends, guests for houses, with access rules in place for entry, lockdowns, house commands, etc. Implemented Private and Public houses Implemented Secure Containers and Trash Barrels Definable max lockdowns, secure containers, player vendors, bans, friends, guests, owners, trash containers and more - per house type JS scripts can now be attached directly to houses Doors in houses can be marked as front doors or interior doors, and will be treated differently with regards to private and public houses Added new item to dfndata/items/containers/misc.dfn - [trashbarrel] Added new JS script (js/items/trashbarrel.js) with trash barrel functionality for houses. Trash barrels that are marked as secure containers are only accessible by owners, co-owners and friends of the house. Various options available at top of script. Updated js/items/axe.js to support chopping up trash barrels and house add-ons in houses owned by the player Fixed an issue with house doors being left behind after demolishing houses while their doors were open Fixed an issue where GMs could be banned from player houses Added Line of Sight checks to speech, to give players some privacy in their own homes Updated house placement code to more accurately check for other multis, dynamic and static objects when placing houses; now requires free space around each house that cannot be blocked by other houses or items that can block player movement, and disallows placement of houses on roads Updated house placement code to move characters blocking house placement to SE corner of the house Updated house placement code to disallow placing houses in guarded regions, or in dungeons Added new DFN tag for regions to enable/disable player houses in specific regions: HOUSING=0/1 Added new region (247) that covers path to Valley of Eodon in Felucca Added new region (248) that covers Valley of Eodon in Ter-Mur, with player housing disabled Added new region (249) that covers entire T2A lands, with player housing disabled Updated SPACEX and SPACEY values for all houses in dfndata/house/house.dfn to match updated house placement code Added new JS property to Regions that can be used to determine or change state of player housing in a region: .canPlaceHouse() Updated rules for usage of dye tubs to dye locked down items; now only house owners or co-owners may dye locked down items Updated rules for usage of the following locked down items in a house, which are now only usable by house owners and co-owners Dyes, Guildstone Deeds, Recall Runes (renaming), Rename Deeds, Townstone Deeds, House Deeds, Boat Models, Player Vendor Deeds, Ore, Hair Dye Updated rules for usage of the following locked down items in a house, which are now only usable by house owners, co-owners and friends: Keys, Dye Tubs, Magic Scrolls, Fireworks Wands, Magic Wands, Smithing Tools, Mining Tools, Fishing Poles Updated item lockdown rules to allow locking down (and releasing) items in a container as long as the container is locked down, and to only allow releasing a locked down container if it's empty of locked down items Updated item lockdown rules to only allow locking down movement-blocking items further than 2 tiles away from doors Updated rules for releasing items in houses - now the house owner can release any locked down items, co-owners can release items locked down by themselves or by friends, while friends can release only items locked down by themselves Added some feedback to player about why their attempted house placement failed Items added by GMs directly into multis will now decay based on the house-specific decay timer instead of the regular one Fixed an issue that could cause items to almost instantly decay after being released from lockdown in a house Placing house add-ons now properly takes into account SPACEX and SPACEY values when checking if they can fit in selected area of houses Re-added SPACEX and SPACEY values for Pentagram and Loom house add-ons House add-ons can now be converted back into house add-on deeds by chopping them with an axe Added new item type - IT_HOUSEADDON (201) - used by house add-ons placed in player houses Fixed a bug where keys would stop working after being added to a keyring, and would turn into blank keys upon release from the keyring Added visitor count for public player houses, which keeps track of how many visits a public house has received, with each player counted max 1 time every 24 hours Fixed an issue with FindPlayersInOldVisrange() where it didn't take into account that players could see buildings further away than the standard update range. This could cause players to see ghost images of buildings if they were at the "right" distance when the building was being demolished Added NODECAY tag to all signs and doors in dfndata/house/house.dfn Added FRONTDOOR or INTERIORDOOR (as appropriate) to all doors in dfndata/house/house.dfn Added BANX and BANY to specify ban location for some houses in dfndata/house/house.dfn instead of relying on finding SE corner automatically Implemented strongboxes (js/server/house/strongbox.js) for co-owners of a house, which can be placed with the house command "i wish to place a strongbox". Max capacity is 25 items Updated 'REMOVE command to take an optional parameter - itemID. If supplied, the command will remove all items with this itemID from a targeted container Fixed a bug when checking if dynamic items were blocking valid spawn locations for NPCs, some function arguments were in the wrong order! Improved code that finds valid spawn locations for items and NPCs spawned via spawn regions. As server gradually builds up lists of valid spawn locations per region over time, it will start using these lists more often, rather than always look for brand new spawn locations. Fixed a bug with CMulHandler::CheckStaticFlag() that prevented NPCs from spawning inside buildings with no static floors! Fixed an issue with repeating commands that prevented GMs from being able to cancel them when using the ClassicUO client Exposed character property .accountNum to JS engine Extended CDataList class to include a Clear() method for clearing lists Updated JS File method .Open() to support an optional, third argument - subFolderName - that defines in which sub-folder of UOX3/shared/ to store/look for a file. If no third argument is supplied, UOX3 will default to using the shared folder itself. Updated JS File method .Length() to return a value of -1 for files that don't exist Added new code function, exposed to JS engine with same parameters, which simply checks if a given tile ID has a specific flag bool CheckTileFlag( UI16 itemID, TILEFLAG flagToCheck ) Added JS function used to find the root container of an item (if any) FindRootContainer( itemSerial ) FindRootContainer( item ) Added new JS function that allows deleting files from UOX3/shared/ folder or subfolders of shared folder. If no subFolderName is provided, looks for file directly in shared folder itself. Restrictions on file- and folder-names apply. bool DeleteFile( fileName, subFolderName ) Added new JS functions for checking if a specific client or server feature is enabled. See documentation for full list of client/server features. GetClientFeature( bitNum ) // Returns true if specified client feature is enabled on server GetServerFeature( bitNum ) // Returns true if specified server feature is enabled on server Added new JS function for returning the value of almost any server setting from UOX.INI GetServerSetting( settingNameInDoubleQuotes ) Updated JS function DoesDynamicBlock() with two new parameters - checkOnlyMultis and checkOnlyNonMultis Updated JS function DoesMapBlock() with two new parameters - checkMultiPlacement and checkForRoad Fixed an issue where a LoS check would prevent players from accessing containers in their own backpack Added new functions in findfuncs.cpp to make it easier to find items near another object or location: findNearbyItems( object, distance ) findNearbyItems( x, y, worldNumber, instanceID, distance ) Added new Item property - maxItems - used by containers to determine their max item capacity Added new Item property - totalItemCount - used to get total item count in a container (including sub-containers) Added check for max item capacity when creating new items that are added to a character's backpack - items will be created below character's feet if backpack is full! Added new DFN tag for items, used by containers to determine item capacity for a given container: MAXITEMS=# // 125 is the default for all containers if not set Added new JS Item properties: .maxItems // gets/sets item capacity for a given container .totalItemCount // gets total item count in a container, including sub-containers Updated item tooltips for containers to show accurate total item count, as well as to display max item capacity Fixed a bug where picking up items from a non-locked down pile of items on the floor inside a multi could cause the remaining pile to be seen as no longer inside the multi, disallowing locking it back down and causing it to decay based on regular decay timer instead of house-specific one Updated JS command set to allow setting poison-level on items ('set poison #) and hunger-level on characters ('set hunger #) Fixed an issue with js/item/food.js that prevented poisoned food from poisoning characters when eaten Fixed an issue with js/skill/poisoning.js that prevented players from poisoning food! Updated various JS scripts and hardcoded targeting functions to disallow the targeting of locked down resources using skills and tools Updated JS Method TextMessage() to support three extra, optional parameters. Note that if one optional parameter is included, all preceding optional parameters are also required! speechTarget - What kind of target is this message intended for? 0 - Only visible for sender and receiver of message 1 - Visible to all players in range 2 - Visible to all NPCs and players in range 3 - Visible to all PCs everywhere + NPCs in range 4 - Visible to all PCs everywhere (broadcast) 5 - Only visible for the receiver of the message speechTargetSerial - The serial of the receiver of the message, used if speechTarget is 0 or 5 speechFontType - The type of font to display the text in. Defaults to normal. 0 - Bold 1 - Normal with shadow 2 - Bold with shadow 3 - Normal 4 - Gothic 5 - Italic 6 - Small, dark 7 - Colourful 8 - Runic (only works with CAPS) 9 - Small, light Added timestamp to worldsaves in console, to make it easier to see when a particular world-save was done Added info about compiler/environment displayed at the top of the UOX3 console during startup Updated dictionary files with new messages primarily related to housing
2020-11-04 02:00:37 +08:00
{
2022-06-08 10:38:16 -04:00
// Set the recovery time before another spell can be cast
mChar.SetTimer( tCHAR_SPELLRECOVERYTIME, BuildTimeValue( static_cast<R64>( Magic->spells[spellNum].RecoveryDelay() )));
if( Magic->spells[spellNum].RequireTarget() )
{
2022-06-08 10:38:16 -04:00
mChar.SetCasting( false );
mChar.SetFrozen( false );
mChar.Dirty( UT_UPDATE );
2022-06-08 10:38:16 -04:00
UI08 cursorType = 0;
if( Magic->spells[spellNum].AggressiveSpell() )
{
2022-06-08 10:38:16 -04:00
cursorType = 1;
0.99.4h Exposed a (read-only) JS property for characters to fetch their hunger rate. Uses race's hunger rate if defined, otherwise uses HUNGERRATE form uox.ini: .hungerRate // Seconds between becoming hungrier Updated 'get command to allow retrieving a character's hungerRate property Added some details to console during UOX3 startup about which IPs and Ports UOX3 is listening to Added new JS event that triggers when a player clicks on the Quest button in the paperdoll. Triggers from character script if present, or global script if not: onQuestGump( pUser ) Added new JS event that triggers when player toggles a special move from a combat book. See packet 0xBF, subCmd 0x19 in packet guides for details on the special moves, whose IDs range from 0x00 to 0x1D: onSpecialMove( pUser, abilityID ) Fixed invalid ID for items [0x0174] and [0x0175] in dfndata/items/building/walls/stone_walls.dfn Updated FileSize() function in regions.cpp to fetch file size using std::filesystem::file_size() instead of creating an input stream, opening a file and then trying to seek the last position in the file Added findNearbyObjects() function to findfuncs.cpp, to find all objects (characters and items) of CBaseObject class near a specified location Improved performance when initializing multis on startup; now checks for items near multis, instead of checking for multis near every single item! Improved performance when loading items and characters from worldfiles during startup; around 33% faster for release builds, around ~50% faster when running in debug mode through visual studio (punt) Updated createSection() in ssection.cpp to use std::string and StringUtility functions instead of UString, and added some error handling (punt) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2021-04-23 02:13:17 +08:00
}
else if(( spellNum == 4 ) || ( spellNum == 6 ) || ( spellNum == 7 ) || ( spellNum >= 9 && spellNum <= 11 ) || ( spellNum >= 15 && spellNum <= 17 ) || ( spellNum == 25 ) || ( spellNum == 26 ) || ( spellNum == 29 ) || ( spellNum == 44 ) || ( spellNum == 59 ))
{
2022-06-08 10:38:16 -04:00
cursorType = 2;
0.99.4h Exposed a (read-only) JS property for characters to fetch their hunger rate. Uses race's hunger rate if defined, otherwise uses HUNGERRATE form uox.ini: .hungerRate // Seconds between becoming hungrier Updated 'get command to allow retrieving a character's hungerRate property Added some details to console during UOX3 startup about which IPs and Ports UOX3 is listening to Added new JS event that triggers when a player clicks on the Quest button in the paperdoll. Triggers from character script if present, or global script if not: onQuestGump( pUser ) Added new JS event that triggers when player toggles a special move from a combat book. See packet 0xBF, subCmd 0x19 in packet guides for details on the special moves, whose IDs range from 0x00 to 0x1D: onSpecialMove( pUser, abilityID ) Fixed invalid ID for items [0x0174] and [0x0175] in dfndata/items/building/walls/stone_walls.dfn Updated FileSize() function in regions.cpp to fetch file size using std::filesystem::file_size() instead of creating an input stream, opening a file and then trying to seek the last position in the file Added findNearbyObjects() function to findfuncs.cpp, to find all objects (characters and items) of CBaseObject class near a specified location Improved performance when initializing multis on startup; now checks for items near multis, instead of checking for multis near every single item! Improved performance when loading items and characters from worldfiles during startup; around 33% faster for release builds, around ~50% faster when running in debug mode through visual studio (punt) Updated createSection() in ssection.cpp to use std::string and StringUtility functions instead of UString, and added some error handling (punt) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2021-04-23 02:13:17 +08:00
}
mSock->SendTargetCursor( 0, TARGET_CASTSPELL, Magic->spells[spellNum].StringToSay().c_str(), cursorType );
2022-06-08 10:38:16 -04:00
}
else
{
2022-06-08 10:38:16 -04:00
mChar.SetCasting( false );
Magic->CastSpell( mSock, &mChar );
mChar.SetTimer( tCHAR_SPELLTIME, 0 );
mChar.SetFrozen( false );
0.99.6-RC6x Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility) Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js) Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled Fixed a couple of DFN formatting issues (thanks, punt) Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn) Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn) Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt) Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly Added region spawners for dungeons, towns and overworld in Ilshenar facet Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js) Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js) Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp Added new NPC to dfndata/npc/undead.dfn: ancientlich Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp]) Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js) Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors) Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn) Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn) Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn) Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn) Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn) Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn) Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js) Added two new repeating commands (js/commands/custom/repeatingcmds.js): 'rmovable # // Repeats bringing up targeting cursor to set movable property on multiple objects 'rnodecay // Repeats bringing up targeting cursor to set decayable property to false on multiple objects Added new areacommand (js/commands/targeting/areacommand.js): 'areacommand name [string] // Sets name of all objects within targeted area to [string] Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js) Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp) Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js) Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*) Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*) Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn) Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js) Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax: PACKITEM=sectionID[, amount[, newbieFlag]] // To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1 EQUIPITEM=sectionID[, itemHue[, newbieFlag] // To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1 Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage Address overflow issue in MultiMul.cpp (punt) Address various cast issues (punt) Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt) Replaced RoundNumber with std::round (punt) The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
2023-10-14 05:03:53 +08:00
mChar.Dirty( UT_UPDATE );
2022-06-08 10:38:16 -04:00
}
}
else if( mChar.GetNextAct() <= 0 )
{
2022-06-08 10:38:16 -04:00
//redo the spell action
mChar.SetNextAct( 75 );
if( !mChar.IsOnHorse() && !mChar.IsFlying() )
{
2022-06-08 10:38:16 -04:00
// Consider Gargoyle flying as mounted here
Effects->PlaySpellCastingAnimation( &mChar, Magic->spells[mChar.GetSpellCast()].Action(), false, false );
Housing Revamp and more Updated JS SysMessage function to accept up to 10 extra, optional arguments, which can be used with dictionary messages that require additional parameters like %s or %i Added new type of house privilege in cMultiObj.cpp to keep track of friends of the multi - HOUSEPRIV_FRIEND - which is stored during worldsaves as one or more Friend=<player serial> tags in house.wsc Added new type of house privilege in cMultiObj.cpp to keep track of guests of the multi - HOUSEPRIV_GUEST - which is stored during worldsaves as one or more Guest=<player serial> tags in house.wsc When items are created for houses upon house placement, a reference to the multi's serial is now stored in the house sign's MORE property to allow easier tracking of which house a particular sign belongs to Added tracking of new, persistent properties for houses via cMultiObj.cpp/h: lockdowns, secure containers, vendors, guests, friends, owners, ban location, public status, number of visits, timestamps Added a multitude of new methods in cMultiObj.cpp/h to assist in improving the functionality of houses Added new tags for houses in house.dfn (default values applied if tag not specified): MAXSECURECONTAINERS=4 - Max amount of secure containers allowed in a multi MAXLOCKDOWNS=256 - Max amount of lockdowns allowed in a multi MAXVENDORS=10 - Max amount of vendors allowed in a multi MAXBANS=50 - Max amount of bans in a multi's ban list MAXFRIENDS=50 - Max amount of friends in a multi's friend list MAXGUESTS=50 - Max amount of guests in a multi's guest list MAXOWNERS=8 - Max amount of owners and co-owners in a multi's owner list MAXTRASHCONTAINERS=1 - Max amount of trash containers allowed in multi SCRIPT=<scriptID> - Assign a JS script-ID directly to a multi FRONTDOOR - indicates that a door is the front door of a house. Cannot be locked in public houses! INTERIORDOOR - indicates that a door is an interior door of a house. Can be locked in public houses. BANX - Location X offset for multi's ban location, if not used, will try to use SE corner of multi instead BANY - Location Y offset for multi's ban location, if not used, will try to use SE corner of multi instead Added JS Event: onHouseCommand( tSock, multiObj, cmdID ) - For handling spoken house commands via JS scripts attached to multi. Updated JS Events: onEntrance() - can now trigger both for multi being entered and/or object entering onLeaving() - can now trigger both for multi being left and/or object entering onSpeech() - can now also trigger for items (in addition to chars) with event & script attached, if UOX.INI setting ITEMSDETECTSPEECH is enabled Added JS Multi methods: .IsBoat() - Returns whether the item (or multi) is a boat .IsOwner( playerToCheck ) - Returns whether a player is the owner of a multi .IsOnOwnerList( playerToCheck ) - Returns whether a player is on the (co-)owner list of a multi .IsOnFriendList( playerToCheck ) - Returns whether a player is on the friend list of a multi .IsOnGuestList( playerToCheck ) - Returns whether a player is on the guest list of a multi .IsOnBanList( playerToCheck ) - Returns whether a player is on the ban list of a multi .AddToFriendList( playertoAdd ) - Adds player to the friend list of a multi .RemoveFromFriendList( playertoRemove ) - Removes player from the friend list of a multi .AddToGuestList( playertoAdd ) - Adds player to the guest list of a multi .RemoveFromGuestList( playertoRemove ) - Removes player from the guest list of a multi .ClearOwnerList() - Clears all entries from a multi's (co-)owner list .ClearFriendList() - Clears all entries from a multi's friend list .ClearGuestList() - Clears all entries from a multi's guest list .ClearBanList() - Clears all entries from a multi's ban list .SecureContainer( itemToSecure ) - Secures a container in a multi .UnsecureContainer( itemToUnsecure ) - Unsecures a container in a multi .IsSecureContainer( itemToCheck ) - Checks if specified item is a secure container in a multi .LockDownItem( itemToLockDown) - Locks down an item in a multi .ReleaseItem( itemToRelease ) - Releases a locked down item in a multi .KillKeys() - Deletes ALL keys associated with a multi .AddTrashCont( itemToAdd ) - Add trash container to multi's list of trash containers .RemoveTrashCont( itemToRemove ) - Remove trash container from multi's list of trash containers Added JS Item (Multi only) properties: .lockdowns - Get the number of lockdowns in a multi .maxLockdowns - Get/Set the max number of lockdowns allowed in a multi .secureContainers - Get the number of secure containers in a multi .maxSecureContainers - Get/Set the max number of secure containers allowed in a multi .trashContainers - Get the number of trash containers in a multi .maxTrashContainers - Get/Set the max number of trash containers allowed in a multi .friends - Get the number of friends in a multi's friend list .maxFriends - Get/Set the max number of friends allowed in a multi's friend list .guests - Get the number of guests in a multi's guest list .maxGuests - Get/Set the max number of guests allowed in a multi's guest list .owners - Get the number of owners in a multi's owner list .maxOwners - Get/Set the max number of owners allowed in a multi's owner list .bans - Get the number of banned players in a multi's ban list .maxBans - Get/Set the max number of banned players allowed in a multi's ban list .vendors - Get the number of player vendors in a multi .maxVendors - Get the max number of player vendors allowed in a multi .deed - Get the item sectionID for deed used to place multi .isPublic - Get/Set the private/public state of a multi .buildTimestamp - Get the timestamp for when the house was originally placed .tradeTimestamp - Get the timestamp for when the house was last traded to another player .banX - Get/Set the ban location X offset for the multi .banY - Get/Set the ban location Y offset for the multi Added JS Character properties: .multi = Get/Set the multi object the character is in .accountNum = Get the account number the character belongs to .housesOwned = Get a count of houses owned by the character .housesCoOwned = Get a count of houses co-owned by the character Updated JS cBaseObject Methods .FirstItem(), .NextItem() and .FinishedItems() to also support iterating through items in multis Updated JS multi Methods .FirstChar(), .NextChar() and .FinishedChars() to support an additional parameter to specify what kind of characters to loop through: "default" or no parameter - all characters inside the multi "owner" - players on multi's owner list "friend" - players on multi's friend list "guest" - players on multi's guest list "banned" - players on multi's ban list Added new INI tags to a new section of uox.ini called [houses] DECAYTIMERINHOUSE=3600 // Decay timer in seconds for non-locked down items inside houses PROTECTPRIVATEHOUSES=1 // Toggles whether private houses will automatically boot unauthorized visitors (1) or not (0) TRACKHOUSESPERACCOUNT=1 // Toggles whether to track (and restrict) house ownership per account (1) or per character (0) MAXHOUSESOWNABLE=1 // Specifies the max amount of houses a player can own per account/char, depending on how house ownership is tracked MAXHOUSESCOOWNABLE=10 // Specifies the max amount of houses a player can co-own per character CANOWNANDCOOWNHOUSES=1 // Toggles whether players can own and co-own houses at the same time COOWNHOUSESONSAMEACCOUNT=1 // Toggles whether characters on same account as house owner will be treated as co-owners Added new INI tags in [settings] section of uox.ini: ITEMSDETECTSPEECH=0 // If enabled, server will search for nearby items with onSpeech JS event running whenever a character speaks. Disabled by default. MAXPLAYERPACKITEMS=125 // Defines max item capacity for player (and NPC) backpacks. Defaults to 125. Moved most of the existing house functionality to JS and expanded upon it to reach feature parity with houses in regular UO around Publish 15/16, with various extras thrown in for good measure and all functionality being customizable: js/server/house/house.js (15000) - handles detection of house commands and characters entering/leaving houses js/server/house/houseSign.js (15001) - contains and handles all house-related gumps/menus and what is shown when players interact with house sign js/server/house/houseCommands.js (15002) - handles functionality of house commands and other functionality such as transfer of ownership, demolishing house, etc. js/server/house/houseDeed.js (15003) - handles initial rules that allow/disallow placement of additional houses for players All house-related menus now fully handled through JS All house commands and other functionality now fully handled through JS Removed redundant hard-coded house functionality Implemented Co-owners, friends, guests for houses, with access rules in place for entry, lockdowns, house commands, etc. Implemented Private and Public houses Implemented Secure Containers and Trash Barrels Definable max lockdowns, secure containers, player vendors, bans, friends, guests, owners, trash containers and more - per house type JS scripts can now be attached directly to houses Doors in houses can be marked as front doors or interior doors, and will be treated differently with regards to private and public houses Added new item to dfndata/items/containers/misc.dfn - [trashbarrel] Added new JS script (js/items/trashbarrel.js) with trash barrel functionality for houses. Trash barrels that are marked as secure containers are only accessible by owners, co-owners and friends of the house. Various options available at top of script. Updated js/items/axe.js to support chopping up trash barrels and house add-ons in houses owned by the player Fixed an issue with house doors being left behind after demolishing houses while their doors were open Fixed an issue where GMs could be banned from player houses Added Line of Sight checks to speech, to give players some privacy in their own homes Updated house placement code to more accurately check for other multis, dynamic and static objects when placing houses; now requires free space around each house that cannot be blocked by other houses or items that can block player movement, and disallows placement of houses on roads Updated house placement code to move characters blocking house placement to SE corner of the house Updated house placement code to disallow placing houses in guarded regions, or in dungeons Added new DFN tag for regions to enable/disable player houses in specific regions: HOUSING=0/1 Added new region (247) that covers path to Valley of Eodon in Felucca Added new region (248) that covers Valley of Eodon in Ter-Mur, with player housing disabled Added new region (249) that covers entire T2A lands, with player housing disabled Updated SPACEX and SPACEY values for all houses in dfndata/house/house.dfn to match updated house placement code Added new JS property to Regions that can be used to determine or change state of player housing in a region: .canPlaceHouse() Updated rules for usage of dye tubs to dye locked down items; now only house owners or co-owners may dye locked down items Updated rules for usage of the following locked down items in a house, which are now only usable by house owners and co-owners Dyes, Guildstone Deeds, Recall Runes (renaming), Rename Deeds, Townstone Deeds, House Deeds, Boat Models, Player Vendor Deeds, Ore, Hair Dye Updated rules for usage of the following locked down items in a house, which are now only usable by house owners, co-owners and friends: Keys, Dye Tubs, Magic Scrolls, Fireworks Wands, Magic Wands, Smithing Tools, Mining Tools, Fishing Poles Updated item lockdown rules to allow locking down (and releasing) items in a container as long as the container is locked down, and to only allow releasing a locked down container if it's empty of locked down items Updated item lockdown rules to only allow locking down movement-blocking items further than 2 tiles away from doors Updated rules for releasing items in houses - now the house owner can release any locked down items, co-owners can release items locked down by themselves or by friends, while friends can release only items locked down by themselves Added some feedback to player about why their attempted house placement failed Items added by GMs directly into multis will now decay based on the house-specific decay timer instead of the regular one Fixed an issue that could cause items to almost instantly decay after being released from lockdown in a house Placing house add-ons now properly takes into account SPACEX and SPACEY values when checking if they can fit in selected area of houses Re-added SPACEX and SPACEY values for Pentagram and Loom house add-ons House add-ons can now be converted back into house add-on deeds by chopping them with an axe Added new item type - IT_HOUSEADDON (201) - used by house add-ons placed in player houses Fixed a bug where keys would stop working after being added to a keyring, and would turn into blank keys upon release from the keyring Added visitor count for public player houses, which keeps track of how many visits a public house has received, with each player counted max 1 time every 24 hours Fixed an issue with FindPlayersInOldVisrange() where it didn't take into account that players could see buildings further away than the standard update range. This could cause players to see ghost images of buildings if they were at the "right" distance when the building was being demolished Added NODECAY tag to all signs and doors in dfndata/house/house.dfn Added FRONTDOOR or INTERIORDOOR (as appropriate) to all doors in dfndata/house/house.dfn Added BANX and BANY to specify ban location for some houses in dfndata/house/house.dfn instead of relying on finding SE corner automatically Implemented strongboxes (js/server/house/strongbox.js) for co-owners of a house, which can be placed with the house command "i wish to place a strongbox". Max capacity is 25 items Updated 'REMOVE command to take an optional parameter - itemID. If supplied, the command will remove all items with this itemID from a targeted container Fixed a bug when checking if dynamic items were blocking valid spawn locations for NPCs, some function arguments were in the wrong order! Improved code that finds valid spawn locations for items and NPCs spawned via spawn regions. As server gradually builds up lists of valid spawn locations per region over time, it will start using these lists more often, rather than always look for brand new spawn locations. Fixed a bug with CMulHandler::CheckStaticFlag() that prevented NPCs from spawning inside buildings with no static floors! Fixed an issue with repeating commands that prevented GMs from being able to cancel them when using the ClassicUO client Exposed character property .accountNum to JS engine Extended CDataList class to include a Clear() method for clearing lists Updated JS File method .Open() to support an optional, third argument - subFolderName - that defines in which sub-folder of UOX3/shared/ to store/look for a file. If no third argument is supplied, UOX3 will default to using the shared folder itself. Updated JS File method .Length() to return a value of -1 for files that don't exist Added new code function, exposed to JS engine with same parameters, which simply checks if a given tile ID has a specific flag bool CheckTileFlag( UI16 itemID, TILEFLAG flagToCheck ) Added JS function used to find the root container of an item (if any) FindRootContainer( itemSerial ) FindRootContainer( item ) Added new JS function that allows deleting files from UOX3/shared/ folder or subfolders of shared folder. If no subFolderName is provided, looks for file directly in shared folder itself. Restrictions on file- and folder-names apply. bool DeleteFile( fileName, subFolderName ) Added new JS functions for checking if a specific client or server feature is enabled. See documentation for full list of client/server features. GetClientFeature( bitNum ) // Returns true if specified client feature is enabled on server GetServerFeature( bitNum ) // Returns true if specified server feature is enabled on server Added new JS function for returning the value of almost any server setting from UOX.INI GetServerSetting( settingNameInDoubleQuotes ) Updated JS function DoesDynamicBlock() with two new parameters - checkOnlyMultis and checkOnlyNonMultis Updated JS function DoesMapBlock() with two new parameters - checkMultiPlacement and checkForRoad Fixed an issue where a LoS check would prevent players from accessing containers in their own backpack Added new functions in findfuncs.cpp to make it easier to find items near another object or location: findNearbyItems( object, distance ) findNearbyItems( x, y, worldNumber, instanceID, distance ) Added new Item property - maxItems - used by containers to determine their max item capacity Added new Item property - totalItemCount - used to get total item count in a container (including sub-containers) Added check for max item capacity when creating new items that are added to a character's backpack - items will be created below character's feet if backpack is full! Added new DFN tag for items, used by containers to determine item capacity for a given container: MAXITEMS=# // 125 is the default for all containers if not set Added new JS Item properties: .maxItems // gets/sets item capacity for a given container .totalItemCount // gets total item count in a container, including sub-containers Updated item tooltips for containers to show accurate total item count, as well as to display max item capacity Fixed a bug where picking up items from a non-locked down pile of items on the floor inside a multi could cause the remaining pile to be seen as no longer inside the multi, disallowing locking it back down and causing it to decay based on regular decay timer instead of house-specific one Updated JS command set to allow setting poison-level on items ('set poison #) and hunger-level on characters ('set hunger #) Fixed an issue with js/item/food.js that prevented poisoned food from poisoning characters when eaten Fixed an issue with js/skill/poisoning.js that prevented players from poisoning food! Updated various JS scripts and hardcoded targeting functions to disallow the targeting of locked down resources using skills and tools Updated JS Method TextMessage() to support three extra, optional parameters. Note that if one optional parameter is included, all preceding optional parameters are also required! speechTarget - What kind of target is this message intended for? 0 - Only visible for sender and receiver of message 1 - Visible to all players in range 2 - Visible to all NPCs and players in range 3 - Visible to all PCs everywhere + NPCs in range 4 - Visible to all PCs everywhere (broadcast) 5 - Only visible for the receiver of the message speechTargetSerial - The serial of the receiver of the message, used if speechTarget is 0 or 5 speechFontType - The type of font to display the text in. Defaults to normal. 0 - Bold 1 - Normal with shadow 2 - Bold with shadow 3 - Normal 4 - Gothic 5 - Italic 6 - Small, dark 7 - Colourful 8 - Runic (only works with CAPS) 9 - Small, light Added timestamp to worldsaves in console, to make it easier to see when a particular world-save was done Added info about compiler/environment displayed at the top of the UOX3 console during startup Updated dictionary files with new messages primarily related to housing
2020-11-04 02:00:37 +08:00
}
}
}
if( cwmWorldState->ServerData()->WorldAmbientSounds() >= 1 )
{
if( cwmWorldState->ServerData()->WorldAmbientSounds() > 10 )
{
2022-06-08 10:38:16 -04:00
cwmWorldState->ServerData()->WorldAmbientSounds( 10 );
}
const SI16 soundTimer = static_cast<SI16>( cwmWorldState->ServerData()->WorldAmbientSounds() * 100 );
if( !mChar.IsDead() && ( RandomNum( 0, soundTimer - 1 )) == ( soundTimer / 2 ))
{
Effects->PlayBGSound(( *mSock ), mChar );
2022-06-08 10:38:16 -04:00
}
}
if( mSock->GetTimer( tPC_SPIRITSPEAK ) > 0 && mSock->GetTimer( tPC_SPIRITSPEAK) < cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mSock->SetTimer( tPC_SPIRITSPEAK, 0 );
}
if( mSock->GetTimer( tPC_TRACKING ) > cwmWorldState->GetUICurrentTime() )
{
if( mSock->GetTimer( tPC_TRACKINGDISPLAY ) <= cwmWorldState->GetUICurrentTime() )
{
mSock->SetTimer( tPC_TRACKINGDISPLAY, BuildTimeValue( static_cast<R64>( cwmWorldState->ServerData()->TrackingRedisplayTime() )));
2022-06-08 10:38:16 -04:00
Skills->Track( &mChar );
}
}
else
{
if( mSock->GetTimer( tPC_TRACKING ) > ( cwmWorldState->GetUICurrentTime() / 10 ))
{
2022-06-08 10:38:16 -04:00
// dont send arrow-away packet all the time
mSock->SetTimer( tPC_TRACKING, 0 );
if( ValidateObject( mChar.GetTrackingTarget() ))
{
CPTrackingArrow tSend = ( *mChar.GetTrackingTarget() );
2022-06-08 10:38:16 -04:00
tSend.Active( 0 );
if( mSock->ClientType() >= CV_HS2D )
{
2022-06-08 10:38:16 -04:00
tSend.AddSerial( mChar.GetTrackingTarget()->GetSerial() );
}
mSock->Send( &tSend );
}
}
}
if( mChar.IsOnHorse() )
{
2022-06-08 10:38:16 -04:00
CItem *horseItem = mChar.GetItemAtLayer( IL_MOUNT );
if( !ValidateObject( horseItem ))
{
2022-06-08 10:38:16 -04:00
mChar.SetOnHorse( false ); // turn it off, we aren't on one because there's no item!
}
else if( horseItem->GetDecayTime() != 0 && horseItem->GetDecayTime() <= cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.SetOnHorse( false );
horseItem->Delete();
}
}
if( mChar.GetTimer( tCHAR_FLYINGTOGGLE ) > 0 && mChar.GetTimer( tCHAR_FLYINGTOGGLE ) < cwmWorldState->GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
mChar.SetTimer( tCHAR_FLYINGTOGGLE, 0 );
mChar.SetFrozen( false );
mChar.Teleport();
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckNPC()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check NPC's status
//o------------------------------------------------------------------------------------------------o
auto CheckNPC( CChar& mChar, bool checkAI, bool doRestock, bool doPetOfflineCheck ) -> void
{
2022-06-08 10:38:16 -04:00
bool doAICheck = true;
std::vector<UI16> scriptTriggers = mChar.GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
cScript *toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnAISliver( &mChar ) == 1 )
{
2022-06-08 10:38:16 -04:00
// Script returned true or 1, don't do hard-coded AI check
doAICheck = false;
}
}
}
if( doAICheck && checkAI )
{
2022-06-08 10:38:16 -04:00
CheckAI( mChar );
}
2022-06-08 10:38:16 -04:00
Movement->NpcMovement( mChar );
if( doRestock )
{
RestockNPC( mChar, false );
2022-06-08 10:38:16 -04:00
}
if( doPetOfflineCheck )
{
mChar.CheckPetOfflineTimeout();
2022-06-08 10:38:16 -04:00
}
if( mChar.GetTimer( tNPC_SUMMONTIME ))
{
if(( mChar.GetTimer( tNPC_SUMMONTIME ) <= cwmWorldState->GetUICurrentTime() ) )
{
2022-06-08 10:38:16 -04:00
// Added Dec 20, 1999
// QUEST expire check - after an Escort quest is created a timer is set
// so that the NPC will be deleted and removed from the game if it hangs around
// too long without every having its quest accepted by a player so we have to remove
// its posting from the messageboard before icing the NPC
// Only need to remove the post if the NPC does not have a follow target set
if( mChar.GetQuestType() == QT_ESCORTQUEST && !ValidateObject( mChar.GetFTarg() ))
{
2022-06-08 10:38:16 -04:00
MsgBoardQuestEscortRemovePost( &mChar );
mChar.Delete();
return;
}
if( mChar.GetNpcAiType() == AI_GUARD && mChar.IsAtWar() )
{
mChar.SetTimer( tNPC_SUMMONTIME, BuildTimeValue( 25.0 ));
2022-06-08 10:38:16 -04:00
return;
}
Effects->PlaySound( &mChar, 0x01FE );
mChar.SetDead( true );
mChar.Delete();
return;
}
}
if( mChar.GetFleeAt() == 0 )
{
2022-06-08 10:38:16 -04:00
mChar.SetFleeAt( cwmWorldState->ServerData()->CombatNPCBaseFleeAt() );
}
if( mChar.GetReattackAt() == 0 )
{
2022-06-08 10:38:16 -04:00
mChar.SetReattackAt( cwmWorldState->ServerData()->CombatNPCBaseReattackAt() );
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
auto mNpcWander = mChar.GetNpcWander();
if( mNpcWander == WT_SCARED )
{
if( mChar.GetTimer( tNPC_FLEECOOLDOWN ) <= cwmWorldState->GetUICurrentTime() )
{
if( mChar.GetTimer( tNPC_MOVETIME ) <= cwmWorldState->GetUICurrentTime() )
{
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
mChar.SetFleeDistance( static_cast<UI08>( 0 ));
CChar *mTarget = mChar.GetTarg();
if( ValidateObject( mTarget ) && !mTarget->IsDead() && ObjInRange( &mChar, mTarget, DIST_INRANGE ))
{
if( mChar.GetMounted() )
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetMountedFleeingSpeed() ));
}
else
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetFleeingSpeed() ));
}
}
else
{
// target no longer exists, or is out of range, stop running
mChar.SetTarg( nullptr );
if( mChar.GetOldNpcWander() != WT_NONE )
{
mChar.SetNpcWander( mChar.GetOldNpcWander() );
}
if( mChar.GetMounted() )
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetMountedWalkingSpeed() ));
}
else
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetWalkingSpeed() ));
}
mChar.SetOldNpcWander( WT_NONE ); // so it won't save this at the wsc file
}
2022-06-08 10:38:16 -04:00
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
}
}
else if( mNpcWander != WT_FLEE && mNpcWander != WT_FROZEN && ( mChar.GetHP() < mChar.GetMaxHP() * mChar.GetFleeAt() / 100 ))
{
if( mChar.GetTimer( tNPC_FLEECOOLDOWN ) <= cwmWorldState->GetUICurrentTime() )
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
{
// Make NPC try to flee away from their opponent, if still within range
CChar *mTarget = mChar.GetTarg();
if( ValidateObject( mTarget ) && !mTarget->IsDead() && ObjInRange( &mChar, mTarget, DIST_SAMESCREEN ))
{
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
mChar.SetFleeDistance( static_cast<UI08>( 0 ));
mChar.SetOldNpcWander( mNpcWander );
mChar.SetNpcWander( WT_FLEE );
if( mChar.GetMounted() )
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetMountedFleeingSpeed() ));
}
else
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetFleeingSpeed() ));
}
2022-06-08 10:38:16 -04:00
}
}
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
else if(( mNpcWander == WT_FLEE ) && ( mChar.GetHP() > mChar.GetMaxHP() * mChar.GetReattackAt() / 100 ))
{
// Bring NPC out of flee-mode and back to their original wandermode
mChar.SetTimer( tNPC_FLEECOOLDOWN, BuildTimeValue( 5.0 )); // Wait at least 5 seconds before reentring flee-mode!
2022-06-08 10:38:16 -04:00
mChar.SetNpcWander( mChar.GetOldNpcWander() );
if( mChar.GetMounted() )
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetMountedWalkingSpeed() ));
2022-06-08 10:38:16 -04:00
}
else
{
mChar.SetTimer( tNPC_MOVETIME, BuildTimeValue( mChar.GetWalkingSpeed() ));
2022-06-08 10:38:16 -04:00
}
mChar.SetOldNpcWander( WT_NONE ); // so it won't save this at the wsc file
}
Combat->CombatLoop( nullptr, mChar );
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckItem()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check item decay, spawn timers and boat movement in a given region
//o------------------------------------------------------------------------------------------------o
0.99.6d Cleaned up an issue with last commit where wrong npclists were used in some spawn regions Made a few additional adjustments to the new spawn regions in Lost Lands/New Haven Included more changes related to poison updates that should've been in previous commit (like the complete UOX.INI support for POISONCORROSIONSYSTEM setting) Adjusted region setup for New Haven to set the individual "building" regions within as a sub-region of the main town (regions.dfn) Fixed an issue where the displayed HP of an equipped item would not update correctly Further updates to convert timers 32-bit to 64-bit. This affects and addresses some potential issues with: Character creation/NPC guild-join timestamps, NPC movement, combat timers, idle timeouts, item decay, spellcasting Added support for new JS Events that can trigger from global script, and can be used to store persistent custom entries in players' paperdoll profiles: onProfileRequest( socket, profileOwnerChar ) - Triggers when client requests data for a paperdoll profile onProfileUpdate( socket, updatedText ) - Triggers when client sends updated data from paperdoll profile Added two new helper functions in code that allows faster (but very slightly less accurate) distance checks between two points: GetApproxDist( Point3_st a, Point3_st b ) GetApproxDist( CBaseObject *a, CBaseObject *b ) Improved pathfinding for NPCs attempting to follow another character, by adopting a system of weighted variables to help the NPC determine when to recalculate the path vs when to stick with the old, combined with faster distance checks via GetApproxDist(). The end result of this is faster, smarter and more responsive NPC followers and NPC opponents in combat. The variables influencing this include: how far the target has moved from last pathfind target location, whether NPC is heading in the overall right direction or not, time since last path calculation and some small randomization to avoid edge case jitters. Updated default command levels in commands.dfn, code and scripts to support the Seer role and make space for some custom roles. These are the new defaults as listed in commands.dfn, which should not be changed as they are linked to specific enums in code. Do take note that this might invalidate command levels for existing GMs/Seers/Counselors, who might need another round of 'make gm/seer/cns from an admin: ADMIN - command level 10 GM - command level 9 SEER - command level 7 CNS - command level 4 PLAYER - command level 0 Updated how UOX3 makes use of the account-level flags 0x2000 (Seer) and 0x4000 (Counselor). If either of these flags are set on an account, all new characters created on the accounts will automatically receive the relevant command privileges. Fixed an issue with 'wholist command that prevented admin characters from seeing characters with lower privilege levels in the list (js/commands/wholist.js) Fixed an issue with hiding/GM hide that prevented admin characters from seeing hidden characters with lower privilege levels in the world UOX3 now includes the cross-platform, header-only utf8cpp library found at https://github.com/nemtrif/utfcpp and freely available under Boost Software License v1.0. The immediate use-case for this is in code right now is to better handle strings related to custom paperdoll profiles, but will also look to make more heavy use of this in future updates
2025-06-28 22:37:42 +08:00
auto CheckItem( CMapRegion *toCheck, bool checkItems, TIMERVAL nextDecayItems, TIMERVAL nextDecayItemsInHouses, bool doWeather )
{
2022-06-08 10:38:16 -04:00
auto regItems = toCheck->GetItemList();
auto collection = regItems->collection();
for( const auto &itemCheck : collection )
{
if( !ValidateObject( itemCheck ) || itemCheck->IsFree() )
continue;
if( checkItems )
{
if( itemCheck->IsDecayable() && ( itemCheck->GetCont() == nullptr ))
{
if( itemCheck->GetType() == IT_HOUSESIGN && itemCheck->GetTempVar( CITV_MORE ) > 0 )
{
// Don't decay signs that belong to houses
itemCheck->SetDecayable( false );
}
if(( itemCheck->GetDecayTime() <= cwmWorldState->GetUICurrentTime() ) )
{
auto scriptTriggers = itemCheck->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
cScript *toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnDecay( itemCheck ) == 0 )
{
2022-06-08 10:38:16 -04:00
// if it exists and we don't want hard code, return
return;
}
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
}
}
// Check global script! Maybe there's another event there
auto toExecute = JSMapping->GetScript( static_cast<UI16>( 0 ));
if( toExecute )
{
if( toExecute->OnDecay( itemCheck ) == 0 )
{
// if it exists and we don't want hard code, return
return;
2022-06-08 10:38:16 -04:00
}
}
if( DecayItem(( *itemCheck ), nextDecayItems, nextDecayItemsInHouses ))
continue;
2022-06-08 10:38:16 -04:00
}
}
switch( itemCheck->GetType() )
{
case IT_ITEMSPAWNER:
case IT_NPCSPAWNER:
case IT_SPAWNCONT:
case IT_LOCKEDSPAWNCONT:
case IT_UNLOCKABLESPAWNCONT:
case IT_AREASPAWNER:
case IT_ESCORTNPCSPAWNER:
case IT_PLANK:
{
if( itemCheck->GetTempTimer() <= cwmWorldState->GetUICurrentTime() )
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
if( itemCheck->GetObjType() == OT_SPAWNER )
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
CSpawnItem *spawnItem = static_cast<CSpawnItem *>( itemCheck );
if( spawnItem->DoRespawn() )
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
continue;
2022-06-10 08:12:58 -04:00
}
spawnItem->SetTempTimer( BuildTimeValue( static_cast<R64>( RandomNum( spawnItem->GetInterval( 0 ) * 60, spawnItem->GetInterval( 1 ) * 60 ))));
}
else if( itemCheck->GetObjType() == OT_ITEM && itemCheck->GetType() == IT_PLANK)
{
// Automatically close the plank if it's still open, and still locked
auto plankStatus = itemCheck->GetTag( "plankLocked" );
if( plankStatus.m_IntValue == 1 )
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
switch( itemCheck->GetId() )
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
case 0x3E84: itemCheck->SetId( 0x3EE9 ); itemCheck->SetTempTimer( 0 ); break;
case 0x3ED5: itemCheck->SetId( 0x3EB1 ); itemCheck->SetTempTimer( 0 ); break;
case 0x3ED4: itemCheck->SetId( 0x3EB2 ); itemCheck->SetTempTimer( 0 ); break;
case 0x3E89: itemCheck->SetId( 0x3E8A ); itemCheck->SetTempTimer( 0 ); break;
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
}
}
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
}
else
{
itemCheck->SetType( IT_NOTYPE );
Console.Warning( "Invalid spawner object detected; item type reverted to 0. All spawner objects have to be added using 'ADD SPAWNER # command." );
}
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
}
break;
}
case IT_SOUNDOBJECT:
if( itemCheck->GetTempVar( CITV_MOREY ) < 25 )
{
if( RandomNum( 1, 100 ) <= static_cast<SI32>( itemCheck->GetTempVar( CITV_MOREZ )))
{
for( auto &tSock : FindNearbyPlayers( itemCheck, static_cast<UI16>( itemCheck->GetTempVar( CITV_MOREY ))))
{
Effects->PlaySound( tSock, static_cast<UI16>( itemCheck->GetTempVar( CITV_MOREX )), false );
2022-06-08 10:38:16 -04:00
}
}
}
break;
default:
break;
}
}
if( itemCheck->CanBeObjType( OT_BOAT ))
{
CBoatObj *mBoat = static_cast<CBoatObj *>( itemCheck );
SI08 boatMoveType = mBoat->GetMoveType();
if( ValidateObject( mBoat ) && boatMoveType && mBoat->GetMoveTime() <= cwmWorldState->GetUICurrentTime() )
{
if( boatMoveType != BOAT_ANCHORED )
{
switch( boatMoveType )
{
//case BOAT_ANCHORED:
//case BOAT_STOP:
case BOAT_FORWARD:
case BOAT_SLOWFORWARD:
case BOAT_ONEFORWARD:
MoveBoat( itemCheck->GetDir(), mBoat );
break;
case BOAT_BACKWARD:
case BOAT_SLOWBACKWARD:
case BOAT_ONEBACKWARD:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() + 4 );
if( dir > 7 )
{
2022-06-10 08:12:58 -04:00
dir %= 8;
}
MoveBoat( dir, mBoat );
break;
}
case BOAT_LEFT:
case BOAT_SLOWLEFT:
case BOAT_ONELEFT:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() - 2 );
dir %= 8;
MoveBoat( dir, mBoat );
break;
2022-06-08 10:38:16 -04:00
}
case BOAT_RIGHT:
case BOAT_SLOWRIGHT:
case BOAT_ONERIGHT:
{
// Right / One Right
UI08 dir = static_cast<UI08>( itemCheck->GetDir() + 2 );
dir %= 8;
MoveBoat( dir, mBoat );
break;
2022-06-08 10:38:16 -04:00
}
case BOAT_FORWARDLEFT:
case BOAT_SLOWFORWARDLEFT:
case BOAT_ONEFORWARDLEFT:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() - 1 );
dir %= 8;
MoveBoat( dir, mBoat );
break;
2022-06-08 10:38:16 -04:00
}
case BOAT_FORWARDRIGHT:
case BOAT_SLOWFORWARDRIGHT:
case BOAT_ONEFORWARDRIGHT:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() + 1 );
dir %= 8;
MoveBoat( dir, mBoat );
break;
}
case BOAT_BACKWARDLEFT:
case BOAT_SLOWBACKWARDLEFT:
case BOAT_ONEBACKWARDLEFT:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() + 5 );
if( dir > 7 )
{
dir %= 8;
}
MoveBoat( dir, mBoat );
break;
2022-06-08 10:38:16 -04:00
}
case BOAT_BACKWARDRIGHT:
case BOAT_SLOWBACKWARDRIGHT:
case BOAT_ONEBACKWARDRIGHT:
{
UI08 dir = static_cast<UI08>( itemCheck->GetDir() + 3 );
if( dir > 7 )
{
dir %= 8;
}
MoveBoat( dir, mBoat );
break;
2022-06-08 10:38:16 -04:00
}
default:
break;
}
// One-step boat commands, so reset move type to 0 after the initial move
if( boatMoveType == BOAT_LEFT || boatMoveType == BOAT_RIGHT )
{
// Move 50% slower left/right than forward/back
mBoat->SetMoveTime( BuildTimeValue( cwmWorldState->ServerData()->CheckBoatSpeed() * 1.5 ));
}
else if( boatMoveType >= BOAT_ONELEFT && boatMoveType <= BOAT_ONEBACKWARDRIGHT )
{
mBoat->SetMoveType( 0 );
// Set timer to restrict movement to normal boat speed if player spams command
mBoat->SetMoveTime( BuildTimeValue( cwmWorldState->ServerData()->CheckBoatSpeed() * 1.5 ));
}
else if( boatMoveType >= BOAT_SLOWLEFT && boatMoveType <= BOAT_SLOWBACKWARDLEFT )
{
// Set timer to slowly move the boat forward
mBoat->SetMoveTime( BuildTimeValue( cwmWorldState->ServerData()->CheckBoatSpeed() * 2.0 ));
}
else
{
// Set timer to move the boat forward at normal speed
mBoat->SetMoveTime( BuildTimeValue( cwmWorldState->ServerData()->CheckBoatSpeed() ));
2022-06-08 10:38:16 -04:00
}
}
}
}
// Do JS Weather for item
if( doWeather )
{
DoLight( itemCheck, cwmWorldState->ServerData()->WorldLightCurrentLevel() );
2022-06-08 10:38:16 -04:00
}
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - CWorldMain::CheckAutoTimers()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check automatic and timer controlled functions
//o------------------------------------------------------------------------------------------------o
auto CWorldMain::CheckAutoTimers() -> void
{
static TIMERVAL nextCheckSpawnRegions = 0;
static TIMERVAL nextCheckTownRegions = 0;
static TIMERVAL nextCheckItems = 0;
static TIMERVAL nextDecayItems = 0;
static TIMERVAL nextDecayItemsInHouses = 0;
static TIMERVAL nextSetNPCFlagTime = 0;
static TIMERVAL accountFlush = 0;
2022-06-08 10:38:16 -04:00
bool doWeather = false;
bool doPetOfflineCheck = false;
CServerData *serverData = ServerData();
2022-06-08 10:38:16 -04:00
// modify this stuff to take into account more variables
if( accountFlush <= GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
bool reallyOn = false;
// time to flush our account status!
MAPUSERNAMEID_ITERATOR I;
for( I = Accounts->Begin(); I != Accounts->End(); ++I )
{
CAccountBlock_st& actbTemp = I->second;
if( actbTemp.wAccountIndex == AB_INVALID_ID )
{
2022-06-08 10:38:16 -04:00
continue;
}
if( actbTemp.wFlags.test( AB_FLAGS_ONLINE ))
{
2022-06-08 10:38:16 -04:00
reallyOn = false; // to start with, there's no one really on
{
for( auto &tSock : Network->connClients )
{
2022-06-08 10:38:16 -04:00
CChar *tChar = tSock->CurrcharObj();
if( !ValidateObject( tChar ))
{
2022-06-08 10:38:16 -04:00
continue;
}
if( tChar->GetAccount().wAccountIndex == actbTemp.wAccountIndex )
{
2022-06-08 10:38:16 -04:00
reallyOn = true;
}
}
}
if( !reallyOn )
{
2022-06-08 10:38:16 -04:00
// no one's really on, let's set that
actbTemp.wFlags.reset( AB_FLAGS_ONLINE );
}
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
}
accountFlush = BuildTimeValue( serverData->AccountFlushTimer() );
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
2022-06-08 10:38:16 -04:00
//Network->On(); //<<<<<< WHAT the HECK, this is why you dont bury mutex locking
// PushConn and PopConn lock and unlock as well (yes, bad)
// But now we are doing recursive lock here
if( GetWorldSaveProgress() == SS_NOTSAVING )
{
{
for( auto &tSock : Network->connClients )
{
if(( tSock->IdleTimeout() != -1 ) && tSock->IdleTimeout() <= GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
CChar *tChar = tSock->CurrcharObj();
if( !ValidateObject( tChar ))
{
2022-06-08 10:38:16 -04:00
continue;
}
if( !tChar->IsGM() )
{
2022-06-08 10:38:16 -04:00
tSock->IdleTimeout( -1 );
tSock->SysMessage( 1246 ); // You're being disconnected because you were idle too long.
2022-06-08 10:38:16 -04:00
Network->Disconnect( tSock );
}
}
else if(( static_cast<TIMERVAL>( tSock->IdleTimeout() + 300 * 1000 ) <= GetUICurrentTime()
&& static_cast<TIMERVAL>( tSock->IdleTimeout() + 200 * 1000 ) >= GetUICurrentTime() ) && !tSock->WasIdleWarned() )
{
2022-06-08 10:38:16 -04:00
//is their idle time between 3 and 5 minutes, and they haven't been warned already?
CPIdleWarning warn( 0x07 );
tSock->Send( &warn );
tSock->WasIdleWarned( true );
}
if( serverData->KickOnAssistantSilence() )
{
2025-05-27 08:40:00 +10:00
if( !tSock->NegotiatedWithAssistant() && tSock->NegotiateTimeout() != -1 && tSock->NegotiateTimeout() <= GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
const CChar *tChar = tSock->CurrcharObj();
if( !ValidateObject( tChar ))
{
2022-06-08 10:38:16 -04:00
continue;
}
if( !tChar->IsGM() )
{
2022-06-08 10:38:16 -04:00
tSock->IdleTimeout( -1 );
tSock->SysMessage( 9047 ); // Failed to negotiate features with assistant tool. Disconnecting client...
2022-06-08 10:38:16 -04:00
Network->Disconnect( tSock );
}
}
}
2022-06-08 10:38:16 -04:00
// Check player's network traffic usage versus caps set in ini
if( tSock->LoginComplete() && ( tSock->AcctNo() != 0 ) && tSock->GetTimer( tPC_TRAFFICWARDEN ) <= GetUICurrentTime() )
{
if( !ValidateObject( tSock->CurrcharObj() ) || tSock->CurrcharObj()->IsGM() )
{
2022-06-08 10:38:16 -04:00
continue;
}
2022-06-08 10:38:16 -04:00
bool tempTimeBan = false;
if( tSock->BytesReceived() > serverData->MaxClientBytesIn() )
{
2022-06-08 10:38:16 -04:00
// Player has exceeded the cap! Send one warning - next time kick player
tSock->SysMessage( Dictionary->GetEntry( 9082, tSock->Language() )); // Excessive data usage detected! Sending too many requests to the server in a short amount of time will get you banned.
2022-06-08 10:38:16 -04:00
tSock->BytesReceivedWarning( tSock->BytesReceivedWarning() + 1 );
if( tSock->BytesReceivedWarning() > 2 )
{
2022-06-08 10:38:16 -04:00
// If it happens 3 times in the same session, give player a temporary ban
tempTimeBan = true;
}
}
if( tSock->BytesSent() > serverData->MaxClientBytesOut() )
{
2022-06-08 10:38:16 -04:00
// This is data sent from server, so should be more lenient before a kick (though could still be initiated by player somehow)
tSock->SysMessage( Dictionary->GetEntry( 9082, tSock->Language() )); // Excessive data usage detected! Sending too many requests to the server in a short amount of time will get you banned.
2022-06-08 10:38:16 -04:00
tSock->BytesSentWarning( tSock->BytesSentWarning() + 1 );
if( tSock->BytesSentWarning() > 2 )
{
2022-06-08 10:38:16 -04:00
// If it happens 3 times or more in the same session, give player a temporary ban
tempTimeBan = true;
}
}
if( tempTimeBan )
{
2022-06-08 10:38:16 -04:00
// Give player a 30 minute temp ban
CAccountBlock_st& myAccount = Accounts->GetAccountById( tSock->GetAccount().wAccountIndex );
2022-06-08 10:38:16 -04:00
myAccount.wFlags.set( AB_FLAGS_BANNED, true );
myAccount.wTimeBan = GetMinutesSinceEpoch() + serverData->NetTrafficTimeban();
Network->Disconnect( tSock );
continue;
}
2022-06-08 10:38:16 -04:00
// Reset amount of bytes received and sent, and restart timer
tSock->BytesReceived( 0 );
tSock->BytesSent( 0 );
tSock->SetTimer( tPC_TRAFFICWARDEN, BuildTimeValue( 10.0 ));
2022-06-08 10:38:16 -04:00
}
}
}
}
else if( GetWorldSaveProgress() == SS_JUSTSAVED )
{
// if we've JUST saved, do NOT kick anyone off (due to a possibly really long save), but reset any offending players to 60 seconds to go before being kicked off
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
{
for( auto &wsSocket : Network->connClients )
{
if( wsSocket )
{
2025-05-27 08:40:00 +10:00
if( wsSocket->IdleTimeout() < GetUICurrentTime() )
{
wsSocket->IdleTimeout( BuildTimeValue( 60.0 ));
2022-06-08 10:38:16 -04:00
wsSocket->WasIdleWarned( true );//don't give them the message if they only have 60s
}
if( cwmWorldState->ServerData()->KickOnAssistantSilence() )
{
2025-05-27 08:40:00 +10:00
if( !wsSocket->NegotiatedWithAssistant() && wsSocket->NegotiateTimeout() < GetUICurrentTime() )
{
wsSocket->NegotiateTimeout( BuildTimeValue( 60.0 ));
2022-06-08 10:38:16 -04:00
}
}
}
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
}
2022-06-08 10:38:16 -04:00
SetWorldSaveProgress( SS_NOTSAVING );
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
if( nextCheckTownRegions <= GetUICurrentTime() )
{
2022-10-24 23:42:16 +08:00
std::for_each( cwmWorldState->townRegions.begin(), cwmWorldState->townRegions.end(),[]( std::pair<const UI16, CTownRegion*> &town )
{
if( town.second != nullptr )
{
2022-06-08 10:38:16 -04:00
town.second->PeriodicCheck();
}
});
nextCheckTownRegions = BuildTimeValue( 10.0 ); // do checks every 10 seconds or so, rather than every single time
2022-06-08 10:38:16 -04:00
JailSys->PeriodicCheck();
}
if(( nextCheckSpawnRegions <= GetUICurrentTime() ) && ( serverData->CheckSpawnRegionSpeed() != -1 ))
{
2022-06-08 10:38:16 -04:00
//Regionspawns
UI32 itemsSpawned = 0;
UI32 npcsSpawned = 0;
UI32 totalItemsSpawned = 0;
UI32 totalNpcsSpawned = 0;
UI32 maxItemsSpawned = 0;
UI32 maxNpcsSpawned = 0;
const TIMERVAL s_t = GetClock();
for( auto &[regnum, spawnReg] : cwmWorldState->spawnRegions )
{
if( spawnReg )
{
if( spawnReg->GetNextTime() <= GetUICurrentTime() )
{
spawnReg->DoRegionSpawn( itemsSpawned, npcsSpawned );
2022-06-08 10:38:16 -04:00
}
// Grab some info from the spawn region anyway, even if it's not time to spawn
totalItemsSpawned += static_cast<UI32>( spawnReg->GetCurrentItemAmt() );
totalNpcsSpawned += static_cast<UI32>( spawnReg->GetCurrentCharAmt() );
maxItemsSpawned += static_cast<UI32>( spawnReg->GetMaxItemSpawn() );
maxNpcsSpawned += static_cast<UI32>( spawnReg->GetMaxCharSpawn() );
2022-06-08 10:38:16 -04:00
}
UOX3 0.99.5b Fixed an issue where karma titles would inadvertently have the space behind the title trimmed before being displayed in paperdoll, resulting in erroneous display of title + name there Fixed an issue with a cooking script (js/skill/cooking/cooking.js) where sweet dough would not get consumed properly on cooking (Dragon Slayer) Updated C++ function calcRegionFromXY to work with CBaseObject instead of CChar, so it also works for Items Items now have current town region stored as an object property during runtime. This is calculated on load, when container property is updated, and when an item is picked up or dropped. The region is also accessible via the (read-only) JS Item property .region Added new JS Event to allow capturing button presses from the old-school gump displayed by client via packet 0x76, which was originally used by the old-school crafting menus in T2A. The requirement for this to work is that the gump in question must have a gumpID between 0x4000 and 0xffff (which can be set when manually creating a packet with this ID via JS), and the Event itself must be in the global script: onScrollingGumpPress( pSock, gumpID, buttonID ) Added new JS Event to allow better control over which names UOX3 sends to the client for characters: onNameRequest( myObj, requestedBy ) // return custom string, or return empty string/nothing/true/false to use default name Updated JS Events to also work for Items (previously only worked for Characters) onLightChange( myObj, lightLevel ) onTempChange( myObj, temp ) onWeatherChange( myObj, weatherType ) Adjusted default temperature for town regions with no weather systems defined from 0 to 20 degrees Celsius Updated some JS scripts (fishing.js, baking.js and cooking.js) to make use of GetTempTag/SetTempTag rather than GetTag/SetTag Added cancel-checks to targeting functions in command script for add-commands (js/commands/targeting/add.js) Updated get command script (js/commands/targeting/get.js) to allow retrieving region ID and name using 'get region Updated misc command script (js/commands/custom/misc-cmd.js) to add 'gettemptag and 'settemptag commands, used to retrieve/set temporary custom tags from/on objects Fixed a bug where Spirit Speak skill would be checked for race languages even if the race had LANGUAGEMIN defined as 0 (or not defined at all) Fixed an issue where players using regular UO client would get stuck in a black void after teleporting between worlds, by adding an additional character refresh after the teleport Fixed an issue where crafting tools for Blacksmithing and Carpentry would attempt to fetch the value of an incorrectly named INI setting to handle durability loss for the tools Added new setting under [settings] section of UOX.INI to control whether it should be possible to craft weapons from coloured ingots or not: CRAFTCOLOUREDWEAPONS=0/1 // If enabled(1), players can craft coloured weapons. Defaults to disabled(0) Fixed an issue where the correct ingots were not consumed when attempting to craft items using colored ingots Fixed a rogue debug message leftover in the scissor script
2022-02-13 22:49:37 +08:00
}
const TIMERVAL e_t = GetClock();
Small update Fixed an issue with an internal movement check that prevented characters from moving in valid map areas in Felucca/Trammel from X 6144 to X 7168 Fixed an issue where .instanceID property was misspelled in 'xgo GM command script, causing characters to be teleported to an out of bounds area where they would no longer be saved (js/commands/targeting/x.js) Added some additional error-checking to .Teleport()/.SetLocation() JS Method to prevent script-accidents from sending characters out of bounds. Updated Poisoning skill to add poison-charges to weapons being poisoned. Charges are consumed when applying poison in combat (js/skill/poisoning.js) Updated combat code to consume poison-charges if a poisoned weapon is used to poison an opponent Updated shoplists for Blacksmiths and Weaponsmiths - they now buy/sell longswords (dfndata/items/shoplist.dfn) Updated MageShopping shoplist for mage vendors - they now buy/sell mass curse scrolls (dfndata/items/shoplist.dfn) Added new Spawn Region DFN tag that can specify which era or eras of UO (Multiple comma-separated entries supported) a given spawn region is valid for. Spawn region not valid for core shard era will be ignored. Syntax: ERAS=UO,T2A,UOR,LBR,AOS,SE,ML,SA,HS,TOL Added new Spawn Region DFN tag that allows using another spawn region as a "parent". All properties of this parent will be inherited except for these, which are ignored: ERAS, NPCLIST, ITEMLIST, NPC and ITEM. Syntax for new tag: GET=# // Inherit a specified spawn region Added spawn region for animal trainer vendor in Vesper stable Added spawn region for fur trader/tanner vendors in The Best Hides of Britain Added spawn region for spinner vendor in The Lord's Clothier's and The Right Fit shops in Britain Added spawn region for tanner NPC to Nujel'm Tannery (and fixed leatherworker spawn region for same area) Added spawn regions for banker NPCs in East Bank of Britain, First Bank of Moonglow, Jhelom Bank and Jeweler, Bank of Skara Brae Added spawn regions for stables, tailor and blacksmith inside Castle British Added spawn regions for mage shops, mage guilds and farm houses in Moonglow Added spawn regions for misc vendors and townfolk in multiple cities Added spawn regions for Fire Island Updated spawn regions for Dagger Isle/Ice Island Added spawn regions for forests and jungles in southern Britannia and on various islands including Bucc's Den, Moonglow, Serpent's Hold, and misc unpopulated islands Added spawn regions for area east of Skara Brae, around Hedge Maze and south of Britain Added spawn regions for wandering healers outside every dungeon entrance in Britannia and Lost Lands Re-integrated ocean spawn regions for ocean creatures (dolphin, walrus, water elemental, sea serpent) from the original community-based spawn file Added reagent spawns in overworld spawn regions in Britannia/Lost Lands Added special reagent spawns in swamp areas Added additional overworld spawn regions in Britannia/Lost Lands Added spawn regions for Khaldun dungeon that spawn some new and some old NPCs: Old: Zombies, skeletons, skeletal mages, skeletal knights, ancient liches New: Cursed (and named) NPCs, shadowfiends, zealots of khaldun (knights/summoners), tentacles of the harrower Updated size and positions of some existing overworld spawn regions Fixed incorrect spawn region size for small island south of Trinsic Added switch/door puzzle functionality in Khaldun dungeon using new switch/door combo script (js/item/dungeons/switch_door_combo.js) Added "smart objects" in Khaldun dungeon that activate when you come close enough (js/item/dungeons/smart_activate_item.js) Added teleport locations within Khaldun dungeon (js/teleport.scp) Added custom AIs to existing NPC spawning in Khaldun dungeon: Ancient Lich (summons other undead, and can turn into one of them for disguise) Added DFN entries for new NPCs spawning in Khaldun dungeon, some with custom AIs: [tentacles_of_the_harrower] -> Tentacles of the Harrower (life steal) [shadowfiend] -> Shadowfiends (seek out and reveal hidden players) [zealot_knight]/[zealot_summoner] -> Zealots of Khaldun (turn into undead on death, male/female variants) [cursed] -> Cursed (male/female variants) [spectralarmor] -> Spectral Armor Added DFN entries for new (named) NPCs spawning in Khaldun dungeon: [lysander_gathenwale] -> Lysander Gathenwale [grimmoch_drummel] -> Grimmoch Drummel [morg_bergen] -> Morg Bergen [tavara_sewel] -> Tavara Sewel Added new NPC DFN entries: [leatherworker] -> alias for male/female leatherworker vendors [mapmaker] -> alias for male/female mapmaker vendors Added new Race DFN entries: [RACE 29] -> Cursed (enemies of RACE 30) [RACE 30] -> Zealots (enemies of RACE 29) Added new book DFN entries for Khaldun journals of Lysander, Tavara and Grimmoch - available as loot from the respective NPCs (dfndata/misc/books.dfn and dfndata/items/misc/books.dfn) Added 25% chance for hit-animations and hit-SFX to play for targets in combat, instead of playing every time - can get very spammy Monsters with actual weapons equipped (like Ophidian Enforcer with Halberd/Bardiche) will now get appropriate combat SFX for hitting with that weapon Updated Healing skill to base cure/resurrection skill requirements on the calculated skill, rather than base skill (js/skill/healing.js) Fixed an issue where healing with bandages and dying in the process would not properly reset the healing-related tags and skills used Updated healing script to show a resurrection confirmation menu for players targeted with bandages for resurrect (js/skill/healing.js) All skill usage states now reset on death, to prevent cases of players being "busy" while trying to use skills that got stuck due to script bugs. The 'regspawn GM command now supports a new parameter called "max". Updated command syntax: 'regspawn # // perform a single respawn cycle in a specific spawn region 'regspawn all // perform a single respawn cycle across all spawn regions 'regspawn max // respawn ALL spawn regions to MAX capacity in one go Added new UOX.INI setting that determines the maximum range at which NPCs can initiate attacks on players/NPCs (the old MAXRANGE=10 setting now instead defines max range at which players can initiate attacks on players/NPCs): MAXNPCAGGRORANGE=10 Optimized performance by significantly reducing the number of line-of-sight checks performed by characters, especially in combat scenarios, or when evaluating potential targets for NPC AIs. The amount of checks done is also affected by the new ini setting for max aggro range. Fixed an issue where both NPC and player characters would instantly drop one hunger level (from 6 to 5) upon creation since hungerrate was not initialized until after first hunger-event Updated character priv property from UI16 to UI32, and added a new flag that determines if fame/karma title is hidden for character: HIDEFAMEKARMATITLE (0x10000) NPCs will no longer aggro other NPCs if the Z difference between them is greater or equal to 20 (i.e. they're on different floors), unless both are using ranged weapons and both are in range Fixed an issue where players could get discounts from shopkeepers even though neither player nor shopkeeper were members of a NPC guild (js/npc/ai/shopkeeper.js) Fixed an issue where the "premium" a player would get when selling items to a shopkeeper in the same NPC guild as them would be 110% extra on top of the item's value, instead of the intended 10% (js/npc/ai/shopkeeper.js) (Thanks, cobrag0318!) Added missing tall straw hat to tailoring crafting scripts (Thanks, Dragon Slayer!) Improved error reporting during compilation of individual scripts being reloaded - will now show more context and line number onCombatEnd JS Event now also triggers when NPCs ignore their target and/or evade during combat Updated 'decorate command to support saving/loading custom tags on items for world templates. These are stored after a @ symbol in the world template, each custom tag separated by a | symbol, and with each custom tag saved using this syntax: key$type$value Updated resource-harvesting scripts to use script-specific global (const) variables, to avoid interference between different scripts (js/server/resource/*) Added new resource-harvesting scripts and added spawn regions for these in fields on farms all over Britannia/Lost Lands cabbages (js/server/resource/cabbages.js) canteloupes (js/server/resource/canteloupes.js) carrots (js/server/resource/carrots.js) garlic (js/server/resource/garlic.js) gourds (js/server/resource/gourds.js) honeydew melons (js/server/resource/honeydewmelon.js) onions (js/server/resource/onions.js) pumpkins (js/server/resource/pumpkins.js) squashes (js/server/resource/squashes.js) turnips (js/server/resource/turnips.js) watermelons (js/server/resource/watermelon.js) Updated CSpawnRegion::FindItemSpotToSpawn() function in cSpawnRegion.cpp to prevent duplicate spawning of exact same item in exact same location Updated sectionid of all potion and scroll aliases to match main item, so they'll get correctly picked up by NPC shopkeepers (dfndata/items/magic/potions.dfn and scrolls.dfn) Specified sectionid for backpacks, so it also gets applied to packs added using the alias [backpack] (dfndata/items/misc/provisions.dfn) Fixed a code issue that prevented players from selling empty containers to NPC shopkeepers willing to buy such containers Fixed an issue where field-spells (wall of stone, poison field, etc) would ignore dynamic/static items that should block these Fixed an issue where field-spells could be cast into houses from the outside by standing next to a wall and targeting self Fixed a War/Peace-mode desync between client and server by having server always notify client (using war-toggle packet) when the "at war" flag is toggled for player character Fixed an issue with hiding skill that wouldn't allow player to hide after having acquired self as target in combat (through spellcasting, for instance) (Thanks, Dragon Slayer!) Fixed an issue where mana/reagents were consumed and skillcheck performed before all spellcast-validations had succeeded, resulting in the occasional loss of reagents/mana when spellcasting was disallowed (code and js/magic/clumsy.js and level1targ.js) Fixed an issue with lack of criminal-flagging for casting of hostile spells scripted in JS (clumsy, magic arrow, feeblemind) vs blue targets (js/magic/clumsy.js and level1targ.js) Fixed some issues with Line-of-Sight checking code that returned incorrect results, which amongst other things affected spellcasting in areas with uneven terrain Fixed some issues with movement code and climbing of ladders, in particular the rope ladder in the 2-story log cabin. Code now sets a "is climbing" flag when character steps onto a rope ladder, and uses that to help resolve some edge cases, and then unsets it when they step off. Renamed section headers of some map-items in DFNs from "locationname" to "locationnamemap" for clarity (example: "britain" to "britainmap") Fixed broken "map wrapping" when sailing to edges of map in Felucca or Trammel Fixed a server crash related to attempts at reading data from invalid map tiles
2025-06-27 08:40:02 +08:00
UI32 totalSpawnTime = e_t - s_t;
if( totalSpawnTime > 1 )
{
Console.Print( oldstrutil::format( "Regionspawn cycle completed in %.02fsec\n", static_cast<R32>( totalSpawnTime ) / 1000.0f ));
}
2022-06-08 10:38:16 -04:00
// Adaptive spawn region check timer. The closer spawn regions as a whole are to being at their defined max capacity,
// the less frequently UOX3 will check spawn regions again. Similarly, the more room there is to spawn additional
// stuff, the more frequently UOX3 will check spawn regions
0.99.6d Cleaned up an issue with last commit where wrong npclists were used in some spawn regions Made a few additional adjustments to the new spawn regions in Lost Lands/New Haven Included more changes related to poison updates that should've been in previous commit (like the complete UOX.INI support for POISONCORROSIONSYSTEM setting) Adjusted region setup for New Haven to set the individual "building" regions within as a sub-region of the main town (regions.dfn) Fixed an issue where the displayed HP of an equipped item would not update correctly Further updates to convert timers 32-bit to 64-bit. This affects and addresses some potential issues with: Character creation/NPC guild-join timestamps, NPC movement, combat timers, idle timeouts, item decay, spellcasting Added support for new JS Events that can trigger from global script, and can be used to store persistent custom entries in players' paperdoll profiles: onProfileRequest( socket, profileOwnerChar ) - Triggers when client requests data for a paperdoll profile onProfileUpdate( socket, updatedText ) - Triggers when client sends updated data from paperdoll profile Added two new helper functions in code that allows faster (but very slightly less accurate) distance checks between two points: GetApproxDist( Point3_st a, Point3_st b ) GetApproxDist( CBaseObject *a, CBaseObject *b ) Improved pathfinding for NPCs attempting to follow another character, by adopting a system of weighted variables to help the NPC determine when to recalculate the path vs when to stick with the old, combined with faster distance checks via GetApproxDist(). The end result of this is faster, smarter and more responsive NPC followers and NPC opponents in combat. The variables influencing this include: how far the target has moved from last pathfind target location, whether NPC is heading in the overall right direction or not, time since last path calculation and some small randomization to avoid edge case jitters. Updated default command levels in commands.dfn, code and scripts to support the Seer role and make space for some custom roles. These are the new defaults as listed in commands.dfn, which should not be changed as they are linked to specific enums in code. Do take note that this might invalidate command levels for existing GMs/Seers/Counselors, who might need another round of 'make gm/seer/cns from an admin: ADMIN - command level 10 GM - command level 9 SEER - command level 7 CNS - command level 4 PLAYER - command level 0 Updated how UOX3 makes use of the account-level flags 0x2000 (Seer) and 0x4000 (Counselor). If either of these flags are set on an account, all new characters created on the accounts will automatically receive the relevant command privileges. Fixed an issue with 'wholist command that prevented admin characters from seeing characters with lower privilege levels in the list (js/commands/wholist.js) Fixed an issue with hiding/GM hide that prevented admin characters from seeing hidden characters with lower privilege levels in the world UOX3 now includes the cross-platform, header-only utf8cpp library found at https://github.com/nemtrif/utfcpp and freely available under Boost Software License v1.0. The immediate use-case for this is in code right now is to better handle strings related to custom paperdoll profiles, but will also look to make more heavy use of this in future updates
2025-06-28 22:37:42 +08:00
auto checkSpawnRegionSpeed = static_cast<R64>( serverData->CheckSpawnRegionSpeed() );
2022-06-08 10:38:16 -04:00
UI16 itemSpawnCompletionRatio = ( maxItemsSpawned > 0 ? (( totalItemsSpawned * 100.0 ) / maxItemsSpawned ) : 100 );
UI16 npcSpawnCompletionRatio = ( maxNpcsSpawned > 0 ? (( totalNpcsSpawned * 100.0 ) / maxNpcsSpawned ) : 100 );
SI32 avgCompletionRatio = ( itemSpawnCompletionRatio + npcSpawnCompletionRatio ) / 2;
if( avgCompletionRatio == 100 )
{
2022-06-08 10:38:16 -04:00
checkSpawnRegionSpeed *= 3;
}
else if( avgCompletionRatio >= 90 )
{
2022-06-08 10:38:16 -04:00
checkSpawnRegionSpeed *= 2;
}
else if( avgCompletionRatio >= 75 )
{
2022-06-08 10:38:16 -04:00
checkSpawnRegionSpeed *= 1.5;
UOX3 0.99.5b Fixed an issue where karma titles would inadvertently have the space behind the title trimmed before being displayed in paperdoll, resulting in erroneous display of title + name there Fixed an issue with a cooking script (js/skill/cooking/cooking.js) where sweet dough would not get consumed properly on cooking (Dragon Slayer) Updated C++ function calcRegionFromXY to work with CBaseObject instead of CChar, so it also works for Items Items now have current town region stored as an object property during runtime. This is calculated on load, when container property is updated, and when an item is picked up or dropped. The region is also accessible via the (read-only) JS Item property .region Added new JS Event to allow capturing button presses from the old-school gump displayed by client via packet 0x76, which was originally used by the old-school crafting menus in T2A. The requirement for this to work is that the gump in question must have a gumpID between 0x4000 and 0xffff (which can be set when manually creating a packet with this ID via JS), and the Event itself must be in the global script: onScrollingGumpPress( pSock, gumpID, buttonID ) Added new JS Event to allow better control over which names UOX3 sends to the client for characters: onNameRequest( myObj, requestedBy ) // return custom string, or return empty string/nothing/true/false to use default name Updated JS Events to also work for Items (previously only worked for Characters) onLightChange( myObj, lightLevel ) onTempChange( myObj, temp ) onWeatherChange( myObj, weatherType ) Adjusted default temperature for town regions with no weather systems defined from 0 to 20 degrees Celsius Updated some JS scripts (fishing.js, baking.js and cooking.js) to make use of GetTempTag/SetTempTag rather than GetTag/SetTag Added cancel-checks to targeting functions in command script for add-commands (js/commands/targeting/add.js) Updated get command script (js/commands/targeting/get.js) to allow retrieving region ID and name using 'get region Updated misc command script (js/commands/custom/misc-cmd.js) to add 'gettemptag and 'settemptag commands, used to retrieve/set temporary custom tags from/on objects Fixed a bug where Spirit Speak skill would be checked for race languages even if the race had LANGUAGEMIN defined as 0 (or not defined at all) Fixed an issue where players using regular UO client would get stuck in a black void after teleporting between worlds, by adding an additional character refresh after the teleport Fixed an issue where crafting tools for Blacksmithing and Carpentry would attempt to fetch the value of an incorrectly named INI setting to handle durability loss for the tools Added new setting under [settings] section of UOX.INI to control whether it should be possible to craft weapons from coloured ingots or not: CRAFTCOLOUREDWEAPONS=0/1 // If enabled(1), players can craft coloured weapons. Defaults to disabled(0) Fixed an issue where the correct ingots were not consumed when attempting to craft items using colored ingots Fixed a rogue debug message leftover in the scissor script
2022-02-13 22:49:37 +08:00
}
else if( avgCompletionRatio >= 50 )
{
2022-06-08 10:38:16 -04:00
checkSpawnRegionSpeed *= 1.25;
}
2022-06-08 10:38:16 -04:00
nextCheckSpawnRegions = BuildTimeValue( checkSpawnRegionSpeed );//Don't check them TOO often (Keep down the lag)
UOX3 0.99.5b Fixed an issue where karma titles would inadvertently have the space behind the title trimmed before being displayed in paperdoll, resulting in erroneous display of title + name there Fixed an issue with a cooking script (js/skill/cooking/cooking.js) where sweet dough would not get consumed properly on cooking (Dragon Slayer) Updated C++ function calcRegionFromXY to work with CBaseObject instead of CChar, so it also works for Items Items now have current town region stored as an object property during runtime. This is calculated on load, when container property is updated, and when an item is picked up or dropped. The region is also accessible via the (read-only) JS Item property .region Added new JS Event to allow capturing button presses from the old-school gump displayed by client via packet 0x76, which was originally used by the old-school crafting menus in T2A. The requirement for this to work is that the gump in question must have a gumpID between 0x4000 and 0xffff (which can be set when manually creating a packet with this ID via JS), and the Event itself must be in the global script: onScrollingGumpPress( pSock, gumpID, buttonID ) Added new JS Event to allow better control over which names UOX3 sends to the client for characters: onNameRequest( myObj, requestedBy ) // return custom string, or return empty string/nothing/true/false to use default name Updated JS Events to also work for Items (previously only worked for Characters) onLightChange( myObj, lightLevel ) onTempChange( myObj, temp ) onWeatherChange( myObj, weatherType ) Adjusted default temperature for town regions with no weather systems defined from 0 to 20 degrees Celsius Updated some JS scripts (fishing.js, baking.js and cooking.js) to make use of GetTempTag/SetTempTag rather than GetTag/SetTag Added cancel-checks to targeting functions in command script for add-commands (js/commands/targeting/add.js) Updated get command script (js/commands/targeting/get.js) to allow retrieving region ID and name using 'get region Updated misc command script (js/commands/custom/misc-cmd.js) to add 'gettemptag and 'settemptag commands, used to retrieve/set temporary custom tags from/on objects Fixed a bug where Spirit Speak skill would be checked for race languages even if the race had LANGUAGEMIN defined as 0 (or not defined at all) Fixed an issue where players using regular UO client would get stuck in a black void after teleporting between worlds, by adding an additional character refresh after the teleport Fixed an issue where crafting tools for Blacksmithing and Carpentry would attempt to fetch the value of an incorrectly named INI setting to handle durability loss for the tools Added new setting under [settings] section of UOX.INI to control whether it should be possible to craft weapons from coloured ingots or not: CRAFTCOLOUREDWEAPONS=0/1 // If enabled(1), players can craft coloured weapons. Defaults to disabled(0) Fixed an issue where the correct ingots were not consumed when attempting to craft items using colored ingots Fixed a rogue debug message leftover in the scissor script
2022-02-13 22:49:37 +08:00
}
2022-06-08 10:38:16 -04:00
HTMLTemplates->Poll( ETT_ALLTEMPLATES );
2022-06-08 10:38:16 -04:00
const UI32 saveinterval = serverData->ServerSavesTimerStatus();
if( saveinterval != 0 )
{
2022-06-08 10:38:16 -04:00
time_t oldTime = GetOldTime();
if( !GetAutoSaved() )
{
2022-06-08 10:38:16 -04:00
SetAutoSaved( true );
time( &oldTime );
SetOldTime( static_cast<UI32>( oldTime ));
2022-06-08 10:38:16 -04:00
}
time_t newTime = GetNewTime();
time( &newTime );
SetNewTime( static_cast<UI32>( newTime ));
if( difftime( GetNewTime(), GetOldTime() ) >= saveinterval )
{
2022-06-08 10:38:16 -04:00
// Added Dec 20, 1999
// After an automatic world save occurs, lets check to see if
// anyone is online (clients connected). If nobody is connected
// Lets do some maintenance on the bulletin boards.
if( !GetPlayersOnline() && ( GetWorldSaveProgress() != SS_SAVING ))
{
2022-06-08 10:38:16 -04:00
Console << "No players currently online. Starting bulletin board maintenance" << myendl;
Console.Log( "Bulletin Board Maintenance routine running (AUTO)", "server.log" );
2022-06-08 10:38:16 -04:00
MsgBoardMaintenance();
UOX3 0.99.5b Fixed an issue where karma titles would inadvertently have the space behind the title trimmed before being displayed in paperdoll, resulting in erroneous display of title + name there Fixed an issue with a cooking script (js/skill/cooking/cooking.js) where sweet dough would not get consumed properly on cooking (Dragon Slayer) Updated C++ function calcRegionFromXY to work with CBaseObject instead of CChar, so it also works for Items Items now have current town region stored as an object property during runtime. This is calculated on load, when container property is updated, and when an item is picked up or dropped. The region is also accessible via the (read-only) JS Item property .region Added new JS Event to allow capturing button presses from the old-school gump displayed by client via packet 0x76, which was originally used by the old-school crafting menus in T2A. The requirement for this to work is that the gump in question must have a gumpID between 0x4000 and 0xffff (which can be set when manually creating a packet with this ID via JS), and the Event itself must be in the global script: onScrollingGumpPress( pSock, gumpID, buttonID ) Added new JS Event to allow better control over which names UOX3 sends to the client for characters: onNameRequest( myObj, requestedBy ) // return custom string, or return empty string/nothing/true/false to use default name Updated JS Events to also work for Items (previously only worked for Characters) onLightChange( myObj, lightLevel ) onTempChange( myObj, temp ) onWeatherChange( myObj, weatherType ) Adjusted default temperature for town regions with no weather systems defined from 0 to 20 degrees Celsius Updated some JS scripts (fishing.js, baking.js and cooking.js) to make use of GetTempTag/SetTempTag rather than GetTag/SetTag Added cancel-checks to targeting functions in command script for add-commands (js/commands/targeting/add.js) Updated get command script (js/commands/targeting/get.js) to allow retrieving region ID and name using 'get region Updated misc command script (js/commands/custom/misc-cmd.js) to add 'gettemptag and 'settemptag commands, used to retrieve/set temporary custom tags from/on objects Fixed a bug where Spirit Speak skill would be checked for race languages even if the race had LANGUAGEMIN defined as 0 (or not defined at all) Fixed an issue where players using regular UO client would get stuck in a black void after teleporting between worlds, by adding an additional character refresh after the teleport Fixed an issue where crafting tools for Blacksmithing and Carpentry would attempt to fetch the value of an incorrectly named INI setting to handle durability loss for the tools Added new setting under [settings] section of UOX.INI to control whether it should be possible to craft weapons from coloured ingots or not: CRAFTCOLOUREDWEAPONS=0/1 // If enabled(1), players can craft coloured weapons. Defaults to disabled(0) Fixed an issue where the correct ingots were not consumed when attempting to craft items using colored ingots Fixed a rogue debug message leftover in the scissor script
2022-02-13 22:49:37 +08:00
}
2022-06-08 10:38:16 -04:00
SetAutoSaved( false );
2022-06-08 10:38:16 -04:00
#if PLATFORM == WINDOWS
SetConsoleCtrlHandler( exit_handler, TRUE );
2022-06-08 10:38:16 -04:00
#endif
isWorldSaving = true;
SaveNewWorld( false );
isWorldSaving = false;
#if PLATFORM == WINDOWS
SetConsoleCtrlHandler( exit_handler, false );
#endif
UOX3 0.99.5b Fixed an issue where karma titles would inadvertently have the space behind the title trimmed before being displayed in paperdoll, resulting in erroneous display of title + name there Fixed an issue with a cooking script (js/skill/cooking/cooking.js) where sweet dough would not get consumed properly on cooking (Dragon Slayer) Updated C++ function calcRegionFromXY to work with CBaseObject instead of CChar, so it also works for Items Items now have current town region stored as an object property during runtime. This is calculated on load, when container property is updated, and when an item is picked up or dropped. The region is also accessible via the (read-only) JS Item property .region Added new JS Event to allow capturing button presses from the old-school gump displayed by client via packet 0x76, which was originally used by the old-school crafting menus in T2A. The requirement for this to work is that the gump in question must have a gumpID between 0x4000 and 0xffff (which can be set when manually creating a packet with this ID via JS), and the Event itself must be in the global script: onScrollingGumpPress( pSock, gumpID, buttonID ) Added new JS Event to allow better control over which names UOX3 sends to the client for characters: onNameRequest( myObj, requestedBy ) // return custom string, or return empty string/nothing/true/false to use default name Updated JS Events to also work for Items (previously only worked for Characters) onLightChange( myObj, lightLevel ) onTempChange( myObj, temp ) onWeatherChange( myObj, weatherType ) Adjusted default temperature for town regions with no weather systems defined from 0 to 20 degrees Celsius Updated some JS scripts (fishing.js, baking.js and cooking.js) to make use of GetTempTag/SetTempTag rather than GetTag/SetTag Added cancel-checks to targeting functions in command script for add-commands (js/commands/targeting/add.js) Updated get command script (js/commands/targeting/get.js) to allow retrieving region ID and name using 'get region Updated misc command script (js/commands/custom/misc-cmd.js) to add 'gettemptag and 'settemptag commands, used to retrieve/set temporary custom tags from/on objects Fixed a bug where Spirit Speak skill would be checked for race languages even if the race had LANGUAGEMIN defined as 0 (or not defined at all) Fixed an issue where players using regular UO client would get stuck in a black void after teleporting between worlds, by adding an additional character refresh after the teleport Fixed an issue where crafting tools for Blacksmithing and Carpentry would attempt to fetch the value of an incorrectly named INI setting to handle durability loss for the tools Added new setting under [settings] section of UOX.INI to control whether it should be possible to craft weapons from coloured ingots or not: CRAFTCOLOUREDWEAPONS=0/1 // If enabled(1), players can craft coloured weapons. Defaults to disabled(0) Fixed an issue where the correct ingots were not consumed when attempting to craft items using colored ingots Fixed a rogue debug message leftover in the scissor script
2022-02-13 22:49:37 +08:00
}
}
2022-06-08 10:38:16 -04:00
//Time functions
if( GetUOTickCount() <= GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
UI08 oldHour = serverData->ServerTimeHours();
if( serverData->IncMinute() )
{
2022-06-08 10:38:16 -04:00
Weather->NewDay();
}
if( oldHour != serverData->ServerTimeHours() )
{
2022-06-08 10:38:16 -04:00
Weather->NewHour();
}
0.99.6d Cleaned up an issue with last commit where wrong npclists were used in some spawn regions Made a few additional adjustments to the new spawn regions in Lost Lands/New Haven Included more changes related to poison updates that should've been in previous commit (like the complete UOX.INI support for POISONCORROSIONSYSTEM setting) Adjusted region setup for New Haven to set the individual "building" regions within as a sub-region of the main town (regions.dfn) Fixed an issue where the displayed HP of an equipped item would not update correctly Further updates to convert timers 32-bit to 64-bit. This affects and addresses some potential issues with: Character creation/NPC guild-join timestamps, NPC movement, combat timers, idle timeouts, item decay, spellcasting Added support for new JS Events that can trigger from global script, and can be used to store persistent custom entries in players' paperdoll profiles: onProfileRequest( socket, profileOwnerChar ) - Triggers when client requests data for a paperdoll profile onProfileUpdate( socket, updatedText ) - Triggers when client sends updated data from paperdoll profile Added two new helper functions in code that allows faster (but very slightly less accurate) distance checks between two points: GetApproxDist( Point3_st a, Point3_st b ) GetApproxDist( CBaseObject *a, CBaseObject *b ) Improved pathfinding for NPCs attempting to follow another character, by adopting a system of weighted variables to help the NPC determine when to recalculate the path vs when to stick with the old, combined with faster distance checks via GetApproxDist(). The end result of this is faster, smarter and more responsive NPC followers and NPC opponents in combat. The variables influencing this include: how far the target has moved from last pathfind target location, whether NPC is heading in the overall right direction or not, time since last path calculation and some small randomization to avoid edge case jitters. Updated default command levels in commands.dfn, code and scripts to support the Seer role and make space for some custom roles. These are the new defaults as listed in commands.dfn, which should not be changed as they are linked to specific enums in code. Do take note that this might invalidate command levels for existing GMs/Seers/Counselors, who might need another round of 'make gm/seer/cns from an admin: ADMIN - command level 10 GM - command level 9 SEER - command level 7 CNS - command level 4 PLAYER - command level 0 Updated how UOX3 makes use of the account-level flags 0x2000 (Seer) and 0x4000 (Counselor). If either of these flags are set on an account, all new characters created on the accounts will automatically receive the relevant command privileges. Fixed an issue with 'wholist command that prevented admin characters from seeing characters with lower privilege levels in the list (js/commands/wholist.js) Fixed an issue with hiding/GM hide that prevented admin characters from seeing hidden characters with lower privilege levels in the world UOX3 now includes the cross-platform, header-only utf8cpp library found at https://github.com/nemtrif/utfcpp and freely available under Boost Software License v1.0. The immediate use-case for this is in code right now is to better handle strings related to custom paperdoll profiles, but will also look to make more heavy use of this in future updates
2025-06-28 22:37:42 +08:00
SetUOTickCount( BuildTimeValue( static_cast<R64>( serverData->ServerSecondsPerUOMinute() )));
0.99.4x Fixed an issue where the color of NPC corpse names would not always match up with the NPC's flag color Fixed a bug where the baseRange and maxRange properties of ranged weapons would not get saved to world files. These values are now saved in the format of RANGE=baseRange,maxRange Changed the way items are added to containers, to ensure that the order in which the items are displayed to the player always reflects the order in which they were added; now the most recent item added/moved in a container will always be rendered on top of older items. Made adjustments to how items are randomly added to containers; should use more of a given container gump's available area now Exposed Item property to JS engine, which contains serial of the creator of an item: .creator // contains serial of the creator of an item. If set, maker's marks will show up in the item's tooltip Fixed an issue where JS engine would lose track of script context if one script used CreateDFNItem() or SpawnNPC() functions and the new objects had events that triggered upon creation. UOX3 now restores the original script context at the tail end of these functions. Added new JS Event to allow inserting custom tooltip text for objects, which will be displayed in tooltips right after the object name. Any text returned from the event will be displayed, and the text can make use of the same HTML tags as gumps to make changes to color, font, etc. onTooltip( myObj ) // Triggers for objects right before the object's tooltip properties are sent to client Updated 'tweak and 'set commands to refresh item being modified if movable state of item changes, so the change is reflected in nearby clients Fixed an issue with NPC vendors and items bought from players not being properly removed from the vendor's "bought container" when players buy them again Ported Item Identification skill from code to JS (js/skill/itemid.js) and removed hard-coded version Implemented magic item generator in JS (js/item/magic_item.js). When this script is attached to an NPC, it has a chance to generate magic weapons, armors, wands/staffs and rings as loot on the NPC's corpse when slain. The chance of getting quality magical items increases with the fame level of the NPC in question. The types of magical items generated follows the pattern of such items as implemented in UO prior to the AoS expansion. Examples: exceedingly accurate war hammer of vanquishing substantial, accurate axe of power and Daemon's Breath silver long sword massive platemail arms of Protection metal shield of defense durable ringmail tunic of guarding All magic items have a chance to have spell effects attached (with rings/wands being guaranteed to have these), with a limited amount of charges available. For weapons, these effects activate on successful hits in combat, while for armors they activate on equip, and then periodically as long as the item is worn. Rings and wands/staffs have to be manually activated and targeted - with the exception of rings of invisibility, which activate the moment you equip them! Related scripts: js/item/magic_armor_equipeffects.js js/item/magic_weapon_accbonus.js js/item/magic_weapon_equip.js js/item/magic_weapon_spell_attack.js The magic item loot generation script has been attached to a number of different NPCs, all of which now have a chance to drop magic items as loot when defeated. A bonus magical item - the glacial staff - has also been implemented (js/item/magic_glacial_staff.js), and has a chance to drop as loot from Giant Ice Serpents! Fixed an issue with CustomTarget where the target message would not be displayed if the cursorType parameter was provided Fixed bug with 'rename command, which referenced a non-existing variable that caused a script crash Added additional object properties to 'get and 'set commands: .shouldSave // Determines if an item should be saved in worldfiles or not .baseRange // Determines the base range of a ranged weapon, less than which it becomes less effective .maxRange // Determines the max range of a ranged weapon, beyond which it cannot reach its target The feature that allows stats like Strength, Dexterity and Intelligence to provide bonuses to skill checks has been turned into a UOX.INI setting, which is disabled by default. The bonuses have also been nerfed; they will no longer contribute more to the success of a skill check than the actual skill being checked! STATSAFFECTSKILLCHECKS=0/1 // If enabled, stats can provide bonuses to skill checks based on the weighting for those stats as setup in dfndata/skills/skills.dfn Updated damage tracking code to include the type of damage that was dealt (PHYSICAl vs HEAT vs COLD, etc) Updated Character JS Method Damage() to include a new parameter that can specify the type of damage that was dealt to the character. The new parameter must always be included if other optional parameters are used. Note that updates might be required for scripts making use of this method.Updated syntax: .Damage( amount ) .Damage( amount, damageType ) .Damage( amount, damageType, attacker ) .Damage( amount, damageType, attacker, doRepsys ) Supported damageTypes: PHYSICAL = 1 LIGHT = 2 RAIN = 3 COLD = 4 HEAT = 5 LIGHTNING = 6 // magic damage POISON = 7 SNOW = 8 Updated JS Event OnDamage to include an additional parameter that describes the type of damage that was dealt. New syntax: onDamage( damaged, attacker, damageValue, damageType ) Updated JS Event OnSpellTarget to allow rejecting a spell being cast on a target by returning a value of 2 from the script Split the character priv flag for magic reflection into a temporary one (one-time magic reflection spell) and a permanent one (innate permanent reflection ability). The temporary effect is put in place by Magic Reflection spell, and is removed after a successful spell reflect. The permanent one is an innate ability of a character and is not removed even after a spell is reflected. Added new Character JS property to get/set state of a character's permanent magic reflect ability: .permanentMagicReflect // 0 = disable, 1 = enable Added special abilities/effects for the following NPCs: Acid Elementals now have a chance to damage the melee weapons of their attackers Dull Copper Elementals now explode on death Shadow Iron Elemental is immune to targeted spell damage Copper Elementals have permanent magic reflect, and reflect some physical damage back at their attacker Bronze Elementals deal passive area damage to nearby players every 5 to 10 seconds Valorite Elementals have permanent magic reflect, reflect some physical damage back at their attacker Snow/Ice Elementals deal passive area damage to nearby players every 5 to 10 seconds Lava Serpents deal passive area damage to nearby players every 5 to 10 seconds Phoenixes deal passive area damage to nearby players every 5 to 10 seconds Pixies have a chance to cast a random spell upon receiving a death blow: Bless (target) Curse (target) Explosion (target) Greater Poison (target) Greater Heal (self, prevents death) Ethereal Warriors will now resurrect dead players with positive karma Ethereal Warriors now have a chance to drain target's health, stamina or mana on hit Fire Breath special ability added to the following NPCs, with the random ability damage scaling with the NPCs current health: Hell Cat, 5 to 8 dmg at max health Fire Steed, 6 to 9 dmg at max health Hell Hounds, 8 to 11 dmg at max health Lava Lizard, 8 to 11 dmg at max health Predator Hell Cat, 9 to 14 dmg at max health Sea Serpent, 11 to 17 dmg at max health Swamp Dragon, 15 to 22 dmg at max health Armored Swamp Dragon, 15 to 22 dmg at max health Fire Gargoyle, 20 to 30 dmg at max health Deep Sea Serpent, 21 to 32 dmg at max health Serpentine Dragon, 22 to 32 dmg at max health Drake (Gray), 22 to 32 dmg at max health Drake (Red), 22 to 32 dmg at max health Nightmare, 26 to 39 dmg at max health Dark Steed, 26 to 39 dmg at max health Silver Steed, 26 to 39 dmg at max health Kraken, 39 to 59 dmg at max health Dragon (Red), 41 to 62 dmg at max health Dragon (Gray), 41 to 62 dmg at max health Shadow Wyrm, 50 to 75 dmg at max health Reptalon, 51 to 77 dmg at max health Skeletal Dragon, 52 to 77 dmg at max health Ancient Wyrm, 60 to 90 dmg at max health Update stats, skills and loot for all currently implemented NPCs Removed an ancient piece of code that prevented corpses from being generated for various elementals and blade spirits on death. This was originally put in place because these creatures had no corpses, and would replace it with a backpack instead, but these creatures now all have corpses in all client versions supported by UOX3 Updated potions script (js/item/potion.js) with updated formula for amount of hitpoints healed by healing potions, and added restrictions for using them when at full health and/or if poisoned (Dragon Slayer) Fixed a bug where creatures (and humans, if FORCENEWANIMATIONPACKET was disabled in uox.ini) would play animations with wrong frame count, causing the animations to either freeze for a few frames at the end, or get cut off a couple of frames early Implemented bonus hit chance for Archery skill, based on mention of such a bonus in Publish 5 patch notes and related UO House of Commons chat. This has been exposed as a UOX.INI setting where this bonus can be tweaked: ARCHERYHITBONUS=10 // Bonus hit chance for Archery skill added to regular hit chance in combat. Defaults to 10% Implemented optional extra delay between moving and being able to shoot with ranged weapons in combat (in addition to whatever delay is there due to speed of the ranged weapon). This is exposed as a UOX.INI setting: ARCHERYSHOOTDELAY=0.5 // Minimum delay in seconds from a player stops moving until they can start to fire their ranged weapon. Defaults to 0.5s Fixed a bug where players who never entered combat mode could fire ranged weapons while moving Updated Add-menu with some improvements for usability: Menu now directly on the Objects (previously "Shard") tab for quicker access, with a small welcome text and quick-link button for UOX3 docs Settings tab contains some (persistent, will be saved with character) options for how the Add-menu behaves, along with a few quick-access buttons to some useful commands. Available options: Option to add chosen item at specific location instead of in GM's backpack Option to add chosen item repeatedly until cancelled Option to automatically reopen Add-menu on last menu that was open when a selection is made Option to force decayable state of all added items to either off (doesn't decay), on (decays) or nothing (use item default) Option to force movable state of all added items to either off (not movable), on (movable) or nothing (use item default) Added a Home button at the bottom of the menu, that takes the user back to the front page of the Add-menu regardless of which menu page they're on Updated Character/Socket JS Method SysMessage() with an optional parameter to specify the color used to display the system message. Updated syntax: .SysMessage( "Text" ) // Display "Text" to user as a system message with default system message color from ini .SysMessage( "Text %s %s", txtArg1, txtArg2 ) // Display "Text" to player with string arguments injected into text .SysMessage( txtColor, "Text" ) // Display "Text" to user with a specified color .SysMessage( txtColor, "Text %s %s", txtArg1, txtArg2 ) // Combination of text color, text and string arguments Fixed a bug where hair/beard items could show up inside corpses Fixed a bug where items could sometimes vanish (visually) from containers when bouncing back because player was not able to pick them up Fixed a bug where players would be unable to pick up a freely movable item from a locked down container Updated handling of item bouncing on pickup to use UOX3 dictionary messages instead of hard-coded client messages Added support for new Dictionary language: dictionary.POL - Polish (SERVERLANGUAGE=8 in uox.ini, or client language 83 if SERVERLANGUAGE is set to 0) Added taming restrictions for Unicorn, Ki-Rin and Cu Sidhe (js/skill/taming.js) Added modification of some creatures stats after they've been tamed (js/skill/taming.js) Added restrictions for who can ride certain creatures (Unicorn, Ki-Rin, Cu Sidhe) Updated words of power for Meteor Swarm spell to follow the same logic as other spells using Kal (Summon): Kal Des Flam Ylem Added new Item/Character JS Methods to get/set temporary custom tags which don't persist across worldsaves (or across reconnects, for players): .GetTempTag( "tagName" ) .SetTempTag( "tagName", tagValue ) When applying HPMAX, STAMINAMAX AND MANAMAX DFN tags to new NPCs, their current HP, STAMINA and MANA properties will now be automatically updated to match Fixed a server crash caused by empty speech messages sent from certain clients Fixed a bug that prevented teleport locations in Felucca/Trammel from working properly Updated calculations in code for duration and damage of existing poison strengths (1 - Lesser, 2 - Normal, 3 - Greater, 4 - Deadly) to match with ~Publish 15 (LBR/pre-AoS), and added another poison strength for monster usage (5 - Lethal) The strength of the Poison and Poison Field spells is now based on the average of the caster's Magery and Poisoning skills, the distance from the target (Poison spell only) and the target's Resisting Spells skill. If caster is further away than 2 tiles from target, the poison strength always equals Lesser Poison, otherwise the following rules apply: If caster's combined skill is higher than 100.0, poison strength equals Greater Poison, with 5% chance of Deadly Poison (if Poison spell) or Deadly Poison (if Poison Field spell) If caster's combined skill is higher than 70.2, poison strength equals Greater Poison If caster's combined skill is higher than 30.2, poison strength equals Normal Poison If caster's combined skill is 30.2 or lower, poison strength equals Lesser Poison If target resists spell, poison strength is reduced by 1 level, unless it's already at the lowest level Fixed an issue that would would let players move faster than they should have been allowed to Fixed misc issues with Party System: Mana and Stamina should now update for Party Members when added to the party, when going in/out of range and when their stats update while in range Players who get disconnected or relog should now find themselves back in the same party they were in previously Added system messages to inform party members about updates to their party, and to let invited players know they've successfully joined a party (or rejoined, if relogging) World saves now operate on the principle of only saving changes done since the last world save. Combined with the fact that NPCs in UOX3 are only active if there are players in the same/neighbouring map regions, shard owners may expect to see a decrease in world save times ranging from ~11% to ~99%, depending on how active and how spread out their player base is. If no changes have taken place since last save, saves are virtually instantaneous!
2021-09-20 21:35:17 +08:00
}
if( GetTimer( tWORLD_LIGHTTIME ) <= GetUICurrentTime() )
{
DoWorldLight(); //Changes lighting, if it is currently time to.
2022-06-08 10:38:16 -04:00
Weather->DoStuff(); // updates the weather types
SetTimer( tWORLD_LIGHTTIME, serverData->BuildSystemTimeValue( tSERVER_WEATHER ));
2022-06-08 10:38:16 -04:00
doWeather = true;
}
if( GetTimer( tWORLD_PETOFFLINECHECK ) <= GetUICurrentTime() )
{
SetTimer( tWORLD_PETOFFLINECHECK, serverData->BuildSystemTimeValue( tSERVER_PETOFFLINECHECK ));
2022-06-08 10:38:16 -04:00
doPetOfflineCheck = true;
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
}
2022-06-08 10:38:16 -04:00
bool checkFieldEffects = false;
if( GetTimer( tWORLD_NEXTFIELDEFFECT ) <= GetUICurrentTime() )
{
2022-06-08 10:38:16 -04:00
checkFieldEffects = true;
0.99.6d Cleaned up an issue with last commit where wrong npclists were used in some spawn regions Made a few additional adjustments to the new spawn regions in Lost Lands/New Haven Included more changes related to poison updates that should've been in previous commit (like the complete UOX.INI support for POISONCORROSIONSYSTEM setting) Adjusted region setup for New Haven to set the individual "building" regions within as a sub-region of the main town (regions.dfn) Fixed an issue where the displayed HP of an equipped item would not update correctly Further updates to convert timers 32-bit to 64-bit. This affects and addresses some potential issues with: Character creation/NPC guild-join timestamps, NPC movement, combat timers, idle timeouts, item decay, spellcasting Added support for new JS Events that can trigger from global script, and can be used to store persistent custom entries in players' paperdoll profiles: onProfileRequest( socket, profileOwnerChar ) - Triggers when client requests data for a paperdoll profile onProfileUpdate( socket, updatedText ) - Triggers when client sends updated data from paperdoll profile Added two new helper functions in code that allows faster (but very slightly less accurate) distance checks between two points: GetApproxDist( Point3_st a, Point3_st b ) GetApproxDist( CBaseObject *a, CBaseObject *b ) Improved pathfinding for NPCs attempting to follow another character, by adopting a system of weighted variables to help the NPC determine when to recalculate the path vs when to stick with the old, combined with faster distance checks via GetApproxDist(). The end result of this is faster, smarter and more responsive NPC followers and NPC opponents in combat. The variables influencing this include: how far the target has moved from last pathfind target location, whether NPC is heading in the overall right direction or not, time since last path calculation and some small randomization to avoid edge case jitters. Updated default command levels in commands.dfn, code and scripts to support the Seer role and make space for some custom roles. These are the new defaults as listed in commands.dfn, which should not be changed as they are linked to specific enums in code. Do take note that this might invalidate command levels for existing GMs/Seers/Counselors, who might need another round of 'make gm/seer/cns from an admin: ADMIN - command level 10 GM - command level 9 SEER - command level 7 CNS - command level 4 PLAYER - command level 0 Updated how UOX3 makes use of the account-level flags 0x2000 (Seer) and 0x4000 (Counselor). If either of these flags are set on an account, all new characters created on the accounts will automatically receive the relevant command privileges. Fixed an issue with 'wholist command that prevented admin characters from seeing characters with lower privilege levels in the list (js/commands/wholist.js) Fixed an issue with hiding/GM hide that prevented admin characters from seeing hidden characters with lower privilege levels in the world UOX3 now includes the cross-platform, header-only utf8cpp library found at https://github.com/nemtrif/utfcpp and freely available under Boost Software License v1.0. The immediate use-case for this is in code right now is to better handle strings related to custom paperdoll profiles, but will also look to make more heavy use of this in future updates
2025-06-28 22:37:42 +08:00
SetTimer( tWORLD_NEXTFIELDEFFECT, BuildTimeValue( 0.5 ));
2022-06-08 10:38:16 -04:00
}
std::set<CMapRegion *> regionList;
{
for( auto &iSock : Network->connClients )
{
if( iSock )
{
CChar *mChar = iSock->CurrcharObj();
if( !ValidateObject( mChar ))
{
2022-06-08 10:38:16 -04:00
continue;
}
UI08 worldNumber = mChar->WorldNumber();
if( mChar->GetAccount().wAccountIndex == iSock->AcctNo() && mChar->GetAccount().dwInGame == mChar->GetSerial() )
{
GenericCheck( iSock, (*mChar), checkFieldEffects, doWeather );
CheckPC( iSock, ( *mChar ));
2022-06-08 10:38:16 -04:00
SI16 xOffset = MapRegion->GetGridX( mChar->GetX() );
SI16 yOffset = MapRegion->GetGridY( mChar->GetY() );
// Restrict the amount of active regions based on how far player is from the border
// to the next one. This reduces active regions around a player from always 9 to
// varying between 3 to 6. Only regions on yOffset are considered, because the xOffset
// ones are too narrow
auto yOffsetUnrounded = static_cast<R32>( mChar->GetY() ) / static_cast<R32>( MapRowSize );
2022-06-08 10:38:16 -04:00
SI08 counter2Start = 0, counter2End = 0;
if( yOffsetUnrounded < yOffset + 0.25 )
{
2022-06-08 10:38:16 -04:00
counter2Start = -1;
counter2End = 0;
}
else if( yOffsetUnrounded > yOffset + 0.75 )
{
2022-06-08 10:38:16 -04:00
counter2Start = 0;
counter2End = 1;
}
for( SI08 counter = -1; counter <= 1; ++counter )
{
2022-06-08 10:38:16 -04:00
// Check 3 x colums
for( SI08 ctr2 = counter2Start; ctr2 <= counter2End; ++ctr2 )
{
2022-06-08 10:38:16 -04:00
// Check variable y colums
auto tC = MapRegion->GetMapRegion( xOffset + counter, yOffset + ctr2, worldNumber );
if( tC )
{
2022-06-08 10:38:16 -04:00
regionList.insert( tC );
}
}
}
}
}
}
}
2022-06-08 10:38:16 -04:00
// Reduce some lag checking these timers constantly in the loop
bool setNPCFlags = false, checkItems = false, checkAI = false, doRestock = false;
if( nextSetNPCFlagTime <= GetUICurrentTime() )
{
nextSetNPCFlagTime = serverData->BuildSystemTimeValue( tSERVER_NPCFLAGUPDATETIMER ); // Slow down lag "needed" for setting flags, they are set often enough;-)
2022-06-08 10:38:16 -04:00
setNPCFlags = true;
0.99.4v Added JS command to reload dictionaries 'reloaddictionaries Fixed a server crash related to casting of spells Fixed some issues with Line-of-Sight checks related to items under/above ground, LoS checks between different floors of buildings, etc. Updated handling of skill-training keywords to be based on language-independent keyword IDs rather than trying to match player-input text to specific skill-names Updated animal-trainer/stablemasterscript (js/npc/ai/stablemaster.js) with several changes: Fixed an issue where the same pet would be stabled in all available slots if payment was taken from player's bank account instead of their backpack Fixed an issue where stablemaster would not pause walking for a while when a player interacts with them Converted all system messages and text messages in stablemaster script to dictionary entries Added new NPC AI type to source - AI_STABLEMASTER (9) - and assigned this to animal trainers. This is used to identify this type of NPCs for the purpose of displaying relevant context menus Reworked banker AI script (js/npc/ai/banker.js) to use triggerwords from client instead of hard-defined strings, to work better with multiple languages (and work with all relevant triggerwords) Fixed a bug with banker AI script (js/npc/ai/banker.js) that prevented players from using the "withdraw" command Re-added NPC AI 8 to banker NPCs (dfndata/npc/male_vendors.dfn and female_vendors.dfn) so code can check for presence of this AI when handling context menus Removed remaining hard-coded banking functionality - all handled by script anyway Added new context menu option for NPC bankers - Open Bankbox Updated code handling of context menus to only show context menus when relevant: Open Paperdoll - Shows for all characters with a paperdoll Open Backpack - Shows for player's character, pack animals and hirelings Open Bankbox - Shows for banker NPCs (if within 8 tiles) Buy/Sell - Shows for vendor NPCs (if within 8 tiles, and if they have anything for sale/are buying anything) Added new context menu entries for pets, which can be used if player is within 12 tiles of pet: Command: Kill Command: Stop Command: Follow Command: Stay Command: Guard Add Friend Remove Friend Transfer Release Added new context menu entries for stablemasters/animal trainers: Claim All Pets Stable Pet Added new context menu entries for Escort Quest NPCs Ask Destination (if within 3 tiles) Accept Escort (if within 3 tiles) Abandon Escort Added new context menus for NPCs that can teach skills to players (limited to max 10 per NPC) Train [skillName] Added new AI script for NPC hirelings (3204=js/npc/ai/hireling.js), who can be hired to follow the player around for a limited amount of time, and function the same way as pets. In addition to the regular pet commands, these speech commands are supported: hire // The hireling will respond with the cost to hire them dismiss // Replaces the "release" command for pets; will dismiss the hireling patrol // The hireling will patrol between it's current location and a second targeted location nearby move // The hireling will try to shuffle out of the way fetch // The hireling will try to fetch a targeted item drop // The hireling will drop to the ground all loot they're currently carrying report // The hireling will report on the remaining time they're hired for Added new NPC DFN tag used by code to detect hireling NPCs for the purpose of displaying context menus: HIRELING // No additional value/data needed for tag Added new context menu entries for Hireling NPCs, in addition to the ones for regular pets: Hire // Can be used within 3 steps of the hireling, who will respond with cost to hire them Dismiss // Replaces the "release" command for pets, will dismiss the hireling Added HIRELING tag and SCRIPT=3204 to and updated stats of various NPCs that will be hireable: m_fighter, f_fighter, m_beggar, f_beggar, m_peasant, f_peasant, m_sailor, f_sailor, m_pirate, f_pirate Added new hireling NPC: m_paladin, f_paladin Added new UOX ini setting to enable/disable context menus CONTEXTMENUS=1/0 (defaults to 1) Added new Item JS Method to check if an item's ID is on a specified food list .IsOnFoodList( foodList ) // Returns true/false if item's ID is on specified foodList Added new OMNIVORE food list and assigned it to [basehuman] DFN section Added new Character JS Properties .isGuarded // Gets/Sets whether character is guarded by a pet/hireling .guarding // Gets/Sets the object (if any) being guarded by a pet/hireling Fixed multiple issues with health bars, flagging and character highlighting Added some crash protection for invalid data used with CUSTOMINTTAG and CUSTOMSTRINGTAG DFN tags for Items, NPCs and Multis Fixed an issue which prevented hard-coded checks from running when using items Added new global js object (Timer) to make the use of character timers in JS more robust, with properties matching timer names from enum in source. Properties: .TIMEOUT // Time until next attack can be done in combat .INVIS // Time until invisible character becomes visible .HUNGER // Time until character grows more hungry .THIRST // Time until character grows more thirsty .POISONTIME // Time until next tick of poison damage .POISONTEXT // Time until next message about suffering from poison .POISONWEAROFF // Time until poison wears off .SPELLTIME // Time until spell cast is completed. Can be set to 0 to interrupt .ANTISPAM // Time until next speech message can be sent (for anti spam purposes) .CRIMFLAG // Time until criminal flag runs out .MURDERRATE // Time until next murder count decay .PEACETIMER // Time until character can re-enter combat after being affected by peacemaking .FLYINGTOGGLE // Time until next time flying ability can be toggled for gargoyles .MOVETIME // Time until NPC can move again .SPATIMER // Time until next time NPC can cast a spell .SUMMONTIME // Time until a summoned NPC will vanish .EVADETIME // Time until an NPC will exit evade state .LOGOUT // Time it takes for a player char to vanish after logout Examples of use: var hungerTimer = myChar.GetTimer( Timer.HUNGER ) myChar.SetTimer( Timer.HUNGER, 15000 ) Added new Character JS Methods to add, remove and list friends of a pet/hireling: .AddFriend( playerToAdd ) // Adds player to friend list .RemoveFriend( playerToRemove ) // Removes player from friend list .GetFriendList() // Gets list of friends .ClearFriendList() // Clears list of friends Added new Character JS Method to fetch a player character's list of pets/followers .GetPetList() // Gets list of pets/followers Added new persistent NPC property to keep track of a pet's previous owners, whether those tamed the pet or had it transferred to them. Every time a pet is tamed, or is transferred to a new owner, this list is updated: GenericList< CChar * > petOwnerList Added new Character JS Method to check if a player is on a pet's owner list as a previous owner: .HasBeenOwner( mChar ) Previous owners of a pet can re-tame it with guaranteed chance of success Updated JS Method Refresh() to be usable with both items or characters, to send updated state of object to nearby players Added character tooltip [Guarded] for characters being guarded by a pet/hireling Pets/hirelings that are transferred will now immediately start following their new master instead of wandering freely Pets/hirelings can no longer be transferred between players as long as either party is flagged as a criminal Pets/hirelings can no longer be transferred to dead players Pets/hirelings can no longer be transferred to NPCs Summoned creatures can no longer be transferred to other players Summoned creatures can no longer have friends Friend lists of pets/hirelings are now cleared when the pet/hireling is transferred to another player Added new UOX.INI settings to control how many pets players can have active: MAXCONTROLSLOTS=0 // Maximum number of pet control slots available to player. Disabled if 0 MAXFOLLOWERS=5 // Maximum pets/followers a player can have active at the same time. Used if control slots are disabled MAXPETOWNERS=5 // Maximum number of different owners a pet can have over its lifetime before it becomes impossible to retame Added new NPC property and NPC DFN tag that keeps track of how many pet control slots an NPC would take up if owned by a player: UI08 controlSlots // source property CONTROLSLOTS=# // DFN tag Added new Character JS properties: .ownerCount // Get the total number of owners a pet/hireling has had, based on NPC's petOwnerList .controlSlots // Get/Set number of pet control slots an NPC will occupy .controlSlotsUsed // Get/Set the number of control slots used by a player Updated get (js/commands/targeting/get.js) and set (js/commands/targeting/set.js) commands to support getting/setting the following character properties: deaths ownerCount (read only) controlSlots controlSlotsUsed Updated NPC DFNs with default CONTROLSLOT=# tags Increased the max distance from player that onSpeech JS event will trigger from 7 to 12 Updated how "all attack" and "all follow" commands for pets are handled. Now loops through all pets owned by character and executes command for each eligible pet Fixed an issue where NPCs could follow characters in different worlds/instances than them selves Updated default max amount of items that can be sold to NPC vendors from 5 to 250 Guards can no longer train players in skills Updated equipment itemlists (dfndata/items/itemlists/itemlists.dfn) with blank entries to introduce some more variety in the type of clothes NPCs wear in general Added new NPCs to DFNs (dfndata/npc/undead.dfn) and added them to undead npclist: [skeletalmage] // variation of [bonemage] [skeletalknight] // variation of [boneknight] Updated Titles (dfndata/titles/titles.dfn) with up-to-date titles for skills around Pub 15, and added titles for skills added after that. Also added "Elder" and "Legendary" titles for 110 and 120 skillpoints Updated EQUIPITEM tag in newbie.dfn (dfndata/newbie/newbie.dfn) to support an optional hue parameter (EQUIPITEM=id,hue) Updated starting equipment for new characters (dfndata/newbie/newbie.dfn), with commented out practice weapons. Uncomment to use Added item definitions for practice weapons (dfndata/items/gear/weapons/practice_weapons.dfn): practice_skinning_knife practice_hatchet practice_axe practice_mace practice_longsword practice_spear practice_bow practice_club practice_crook practice_gnarled_staff Updated mount statues DFN (dfndata/items/misc/mount-statues.dfn) and JS (js/npc/pets/*.js) files to include pet control slot related stuff Pets now inherit the karma of their owners, but revert to their original karma upon release Pets and hirelings will no longer follow the ghosts of their dead owners, but stay to guard their corpse Added optional 9th parameter for JS Function CreateDFNItem to specify a color for item created. This comes before the other optional parameters - worldNumber and instanceID (which are only used if character is NULL): CreateDFNItem( mSock, mChar, sectionName, inPack, iAmount, itemType, iColor, worldNumber, instanceID ) Added ID of Giant Beetle to various pack animal checks Pack animals will now drop any newbie/blessed items stored in their packs upon death Added new NPC properties to track pet loyalty, and exposed these as Character JS properties, and NPC DFN tags: JS Properties .maxLoyalty // Defaults to 100 .loyalty // Starts at 25 DFN Tags MAXLOYALTY=# // Defaults to 100 LOYALTY=# // Starts at 25 Updated TriggerEvent JS function to support return values (int, bool, string, object) from called script Updated various JS scripts to make use of new TriggerEvent functionality and reduce reliance on custom tags: js/item/archerybutte.js js/item/trainingdummy.js js/server/data/combatanims.js js/server/data/weapontypes.js Updated archerybutte script to use dictionary for system and text messages Updated archerybutte script to support increased range, distance penalty and dex/str bonuses when calculating score Added new UOX.INI settings under [pets and hirelings] section related to pet control and loyalty: CHECKPETCONTROLDIFFICULTY=1 // Enable/Disable pet control difficulty system PETLOYALTYGAINONSUCCESS=1 // Amount of pet loyalty gained on successful pet command use PETLOYALTYLOSSONFAILURE=3 // Amount of pet loyalty lost on failed pet command use PETLOYALTYRATE=900 // Amount of seconds between each time pet loyalty is automatically reduced by 1. Takes 25 hours to deplete completely from max Added new persistent NPC property that keeps track of the difficulty of taming and controlling a pet, and exposed it as a Character JS property: .orneriness Every time a tamed pet is released or goes wild, its "orneriness" increases, making it more difficult for other players to tame, and more difficult for anyone to control. Updated CBasePetResponse::canControlPet() function to use pet control difficulty system if enabled, which checks player's animal taming/animal lore skill vs a pet's "orneriness" to determine chance of pet accepting a given pet command On successful use of pet command, increases pet loyalty by value defined in PETLOYALTYGAINONSUCCESS ini setting On failed use of pet command, decreases pet loyalty by value defined in PETLOYALTYLOSSONFAILURE ini setting Added new Character JS Method to calculate chance of a player successfully controlling the pet: .CalculateControlChance( mChar ) // Returns value between 0 and 1000 indicating chance of success Feeding a pet will now restore its loyalty to maximum Pets will now lose loyalty on hunger checks when at maximum hunger Pets that are maximum hungry will now only have a chance to go wild if loyalty has dropped to zero Added new DFN tag for creatures.dfn - TYPE - which contains a string describing the type of creature Added secure pet trading. Players who trade pets will now see a pet transfer deed appear in a secure trade window with the name and type of creature, and upon completion of the trade the associated pet will be instantly transferred to the other player Updated resource JS scripts (js/server/resource/*) to use dictionaries for all system messages Updated skill JS scripts (js/skill/*) to use dictionaries for all system messages Updated housing JS scripts (js/server/house/*) to use dictionaries for all system messages Updated item JS scripts (js/item/*) to use dictionaries for all system messages Updated magic JS scripts (js/magic/*) to use dictionaries for all system messages Updated NPC AI JS scripts (js/npc/ai/*) to use dictionaries for all system messages Updated command JS scripts (js/commands/*) to use dictionaries for all system messages, gump tooltips, etc Updated code to use dictionaries for all system messages Fixed incorrect spelling for UOX.INI setting HIDEW(H)ILEMOUNTED and updated hiding skill (js/skill/hiding.js) to actually allow/disallow hiding while mounted based on this setting Added new Character JS Method to make it easier to make one NPC initiate combat with another: .InitiateCombat( targetChar ) // Character attempts to initiate combat with target character Updated parrying portion of combat code to be in line with Pub15/pre-AoS parrying mechanics. High AR shields now absorb more damage on a successful parry, while low AR shields have a higher chance of parrying. Shields are also now more effective against archery attacks (full absorption potential) than melee attacks (half absorption potential). Updated combat damage calculations to be in line with Pub15/pre-AoS damage calculations Adjusted default value of COMBATNPCDAMAGERATE ini setting (damage divisor when target is a player) from 2 to 1 to account for these changes. Removed dictionary.UNK, and made dictionary.ZRO the default dictionary used for all unsupported languages Added dictionary support for additional languages: Portuguese, Italian, Czech Updated default dictionaries for the following languages: English, French Added default dictionaries for the following languages: German, Spanish, Portuguese, Italian, Czech (note that translations have been provided by automatic services and will contain inaccuracies!) Added new UOX.INI setting to allow specifying a default dictionary language for server, which if set will force that language for all dictionary messages, regardless of client settings: SERVERLANGUAGE=0 // Set default server dictionary language. Supported languages: 0 - None/language used by each client, 1 - English, 2 - German, 3 - Spanish, 5 - French, 6 - Portuguese, 7 - Italian, 8 - Czech Added new function in combat.cpp - AdjustArmorClassDamage() - which adjusts the damage dealt in combat based on whether armour class (AC DFN tag or .ac JS property) of weapon and armour equipped on hit location of target match up. A weapon with armour class 1 would essentially be doubly effective against armour of armour class 1. Allows setting up things like piercing weapons being better against some armor types than mace weapons, etc. Added new UOX.INI setting under [combat] to enable/disable double damage from armour class bonuses: ARMORCLASSDAMAGEBONUS=0/1 //defaults to 0)
2021-07-28 16:02:56 +08:00
}
if( nextCheckItems <= GetUICurrentTime() )
{
nextCheckItems = BuildTimeValue( serverData->CheckItemsSpeed() );
2022-06-08 10:38:16 -04:00
nextDecayItems = serverData->BuildSystemTimeValue( tSERVER_DECAY );
nextDecayItemsInHouses = serverData->BuildSystemTimeValue( tSERVER_DECAYINHOUSE );
checkItems = true;
0.99.4v Added JS command to reload dictionaries 'reloaddictionaries Fixed a server crash related to casting of spells Fixed some issues with Line-of-Sight checks related to items under/above ground, LoS checks between different floors of buildings, etc. Updated handling of skill-training keywords to be based on language-independent keyword IDs rather than trying to match player-input text to specific skill-names Updated animal-trainer/stablemasterscript (js/npc/ai/stablemaster.js) with several changes: Fixed an issue where the same pet would be stabled in all available slots if payment was taken from player's bank account instead of their backpack Fixed an issue where stablemaster would not pause walking for a while when a player interacts with them Converted all system messages and text messages in stablemaster script to dictionary entries Added new NPC AI type to source - AI_STABLEMASTER (9) - and assigned this to animal trainers. This is used to identify this type of NPCs for the purpose of displaying relevant context menus Reworked banker AI script (js/npc/ai/banker.js) to use triggerwords from client instead of hard-defined strings, to work better with multiple languages (and work with all relevant triggerwords) Fixed a bug with banker AI script (js/npc/ai/banker.js) that prevented players from using the "withdraw" command Re-added NPC AI 8 to banker NPCs (dfndata/npc/male_vendors.dfn and female_vendors.dfn) so code can check for presence of this AI when handling context menus Removed remaining hard-coded banking functionality - all handled by script anyway Added new context menu option for NPC bankers - Open Bankbox Updated code handling of context menus to only show context menus when relevant: Open Paperdoll - Shows for all characters with a paperdoll Open Backpack - Shows for player's character, pack animals and hirelings Open Bankbox - Shows for banker NPCs (if within 8 tiles) Buy/Sell - Shows for vendor NPCs (if within 8 tiles, and if they have anything for sale/are buying anything) Added new context menu entries for pets, which can be used if player is within 12 tiles of pet: Command: Kill Command: Stop Command: Follow Command: Stay Command: Guard Add Friend Remove Friend Transfer Release Added new context menu entries for stablemasters/animal trainers: Claim All Pets Stable Pet Added new context menu entries for Escort Quest NPCs Ask Destination (if within 3 tiles) Accept Escort (if within 3 tiles) Abandon Escort Added new context menus for NPCs that can teach skills to players (limited to max 10 per NPC) Train [skillName] Added new AI script for NPC hirelings (3204=js/npc/ai/hireling.js), who can be hired to follow the player around for a limited amount of time, and function the same way as pets. In addition to the regular pet commands, these speech commands are supported: hire // The hireling will respond with the cost to hire them dismiss // Replaces the "release" command for pets; will dismiss the hireling patrol // The hireling will patrol between it's current location and a second targeted location nearby move // The hireling will try to shuffle out of the way fetch // The hireling will try to fetch a targeted item drop // The hireling will drop to the ground all loot they're currently carrying report // The hireling will report on the remaining time they're hired for Added new NPC DFN tag used by code to detect hireling NPCs for the purpose of displaying context menus: HIRELING // No additional value/data needed for tag Added new context menu entries for Hireling NPCs, in addition to the ones for regular pets: Hire // Can be used within 3 steps of the hireling, who will respond with cost to hire them Dismiss // Replaces the "release" command for pets, will dismiss the hireling Added HIRELING tag and SCRIPT=3204 to and updated stats of various NPCs that will be hireable: m_fighter, f_fighter, m_beggar, f_beggar, m_peasant, f_peasant, m_sailor, f_sailor, m_pirate, f_pirate Added new hireling NPC: m_paladin, f_paladin Added new UOX ini setting to enable/disable context menus CONTEXTMENUS=1/0 (defaults to 1) Added new Item JS Method to check if an item's ID is on a specified food list .IsOnFoodList( foodList ) // Returns true/false if item's ID is on specified foodList Added new OMNIVORE food list and assigned it to [basehuman] DFN section Added new Character JS Properties .isGuarded // Gets/Sets whether character is guarded by a pet/hireling .guarding // Gets/Sets the object (if any) being guarded by a pet/hireling Fixed multiple issues with health bars, flagging and character highlighting Added some crash protection for invalid data used with CUSTOMINTTAG and CUSTOMSTRINGTAG DFN tags for Items, NPCs and Multis Fixed an issue which prevented hard-coded checks from running when using items Added new global js object (Timer) to make the use of character timers in JS more robust, with properties matching timer names from enum in source. Properties: .TIMEOUT // Time until next attack can be done in combat .INVIS // Time until invisible character becomes visible .HUNGER // Time until character grows more hungry .THIRST // Time until character grows more thirsty .POISONTIME // Time until next tick of poison damage .POISONTEXT // Time until next message about suffering from poison .POISONWEAROFF // Time until poison wears off .SPELLTIME // Time until spell cast is completed. Can be set to 0 to interrupt .ANTISPAM // Time until next speech message can be sent (for anti spam purposes) .CRIMFLAG // Time until criminal flag runs out .MURDERRATE // Time until next murder count decay .PEACETIMER // Time until character can re-enter combat after being affected by peacemaking .FLYINGTOGGLE // Time until next time flying ability can be toggled for gargoyles .MOVETIME // Time until NPC can move again .SPATIMER // Time until next time NPC can cast a spell .SUMMONTIME // Time until a summoned NPC will vanish .EVADETIME // Time until an NPC will exit evade state .LOGOUT // Time it takes for a player char to vanish after logout Examples of use: var hungerTimer = myChar.GetTimer( Timer.HUNGER ) myChar.SetTimer( Timer.HUNGER, 15000 ) Added new Character JS Methods to add, remove and list friends of a pet/hireling: .AddFriend( playerToAdd ) // Adds player to friend list .RemoveFriend( playerToRemove ) // Removes player from friend list .GetFriendList() // Gets list of friends .ClearFriendList() // Clears list of friends Added new Character JS Method to fetch a player character's list of pets/followers .GetPetList() // Gets list of pets/followers Added new persistent NPC property to keep track of a pet's previous owners, whether those tamed the pet or had it transferred to them. Every time a pet is tamed, or is transferred to a new owner, this list is updated: GenericList< CChar * > petOwnerList Added new Character JS Method to check if a player is on a pet's owner list as a previous owner: .HasBeenOwner( mChar ) Previous owners of a pet can re-tame it with guaranteed chance of success Updated JS Method Refresh() to be usable with both items or characters, to send updated state of object to nearby players Added character tooltip [Guarded] for characters being guarded by a pet/hireling Pets/hirelings that are transferred will now immediately start following their new master instead of wandering freely Pets/hirelings can no longer be transferred between players as long as either party is flagged as a criminal Pets/hirelings can no longer be transferred to dead players Pets/hirelings can no longer be transferred to NPCs Summoned creatures can no longer be transferred to other players Summoned creatures can no longer have friends Friend lists of pets/hirelings are now cleared when the pet/hireling is transferred to another player Added new UOX.INI settings to control how many pets players can have active: MAXCONTROLSLOTS=0 // Maximum number of pet control slots available to player. Disabled if 0 MAXFOLLOWERS=5 // Maximum pets/followers a player can have active at the same time. Used if control slots are disabled MAXPETOWNERS=5 // Maximum number of different owners a pet can have over its lifetime before it becomes impossible to retame Added new NPC property and NPC DFN tag that keeps track of how many pet control slots an NPC would take up if owned by a player: UI08 controlSlots // source property CONTROLSLOTS=# // DFN tag Added new Character JS properties: .ownerCount // Get the total number of owners a pet/hireling has had, based on NPC's petOwnerList .controlSlots // Get/Set number of pet control slots an NPC will occupy .controlSlotsUsed // Get/Set the number of control slots used by a player Updated get (js/commands/targeting/get.js) and set (js/commands/targeting/set.js) commands to support getting/setting the following character properties: deaths ownerCount (read only) controlSlots controlSlotsUsed Updated NPC DFNs with default CONTROLSLOT=# tags Increased the max distance from player that onSpeech JS event will trigger from 7 to 12 Updated how "all attack" and "all follow" commands for pets are handled. Now loops through all pets owned by character and executes command for each eligible pet Fixed an issue where NPCs could follow characters in different worlds/instances than them selves Updated default max amount of items that can be sold to NPC vendors from 5 to 250 Guards can no longer train players in skills Updated equipment itemlists (dfndata/items/itemlists/itemlists.dfn) with blank entries to introduce some more variety in the type of clothes NPCs wear in general Added new NPCs to DFNs (dfndata/npc/undead.dfn) and added them to undead npclist: [skeletalmage] // variation of [bonemage] [skeletalknight] // variation of [boneknight] Updated Titles (dfndata/titles/titles.dfn) with up-to-date titles for skills around Pub 15, and added titles for skills added after that. Also added "Elder" and "Legendary" titles for 110 and 120 skillpoints Updated EQUIPITEM tag in newbie.dfn (dfndata/newbie/newbie.dfn) to support an optional hue parameter (EQUIPITEM=id,hue) Updated starting equipment for new characters (dfndata/newbie/newbie.dfn), with commented out practice weapons. Uncomment to use Added item definitions for practice weapons (dfndata/items/gear/weapons/practice_weapons.dfn): practice_skinning_knife practice_hatchet practice_axe practice_mace practice_longsword practice_spear practice_bow practice_club practice_crook practice_gnarled_staff Updated mount statues DFN (dfndata/items/misc/mount-statues.dfn) and JS (js/npc/pets/*.js) files to include pet control slot related stuff Pets now inherit the karma of their owners, but revert to their original karma upon release Pets and hirelings will no longer follow the ghosts of their dead owners, but stay to guard their corpse Added optional 9th parameter for JS Function CreateDFNItem to specify a color for item created. This comes before the other optional parameters - worldNumber and instanceID (which are only used if character is NULL): CreateDFNItem( mSock, mChar, sectionName, inPack, iAmount, itemType, iColor, worldNumber, instanceID ) Added ID of Giant Beetle to various pack animal checks Pack animals will now drop any newbie/blessed items stored in their packs upon death Added new NPC properties to track pet loyalty, and exposed these as Character JS properties, and NPC DFN tags: JS Properties .maxLoyalty // Defaults to 100 .loyalty // Starts at 25 DFN Tags MAXLOYALTY=# // Defaults to 100 LOYALTY=# // Starts at 25 Updated TriggerEvent JS function to support return values (int, bool, string, object) from called script Updated various JS scripts to make use of new TriggerEvent functionality and reduce reliance on custom tags: js/item/archerybutte.js js/item/trainingdummy.js js/server/data/combatanims.js js/server/data/weapontypes.js Updated archerybutte script to use dictionary for system and text messages Updated archerybutte script to support increased range, distance penalty and dex/str bonuses when calculating score Added new UOX.INI settings under [pets and hirelings] section related to pet control and loyalty: CHECKPETCONTROLDIFFICULTY=1 // Enable/Disable pet control difficulty system PETLOYALTYGAINONSUCCESS=1 // Amount of pet loyalty gained on successful pet command use PETLOYALTYLOSSONFAILURE=3 // Amount of pet loyalty lost on failed pet command use PETLOYALTYRATE=900 // Amount of seconds between each time pet loyalty is automatically reduced by 1. Takes 25 hours to deplete completely from max Added new persistent NPC property that keeps track of the difficulty of taming and controlling a pet, and exposed it as a Character JS property: .orneriness Every time a tamed pet is released or goes wild, its "orneriness" increases, making it more difficult for other players to tame, and more difficult for anyone to control. Updated CBasePetResponse::canControlPet() function to use pet control difficulty system if enabled, which checks player's animal taming/animal lore skill vs a pet's "orneriness" to determine chance of pet accepting a given pet command On successful use of pet command, increases pet loyalty by value defined in PETLOYALTYGAINONSUCCESS ini setting On failed use of pet command, decreases pet loyalty by value defined in PETLOYALTYLOSSONFAILURE ini setting Added new Character JS Method to calculate chance of a player successfully controlling the pet: .CalculateControlChance( mChar ) // Returns value between 0 and 1000 indicating chance of success Feeding a pet will now restore its loyalty to maximum Pets will now lose loyalty on hunger checks when at maximum hunger Pets that are maximum hungry will now only have a chance to go wild if loyalty has dropped to zero Added new DFN tag for creatures.dfn - TYPE - which contains a string describing the type of creature Added secure pet trading. Players who trade pets will now see a pet transfer deed appear in a secure trade window with the name and type of creature, and upon completion of the trade the associated pet will be instantly transferred to the other player Updated resource JS scripts (js/server/resource/*) to use dictionaries for all system messages Updated skill JS scripts (js/skill/*) to use dictionaries for all system messages Updated housing JS scripts (js/server/house/*) to use dictionaries for all system messages Updated item JS scripts (js/item/*) to use dictionaries for all system messages Updated magic JS scripts (js/magic/*) to use dictionaries for all system messages Updated NPC AI JS scripts (js/npc/ai/*) to use dictionaries for all system messages Updated command JS scripts (js/commands/*) to use dictionaries for all system messages, gump tooltips, etc Updated code to use dictionaries for all system messages Fixed incorrect spelling for UOX.INI setting HIDEW(H)ILEMOUNTED and updated hiding skill (js/skill/hiding.js) to actually allow/disallow hiding while mounted based on this setting Added new Character JS Method to make it easier to make one NPC initiate combat with another: .InitiateCombat( targetChar ) // Character attempts to initiate combat with target character Updated parrying portion of combat code to be in line with Pub15/pre-AoS parrying mechanics. High AR shields now absorb more damage on a successful parry, while low AR shields have a higher chance of parrying. Shields are also now more effective against archery attacks (full absorption potential) than melee attacks (half absorption potential). Updated combat damage calculations to be in line with Pub15/pre-AoS damage calculations Adjusted default value of COMBATNPCDAMAGERATE ini setting (damage divisor when target is a player) from 2 to 1 to account for these changes. Removed dictionary.UNK, and made dictionary.ZRO the default dictionary used for all unsupported languages Added dictionary support for additional languages: Portuguese, Italian, Czech Updated default dictionaries for the following languages: English, French Added default dictionaries for the following languages: German, Spanish, Portuguese, Italian, Czech (note that translations have been provided by automatic services and will contain inaccuracies!) Added new UOX.INI setting to allow specifying a default dictionary language for server, which if set will force that language for all dictionary messages, regardless of client settings: SERVERLANGUAGE=0 // Set default server dictionary language. Supported languages: 0 - None/language used by each client, 1 - English, 2 - German, 3 - Spanish, 5 - French, 6 - Portuguese, 7 - Italian, 8 - Czech Added new function in combat.cpp - AdjustArmorClassDamage() - which adjusts the damage dealt in combat based on whether armour class (AC DFN tag or .ac JS property) of weapon and armour equipped on hit location of target match up. A weapon with armour class 1 would essentially be doubly effective against armour of armour class 1. Allows setting up things like piercing weapons being better against some armor types than mace weapons, etc. Added new UOX.INI setting under [combat] to enable/disable double damage from armour class bonuses: ARMORCLASSDAMAGEBONUS=0/1 //defaults to 0)
2021-07-28 16:02:56 +08:00
}
if( GetTimer( tWORLD_NEXTNPCAI ) <= GetUICurrentTime() )
{
SetTimer( tWORLD_NEXTNPCAI, BuildTimeValue( serverData->CheckNpcAISpeed() ));
2022-06-08 10:38:16 -04:00
checkAI = true;
}
if( GetTimer( tWORLD_SHOPRESTOCK ) <= GetUICurrentTime() )
{
SetTimer( tWORLD_SHOPRESTOCK, serverData->BuildSystemTimeValue( tSERVER_SHOPSPAWN ));
2022-06-08 10:38:16 -04:00
doRestock = true;
0.99.4v Added JS command to reload dictionaries 'reloaddictionaries Fixed a server crash related to casting of spells Fixed some issues with Line-of-Sight checks related to items under/above ground, LoS checks between different floors of buildings, etc. Updated handling of skill-training keywords to be based on language-independent keyword IDs rather than trying to match player-input text to specific skill-names Updated animal-trainer/stablemasterscript (js/npc/ai/stablemaster.js) with several changes: Fixed an issue where the same pet would be stabled in all available slots if payment was taken from player's bank account instead of their backpack Fixed an issue where stablemaster would not pause walking for a while when a player interacts with them Converted all system messages and text messages in stablemaster script to dictionary entries Added new NPC AI type to source - AI_STABLEMASTER (9) - and assigned this to animal trainers. This is used to identify this type of NPCs for the purpose of displaying relevant context menus Reworked banker AI script (js/npc/ai/banker.js) to use triggerwords from client instead of hard-defined strings, to work better with multiple languages (and work with all relevant triggerwords) Fixed a bug with banker AI script (js/npc/ai/banker.js) that prevented players from using the "withdraw" command Re-added NPC AI 8 to banker NPCs (dfndata/npc/male_vendors.dfn and female_vendors.dfn) so code can check for presence of this AI when handling context menus Removed remaining hard-coded banking functionality - all handled by script anyway Added new context menu option for NPC bankers - Open Bankbox Updated code handling of context menus to only show context menus when relevant: Open Paperdoll - Shows for all characters with a paperdoll Open Backpack - Shows for player's character, pack animals and hirelings Open Bankbox - Shows for banker NPCs (if within 8 tiles) Buy/Sell - Shows for vendor NPCs (if within 8 tiles, and if they have anything for sale/are buying anything) Added new context menu entries for pets, which can be used if player is within 12 tiles of pet: Command: Kill Command: Stop Command: Follow Command: Stay Command: Guard Add Friend Remove Friend Transfer Release Added new context menu entries for stablemasters/animal trainers: Claim All Pets Stable Pet Added new context menu entries for Escort Quest NPCs Ask Destination (if within 3 tiles) Accept Escort (if within 3 tiles) Abandon Escort Added new context menus for NPCs that can teach skills to players (limited to max 10 per NPC) Train [skillName] Added new AI script for NPC hirelings (3204=js/npc/ai/hireling.js), who can be hired to follow the player around for a limited amount of time, and function the same way as pets. In addition to the regular pet commands, these speech commands are supported: hire // The hireling will respond with the cost to hire them dismiss // Replaces the "release" command for pets; will dismiss the hireling patrol // The hireling will patrol between it's current location and a second targeted location nearby move // The hireling will try to shuffle out of the way fetch // The hireling will try to fetch a targeted item drop // The hireling will drop to the ground all loot they're currently carrying report // The hireling will report on the remaining time they're hired for Added new NPC DFN tag used by code to detect hireling NPCs for the purpose of displaying context menus: HIRELING // No additional value/data needed for tag Added new context menu entries for Hireling NPCs, in addition to the ones for regular pets: Hire // Can be used within 3 steps of the hireling, who will respond with cost to hire them Dismiss // Replaces the "release" command for pets, will dismiss the hireling Added HIRELING tag and SCRIPT=3204 to and updated stats of various NPCs that will be hireable: m_fighter, f_fighter, m_beggar, f_beggar, m_peasant, f_peasant, m_sailor, f_sailor, m_pirate, f_pirate Added new hireling NPC: m_paladin, f_paladin Added new UOX ini setting to enable/disable context menus CONTEXTMENUS=1/0 (defaults to 1) Added new Item JS Method to check if an item's ID is on a specified food list .IsOnFoodList( foodList ) // Returns true/false if item's ID is on specified foodList Added new OMNIVORE food list and assigned it to [basehuman] DFN section Added new Character JS Properties .isGuarded // Gets/Sets whether character is guarded by a pet/hireling .guarding // Gets/Sets the object (if any) being guarded by a pet/hireling Fixed multiple issues with health bars, flagging and character highlighting Added some crash protection for invalid data used with CUSTOMINTTAG and CUSTOMSTRINGTAG DFN tags for Items, NPCs and Multis Fixed an issue which prevented hard-coded checks from running when using items Added new global js object (Timer) to make the use of character timers in JS more robust, with properties matching timer names from enum in source. Properties: .TIMEOUT // Time until next attack can be done in combat .INVIS // Time until invisible character becomes visible .HUNGER // Time until character grows more hungry .THIRST // Time until character grows more thirsty .POISONTIME // Time until next tick of poison damage .POISONTEXT // Time until next message about suffering from poison .POISONWEAROFF // Time until poison wears off .SPELLTIME // Time until spell cast is completed. Can be set to 0 to interrupt .ANTISPAM // Time until next speech message can be sent (for anti spam purposes) .CRIMFLAG // Time until criminal flag runs out .MURDERRATE // Time until next murder count decay .PEACETIMER // Time until character can re-enter combat after being affected by peacemaking .FLYINGTOGGLE // Time until next time flying ability can be toggled for gargoyles .MOVETIME // Time until NPC can move again .SPATIMER // Time until next time NPC can cast a spell .SUMMONTIME // Time until a summoned NPC will vanish .EVADETIME // Time until an NPC will exit evade state .LOGOUT // Time it takes for a player char to vanish after logout Examples of use: var hungerTimer = myChar.GetTimer( Timer.HUNGER ) myChar.SetTimer( Timer.HUNGER, 15000 ) Added new Character JS Methods to add, remove and list friends of a pet/hireling: .AddFriend( playerToAdd ) // Adds player to friend list .RemoveFriend( playerToRemove ) // Removes player from friend list .GetFriendList() // Gets list of friends .ClearFriendList() // Clears list of friends Added new Character JS Method to fetch a player character's list of pets/followers .GetPetList() // Gets list of pets/followers Added new persistent NPC property to keep track of a pet's previous owners, whether those tamed the pet or had it transferred to them. Every time a pet is tamed, or is transferred to a new owner, this list is updated: GenericList< CChar * > petOwnerList Added new Character JS Method to check if a player is on a pet's owner list as a previous owner: .HasBeenOwner( mChar ) Previous owners of a pet can re-tame it with guaranteed chance of success Updated JS Method Refresh() to be usable with both items or characters, to send updated state of object to nearby players Added character tooltip [Guarded] for characters being guarded by a pet/hireling Pets/hirelings that are transferred will now immediately start following their new master instead of wandering freely Pets/hirelings can no longer be transferred between players as long as either party is flagged as a criminal Pets/hirelings can no longer be transferred to dead players Pets/hirelings can no longer be transferred to NPCs Summoned creatures can no longer be transferred to other players Summoned creatures can no longer have friends Friend lists of pets/hirelings are now cleared when the pet/hireling is transferred to another player Added new UOX.INI settings to control how many pets players can have active: MAXCONTROLSLOTS=0 // Maximum number of pet control slots available to player. Disabled if 0 MAXFOLLOWERS=5 // Maximum pets/followers a player can have active at the same time. Used if control slots are disabled MAXPETOWNERS=5 // Maximum number of different owners a pet can have over its lifetime before it becomes impossible to retame Added new NPC property and NPC DFN tag that keeps track of how many pet control slots an NPC would take up if owned by a player: UI08 controlSlots // source property CONTROLSLOTS=# // DFN tag Added new Character JS properties: .ownerCount // Get the total number of owners a pet/hireling has had, based on NPC's petOwnerList .controlSlots // Get/Set number of pet control slots an NPC will occupy .controlSlotsUsed // Get/Set the number of control slots used by a player Updated get (js/commands/targeting/get.js) and set (js/commands/targeting/set.js) commands to support getting/setting the following character properties: deaths ownerCount (read only) controlSlots controlSlotsUsed Updated NPC DFNs with default CONTROLSLOT=# tags Increased the max distance from player that onSpeech JS event will trigger from 7 to 12 Updated how "all attack" and "all follow" commands for pets are handled. Now loops through all pets owned by character and executes command for each eligible pet Fixed an issue where NPCs could follow characters in different worlds/instances than them selves Updated default max amount of items that can be sold to NPC vendors from 5 to 250 Guards can no longer train players in skills Updated equipment itemlists (dfndata/items/itemlists/itemlists.dfn) with blank entries to introduce some more variety in the type of clothes NPCs wear in general Added new NPCs to DFNs (dfndata/npc/undead.dfn) and added them to undead npclist: [skeletalmage] // variation of [bonemage] [skeletalknight] // variation of [boneknight] Updated Titles (dfndata/titles/titles.dfn) with up-to-date titles for skills around Pub 15, and added titles for skills added after that. Also added "Elder" and "Legendary" titles for 110 and 120 skillpoints Updated EQUIPITEM tag in newbie.dfn (dfndata/newbie/newbie.dfn) to support an optional hue parameter (EQUIPITEM=id,hue) Updated starting equipment for new characters (dfndata/newbie/newbie.dfn), with commented out practice weapons. Uncomment to use Added item definitions for practice weapons (dfndata/items/gear/weapons/practice_weapons.dfn): practice_skinning_knife practice_hatchet practice_axe practice_mace practice_longsword practice_spear practice_bow practice_club practice_crook practice_gnarled_staff Updated mount statues DFN (dfndata/items/misc/mount-statues.dfn) and JS (js/npc/pets/*.js) files to include pet control slot related stuff Pets now inherit the karma of their owners, but revert to their original karma upon release Pets and hirelings will no longer follow the ghosts of their dead owners, but stay to guard their corpse Added optional 9th parameter for JS Function CreateDFNItem to specify a color for item created. This comes before the other optional parameters - worldNumber and instanceID (which are only used if character is NULL): CreateDFNItem( mSock, mChar, sectionName, inPack, iAmount, itemType, iColor, worldNumber, instanceID ) Added ID of Giant Beetle to various pack animal checks Pack animals will now drop any newbie/blessed items stored in their packs upon death Added new NPC properties to track pet loyalty, and exposed these as Character JS properties, and NPC DFN tags: JS Properties .maxLoyalty // Defaults to 100 .loyalty // Starts at 25 DFN Tags MAXLOYALTY=# // Defaults to 100 LOYALTY=# // Starts at 25 Updated TriggerEvent JS function to support return values (int, bool, string, object) from called script Updated various JS scripts to make use of new TriggerEvent functionality and reduce reliance on custom tags: js/item/archerybutte.js js/item/trainingdummy.js js/server/data/combatanims.js js/server/data/weapontypes.js Updated archerybutte script to use dictionary for system and text messages Updated archerybutte script to support increased range, distance penalty and dex/str bonuses when calculating score Added new UOX.INI settings under [pets and hirelings] section related to pet control and loyalty: CHECKPETCONTROLDIFFICULTY=1 // Enable/Disable pet control difficulty system PETLOYALTYGAINONSUCCESS=1 // Amount of pet loyalty gained on successful pet command use PETLOYALTYLOSSONFAILURE=3 // Amount of pet loyalty lost on failed pet command use PETLOYALTYRATE=900 // Amount of seconds between each time pet loyalty is automatically reduced by 1. Takes 25 hours to deplete completely from max Added new persistent NPC property that keeps track of the difficulty of taming and controlling a pet, and exposed it as a Character JS property: .orneriness Every time a tamed pet is released or goes wild, its "orneriness" increases, making it more difficult for other players to tame, and more difficult for anyone to control. Updated CBasePetResponse::canControlPet() function to use pet control difficulty system if enabled, which checks player's animal taming/animal lore skill vs a pet's "orneriness" to determine chance of pet accepting a given pet command On successful use of pet command, increases pet loyalty by value defined in PETLOYALTYGAINONSUCCESS ini setting On failed use of pet command, decreases pet loyalty by value defined in PETLOYALTYLOSSONFAILURE ini setting Added new Character JS Method to calculate chance of a player successfully controlling the pet: .CalculateControlChance( mChar ) // Returns value between 0 and 1000 indicating chance of success Feeding a pet will now restore its loyalty to maximum Pets will now lose loyalty on hunger checks when at maximum hunger Pets that are maximum hungry will now only have a chance to go wild if loyalty has dropped to zero Added new DFN tag for creatures.dfn - TYPE - which contains a string describing the type of creature Added secure pet trading. Players who trade pets will now see a pet transfer deed appear in a secure trade window with the name and type of creature, and upon completion of the trade the associated pet will be instantly transferred to the other player Updated resource JS scripts (js/server/resource/*) to use dictionaries for all system messages Updated skill JS scripts (js/skill/*) to use dictionaries for all system messages Updated housing JS scripts (js/server/house/*) to use dictionaries for all system messages Updated item JS scripts (js/item/*) to use dictionaries for all system messages Updated magic JS scripts (js/magic/*) to use dictionaries for all system messages Updated NPC AI JS scripts (js/npc/ai/*) to use dictionaries for all system messages Updated command JS scripts (js/commands/*) to use dictionaries for all system messages, gump tooltips, etc Updated code to use dictionaries for all system messages Fixed incorrect spelling for UOX.INI setting HIDEW(H)ILEMOUNTED and updated hiding skill (js/skill/hiding.js) to actually allow/disallow hiding while mounted based on this setting Added new Character JS Method to make it easier to make one NPC initiate combat with another: .InitiateCombat( targetChar ) // Character attempts to initiate combat with target character Updated parrying portion of combat code to be in line with Pub15/pre-AoS parrying mechanics. High AR shields now absorb more damage on a successful parry, while low AR shields have a higher chance of parrying. Shields are also now more effective against archery attacks (full absorption potential) than melee attacks (half absorption potential). Updated combat damage calculations to be in line with Pub15/pre-AoS damage calculations Adjusted default value of COMBATNPCDAMAGERATE ini setting (damage divisor when target is a player) from 2 to 1 to account for these changes. Removed dictionary.UNK, and made dictionary.ZRO the default dictionary used for all unsupported languages Added dictionary support for additional languages: Portuguese, Italian, Czech Updated default dictionaries for the following languages: English, French Added default dictionaries for the following languages: German, Spanish, Portuguese, Italian, Czech (note that translations have been provided by automatic services and will contain inaccuracies!) Added new UOX.INI setting to allow specifying a default dictionary language for server, which if set will force that language for all dictionary messages, regardless of client settings: SERVERLANGUAGE=0 // Set default server dictionary language. Supported languages: 0 - None/language used by each client, 1 - English, 2 - German, 3 - Spanish, 5 - French, 6 - Portuguese, 7 - Italian, 8 - Czech Added new function in combat.cpp - AdjustArmorClassDamage() - which adjusts the damage dealt in combat based on whether armour class (AC DFN tag or .ac JS property) of weapon and armour equipped on hit location of target match up. A weapon with armour class 1 would essentially be doubly effective against armour of armour class 1. Allows setting up things like piercing weapons being better against some armor types than mace weapons, etc. Added new UOX.INI setting under [combat] to enable/disable double damage from armour class bonuses: ARMORCLASSDAMAGEBONUS=0/1 //defaults to 0)
2021-07-28 16:02:56 +08:00
}
2022-06-08 10:38:16 -04:00
bool allowAwakeNPCs = cwmWorldState->ServerData()->AllowAwakeNPCs();
for( auto &toCheck : regionList )
{
2022-06-08 10:38:16 -04:00
auto regChars = toCheck->GetCharList();
auto collection = regChars->collection();
for( const auto &charCheck : collection )
{
if( ValidateObject( charCheck ))
{
if( charCheck->IsNpc() )
{
if( !charCheck->IsAwake() || !allowAwakeNPCs )
{
2022-06-10 08:12:58 -04:00
// Only perform these checks on NPCs that are not permanently awake
if( !GenericCheck( nullptr, ( *charCheck ), checkFieldEffects, doWeather ))
{
if( setNPCFlags )
{
2022-06-10 08:12:58 -04:00
UpdateFlag( charCheck ); // only set flag on npcs every 60 seconds (save a little extra lag)
}
CheckNPC(( *charCheck ), checkAI, doRestock, doPetOfflineCheck );
2022-06-10 08:12:58 -04:00
}
}
}
else if( charCheck->GetTimer( tPC_LOGOUT ))
{
CAccountBlock_st& actbTemp = charCheck->GetAccount();
if( actbTemp.wAccountIndex != AB_INVALID_ID )
{
2022-06-10 08:12:58 -04:00
SERIAL oaiw = actbTemp.dwInGame;
if( oaiw == INVALIDSERIAL )
{
2022-06-10 08:12:58 -04:00
charCheck->SetTimer( tPC_LOGOUT, 0 );
charCheck->RemoveFromSight();
2022-06-10 08:12:58 -04:00
charCheck->Update();
}
else if( oaiw == charCheck->GetSerial() && charCheck->GetTimer( tPC_LOGOUT ) <= GetUICurrentTime() )
{
2022-06-10 08:12:58 -04:00
actbTemp.dwInGame = INVALIDSERIAL;
charCheck->SetTimer( tPC_LOGOUT, 0 );
// End combat, clear targets
charCheck->SetAttacker( nullptr );
charCheck->SetWar( false );
charCheck->SetTarg( nullptr );
2022-06-10 08:12:58 -04:00
charCheck->Update();
charCheck->Teleport();
// Announce that player has logged out (if enabled)
if( cwmWorldState->ServerData()->ServerJoinPartAnnouncementsStatus() )
{
SysBroadcast( oldstrutil::format(1024, Dictionary->GetEntry( 752 ), charCheck->GetName().c_str() )); // %s has left the realm.
}
2022-06-10 08:12:58 -04:00
}
}
}
}
}
CheckItem( toCheck, checkItems, nextDecayItems, nextDecayItemsInHouses, doWeather );
2022-06-08 10:38:16 -04:00
}
2022-06-08 10:38:16 -04:00
// Check NPCs marked as always active, regardless of whether their region is "awake"
if( allowAwakeNPCs )
{
2022-06-08 10:38:16 -04:00
auto alwaysAwakeChars = Npcs->GetAlwaysAwakeNPCs();
std::vector<CChar*> toRemove;
for( const auto &charCheck : alwaysAwakeChars->collection() )
{
if( ValidateObject( charCheck ) && !charCheck->IsFree() && charCheck->IsNpc() )
{
if( !GenericCheck( nullptr, ( *charCheck ), checkFieldEffects, doWeather ))
{
if( setNPCFlags )
{
2022-06-10 08:12:58 -04:00
UpdateFlag( charCheck ); // only set flag on npcs every 60 seconds (save a little extra lag)
}
CheckNPC(( *charCheck ), checkAI, doRestock, doPetOfflineCheck );
2022-06-10 08:12:58 -04:00
}
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
else
{
toRemove.push_back( charCheck );
Minor JS revamp - multiple scripts per object! Added TryParseJSVal() helper function in cScript.cpp, used to parse jsval values returned from script events. Provides results matching 0 (0, false), 1 (1, true) or any specific int value returned from script. JS events updated to use new TryParseJSVal helper function (no change in behaviour): onDecay, onResurrect, onCommand, onBuyFromVendor, onSellToVendor, onPickup, onCharDoubleClick, onSkillGump, onUseBandageMacro, onCombatStart, onCombatEnd, onDeathBlow, onBuy, onSell JS events with slight change of behaviour after update to use TryParseJSVal: onDrop, onDropItemOnItem, onDropItemOnNpc - previously, a blank or non-existent return value would be treated the same as a return true. This will now be treated as a return false. Update scripts accordingly! JS events updated to support return values from scripts: onCollide, onTalk, onSnooped, OnHungerChange Return false or nothing to prevent hard code from running Return true to allow hard code to run like normal onStolenFrom, onAISliver, onLightChange, onVirtueGumpPress, onQuestGump, onSpecialMove, onSwing, onClick, onHouseCommand, onSellToVendor, onSkillCheck, onSpellGain, onSpellLoss Return false to allow hard code and other scripts with event to run like normal Return true to prevent hard code and other scripts with event from running onSteal Return false or nothing to allow hard code and other scripts with event to run like normal Return true to prevent hard code and onStolenFrom event from running (theft failed?) Return 2 to prevent hard code, but allow onStolenFrom event to run (theft succeeded, but handled in script?) onLeaving, onEntrance, onEquip, onUnequip, onEnterEvadeState, onSoldToVendor, onBoughtFromVendor, onSpellSuccess, onSpellTarget, onFlagChange, onDeath Return false or nothing to allow other scripts with event to run like normal Return true to prevent other scripts with event from running Added new JS events that run prior to items being equipped/unequipped, with support for return values: onEquipAttempt( pEquipper, iEquipping ) onUnequipAttempt( pEquipper, iUnequipping ) Return false or nothing to reject attempt to equip/unequip item, and prevent hard-code or other scripts with event from running Return true to allow hard code to run like normal Added new JS event that runs prior to onSnooped event, for character doing the snooping: onSnoopAttempt( snooped, snooper ) Return false or nothing to prevent hard code and other snooping-related events from running Return true to allow hard code and other snooping-related events to run like normal Updated onSnooped JS event to accept return values: Return true when success state is true to prevent other scripts with event from running Return true when success state is false to prevent hard code and other scripts with event from running Updated onClick JS event to also run for characters with event attached (return 1 to prevent showing hard-coded name for whatever object is clicked) Updated onSteal JS event to include a third parameter, an object reference for the target of the theft Added support for assigning multiple JS scripts per object (item, multi, char, region). Any time a scriptID is added to an object, the list of such IDs for that object will be sorted from lowest to highest scriptID, which also determines the execution order for the scripts. Note that if the same JS event is present in several scripts assigned to an object, each of those events will trigger, unless the rules about return values for said event prevent this DFNs for Items, Multis, Characters and Regions can now contain multiple SCRIPT=scriptID tags per definition. Each such SCRIPT tag will be applied to the object in question, then sorted from lowest to highest scriptID by server. Added new JS property for Items, Multis, Characters and Regions: .scriptTriggers // If used to get property, will return array object with all script IDs assigned to object. If used to set property, will add script ID to existing list of script IDs for object. Modified JS property for Items, Multis, Characters and Regions, which for backwards compatibility functions similar to in older versions: .scripttrigger // If used to get property, will return last script ID in list of script IDs assigned to object. If used to set property, will clear list of script IDs and assign only the new ID Added new JS Methods for Items, Multis, Characters and Regions: .AddScriptTrigger( scriptID ) // Adds a new scriptID to list of scripts assigned to object .RemoveScriptTrigger( scriptID ) // Remove a specific scriptID from object (0 = remove all) Moved SETSCPTRIG command from code to JS (js/commands/targeting/scptrig.js), and supplemented it with some additional commands: GETSCPTRIG // List out all scriptIDs assigned to object SETSCPTRIG scriptID // Clears list of scriptIDs for object, then assigns the specified scriptID ADDSCPTRIG scriptID // Adds specified scriptID to list of scriptsIDs assigned to object REMOVESCPTRIG scriptID // Removes specified scriptID from list of scriptIDs assigned to object (0 = remove all)
2021-05-25 19:37:52 +08:00
}
2003-03-05 02:29:44 +00:00
}
std::for_each( toRemove.begin(), toRemove.end(), [&alwaysAwakeChars]( CChar *character )
{
alwaysAwakeChars->Remove( character );
2022-06-10 08:12:58 -04:00
});
toRemove.clear();
}
Effects->CheckTempeffects();
2022-06-08 10:38:16 -04:00
SpeechSys->Poll();
// Implement RefreshItem() / StatWindow() queue here
2022-10-24 23:42:16 +08:00
std::for_each( cwmWorldState->refreshQueue.begin(), cwmWorldState->refreshQueue.end(), []( std::pair<CBaseObject*, UI32> entry )
{
if( ValidateObject( entry.first ))
{
if( entry.first->CanBeObjType( OT_CHAR ))
{
auto uChar = static_cast<CChar *>( entry.first );
// Let's ensure we only do one stat window update for self per cycle,
bool triggerStatWindowUpdate = false;
if( uChar->GetUpdate( UT_HITPOINTS ))
{
triggerStatWindowUpdate = true;
UpdateStats( entry.first, 0, false );
2022-06-08 10:38:16 -04:00
}
if( uChar->GetUpdate( UT_STAMINA ))
{
triggerStatWindowUpdate = true;
UpdateStats( entry.first, 1, false );
2022-06-08 10:38:16 -04:00
}
if( uChar->GetUpdate( UT_MANA ))
{
triggerStatWindowUpdate = true;
UpdateStats( entry.first, 2, false );
2022-06-08 10:38:16 -04:00
}
if( uChar->GetUpdate( UT_LOCATION ))
{
2022-06-08 10:38:16 -04:00
uChar->Teleport();
}
else if( uChar->GetUpdate( UT_HIDE ))
{
2022-06-08 10:38:16 -04:00
uChar->ClearUpdate();
if( uChar->GetVisible() != VT_VISIBLE )
{
2022-06-08 10:38:16 -04:00
uChar->RemoveFromSight();
}
uChar->Update( nullptr, false );
}
else if( uChar->GetUpdate( UT_UPDATE ))
{
2022-06-08 10:38:16 -04:00
uChar->Update();
}
else if( uChar->GetUpdate( UT_STATWINDOW ) || triggerStatWindowUpdate )
{
2022-06-08 10:38:16 -04:00
CSocket *uSock = uChar->GetSocket();
if( uSock )
{
uSock->StatWindow( uChar );
2022-06-08 10:38:16 -04:00
}
}
2022-06-08 10:38:16 -04:00
uChar->ClearUpdate();
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
}
else
{
2022-06-08 10:38:16 -04:00
entry.first->Update();
}
}
2022-06-08 10:38:16 -04:00
});
cwmWorldState->refreshQueue.clear();
}
//o------------------------------------------------------------------------------------------------o
//| Function - InitClasses()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Initialize UOX classes
//o------------------------------------------------------------------------------------------------o
auto InitClasses() -> void
{
2022-06-08 10:38:16 -04:00
cwmWorldState->ClassesInitialized( true );
JSEngine = &aJSEngine;
JSMapping = &aJSMapping;
Effects = &aEffects;
Commands = &aCommands;
Combat = &aCombat;
Items = &aItems;
Map = &aMap;
Npcs = &aNpcs;
Skills = &aSkills;
Weight = &aWeight;
JailSys = &aJailSys;
Network = &aNetwork;
Magic = &aMagic;
Races = &aRaces;
Weather = &aWeather;
Movement = &aMovement;
GuildSys = &aGuildSys;
WhoList = &aWhoList;
OffList = &aOffList;
Books = &aBooks;
GMQueue = &aGMQueue;
Dictionary = &aDictionary;
Accounts = &aAccounts;
MapRegion = &aMapRegion;
SpeechSys = &aSpeechSys;
CounselorQueue = &aCounselorQueue;
HTMLTemplates = &aHTMLTemplates;
FileLookup = &aFileLookup;
aJSEngine.Startup();
aFileLookup.Startup();
aCommands.Startup();
aSpeechSys.Startup();
// Need to do map
aNetwork.Startup();
aMap.Load();
2022-06-08 10:38:16 -04:00
JSMapping->ResetDefaults();
JSMapping->GetEnvokeById()->Parse();
2022-06-08 10:38:16 -04:00
JSMapping->GetEnvokeByType()->Parse();
aMapRegion.Startup();
aAccounts.SetPath( cwmWorldState->ServerData()->Directory( CSDDP_ACCOUNTS ));
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt) Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri) Updated SpiderMonkey from v1.6.0 to v1.7.0 Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri) Added StringUtility file with general common string manipulation functions (punt) Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt) Overall code cleanup to remove/replace platform-dependent code (punt) Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt) Replaced usage of char in many places with std::string (punt) Started process of replacing UString usage with functions provided through StringUtility instead (punt) Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt) Replaced platform specific time handling by using cross-platform chrono library (punt) Removed UOX namespace to reduce complexity (punt) Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt) Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt) Removed some platform specific files like uoxlinux.h, which is no longer required (punt) Removed legacy crash protection code, and removed support for cluox (punt) Removed legacy "support" for Borland compiler (punt) Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri) Removed legacy BUILD folder with outdated compilation instructions (Xuri) Removed old Changelog file (merged into Changelog.txt) (Xuri) Fixed a pointer bug for items in multis on world load (punt) Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt) Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt) Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt) Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt) Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt) Added some new commands to js/commands/custom/misc-cmd.js (Xuri) cont // Targeted item will be made a container, set to nondecay and movable 2 endfight // Targeted character (and character being fought) will stop fighting getmulti // Get multiObject for targeted item finditem // Find item at layer X movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen) Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
}
auto FindNearbyObjects( SI16 x, SI16 y, UI08 worldNumber, UI16 instanceId, UI16 distance ) -> std::vector<CBaseObject *>;
auto InMulti( SI16 x, SI16 y, SI08 z, CMultiObj *m ) -> bool;
//o------------------------------------------------------------------------------------------------o
//| Function - FindMultiFunctor()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Looks for a multi at object's location and assigns any multi found to object
//o------------------------------------------------------------------------------------------------o
auto FindMultiFunctor( CBaseObject *a, [[maybe_unused]] UI32 &b, [[maybe_unused]] void *extraData ) -> bool
{
if( ValidateObject( a ))
{
if( a->CanBeObjType( OT_MULTI ))
{
auto aMulti = static_cast<CMultiObj *>( a );
for( auto &objToCheck : FindNearbyObjects( aMulti->GetX(), aMulti->GetY(), aMulti->WorldNumber(), aMulti->GetInstanceId(), 20 ))
{
if( InMulti( objToCheck->GetX(), objToCheck->GetY(), objToCheck->GetZ(), aMulti ))
{
2022-06-08 10:38:16 -04:00
objToCheck->SetMulti( aMulti );
}
else if(( objToCheck->GetObjType() == OT_ITEM )
&& ((( objToCheck->GetId() >= 0x0b95 ) && ( objToCheck->GetId() <= 0x0c0e )) || ( objToCheck->GetId() == 0x1f28 ) || ( objToCheck->GetId() == 0x1f29 )))
{
2022-06-08 10:38:16 -04:00
// Reunite house signs with their multis
SERIAL houseSerial = static_cast<CItem *>( objToCheck )->GetTempVar( CITV_MORE );
CMultiObj *multi = CalcMultiFromSer( houseSerial );
if( ValidateObject( multi ))
{
2022-06-08 10:38:16 -04:00
objToCheck->SetMulti( multi );
}
}
else
{
2022-06-08 10:38:16 -04:00
// No other multi found where item is, safe to set item's multi to INVALIDSERIAL
if( FindMulti( objToCheck ) == nullptr )
{
2022-06-08 10:38:16 -04:00
objToCheck->SetMulti( INVALIDSERIAL );
}
}
}
}
}
2022-06-08 10:38:16 -04:00
return true;
}
//o------------------------------------------------------------------------------------------------o
//| Function - InitMultis()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Initialize Multis
//o------------------------------------------------------------------------------------------------o
auto InitMultis() -> void
{
2022-06-08 10:38:16 -04:00
Console << "Initializing multis ";
UI32 b = 0;
ObjectFactory::GetSingleton().IterateOver( OT_MULTI, b, nullptr, &FindMultiFunctor );
2022-06-08 10:38:16 -04:00
Console.PrintDone();
}
//o------------------------------------------------------------------------------------------------o
//| Function - DisplayBanner()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Display some information at the end of UOX startup
//o------------------------------------------------------------------------------------------------o
auto DisplayBanner() -> void
{
2022-06-08 10:38:16 -04:00
Console.PrintSectionBegin();
2022-06-08 10:38:16 -04:00
Console.TurnYellow();
Console << "Compiled on ";
Console.TurnNormal();
Console << __DATE__ << " (" << __TIME__ << ")" << myendl;
2022-06-08 10:38:16 -04:00
Console.TurnYellow();
Console << "Compiled by ";
Console.TurnNormal();
Console << CVersionClass::GetName() << myendl;
2022-06-08 10:38:16 -04:00
Console.TurnYellow();
Console << "Contact: ";
Console.TurnNormal();
Console << CVersionClass::GetEmail() << myendl;
2022-06-08 10:38:16 -04:00
Console.PrintSectionBegin();
saveOnShutdown = true;
}
//o------------------------------------------------------------------------------------------------o
//| Function - Shutdown()
2022-06-08 10:38:16 -04:00
//| Date - Oct. 09, 1999
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Handled deleting / free() ing of pointers as neccessary
//| as well as closing open file handles to avoid file file corruption.
//| Exits with proper error code.
//o------------------------------------------------------------------------------------------------o
auto Shutdown( SI32 retCode ) -> void
{
2022-06-08 10:38:16 -04:00
Console.PrintSectionBegin();
Console << "Beginning UOX final shut down sequence..." << myendl;
if( retCode && saveOnShutdown )
{
2022-06-08 10:38:16 -04:00
//they want us to save, there has been an error, we have loaded the world, and WorldState is a valid pointer.
#if PLATFORM == WINDOWS
SetConsoleCtrlHandler( exit_handler, true );
#endif
2022-06-08 10:38:16 -04:00
isWorldSaving = true;
do
{
2022-06-08 10:38:16 -04:00
cwmWorldState->SaveNewWorld( true );
} while( cwmWorldState->GetWorldSaveProgress() == SS_SAVING );
isWorldSaving = false;
#if PLATFORM == WINDOWS
2022-06-08 10:38:16 -04:00
SetConsoleCtrlHandler( exit_handler, false );
#endif
2022-06-08 10:38:16 -04:00
}
if( cwmWorldState && cwmWorldState->ClassesInitialized() )
{
if( HTMLTemplates )
{
2022-06-08 10:38:16 -04:00
Console << "HTMLTemplates object detected. Writing Offline HTML Now...";
HTMLTemplates->Poll( ETT_OFFLINE );
Console.PrintDone();
}
else
{
2022-06-08 10:38:16 -04:00
Console << "HTMLTemplates object not found." << myendl;
}
2022-06-08 10:38:16 -04:00
Console << "Destroying class objects and pointers... ";
// delete any objects that were created (delete takes care of nullptr check =)
UnloadSpawnRegions();
2022-06-08 10:38:16 -04:00
UnloadRegions();
Console.PrintDone();
}
2022-06-08 10:38:16 -04:00
//Lets wait for console thread to quit here
if( !retCode )
{
2022-06-08 10:38:16 -04:00
cons.join();
}
2022-06-08 10:38:16 -04:00
// don't leave file pointers open, could lead to file corruption
2022-06-08 10:38:16 -04:00
Console.PrintSectionBegin();
2022-06-08 10:38:16 -04:00
Console.TurnGreen();
Console << "Server shutdown complete!" << myendl;
Console << "Thank you for supporting " << CVersionClass::GetName() << myendl;
Console.TurnNormal();
Console.PrintSectionBegin();
2022-06-08 10:38:16 -04:00
// dispay what error code we had
// don't report errorlevel for no errors, this is confusing ppl
if( retCode )
{
2022-06-08 10:38:16 -04:00
Console.TurnRed();
Console << "Exiting UOX with errorlevel " << retCode << myendl;
Console.TurnNormal();
#if PLATFORM == WINDOWS
Console << "Press Return to exit " << myendl;
std::string throwAway;
std::getline( std::cin, throwAway );
2022-06-08 10:38:16 -04:00
#endif
}
else
{
0.99.4h Exposed a (read-only) JS property for characters to fetch their hunger rate. Uses race's hunger rate if defined, otherwise uses HUNGERRATE form uox.ini: .hungerRate // Seconds between becoming hungrier Updated 'get command to allow retrieving a character's hungerRate property Added some details to console during UOX3 startup about which IPs and Ports UOX3 is listening to Added new JS event that triggers when a player clicks on the Quest button in the paperdoll. Triggers from character script if present, or global script if not: onQuestGump( pUser ) Added new JS event that triggers when player toggles a special move from a combat book. See packet 0xBF, subCmd 0x19 in packet guides for details on the special moves, whose IDs range from 0x00 to 0x1D: onSpecialMove( pUser, abilityID ) Fixed invalid ID for items [0x0174] and [0x0175] in dfndata/items/building/walls/stone_walls.dfn Updated FileSize() function in regions.cpp to fetch file size using std::filesystem::file_size() instead of creating an input stream, opening a file and then trying to seek the last position in the file Added findNearbyObjects() function to findfuncs.cpp, to find all objects (characters and items) of CBaseObject class near a specified location Improved performance when initializing multis on startup; now checks for items near multis, instead of checking for multis near every single item! Improved performance when loading items and characters from worldfiles during startup; around 33% faster for release builds, around ~50% faster when running in debug mode through visual studio (punt) Updated createSection() in ssection.cpp to use std::string and StringUtility functions instead of UString, and added some error handling (punt) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2021-04-23 02:13:17 +08:00
Console.TurnGreen();
2022-06-08 10:38:16 -04:00
Console << "Exiting UOX with no errors..." << myendl;
0.99.4h Exposed a (read-only) JS property for characters to fetch their hunger rate. Uses race's hunger rate if defined, otherwise uses HUNGERRATE form uox.ini: .hungerRate // Seconds between becoming hungrier Updated 'get command to allow retrieving a character's hungerRate property Added some details to console during UOX3 startup about which IPs and Ports UOX3 is listening to Added new JS event that triggers when a player clicks on the Quest button in the paperdoll. Triggers from character script if present, or global script if not: onQuestGump( pUser ) Added new JS event that triggers when player toggles a special move from a combat book. See packet 0xBF, subCmd 0x19 in packet guides for details on the special moves, whose IDs range from 0x00 to 0x1D: onSpecialMove( pUser, abilityID ) Fixed invalid ID for items [0x0174] and [0x0175] in dfndata/items/building/walls/stone_walls.dfn Updated FileSize() function in regions.cpp to fetch file size using std::filesystem::file_size() instead of creating an input stream, opening a file and then trying to seek the last position in the file Added findNearbyObjects() function to findfuncs.cpp, to find all objects (characters and items) of CBaseObject class near a specified location Improved performance when initializing multis on startup; now checks for items near multis, instead of checking for multis near every single item! Improved performance when loading items and characters from worldfiles during startup; around 33% faster for release builds, around ~50% faster when running in debug mode through visual studio (punt) Updated createSection() in ssection.cpp to use std::string and StringUtility functions instead of UString, and added some error handling (punt) Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2021-04-23 02:13:17 +08:00
Console.TurnNormal();
2022-06-08 10:38:16 -04:00
}
2022-06-08 10:38:16 -04:00
Console.PrintSectionBegin();
exit( retCode );
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - AdvanceObj()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Handle advancement objects (stat / skill gates)
//o------------------------------------------------------------------------------------------------o
auto AdvanceObj( CChar *applyTo, UI16 advObj, bool multiUse ) -> void
{
if(( applyTo->GetAdvObj() == 0 ) || multiUse )
{
2022-06-08 10:38:16 -04:00
Effects->PlayStaticAnimation( applyTo, 0x373A, 0, 15);
Effects->PlaySound( applyTo, 0x01E9 );
applyTo->SetAdvObj( advObj );
auto sect = "ADVANCEMENT "s + oldstrutil::number( advObj );
sect = oldstrutil::trim( oldstrutil::removeTrailing( sect, "//" ));
2022-06-08 21:44:58 -04:00
auto Advancement = FileLookup->FindEntry( sect, advance_def );
if( Advancement == nullptr )
{
2022-06-08 10:38:16 -04:00
Console << "ADVANCEMENT OBJECT: Script section not found, Aborting" << myendl;
applyTo->SetAdvObj( 0 );
return;
}
CItem *retItem = nullptr;
auto hairobject = applyTo->GetItemAtLayer( IL_HAIR );
2022-06-08 10:38:16 -04:00
auto beardobject = applyTo->GetItemAtLayer( IL_FACIALHAIR );
DFNTAGS tag = DFNTAG_COUNTOFTAGS;
std::string cdata;
SI32 ndata = -1, odata = -1;
UI08 skillToSet = 0;
for( const auto &sec : Advancement->collection2() )
{
2022-06-08 21:44:58 -04:00
tag = sec->tag;
cdata = sec->cdata;
ndata = sec->ndata;
odata = sec->odata;
2022-06-08 21:44:58 -04:00
switch( tag )
{
2022-06-08 10:38:16 -04:00
case DFNTAG_ALCHEMY: skillToSet = ALCHEMY; break;
case DFNTAG_ANATOMY: skillToSet = ANATOMY; break;
case DFNTAG_ANIMALLORE: skillToSet = ANIMALLORE; break;
case DFNTAG_ARMSLORE: skillToSet = ARMSLORE; break;
case DFNTAG_ARCHERY: skillToSet = ARCHERY; break;
case DFNTAG_ADVOBJ: applyTo->SetAdvObj( static_cast<UI16>( ndata )); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_BEGGING: skillToSet = BEGGING; break;
case DFNTAG_BLACKSMITHING: skillToSet = BLACKSMITHING; break;
case DFNTAG_BOWCRAFT: skillToSet = BOWCRAFT; break;
case DFNTAG_BUSHIDO: skillToSet = BUSHIDO; break;
case DFNTAG_CAMPING: skillToSet = CAMPING; break;
case DFNTAG_CARPENTRY: skillToSet = CARPENTRY; break;
case DFNTAG_CARTOGRAPHY: skillToSet = CARTOGRAPHY; break;
case DFNTAG_CHIVALRY: skillToSet = CHIVALRY; break;
case DFNTAG_COOKING: skillToSet = COOKING; break;
case DFNTAG_DEX: applyTo->SetDexterity( static_cast<SI16>( RandomNum( ndata, odata ))); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_DETECTINGHIDDEN: skillToSet = DETECTINGHIDDEN; break;
case DFNTAG_DYEHAIR:
if( ValidateObject( hairobject ))
{
hairobject->SetColour( static_cast<UI16>( ndata ));
}
2022-06-08 10:38:16 -04:00
break;
case DFNTAG_DYEBEARD:
if( ValidateObject( beardobject ))
{
beardobject->SetColour( static_cast<UI16>( ndata ));
}
2022-06-08 10:38:16 -04:00
break;
case DFNTAG_ENTICEMENT: skillToSet = ENTICEMENT; break;
case DFNTAG_EVALUATINGINTEL: skillToSet = EVALUATINGINTEL; break;
case DFNTAG_EQUIPITEM:
retItem = Items->CreateBaseScriptItem( nullptr, cdata, applyTo->WorldNumber(), 1 );
if( retItem )
{
if( !retItem->SetCont( applyTo ))
{
2022-06-08 10:38:16 -04:00
retItem->SetCont( applyTo->GetPackItem() );
retItem->PlaceInPack();
}
}
break;
case DFNTAG_FAME: applyTo->SetFame( static_cast<SI16>( ndata )); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_FENCING: skillToSet = FENCING; break;
case DFNTAG_FISHING: skillToSet = FISHING; break;
case DFNTAG_FOCUS: skillToSet = FOCUS; break;
case DFNTAG_FORENSICS: skillToSet = FORENSICS; break;
case DFNTAG_HEALING: skillToSet = HEALING; break;
case DFNTAG_HERDING: skillToSet = HERDING; break;
case DFNTAG_HIDING: skillToSet = HIDING; break;
case DFNTAG_IMBUING: skillToSet = IMBUING; break;
case DFNTAG_INTELLIGENCE: applyTo->SetIntelligence( static_cast<SI16>( RandomNum( ndata, odata ))); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_ITEMID: skillToSet = ITEMID; break;
case DFNTAG_INSCRIPTION: skillToSet = INSCRIPTION; break;
case DFNTAG_KARMA: applyTo->SetKarma( static_cast<SI16>( ndata )); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_KILLHAIR:
retItem = applyTo->GetItemAtLayer( IL_HAIR );
if( ValidateObject( retItem ))
{
2022-06-08 10:38:16 -04:00
retItem->Delete();
}
break;
case DFNTAG_KILLBEARD:
retItem = applyTo->GetItemAtLayer( IL_FACIALHAIR );
if( ValidateObject( retItem ))
{
2022-06-08 10:38:16 -04:00
retItem->Delete();
}
break;
case DFNTAG_KILLPACK:
retItem = applyTo->GetItemAtLayer( IL_PACKITEM );
if( ValidateObject( retItem ))
{
2022-06-08 10:38:16 -04:00
retItem->Delete();
}
break;
case DFNTAG_LOCKPICKING: skillToSet = LOCKPICKING; break;
case DFNTAG_LUMBERJACKING: skillToSet = LUMBERJACKING; break;
case DFNTAG_MAGERY: skillToSet = MAGERY; break;
case DFNTAG_MAGICRESISTANCE: skillToSet = MAGICRESISTANCE; break;
case DFNTAG_MACEFIGHTING: skillToSet = MACEFIGHTING; break;
case DFNTAG_MEDITATION: skillToSet = MEDITATION; break;
case DFNTAG_MINING: skillToSet = MINING; break;
case DFNTAG_MUSICIANSHIP: skillToSet = MUSICIANSHIP; break;
case DFNTAG_MYSTICISM: skillToSet = MYSTICISM; break;
case DFNTAG_NECROMANCY: skillToSet = NECROMANCY; break;
case DFNTAG_NINJITSU: skillToSet = NINJITSU; break;
case DFNTAG_PARRYING: skillToSet = PARRYING; break;
case DFNTAG_PEACEMAKING: skillToSet = PEACEMAKING; break;
case DFNTAG_POISONING: skillToSet = POISONING; break;
case DFNTAG_PROVOCATION: skillToSet = PROVOCATION; break;
case DFNTAG_POLY: applyTo->SetId( static_cast<UI16>( ndata )); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_PACKITEM:
if( ValidateObject( applyTo->GetPackItem() ))
{
2022-06-08 10:38:16 -04:00
auto csecs = oldstrutil::sections( cdata, "," );
if( !cdata.empty() )
{
if( csecs.size() > 1 )
{
2022-10-24 23:42:16 +08:00
retItem = Items->CreateScriptItem( nullptr, applyTo, oldstrutil::trim( oldstrutil::removeTrailing( csecs[0],"//") ), oldstrutil::value<UI16>( oldstrutil::trim( oldstrutil::removeTrailing( csecs[1], "//" ))), OT_ITEM, true );
2022-06-08 10:38:16 -04:00
}
else
{
2022-06-08 10:38:16 -04:00
retItem = Items->CreateScriptItem( nullptr, applyTo, cdata, 1, OT_ITEM, true );
}
}
}
else
{
2022-06-08 10:38:16 -04:00
Console << "Warning: Bad NPC Script with problem no backpack for packitem" << myendl;
}
break;
case DFNTAG_REMOVETRAP: skillToSet = REMOVETRAP; break;
case DFNTAG_STRENGTH: applyTo->SetStrength( static_cast<SI16>( RandomNum( ndata, odata ))); break;
case DFNTAG_SKILL: applyTo->SetBaseSkill( static_cast<UI16>( odata ), static_cast<UI08>( ndata )); break;
case DFNTAG_SKIN: applyTo->SetSkin( static_cast<UI16>( std::stoul( cdata, nullptr, 0 ))); break;
2022-06-08 10:38:16 -04:00
case DFNTAG_SNOOPING: skillToSet = SNOOPING; break;
case DFNTAG_SPELLWEAVING: skillToSet = SPELLWEAVING; break;
case DFNTAG_SPIRITSPEAK: skillToSet = SPIRITSPEAK; break;
case DFNTAG_STEALING: skillToSet = STEALING; break;
case DFNTAG_STEALTH: skillToSet = STEALTH; break;
case DFNTAG_SWORDSMANSHIP: skillToSet = SWORDSMANSHIP; break;
case DFNTAG_TACTICS: skillToSet = TACTICS; break;
case DFNTAG_TAILORING: skillToSet = TAILORING; break;
case DFNTAG_TAMING: skillToSet = TAMING; break;
case DFNTAG_TASTEID: skillToSet = TASTEID; break;
case DFNTAG_THROWING: skillToSet = THROWING; break;
case DFNTAG_TINKERING: skillToSet = TINKERING; break;
case DFNTAG_TRACKING: skillToSet = TRACKING; break;
case DFNTAG_VETERINARY: skillToSet = VETERINARY; break;
case DFNTAG_WRESTLING: skillToSet = WRESTLING; break;
default: Console << "Unknown tag in AdvanceObj(): " << static_cast<SI32>( tag ) << myendl; break;
2022-06-08 10:38:16 -04:00
}
if( skillToSet > 0 )
{
applyTo->SetBaseSkill( static_cast<UI16>( RandomNum( ndata, odata )), skillToSet );
2022-06-08 10:38:16 -04:00
skillToSet = 0; // reset for next time through
}
}
applyTo->Teleport();
}
else
{
2022-06-08 10:38:16 -04:00
auto sock = applyTo->GetSocket();
if( sock )
{
sock->SysMessage( 1366 ); // You have already used an advancement object with this character.
}
2022-06-08 10:38:16 -04:00
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetClock()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Return CPU time used, Emulates clock()
//o------------------------------------------------------------------------------------------------o
auto GetClock() -> TIMERVAL
{
2022-06-08 10:38:16 -04:00
auto now = std::chrono::system_clock::now();
return static_cast<TIMERVAL>( std::chrono::duration_cast<std::chrono::milliseconds>( now - current ).count() );
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - IsNumber()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Returns true if string is a number, false if not
//o------------------------------------------------------------------------------------------------o
auto IsNumber( const std::string& str ) -> bool
{
2022-06-08 10:38:16 -04:00
return str.find_first_not_of( "0123456789" ) == std::string::npos;
}
//o------------------------------------------------------------------------------------------------o
//| Function - DoLight()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Sets light level for player and applies relevant effects
//o------------------------------------------------------------------------------------------------o
auto DoLight( CSocket *s, UI08 level ) -> void
{
if( s == nullptr )
return;
auto mChar = s->CurrcharObj();
CPLightLevel toSend( level );
if(( Races->Affect( mChar->GetRace(), LIGHT )) && mChar->GetWeathDamage( LIGHT ) == 0 )
{
mChar->SetWeathDamage( BuildTimeValue( static_cast<R64>( Races->Secs( mChar->GetRace(), LIGHT ))), LIGHT );
}
if( mChar->GetFixedLight() != 255 )
{
toSend.Level( mChar->GetFixedLight() );
s->Send( &toSend );
Weather->DoPlayerStuff( s, mChar );
return;
}
auto curRegion = mChar->GetRegion();
auto wSys = Weather->Weather( curRegion->GetWeather() );
auto toShow = cwmWorldState->ServerData()->WorldLightCurrentLevel();
auto dunLevel = cwmWorldState->ServerData()->DungeonLightLevel();
// we have a valid weather system
if( wSys )
{
const R32 lightMin = wSys->LightMin();
const R32 lightMax = wSys->LightMax();
if( lightMin < 300 && lightMax < 300 )
{
R32 i = wSys->CurrentLight();
if( Races->VisLevel( mChar->GetRace() ) > i )
{
toShow = 0;
2022-06-08 10:38:16 -04:00
}
else
{
0.99.6-RC6x Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility) Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js) Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled Fixed a couple of DFN formatting issues (thanks, punt) Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn) Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn) Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt) Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly Added region spawners for dungeons, towns and overworld in Ilshenar facet Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js) Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js) Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp Added new NPC to dfndata/npc/undead.dfn: ancientlich Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp]) Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js) Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors) Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn) Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn) Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn) Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn) Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn) Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn) Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js) Added two new repeating commands (js/commands/custom/repeatingcmds.js): 'rmovable # // Repeats bringing up targeting cursor to set movable property on multiple objects 'rnodecay // Repeats bringing up targeting cursor to set decayable property to false on multiple objects Added new areacommand (js/commands/targeting/areacommand.js): 'areacommand name [string] // Sets name of all objects within targeted area to [string] Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js) Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp) Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js) Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*) Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*) Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn) Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js) Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax: PACKITEM=sectionID[, amount[, newbieFlag]] // To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1 EQUIPITEM=sectionID[, itemHue[, newbieFlag] // To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1 Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage Address overflow issue in MultiMul.cpp (punt) Address various cast issues (punt) Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt) Replaced RoundNumber with std::round (punt) The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
2023-10-14 05:03:53 +08:00
toShow = static_cast<LIGHTLEVEL>( std::round( i - Races->VisLevel( mChar->GetRace() )));
2022-06-08 10:38:16 -04:00
}
toSend.Level( toShow );
2022-06-08 10:38:16 -04:00
}
else
{
toSend.Level( level );
}
}
else
{
if( mChar->InDungeon() )
{
if( Races->VisLevel( mChar->GetRace() ) > dunLevel )
{
toShow = 0;
2022-06-08 10:38:16 -04:00
}
else
{
0.99.6-RC6x Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility) Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js) Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled Fixed a couple of DFN formatting issues (thanks, punt) Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn) Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn) Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt) Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly Added region spawners for dungeons, towns and overworld in Ilshenar facet Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js) Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js) Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp Added new NPC to dfndata/npc/undead.dfn: ancientlich Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp]) Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js) Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors) Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn) Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn) Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn) Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn) Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn) Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn) Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js) Added two new repeating commands (js/commands/custom/repeatingcmds.js): 'rmovable # // Repeats bringing up targeting cursor to set movable property on multiple objects 'rnodecay // Repeats bringing up targeting cursor to set decayable property to false on multiple objects Added new areacommand (js/commands/targeting/areacommand.js): 'areacommand name [string] // Sets name of all objects within targeted area to [string] Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js) Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp) Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js) Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*) Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*) Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn) Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js) Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax: PACKITEM=sectionID[, amount[, newbieFlag]] // To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1 EQUIPITEM=sectionID[, itemHue[, newbieFlag] // To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1 Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage Address overflow issue in MultiMul.cpp (punt) Address various cast issues (punt) Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt) Replaced RoundNumber with std::round (punt) The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
2023-10-14 05:03:53 +08:00
toShow = static_cast<LIGHTLEVEL>( std::round( dunLevel - Races->VisLevel( mChar->GetRace() )));
}
toSend.Level( toShow );
2022-06-08 10:38:16 -04:00
}
}
s->Send( &toSend );
auto eventFound = false;
auto scriptTriggers = mChar->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnLightChange( mChar, toShow ) == 1 )
{
// A script with the event returned true; prevent other scripts from running
eventFound = true;
break;
2022-06-08 10:38:16 -04:00
}
}
}
if( !eventFound )
{
// Check global script! Maybe there's another event there
auto toExecute = JSMapping->GetScript( static_cast<UI16>( 0 ));
if( toExecute )
{
toExecute->OnLightChange( mChar, toShow );
2022-06-08 10:38:16 -04:00
}
}
Weather->DoPlayerStuff( s, mChar );
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - DoLight()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Sets light level for character and applies relevant effects
//o------------------------------------------------------------------------------------------------o
auto DoLight( CChar *mChar, UI08 level ) -> void
{
if(( Races->Affect( mChar->GetRace(), LIGHT )) && ( mChar->GetWeathDamage( LIGHT ) == 0 ))
{
mChar->SetWeathDamage( BuildTimeValue( static_cast<R64>( Races->Secs( mChar->GetRace(), LIGHT ))), LIGHT );
2022-06-08 10:38:16 -04:00
}
auto curRegion = mChar->GetRegion();
auto wSys = Weather->Weather( curRegion->GetWeather() );
2022-06-08 10:38:16 -04:00
LIGHTLEVEL toShow = level;
LIGHTLEVEL dunLevel = cwmWorldState->ServerData()->DungeonLightLevel();
2022-06-08 10:38:16 -04:00
// we have a valid weather system
if( wSys )
{
2022-06-08 10:38:16 -04:00
const R32 lightMin = wSys->LightMin();
const R32 lightMax = wSys->LightMax();
if( lightMin < 300 && lightMax < 300 )
{
2022-06-08 10:38:16 -04:00
R32 i = wSys->CurrentLight();
if( Races->VisLevel( mChar->GetRace() ) > i )
{
2022-06-08 10:38:16 -04:00
toShow = 0;
}
else
{
0.99.6-RC6x Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility) Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js) Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled Fixed a couple of DFN formatting issues (thanks, punt) Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn) Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn) Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt) Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly Added region spawners for dungeons, towns and overworld in Ilshenar facet Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js) Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js) Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp Added new NPC to dfndata/npc/undead.dfn: ancientlich Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp]) Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js) Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors) Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn) Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn) Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn) Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn) Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn) Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn) Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js) Added two new repeating commands (js/commands/custom/repeatingcmds.js): 'rmovable # // Repeats bringing up targeting cursor to set movable property on multiple objects 'rnodecay // Repeats bringing up targeting cursor to set decayable property to false on multiple objects Added new areacommand (js/commands/targeting/areacommand.js): 'areacommand name [string] // Sets name of all objects within targeted area to [string] Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js) Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp) Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js) Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*) Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*) Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn) Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js) Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax: PACKITEM=sectionID[, amount[, newbieFlag]] // To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1 EQUIPITEM=sectionID[, itemHue[, newbieFlag] // To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1 Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage Address overflow issue in MultiMul.cpp (punt) Address various cast issues (punt) Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt) Replaced RoundNumber with std::round (punt) The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
2023-10-14 05:03:53 +08:00
toShow = static_cast<LIGHTLEVEL>( std::round( i - Races->VisLevel( mChar->GetRace() )));
2022-06-08 10:38:16 -04:00
}
}
}
else
{
if( mChar->InDungeon() )
{
if( Races->VisLevel( mChar->GetRace() ) > dunLevel )
{
2022-06-08 10:38:16 -04:00
toShow = 0;
}
else
{
0.99.6-RC6x Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility) Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js) Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled Fixed a couple of DFN formatting issues (thanks, punt) Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn) Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn) Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt) Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly Added region spawners for dungeons, towns and overworld in Ilshenar facet Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js) Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js) Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp Added new NPC to dfndata/npc/undead.dfn: ancientlich Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp]) Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js) Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors) Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn) Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn) Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn) Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn) Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn) Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn) Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js) Added two new repeating commands (js/commands/custom/repeatingcmds.js): 'rmovable # // Repeats bringing up targeting cursor to set movable property on multiple objects 'rnodecay // Repeats bringing up targeting cursor to set decayable property to false on multiple objects Added new areacommand (js/commands/targeting/areacommand.js): 'areacommand name [string] // Sets name of all objects within targeted area to [string] Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js) Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp) Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js) Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*) Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*) Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn) Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js) Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax: PACKITEM=sectionID[, amount[, newbieFlag]] // To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1 EQUIPITEM=sectionID[, itemHue[, newbieFlag] // To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1 Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage Address overflow issue in MultiMul.cpp (punt) Address various cast issues (punt) Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt) Replaced RoundNumber with std::round (punt) The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
2023-10-14 05:03:53 +08:00
toShow = static_cast<LIGHTLEVEL>( std::round( dunLevel - Races->VisLevel( mChar->GetRace() )));
2022-06-08 10:38:16 -04:00
}
}
}
2022-06-08 10:38:16 -04:00
bool eventFound = false;
auto scriptTriggers = mChar->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnLightChange( mChar, toShow ) == 1 )
{
2022-06-08 10:38:16 -04:00
// A script with the event returned true; prevent other scripts from running
eventFound = true;
break;
}
}
}
if( !eventFound )
{
2022-06-08 10:38:16 -04:00
// Check global script! Maybe there's another event there
auto toExecute = JSMapping->GetScript( static_cast<UI16>( 0 ));
if( toExecute )
{
2022-06-08 10:38:16 -04:00
toExecute->OnLightChange( mChar, toShow );
}
}
2022-06-08 10:38:16 -04:00
Weather->DoNPCStuff( mChar );
}
//o------------------------------------------------------------------------------------------------o
//| Function - DoLight()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Sets light level for items and applies relevant effects
//o------------------------------------------------------------------------------------------------o
auto DoLight( CItem *mItem, UI08 level ) -> void
{
auto curRegion = mItem->GetRegion();
auto wSys = Weather->Weather( curRegion->GetWeather() );
2022-06-08 10:38:16 -04:00
LIGHTLEVEL toShow = level;
LIGHTLEVEL dunLevel = cwmWorldState->ServerData()->DungeonLightLevel();
2022-06-08 10:38:16 -04:00
// we have a valid weather system
if( wSys )
{
2022-06-08 10:38:16 -04:00
const R32 lightMin = wSys->LightMin();
const R32 lightMax = wSys->LightMax();
if(( lightMin < 300 ) && ( lightMax < 300 ))
{
toShow = static_cast<LIGHTLEVEL>( wSys->CurrentLight() );
2022-06-08 10:38:16 -04:00
}
}
else
{
if( mItem->InDungeon() )
{
2022-06-08 10:38:16 -04:00
toShow = dunLevel;
}
}
2022-06-08 10:38:16 -04:00
auto eventFound = false;
auto scriptTriggers = mItem->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnLightChange( mItem, toShow ) == 1 )
{
2022-06-08 10:38:16 -04:00
// A script with the event returned true; prevent other scripts from running
eventFound = true;
break;
}
}
}
if( !eventFound )
{
2022-06-08 10:38:16 -04:00
// Check global script! Maybe there's another event there
auto toExecute = JSMapping->GetScript( static_cast<UI16>( 0 ));
if( toExecute )
{
2022-06-08 10:38:16 -04:00
toExecute->OnLightChange( mItem, toShow );
}
}
2022-06-08 10:38:16 -04:00
Weather->DoItemStuff( mItem );
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetPoisonDuration()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Calculates the duration of poison based on its strength
//o------------------------------------------------------------------------------------------------o
auto GetPoisonDuration( UI08 poisonStrength ) ->TIMERVAL
{
2022-06-08 10:38:16 -04:00
// Calculate duration of poison, based on the strength of the poison
auto poisonDuration = TIMERVAL( 0 );
switch( poisonStrength )
{
2022-06-08 10:38:16 -04:00
case 1: // Lesser poison - 9 to 13 pulses, 2 second frequency
poisonDuration = RandomNum( 9, 13 ) * 2;
break;
case 2: // Normal poison - 10 to 14 pulses, 3 second frequency
poisonDuration = RandomNum( 10, 14 ) * 3;
break;
case 3: // Greater poison - 11 to 15 pulses, 4 second frequency
poisonDuration = RandomNum( 11, 15 ) * 4;
break;
case 4: // Deadly poison - 12 to 16 pulses, 5 second frequency
poisonDuration = RandomNum( 12, 16 ) * 5;
break;
case 5: // Lethal poison - 13 to 17 pulses, 5 second frequency
poisonDuration = RandomNum( 13, 17 ) * 5;
break;
default:
poisonDuration = 10; // Fallback
break;
2022-06-08 10:38:16 -04:00
}
return poisonDuration;
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetPoisonTickTime()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Calculates the time between each tick of a poison, based on its strength
//o------------------------------------------------------------------------------------------------o
auto GetPoisonTickTime( UI08 poisonStrength )->TIMERVAL
{
2022-06-08 10:38:16 -04:00
// Calculate duration of poison, based on the strength of the poison
auto poisonTickTime = TIMERVAL( 0 );
switch( poisonStrength )
{
2022-06-08 10:38:16 -04:00
case 1: // Lesser poison - 2 second frequency
poisonTickTime = 2;
break;
case 2: // Normal poison - 3 second frequency
poisonTickTime = 3;
break;
case 3: // Greater poison - 4 second frequency
poisonTickTime = 4;
break;
case 4: // Deadly poison - 5 second frequency
poisonTickTime = 5;
break;
case 5: // Lethal poison - 5 second frequency
poisonTickTime = 5;
break;
}
return poisonTickTime;
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetTileName()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Returns the length of an items name from tiledata.mul and
//| sets itemname to the name.
//| The format it accepts is same as UO style - %plural/single% or %plural%
//| arrow%s%
//| loa%ves/f% of bread
//o------------------------------------------------------------------------------------------------o
auto GetTileName( CItem& mItem, std::string& itemname ) -> size_t
{
std::string temp = mItem.GetName();
temp = oldstrutil::trim( oldstrutil::removeTrailing( temp, "//" ));
2022-06-08 10:38:16 -04:00
const UI16 getAmount = mItem.GetAmount();
CTile& tile = Map->SeekTile( mItem.GetId() );
if( temp.substr( 0, 1 ) == "#" )
{
2022-06-08 10:38:16 -04:00
temp = tile.Name();
}
if( getAmount == 1 )
{
if( tile.CheckFlag( TF_DISPLAYAN ))
{
2022-06-08 10:38:16 -04:00
temp = "an " + temp;
}
else if( tile.CheckFlag( TF_DISPLAYA ))
{
2022-06-08 10:38:16 -04:00
temp = "a " + temp;
}
}
2022-06-08 10:38:16 -04:00
auto psecs = oldstrutil::sections( temp, "%" );
// Find out if the name has a % in it
if( psecs.size() > 2 )
{
2022-06-08 10:38:16 -04:00
std::string single;
const std::string first = psecs[0];
std::string plural = psecs[1];
const std::string rest = psecs[2];
auto fssecs = oldstrutil::sections( plural, "/" );
if( fssecs.size() > 1 )
{
2022-06-08 10:38:16 -04:00
single = fssecs[1];
plural = fssecs[0];
}
if( getAmount < 2 )
{
2022-06-08 10:38:16 -04:00
temp = first + single + rest;
}
else
{
2022-06-08 10:38:16 -04:00
temp = first + plural + rest;
}
}
itemname = oldstrutil::simplify( temp );
return itemname.size() + 1;
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetNpcDictName()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Returns the dictionary name for a given NPC, if their name equals # or a dictionary ID
//o------------------------------------------------------------------------------------------------o
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
auto GetNpcDictName( CChar *mChar, CSocket *tSock, UI08 requestSource ) -> std::string
{
2022-06-08 10:38:16 -04:00
CChar *tChar = nullptr;
if( tSock )
{
2022-06-08 10:38:16 -04:00
tChar = tSock->CurrcharObj();
}
UOX3 0.99.6-RC6 Removed arbitrary and hidden restrictions on refreshing list of online players shown with 'wholist command Fixed an issue where player ghosts that get teleported would not see themselves get updated to new location Fixed a server crash from clients disconnecting while running server in debug mode Improved how container updates are sent to players; now only sends to clients that have actually opened the container, and who are still within range Added more information about UO data files being loaded during server startup Enhanced the GM 'add menu to allow clicking directly on images of items/npcs to add them, and adjusted size of menus to accommodate this Fixed an issue with fleeing NPCs that could cause them to attempt to flee across time and space, regardless of distance to target/attacker in combat Added NPC AI that runs away from players if they get too close (even outside combat). Applied to hind, rabbits, squirrels, ferrets and various birds by default: AI_ANIMAL_SCARED (aitype 12) Fixed issues with NPCs fleeing forever, or getting stuck in flee/don't flee loop, by introducing max fleeing distance (50 tiles) and cooldown (30 sec) on fleeing Updated onNameRequest JS Event to include third parameter with origin of name request, so script responses can be tailored appropriately: onNameRequest( myObj, requestedBy, requestSource ) Potential values for requestSource: 0 - Speech/System Messages 1 - Guild Menus 2 - Stat Window (self) 3 - Stat Window (other) 4 - Tooltip 5 - Paperdoll Journal 6 - Paperdoll 7 - Single Click / All-Names 8 - System 9 - Secure Trade Window Added Adaptive Performance System (APS) that dynamically adjust how often NPC AI/movement is checked based on overall shard performance. If performance drops below defined threshold, UOX3 gradually slows down checks for NPC AI/movement to prioritize player movement/speech/command responsiveness. If performance climbs back up above threshold, slowdowns are gradually removed. The following UOX.INI options have been added under [system] category to support this system: APSPERFTHRESHOLD=50 // Performance threshold (measured in simulation cycles/sec) below which the APS kicks in APSINTERVAL=100 // How often (in milliseconds) the APS checks performance and makes adjustments (if needed) to balance out shard performance APSDELAYSTEP=50 // How much the delay timer is modified by (in milliseconds) each time APS makes adjustments APSDELAYMAXCAP=2000 // Max amount of of delay APS can introduce for NPC AI/movement handling when attempting to restore shard performance Added new JS Methods for Region objects: .GetOrePrefs( oreType ) // Get ore preference data for ore type found in town region. Returned as an array containing the following data: orePrefData -> [ oreName, // name of ore color, // color of ore minskill, // min skill to mine ore ingotName, // name of ingot created from ore makemenu, // makemenu entry for crafting something from ingot oreChance, // default global chance of finding this ore type scriptID // script attached to mined ore ], orePrefChance // Chance of finding this ore type in given town region .GetOreChance() // Get base chance of finding any ore in town region Moved Mining skill plus gravedigging feature from hard code to scripts (js/skill/mining.js) to make it easier to maintain and/or customize, and removed hard coded variants Gravedigging now relies on the ore resource system behind the scenes to restrict how often graves in a given area can be dug up Fixed some incorrect references to .worldNumber Character property in misc scripts (should be .worldnumber) Made some "hard-scripted" system messages in misc scripts use dictionary system instead Added spawn region for banker NPCs in Serpent's Hold (dfndata/spawn/felucca/spawn_town_serpents_hold.dfn, dfndata/spawn/trammel/spawn_town_serpents_hold.dfn) Fixed region definition of Ocllo to actually cover the entire town (dfndata/regions/regions.dfn) Added numerous additional locations accessible with 'goplace # command, for key locations in Ilshenar, Malas, Tokuno Islands and Ter Mur (dfndata/location/location.dfn) Revised travel-menu portion of GM menu (shortcut: 'travel) to include more travel options based on new locations (dfndata/items/travelmenu.dfn and travelmenu.bulk.dfn) Fixed an issue where NPCs could attempt to attack targets in other worlds/instances Added new JS Event that triggers for characters who are about to deal damage in combat. Complimentary to onDamage, which triggers for chars receiving damage: onDamageDeal( dmgDealer, dmgReceiver, damageValue, damageType ) Added new JS Event that can trigger in global script upon creation of new player chars. Note that this will trigger in place of onCreateDFN event for player characters: onCreatePlayer( pChar ) Added new JS Event that triggers for characters selecting a target with a spell. Complimentary to onSpellTarget, which triggers for targets selected with a spell: onSpellTargetSelect( caster, target, spellNum ) Updated onCombatStart and onCombatEnd JS Events to also trigger for the other party in combat Updated onPickup JS Event to include a third parameter - the potential container item was picked up from. Event now also triggers event in scripts attached to said containers: onPickup( iPickedUp, pChar, iCont ) Added tracking of total playtime per individual character, and per account across all characters, and exposed these properties to JS engine: .totalPlayTime // Account property, total playtime across all chars .playTime // Character property, total playtime on given character only Added new player-accessible command ('playtime) to spit out the playtime of current character/account as a whole (js/commands/playtime.js) Implemented first version of Young Player System: Replaced the UNUSED9 account flag with YOUNG, to be used by Young/New Player System Added new JS Account property that gets/sets whether player account is considered Young: .isYoung Added new Char timers: TIMER_YOUNGHEAL // Restricts how often Young players are healed by NPC healers TIMER_YOUNGMESSAGE // Restricts how often Young players are warned about dangerous looking monsters in overworld Updated GM commands 'get and 'set to get/set .isYoung property of player's account (js/commands/targeting/get.js and set.js) Added new UOX.INI setting to enable/disable Young Player System (enabled by default): YOUNGPLAYERSYSTEM=1 If Young Player System is enabled, all newly created player accounts are automatically marked with Young flag Added new script to handle various restrictions and functions related to Young characters (js/player/young_player.js): Young characters will have [Young] displayed over their head Young characters will have their Young status checked and verified on every login + every stat/skill gain, to revoke the Young status if any of the following is true: Account has a total playtime of more than 40 hours Any character has more than 350 total (base) skill points Any character has more than 70 skill points in a single skill Any character has more than 150 total stat points Any character has more than 80 stat points in a single stat Young characters can renounce their Young status manually by saying the words "I renounce my young player status" Young characters get two additional items upon creation: a new player ticket (can be combined with any other players new player ticket for both players to get a reward) a sextant (shows Young players directions to nearest moongate/bank regardless of where they are, as long as outdoors) Young characters cannot target other player characters with hostile spells or skills Young characters cannot be the target of other player characters' hostile spells or skills Young characters can only cast beneficial spells upon themselves or other Young characters Young characters can only be the target of beneficial spells from other Young players Young players (and their pets/followers) cannot attack or harm any other players (or their pets/followers), nor themselves be attacked or harmed by any other players (or their pets/followers), whether from combat, spells, skills or items Young players don't lose any of their items on death, and are teleported to the nearest healer upon death with all their items intact Young players receive a warning upon entering dungeons that monsters there will be hostile Updated global script (js/server/global.js) to: Check/Verify Young status of players upon login Attach young player script on login/creation for players on Young accounts Give specific items to Young players upon creation Added new script (js/item/corpse.js) that is assigned to all freshly created corpses. This script handles restrictions related to Young players interactions with corpses, and the interactions of other players with corpses of Young players Updated JS Method .Carve() to return true/false depending on whether carving a corpse was successful Updated Healer AI in code to heal nearby injured Young players Updated Evil AI and Evil Caster AI in code to avoid selecting Young players as targets in combat outside of dungeons Added a new section to UOX.INI - [young player starting locations] - that can be used to define starting locations for Young players. If only one such location is provided, all players start there. Otherwise, it matches the same starting location setup as the regular one - with one entry per town in Britannia. Restricted transferring and/or friending of pets (code) and hirelings (hirelings.js) between Young and non-Young players Restricted Young players from recalling or gating to Felucca facet Young players can instantly logout from anywhere, at any time
2023-07-01 20:02:40 +08:00
std::string dictName = mChar->GetNameRequest( tChar, requestSource );
SI32 dictEntryId = 0;
if( dictName == "#" )
{
2022-06-08 10:38:16 -04:00
// If character name is #, get dictionary entry based on base dictionary entry for creature names (3000) plus character's ID
dictEntryId = static_cast<SI32>( 3000 + mChar->GetId() );
if( tSock )
{
dictName = Dictionary->GetEntry( dictEntryId, tSock->Language() );
2022-06-08 10:38:16 -04:00
}
else
{
dictName = Dictionary->GetEntry( dictEntryId );
2022-06-08 10:38:16 -04:00
}
}
else if( IsNumber( dictName ))
{
2022-06-08 10:38:16 -04:00
// If name is a number, assume it's a direct dictionary entry reference, and use that
dictEntryId = static_cast<SI32>( oldstrutil::value<SI32>( dictName ));
if( tSock )
{
dictName = Dictionary->GetEntry( dictEntryId, tSock->Language() );
2022-06-08 10:38:16 -04:00
}
else
{
dictName = Dictionary->GetEntry( dictEntryId );
2022-06-08 10:38:16 -04:00
}
}
2022-06-08 10:38:16 -04:00
return dictName;
}
//o------------------------------------------------------------------------------------------------o
//| Function - GetNpcDictTitle()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Returns the dictionary string for the title of a given NPC, if their title
//| equals a dictionary ID
//o------------------------------------------------------------------------------------------------o
auto GetNpcDictTitle( CChar *mChar, CSocket *tSock ) -> std::string
{
2022-06-08 10:38:16 -04:00
std::string dictTitle = mChar->GetTitle();
SI32 dictEntryId = 0;
if( !dictTitle.empty() && IsNumber( dictTitle ))
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
{
2022-06-08 10:38:16 -04:00
// If title is a number, assume it's a direct dictionary entry reference, and use that
dictEntryId = static_cast<SI32>( oldstrutil::value<SI32>( dictTitle ));
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
if( tSock )
{
dictTitle = Dictionary->GetEntry( dictEntryId, tSock->Language() );
2022-06-08 10:38:16 -04:00
}
UOX3 0.99.5b-6 Increased world load speed by almost 20% by reducing how often loading progress is written to the console Increased world save speed by almost 50% through the use of binary mode and buffer tweaks for ofstream combined with a cached newline char and std::to_string instead of static_cast Fixed a server crash involving killing NPCs of a specific spawn region using the 'spawnkill # command Fixed a server crash involving moving items from decaying corpses to the ground Fixed a server crash involving carving up human corpses Fixed a server crash related to AreaCharacterFunction JS function, which could trigger for any script that potentially kills any NPC this function iterates over (like explosion potions) Fixed a server crash related to GMs attempting to add items from add-menu while having no backpack Fixed a client crash issue caused by attempting to sell house deeds back to architect NPCs Fixed an issue where players would get incorrect amounts of gold for selling house deeds back to architect NPCs Fixed an issue with characters dying onboard boats which prevented players from packing up the boats later Added new item property in code (via bools bitset) that can be used to enable/disable maker's mark on crafted items. This property can be set to true for items crafted at exceptional quality by GM craftsmen Exposed the new item property to JS engine: .isMarkedByMaker // If true, maker's mark will be displayed Updated default item tooltip to display " of exceptional quality" for items crafted with exceptional quality Updated default item tooltip to display "[Crafted] by [Crafter's Name]" for exceptional quality items crafted by GM craftsmen. The [Crafted] text comes from the MADEWORD defined in dfndata/skills/skills.dfn for the primary skill used to craft the item Updated old-school single-click names for items (when AoS bit is disabled in client/server features) to display exceptional status and/or maker's mark for appropriate items Fixed an issue with the display of titles for NPCs that used dictionary lookups for their title Added new UOX.INI settings under the [settings] section: DISPLAYMAKERSMARK=1/0 // Controls if maker's marks on crafted items are shown on a global level SHOWNPCTITLESOVERHEAD=1/0 // Controls whether NPC titles are shown over their heads SHOWINVULNERABLETAGOVERHEAD=0/1 // Controls whether invulnerable tags are shown overhead GLOBALRESTOCKMULTIPLIER=1.0 // Global multiplier applied to RESTOCK property of items when loaded from DFNs Added new UOX.INI settings under the [combat] section: PETCOMBATTRAINING=1/0 // Controls whether pets can gain skills/stats from combat HIRELINGCOMBATTRAINING=1/0 // Controls whether hirelings can gain skills/stats from combat NPCCOMBATTRAINING=0/1 // Controls whether NPCs in general can gain skills/stats from combat Fixed an issue where a player meeting the exact minimum requirements for crafting an item would always fail Fixed a bug with teleporting off boats to valid nearby locations when double-clicking boat planks while standing on it Updated behaviour of planks on boats: Boat key can unlock plank, but won't automatically open it Boat key used on an open, unlocked plank will lock and automatically close the plank Boat key used on an open, locked plank will unlock the plank and leave it open Player using an unlocked plank now opens it Player using an open plank will disembark (if onboard) or embark (if not) the boat Player can always open a locked plank if they're on the boat, even with no key, to allow disembarking the boat. Planks that are open, but locked cannot be accessed from outside the boat, and will close automatically after five of seconds Updated behaviour of Magic Lock/Unlock spells: Magic Lock cannot be used on objects inside a multi Magic Lock applies difficulty to lock based on caster's Magery skill Magic Lock effect will last between 7 to 50 seconds (depending on caster's Magery skill) Any object that can be locked via Magic Lock spell can also be unlocked via Magic Unlock spell, if caster has high enough Magery skill Fixed a bug where certain JS Functions, Methods and Properties would occasionally pass incorrect values to scripts that called upon them. Scripts that rely on the GetCurrentClock() Function, the .GetTimer() Method, .decayTime, .logTime, .oreTime and .fishTime Properties might need to be updated to account for the fix, which causes larger values to be passed in than before. Fixed a bug related to GetCurrentClock() that caused decay and respawning of dungeon chests from working properly Fixed a bug related to GetCurrentClock() and .logTime/.fishTime that prevented consumption and regeneration of log/fish resources from working properly Added a new JS Function: GetStartTime() // Returns a timestamp for when server started up Fixed a bug related to GetCurrentClock() where server uptime stats in help menu was showing up incorrectly Fixed a bug related to GetCurrentClock() and purging of registrations of visitors in public houses so their visits can be counted again later Fixed a bug related to GetCurrentClock() that caused monster speech to not work properly Fixed a Z-related issue that sometimes prevented players from fishing when standing on the shoreline next to the sea Fixed an issue with Animal Lore skill that would always return a pet's loyalty level as "Wild" Increased max range pets can be from their owner in order to still be included in moongate/teleporter travel from 12 to 24 tiles Fixed an issue where the alchemy bonus damage for explosion potions was off by an order of magnitude Fixed an issue where food IDs from foodlists referenced by other foodlists was not detected as valid food for tamed pets or NPCs Fixed an issue where Alchemy crafting skill did not properly check for the existence of the crafting tool before proceeding with the crafting process Fixed an issue that prevented the Teleport spell from working as intended Fixed an issue where players would still get 1 gold even if STARTGOLD in uox.ini was set to 0 Fixed an issue with mount restrictions script that prevented players from mounting Unicorns, Ki-rins and Cu Sidhes Fixed an issue where aggressive creatures wouldn't stop attacking player after being tamed (js/skill/taming.js) Added a system message to inform the player when they've dropped out of stealth due to taking too many steps Fixed an issue where hunger level of NPCs instantly dropped upon spawning because hunger timer was not active yet Fixed a bug where character corpses would appear with a [unidentified] tag attached Fixed an issue where the [unidentified] tag did not show up for unidentified magic items Added ANIMAL tag to a small bunch of creature definitions (dfndata/creatures/creatures.dfn) Fixed an issue with Bowcraft skill where player could not gain enough skill from crafting bows to reach min requirement for crossbows, and similiarly could not reach min requirement for heavy crossbows from crossbows Updated default value of MURDERDECAYTIMER INI setting from 60 seconds to 28800 seconds (8 hours), to match the amount of time it would take for one (short term) murder count to decay on LBR-era OSI shards.
2022-08-25 02:13:00 +08:00
else
{
dictTitle = Dictionary->GetEntry( dictEntryId );
2022-06-08 10:38:16 -04:00
}
}
2022-06-08 10:38:16 -04:00
return dictTitle;
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckRegion()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check what region a character is in, updating it if necesarry.
//o------------------------------------------------------------------------------------------------o
auto CheckRegion( CSocket *mSock, CChar& mChar, bool forceUpdateLight) -> void
{
2022-06-08 10:38:16 -04:00
// Get character's old/previous region
auto iRegion = mChar.GetRegion();
auto oldSubRegionNum = mChar.GetSubRegion();
2022-06-08 10:38:16 -04:00
// Calculate character's current region
auto calcReg = CalcRegionFromXY( mChar.GetX(), mChar.GetY(), mChar.WorldNumber(), mChar.GetInstanceId(), &mChar );
if(( iRegion == nullptr ) && ( calcReg != nullptr ))
{
2022-06-08 10:38:16 -04:00
mChar.SetRegion( calcReg->GetRegionNum() );
}
else if( calcReg != iRegion )
{
if( mSock )
{
if( iRegion != nullptr && calcReg != nullptr )
{
2022-06-08 10:38:16 -04:00
// Don't display left/entered region messages if name of region is identical
if( iRegion->GetName() != calcReg->GetName() )
{
if( !iRegion->GetName().empty() )
{
mSock->SysMessage( 1358, iRegion->GetName().c_str() ); // You have left %s.
2022-06-08 10:38:16 -04:00
}
if( !calcReg->GetName().empty() )
{
mSock->SysMessage( 1359, calcReg->GetName().c_str() ); // You have entered %s.
2022-06-08 10:38:16 -04:00
}
}
if( calcReg->IsGuarded() || iRegion->IsGuarded() )
{
if( calcReg->IsGuarded() )
{
2022-06-08 10:38:16 -04:00
// Don't display change of guard message if guardowner is identical
if( !iRegion->IsGuarded() || ( iRegion->IsGuarded() && calcReg->GetOwner() != iRegion->GetOwner() ))
{
if( calcReg->GetOwner().empty() )
{
mSock->SysMessage( 1360 ); // You are now under the protection of the guards.
2022-06-08 10:38:16 -04:00
}
else
{
mSock->SysMessage( 1361, calcReg->GetOwner().c_str() ); // You are now under the protection of %s guards.
2022-06-08 10:38:16 -04:00
}
}
}
else
{
if( iRegion->GetOwner().empty() )
{
mSock->SysMessage( 1362 ); // You are no longer under the protection of the guards.
2022-06-08 10:38:16 -04:00
}
else
{
mSock->SysMessage( 1363, iRegion->GetOwner().c_str() ); // You are no longer under the protection of %s guards.
2022-06-08 10:38:16 -04:00
}
}
UpdateFlag( &mChar );
}
if( calcReg->GetAppearance() != iRegion->GetAppearance() ) // if the regions look different
{
2022-06-08 10:38:16 -04:00
CPWorldChange wrldChange( calcReg->GetAppearance(), 1 );
mSock->Send( &wrldChange );
}
if( calcReg == cwmWorldState->townRegions[mChar.GetTown()] ) // enter our home town
{
mSock->SysMessage( 1364 ); // You feel loved and cherished under the protection of your home town.
2022-06-08 10:38:16 -04:00
CItem *packItem = mChar.GetPackItem();
if( ValidateObject( packItem ))
{
auto piCont = packItem->GetContainsList();
for( const auto &toScan : piCont->collection() )
{
if( ValidateObject( toScan ))
{
if( toScan->GetType() == IT_TOWNSTONE )
{
CTownRegion *targRegion = cwmWorldState->townRegions[static_cast<UI16>( toScan->GetTempVar( CITV_MOREX ))];
mSock->SysMessage( 1365, targRegion->GetName().c_str() ); // You have successfully returned the townstone of %s to your home town.
2022-06-08 10:38:16 -04:00
targRegion->DoDamage( targRegion->GetHealth() ); // finish it off
targRegion->Possess( calcReg );
mChar.SetFame( static_cast<SI16>( mChar.GetFame() + mChar.GetFame() / 5 )); // 20% fame boost
2022-06-08 10:38:16 -04:00
break;
}
}
}
}
}
}
2022-06-08 10:38:16 -04:00
}
if( iRegion != nullptr && calcReg != nullptr )
{
2022-06-08 10:38:16 -04:00
// Run onLeaveRegion/onEnterRegion for character
auto scriptTriggers = mChar.GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute)
{
2022-06-08 10:38:16 -04:00
toExecute->OnLeaveRegion( &mChar, iRegion->GetRegionNum() );
toExecute->OnEnterRegion( &mChar, calcReg->GetRegionNum() );
}
}
2022-06-08 10:38:16 -04:00
// Run onLeaveRegion event for region being left
scriptTriggers.clear();
scriptTriggers.shrink_to_fit();
scriptTriggers = iRegion->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
2022-06-08 10:38:16 -04:00
toExecute->OnLeaveRegion( &mChar, iRegion->GetRegionNum() );
}
}
2022-06-08 10:38:16 -04:00
// Run onEnterRegion event for region being entered
scriptTriggers.clear();
scriptTriggers.shrink_to_fit();
scriptTriggers = calcReg->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
2022-06-08 10:38:16 -04:00
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
2022-06-08 10:38:16 -04:00
toExecute->OnEnterRegion( &mChar, calcReg->GetRegionNum() );
}
2022-02-24 22:55:26 -05:00
}
2022-06-08 10:38:16 -04:00
}
if( calcReg )
{
2022-06-08 10:38:16 -04:00
mChar.SetRegion( calcReg->GetRegionNum() );
}
if( mSock )
{
Effects->DoSocketMusic( mSock );
DoLight( mSock, cwmWorldState->ServerData()->WorldLightCurrentLevel() );
2022-06-08 10:38:16 -04:00
}
}
else
{
2022-06-08 10:38:16 -04:00
// Main region didn't change, but subregion did! Update music
if( oldSubRegionNum != mChar.GetSubRegion() )
{
Effects->DoSocketMusic( mSock );
}
2022-06-08 10:38:16 -04:00
// Update lighting
if( forceUpdateLight && mSock != nullptr )
{
DoLight( mSock, cwmWorldState->ServerData()->WorldLightCurrentLevel() );
2022-06-08 10:38:16 -04:00
}
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - CheckCharInsideBuilding()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Checks if a character is inside a building before applying weather effects
//o------------------------------------------------------------------------------------------------o
auto CheckCharInsideBuilding( CChar *c, CSocket *mSock, bool doWeatherStuff ) -> void
{
if( !c->GetMounted() && !c->GetStabled() )
{
auto wasInBuilding = c->InBuilding();
bool isInBuilding = Map->InBuilding( c->GetX(), c->GetY(), c->GetZ(), c->WorldNumber(), c->GetInstanceId() );
if( wasInBuilding != isInBuilding )
{
2022-06-08 10:38:16 -04:00
c->SetInBuilding( isInBuilding );
if( doWeatherStuff )
{
if( c->IsNpc() )
{
2022-06-08 10:38:16 -04:00
Weather->DoNPCStuff( c );
}
else
{
2022-06-08 10:38:16 -04:00
Weather->DoPlayerStuff( mSock, c );
}
}
}
2022-06-08 10:38:16 -04:00
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - WillResultInCriminal()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check flagging, race, and guild info to find if character
//| should be flagged criminal (returns true if so)
//o------------------------------------------------------------------------------------------------o
auto WillResultInCriminal( CChar *mChar, CChar *targ ) -> bool
{
2022-06-08 10:38:16 -04:00
auto tOwner = targ->GetOwnerObj();
auto mOwner = mChar->GetOwnerObj();
auto mCharParty = PartyFactory::GetSingleton().Get( mChar );
auto rValue = false;
if( ValidateObject( mChar ) && ValidateObject( targ ) && mChar != targ )
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure they're not racial enemies, or guild members/guild enemies
if(( Races->Compare( mChar, targ ) > RACE_ENEMY ) && GuildSys->ResultInCriminal( mChar, targ ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure they're not in the same party
if( !mCharParty || mCharParty->HasMember( targ ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure the target is not the aggressor in the fight
if( !targ->CheckAggressorFlag( mChar->GetSerial() ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure target doesn't have an owner
if( !ValidateObject( tOwner ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure attacker doesn't have an owner
if( !ValidateObject( mOwner ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Make sure target is innocent
if( targ->IsInnocent() )
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// All the stars align - this is a criminal action!
rValue = true;
2022-06-08 10:38:16 -04:00
}
}
}
}
}
}
}
return rValue;
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - MakeCriminal()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Make character a criminal
//o------------------------------------------------------------------------------------------------o
auto MakeCriminal( CChar *c ) -> void
{
c->SetTimer( tCHAR_CRIMFLAG, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_CRIMINAL ));
if( !c->IsCriminal() && !c->IsMurderer() )
{
2022-06-08 10:38:16 -04:00
auto cSock = c->GetSocket();
if( cSock )
{
cSock->SysMessage( 1379 ); // You are now a criminal!
2022-06-08 10:38:16 -04:00
}
UpdateFlag( c );
}
}
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
//o------------------------------------------------------------------------------------------------o
//| Function - FlagForStealing()
//o------------------------------------------------------------------------------------------------o
//| Purpose - Flag character for stealing
//o------------------------------------------------------------------------------------------------o
auto FlagForStealing( CChar *c ) -> void
{
c->SetTimer( tCHAR_STEALFLAG, cwmWorldState->ServerData()->BuildSystemTimeValue( tSERVER_STEALINGFLAG ));
if( !c->IsCriminal() && !c->IsMurderer() && !c->HasStolen() )
{
c->HasStolen( true );
UpdateFlag( c );
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - UpdateFlag()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Updates character flags
//o------------------------------------------------------------------------------------------------o
auto UpdateFlag( CChar *mChar ) -> void
{
if( !ValidateObject( mChar ))
return;
UI08 oldFlag = mChar->GetFlag();
if( mChar->IsTamed() )
{
CChar *i = mChar->GetOwnerObj();
if( ValidateObject( i ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Set character's flag to match owner's flag
mChar->SetFlag( i->GetFlag() );
2022-06-08 10:38:16 -04:00
}
else
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Default to blue, invalid owner detected
mChar->SetFlagBlue();
Console.Warning( oldstrutil::format( "Tamed Creature has an invalid owner, Serial: 0x%X", mChar->GetSerial() ));
}
}
else
{
if( mChar->GetKills() > cwmWorldState->ServerData()->RepMaxKills() )
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Character is flagged as a murderer
mChar->SetFlagRed();
}
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
else if(( mChar->GetTimer( tCHAR_CRIMFLAG ) != 0 || mChar->GetTimer( tCHAR_STEALFLAG ) != 0 ) && ( mChar->GetNPCFlag() != fNPC_EVIL ))
{
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
// Character is flagged as criminal or for stealing
mChar->SetFlagGray();
}
else
{
if( mChar->IsNpc() )
{
auto doSwitch = true;
if( cwmWorldState->creatures[mChar->GetId()].IsAnimal() && ( mChar->GetNpcAiType() != AI_EVIL && mChar->GetNpcAiType() != AI_EVIL_CASTER ))
{
if( cwmWorldState->ServerData()->CombatAnimalsGuarded() && mChar->GetRegion()->IsGuarded() )
{
mChar->SetFlagBlue();
doSwitch = false;
2022-06-08 10:38:16 -04:00
}
}
if( doSwitch )
{
switch( mChar->GetNPCFlag() )
{
case fNPC_NEUTRAL:
default:
mChar->SetFlagNeutral();
break;
case fNPC_INNOCENT:
mChar->SetFlagBlue();
break;
case fNPC_EVIL:
mChar->SetFlagRed();
break;
}
2022-06-08 10:38:16 -04:00
}
}
else
{
mChar->SetFlagBlue();
}
2022-06-08 10:38:16 -04:00
}
}
UI08 newFlag = mChar->GetFlag();
if( oldFlag != newFlag )
{
auto scriptTriggers = mChar->GetScriptTriggers();
for( auto scriptTrig : scriptTriggers )
{
auto toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute )
{
if( toExecute->OnFlagChange( mChar, newFlag, oldFlag ) == 1 )
{
break;
2022-06-08 10:38:16 -04:00
}
}
}
mChar->Dirty( UT_UPDATE );
}
Thief Revamp - 0.99.6-RC5 Added script for NPC guildmasters (js/npc/ai/guildmaster.js). Only one NPC guild has been setup in the script so far (more can be easily added) - the Thieves Guild - which if joined grants players the ability to steal from other players and to buy disguise kits Added two new NPCs, which there will now spawn one of in a random location in each city in Britannia (felucca facet): m_thief_guildmaster (dfndata/npc/male_human.dfn) f_thief_guildmaster (dfndata/npc/female_Human.dfn) Added two new character properties to keep track of which NPC guild a player (or NPC) belongs to. These properties have been exposed as the following Character JS properties: .npcGuild // ID of NPC guild, as defined in script .npcGuildJoined // Timestamp for when player joined NPC guild Added script for Disguise Kits (js/item/disguisekit.js). These allow members of the Thieves Guild to disguise themselves from the prying eyes of other players. Added two new character properties: .isDisguised // true/false flag for character being disguised .origName // used to store character's original name before disguise went into effect Moved implementation of Stealing skill from code to script (js/skill/stealing.js) and revamped it completely in the process. Changes include: New features: Town rare stealing - any item marked as "special stealable" with new item property .stealable can be stolen, even if it's locked down by a GM on the ground, or inside a container When stealing from item piles, thief can potentially steal the amount of items that makes up the max weight limit for what they can steal, from those piles Chance to successfully steal is now affected by whether there are any characters (NPCs or Players) that witness the attempt. Depends on distance to character, and direction character is facing Players now become "permagrey" when successfully stealing from another player, regardless of whether it's witnessed Players now receive a "stealing" flag when stealing from another player, regardless of whether it's witnessed Stolen items cannot be removed from thief's backpack for 30 seconds following the theft of the item (AoS core shard era and above) Optional AoS feature to steal special consumable items from monsters Updated default stealing rules: Updated calculations to determine chance of success when stealing Players cannot steal while engaged in combat Players are revealed if hidden as soon as they use the stealing skill Players can no longer steal items in the secure trade window Players can no longer steal items from NPC shopkeepers Both hands must be free to steal Stealing now checks line of sight to target player/object Only members of Thieves Guild (NPC guild) can now steal from other players, unless they are guild enemies Players can no longer steal from NPC guards by default Players can no longer steal from the same NPC monster more than once Only gold and gems can be stolen from innocent players in dungeon/ll areas of Felucca, if core shard era is set to AoS or higher Players can no longer steal items held on cursor by other players Orcish masks now eplode if player steals from orcs while wearing it If core shard era is set to LBR or lower, player is marked as an aggressor if they steal from another player Guards can only be called on players that are flagged as criminals within the first 10 seconds of them being flagged Stealing script options: Allow stealing entire containers (off by default pre-AoS) Return stolen items on thief death (off by default) Temporarily make stolen items immovable in thief's backpack (on by default post-AoS) Temporarily protect traded items (on by default) Let dexterity affect chance for successful theft (off by default) Let light level affect chance for successful theft (off by default) Allow stealing from NPC Guards (off by default) Allow stealing special loot from monsters (on by default post-ml) Moved implementation of Snooping skill from code to script (js/skill/snooping.js), with some changes: Players cannot snoop pack animals from inside a house, if the animal is outside The deeper inside main backpack a container sits, the harder it becomes to snoop inside it Included an optional feature that lets targets of snooping gradually become more aware, increasing the difficulty of succeeding. This awareness fades over time. Players have a chance to stay hidden while snooping, based on their Hiding skill Karma is now lowered by snooping regardless of success or failure Added tracking system for "aggressors" in combat. A player attacking someone (regardless of flag status) will be marked as aggressor to that someone for 2 minutes Added tracking system for "permagrey" flags - these are stored on a per-target basis, so a player can be flagged visibly as permagrey to multiple other players. Persists until player dies. Player combat targets and war mode are now cleared on logout Players will now be unable to hide if within visual distance and in line of sight of their attacker or current target in combat Server leave-announcement now only happens after the logout timer has expired, instead of the exact moment the player presses the logout button Fixed an issue that could cause swimming NPCs to swim on land NPCs now have the ability to temporarily ignore unreachable targets in combat. If attacked by someone they are ignoring, they will enter evade state and try to move away from that someone. SpawnRegions now support NPCLISTS with weighted entries. Example of an NPCLIST with 75% chance of spawning some kind of orc, and 25% chance of spawning a ratman archer: [NPCLIST example] { 75|NPCLIST=allorc 25|ratman } Added 3 additional "all purpose" item properties (.more0, .more1 and .more2) and exposed those to JS engine. These work the same as more/morex/morey/morez Mark spell now stores a 4th property on recall runes - instanceID. This is stored in the rune's .more0 property. Recall and Gate spells now check the recall rune (or runebook)'s 4th location property - instanceID - to determine where the player ends up Fixed a server crash related to equipment being automatically unequipped if character is no longer strong enough to have it equipped Added new JS Function to check if any characters at specified location potentially block movement: DoesCharacterBlock( x, y, z, worldNum, instanceID ) // returns true if a character exists at given coordinate (within z +/- 4)
2023-06-20 02:21:16 +08:00
if( !mChar->IsNpc() )
{
// Flag was updated, so loop through player's corpses so flagging can be updated for those!
for( auto tempCorpse = mChar->GetOwnedCorpses()->First(); !mChar->GetOwnedCorpses()->Finished(); tempCorpse = mChar->GetOwnedCorpses()->Next() )
{
if( ValidateObject( tempCorpse ))
{
tempCorpse->Dirty( UT_UPDATE );
}
}
}
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - SendMapChange()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Send mapchange packet to client to teleport player to new world/map
//o------------------------------------------------------------------------------------------------o
void SendMapChange( UI08 worldNumber, CSocket *sock, [[maybe_unused]] bool initialLogin )
2022-06-08 10:38:16 -04:00
{
if( sock )
{
2022-06-08 10:38:16 -04:00
CPMapChange mapChange( worldNumber );
sock->Send( &mapChange );
}
}
//o------------------------------------------------------------------------------------------------o
//| Function - SocketMapChange()
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Check if conditions are right to send a map change packet to the client
//o------------------------------------------------------------------------------------------------o
auto SocketMapChange( CSocket *sock, CChar *charMoving, CItem *gate ) -> void
{
if( !sock )
return;
if( !ValidateObject( gate ) || !ValidateObject( charMoving ))
return;
UI08 tWorldNum = static_cast<UI08>( gate->GetTempVar( CITV_MORE ));
UI16 tInstanceId = gate->GetInstanceId();
if( !Map->MapExists( tWorldNum ))
return;
CChar *toMove = nullptr;
if( ValidateObject( charMoving ))
{
toMove = charMoving;
}
else
{
toMove = sock->CurrcharObj();
}
if( !ValidateObject( toMove ))
return;
Pets and followers mini-revamp Added new protected property for CChar class to track a player's currently controlled pets/followers/summons, and renamed the on tracking all pets owned: GenericList<CChar *> activeFollowers GenericList<CChar *> petsControlled -> petsOwned Added new JS Character Methods to view/manipulate follower list: GetFollowerList() AddFollower( npcObject ) RemoveFollower( npcObject ) Added new JS Character Property to fetch current count of followers character has: .followerCount Added new GM commands for spitting out information on all pets/followers a player has, in the following format: Name: %s | ID: %i | Serial: %i | x: %i | y: %i | z: %i | world: %i | instanceID: %i 'listpets 'listfollowers Replaced most instances of GetPetList in code and scripts with GetFollowerList, as that's what we actually care about for the most part Updated code and relevant scripts to make use of AddFollower and RemoveFollower functions where appropriate Modified code for restoring pet loyalty upon feeding pet; by default it now restores 10/100 loyalty per time pet is fed, while if CoreShardEra setting in UOX.INI is set to AoS expansion or higher, loyalty is instantly restored to max when pet is fed (regardless of amount) Updated AreaCharacterFunction and AreaItemFunction JS Functions to still work if third parameter (socket) is provided as null Modified code and relevant scripts that teleport pets/followers along with player to only do so for pets/followers using the "follow" wandermode with player as follow target Updated some instances of code and script that checked for both controlSlot AND maxFollowers requirements - now only checks maxFollowers if controlSlots is set to 0 in ini Added function _restorecontext_() {} to a couple more scripts: js/commands/targeting/tele.js Updated error message shown when attempts are made to add deleted objects to refreshQueue, to include name, ID and serial of the object in question
2023-06-02 01:44:40 +08:00
// Teleport followers to new location too!
auto myFollowers = toMove->GetFollowerList();
for( CChar *myFollower = myFollowers->First(); !myFollowers->Finished(); myFollower = myFollowers->Next() )
{
Pets and followers mini-revamp Added new protected property for CChar class to track a player's currently controlled pets/followers/summons, and renamed the on tracking all pets owned: GenericList<CChar *> activeFollowers GenericList<CChar *> petsControlled -> petsOwned Added new JS Character Methods to view/manipulate follower list: GetFollowerList() AddFollower( npcObject ) RemoveFollower( npcObject ) Added new JS Character Property to fetch current count of followers character has: .followerCount Added new GM commands for spitting out information on all pets/followers a player has, in the following format: Name: %s | ID: %i | Serial: %i | x: %i | y: %i | z: %i | world: %i | instanceID: %i 'listpets 'listfollowers Replaced most instances of GetPetList in code and scripts with GetFollowerList, as that's what we actually care about for the most part Updated code and relevant scripts to make use of AddFollower and RemoveFollower functions where appropriate Modified code for restoring pet loyalty upon feeding pet; by default it now restores 10/100 loyalty per time pet is fed, while if CoreShardEra setting in UOX.INI is set to AoS expansion or higher, loyalty is instantly restored to max when pet is fed (regardless of amount) Updated AreaCharacterFunction and AreaItemFunction JS Functions to still work if third parameter (socket) is provided as null Modified code and relevant scripts that teleport pets/followers along with player to only do so for pets/followers using the "follow" wandermode with player as follow target Updated some instances of code and script that checked for both controlSlot AND maxFollowers requirements - now only checks maxFollowers if controlSlots is set to 0 in ini Added function _restorecontext_() {} to a couple more scripts: js/commands/targeting/tele.js Updated error message shown when attempts are made to add deleted objects to refreshQueue, to include name, ID and serial of the object in question
2023-06-02 01:44:40 +08:00
if( ValidateObject( myFollower ))
{
Pets and followers mini-revamp Added new protected property for CChar class to track a player's currently controlled pets/followers/summons, and renamed the on tracking all pets owned: GenericList<CChar *> activeFollowers GenericList<CChar *> petsControlled -> petsOwned Added new JS Character Methods to view/manipulate follower list: GetFollowerList() AddFollower( npcObject ) RemoveFollower( npcObject ) Added new JS Character Property to fetch current count of followers character has: .followerCount Added new GM commands for spitting out information on all pets/followers a player has, in the following format: Name: %s | ID: %i | Serial: %i | x: %i | y: %i | z: %i | world: %i | instanceID: %i 'listpets 'listfollowers Replaced most instances of GetPetList in code and scripts with GetFollowerList, as that's what we actually care about for the most part Updated code and relevant scripts to make use of AddFollower and RemoveFollower functions where appropriate Modified code for restoring pet loyalty upon feeding pet; by default it now restores 10/100 loyalty per time pet is fed, while if CoreShardEra setting in UOX.INI is set to AoS expansion or higher, loyalty is instantly restored to max when pet is fed (regardless of amount) Updated AreaCharacterFunction and AreaItemFunction JS Functions to still work if third parameter (socket) is provided as null Modified code and relevant scripts that teleport pets/followers along with player to only do so for pets/followers using the "follow" wandermode with player as follow target Updated some instances of code and script that checked for both controlSlot AND maxFollowers requirements - now only checks maxFollowers if controlSlots is set to 0 in ini Added function _restorecontext_() {} to a couple more scripts: js/commands/targeting/tele.js Updated error message shown when attempts are made to add deleted objects to refreshQueue, to include name, ID and serial of the object in question
2023-06-02 01:44:40 +08:00
if( !myFollower->GetMounted() && myFollower->GetOwnerObj() == toMove )
{
Pets and followers mini-revamp Added new protected property for CChar class to track a player's currently controlled pets/followers/summons, and renamed the on tracking all pets owned: GenericList<CChar *> activeFollowers GenericList<CChar *> petsControlled -> petsOwned Added new JS Character Methods to view/manipulate follower list: GetFollowerList() AddFollower( npcObject ) RemoveFollower( npcObject ) Added new JS Character Property to fetch current count of followers character has: .followerCount Added new GM commands for spitting out information on all pets/followers a player has, in the following format: Name: %s | ID: %i | Serial: %i | x: %i | y: %i | z: %i | world: %i | instanceID: %i 'listpets 'listfollowers Replaced most instances of GetPetList in code and scripts with GetFollowerList, as that's what we actually care about for the most part Updated code and relevant scripts to make use of AddFollower and RemoveFollower functions where appropriate Modified code for restoring pet loyalty upon feeding pet; by default it now restores 10/100 loyalty per time pet is fed, while if CoreShardEra setting in UOX.INI is set to AoS expansion or higher, loyalty is instantly restored to max when pet is fed (regardless of amount) Updated AreaCharacterFunction and AreaItemFunction JS Functions to still work if third parameter (socket) is provided as null Modified code and relevant scripts that teleport pets/followers along with player to only do so for pets/followers using the "follow" wandermode with player as follow target Updated some instances of code and script that checked for both controlSlot AND maxFollowers requirements - now only checks maxFollowers if controlSlots is set to 0 in ini Added function _restorecontext_() {} to a couple more scripts: js/commands/targeting/tele.js Updated error message shown when attempts are made to add deleted objects to refreshQueue, to include name, ID and serial of the object in question
2023-06-02 01:44:40 +08:00
if( myFollower->GetNpcWander() == WT_FOLLOW && ObjInOldRange( toMove, myFollower, DIST_CMDRANGE ))
{
Pets and followers mini-revamp Added new protected property for CChar class to track a player's currently controlled pets/followers/summons, and renamed the on tracking all pets owned: GenericList<CChar *> activeFollowers GenericList<CChar *> petsControlled -> petsOwned Added new JS Character Methods to view/manipulate follower list: GetFollowerList() AddFollower( npcObject ) RemoveFollower( npcObject ) Added new JS Character Property to fetch current count of followers character has: .followerCount Added new GM commands for spitting out information on all pets/followers a player has, in the following format: Name: %s | ID: %i | Serial: %i | x: %i | y: %i | z: %i | world: %i | instanceID: %i 'listpets 'listfollowers Replaced most instances of GetPetList in code and scripts with GetFollowerList, as that's what we actually care about for the most part Updated code and relevant scripts to make use of AddFollower and RemoveFollower functions where appropriate Modified code for restoring pet loyalty upon feeding pet; by default it now restores 10/100 loyalty per time pet is fed, while if CoreShardEra setting in UOX.INI is set to AoS expansion or higher, loyalty is instantly restored to max when pet is fed (regardless of amount) Updated AreaCharacterFunction and AreaItemFunction JS Functions to still work if third parameter (socket) is provided as null Modified code and relevant scripts that teleport pets/followers along with player to only do so for pets/followers using the "follow" wandermode with player as follow target Updated some instances of code and script that checked for both controlSlot AND maxFollowers requirements - now only checks maxFollowers if controlSlots is set to 0 in ini Added function _restorecontext_() {} to a couple more scripts: js/commands/targeting/tele.js Updated error message shown when attempts are made to add deleted objects to refreshQueue, to include name, ID and serial of the object in question
2023-06-02 01:44:40 +08:00
myFollower->SetLocation( static_cast<SI16>( gate->GetTempVar( CITV_MOREX )),
static_cast<SI16>( gate->GetTempVar( CITV_MOREY )),
static_cast<SI08>( gate->GetTempVar( CITV_MOREZ )), tWorldNum, tInstanceId );
2022-06-08 10:38:16 -04:00
}
}
}
}
switch( sock->ClientType() )
{
case CV_UO3D:
case CV_KRRIOS:
toMove->SetLocation( static_cast<SI16>( gate->GetTempVar( CITV_MOREX )),
static_cast<SI16>( gate->GetTempVar( CITV_MOREY )),
static_cast<SI08>( gate->GetTempVar( CITV_MOREZ )), tWorldNum, tInstanceId );
break;
default:
toMove->SetLocation( static_cast<SI16>( gate->GetTempVar( CITV_MOREX )),
static_cast<SI16>( gate->GetTempVar( CITV_MOREY )),
static_cast<SI08>( gate->GetTempVar( CITV_MOREZ )), tWorldNum, tInstanceId );
break;
}
SendMapChange( tWorldNum, sock );
2022-06-08 10:38:16 -04:00
}
//o------------------------------------------------------------------------------------------------o
//| Function - DoorMacro()
2022-06-08 10:38:16 -04:00
//| Date - 11th October, 1999
//| Changes - (support CSocket *s and door blocking)
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
//| Purpose - Door use macro support.
//o------------------------------------------------------------------------------------------------o
2022-06-08 10:38:16 -04:00
void DoorMacro( CSocket *s )
{
CChar *mChar = s->CurrcharObj();
SI16 xc = mChar->GetX(), yc = mChar->GetY();
switch( mChar->GetDir() )
{
case 0 : --yc; break;
case 1 : { ++xc; --yc; } break;
case 2 : ++xc; break;
case 3 : { ++xc; ++yc; } break;
case 4 : ++yc; break;
case 5 : { --xc; ++yc; } break;
case 6 : --xc; break;
case 7 : { --xc; --yc; } break;
}
for( auto &toCheck : MapRegion->PopulateList( mChar ))
{
if( !toCheck )
continue;
auto regItems = toCheck->GetItemList();
for( const auto &itemCheck : regItems->collection() )
{
if( !ValidateObject( itemCheck ) || itemCheck->GetInstanceId() != mChar->GetInstanceId() )
continue;
SI16 distZ = abs( itemCheck->GetZ() - mChar->GetZ() );
if( itemCheck->GetX() == xc && itemCheck->GetY() == yc && distZ < 7 )
{
if( itemCheck->GetType() == IT_DOOR || itemCheck->GetType() == IT_LOCKEDDOOR )
{
// only open doors
if( JSMapping->GetEnvokeByType()->Check( static_cast<UI16>( itemCheck->GetType() )))
{
UI16 envTrig = JSMapping->GetEnvokeByType()->GetScript( static_cast<UI16>( itemCheck->GetType() ));
auto envExecute = JSMapping->GetScript( envTrig );
if( envExecute )
{
[[maybe_unused]] SI08 retVal = envExecute->OnUseChecked( mChar, itemCheck );
2022-06-08 10:38:16 -04:00
}
return;
2022-06-08 10:38:16 -04:00
}
}
}
}
}
}
2022-06-08 10:38:16 -04:00