mirror of
https://github.com/UOX3DevTeam/UOX3
synced 2026-08-13 12:27:04 -04:00
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
287 lines
11 KiB
C++
287 lines
11 KiB
C++
// Copyright 2006 Nemanja Trifunovic
|
|
|
|
/*
|
|
Permission is hereby granted, free of charge, to any person or organization
|
|
obtaining a copy of the software and accompanying documentation covered by
|
|
this license (the "Software") to use, reproduce, display, distribute,
|
|
execute, and transmit the Software, and to prepare derivative works of the
|
|
Software, and to permit third-parties to whom the Software is furnished to
|
|
do so, all subject to the following:
|
|
|
|
The copyright notices in the Software and this entire statement, including
|
|
the above license grant, this restriction and the following disclaimer,
|
|
must be included in all copies of the Software, in whole or in part, and
|
|
all derivative works of the Software, unless such copies or derivative
|
|
works are solely in the form of machine-executable object code generated by
|
|
a source language processor.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
|
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
|
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
|
|
#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
|
#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
|
|
|
#include "core.h"
|
|
|
|
namespace utf8
|
|
{
|
|
namespace unchecked
|
|
{
|
|
template <typename octet_iterator>
|
|
octet_iterator append(utfchar32_t cp, octet_iterator result)
|
|
{
|
|
return internal::append(cp, result);
|
|
}
|
|
|
|
template <typename word_iterator>
|
|
word_iterator append16(utfchar32_t cp, word_iterator result)
|
|
{
|
|
return internal::append16(cp, result);
|
|
}
|
|
|
|
template <typename octet_iterator, typename output_iterator>
|
|
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, utfchar32_t replacement)
|
|
{
|
|
while (start != end) {
|
|
octet_iterator sequence_start = start;
|
|
internal::utf_error err_code = utf8::internal::validate_next(start, end);
|
|
switch (err_code) {
|
|
case internal::UTF8_OK :
|
|
for (octet_iterator it = sequence_start; it != start; ++it)
|
|
*out++ = *it;
|
|
break;
|
|
case internal::NOT_ENOUGH_ROOM:
|
|
out = utf8::unchecked::append(replacement, out);
|
|
start = end;
|
|
break;
|
|
case internal::INVALID_LEAD:
|
|
out = utf8::unchecked::append(replacement, out);
|
|
++start;
|
|
break;
|
|
case internal::INCOMPLETE_SEQUENCE:
|
|
case internal::OVERLONG_SEQUENCE:
|
|
case internal::INVALID_CODE_POINT:
|
|
out = utf8::unchecked::append(replacement, out);
|
|
++start;
|
|
// just one replacement mark for the sequence
|
|
while (start != end && utf8::internal::is_trail(*start))
|
|
++start;
|
|
break;
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
template <typename octet_iterator, typename output_iterator>
|
|
inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
|
|
{
|
|
static const utfchar32_t replacement_marker = utf8::internal::mask16(0xfffd);
|
|
return utf8::unchecked::replace_invalid(start, end, out, replacement_marker);
|
|
}
|
|
|
|
inline std::string replace_invalid(const std::string& s, utfchar32_t replacement)
|
|
{
|
|
std::string result;
|
|
replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
|
|
return result;
|
|
}
|
|
|
|
inline std::string replace_invalid(const std::string& s)
|
|
{
|
|
std::string result;
|
|
replace_invalid(s.begin(), s.end(), std::back_inserter(result));
|
|
return result;
|
|
}
|
|
|
|
template <typename octet_iterator>
|
|
utfchar32_t next(octet_iterator& it)
|
|
{
|
|
utfchar32_t cp = utf8::internal::mask8(*it);
|
|
switch (utf8::internal::sequence_length(it)) {
|
|
case 1:
|
|
break;
|
|
case 2:
|
|
it++;
|
|
cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
|
|
break;
|
|
case 3:
|
|
++it;
|
|
cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
|
|
++it;
|
|
cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
|
|
break;
|
|
case 4:
|
|
++it;
|
|
cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
|
|
++it;
|
|
cp = static_cast<utfchar32_t>(cp + ((utf8::internal::mask8(*it) << 6) & 0xfff));
|
|
++it;
|
|
cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
|
|
break;
|
|
}
|
|
++it;
|
|
return cp;
|
|
}
|
|
|
|
template <typename octet_iterator>
|
|
utfchar32_t peek_next(octet_iterator it)
|
|
{
|
|
return utf8::unchecked::next(it);
|
|
}
|
|
|
|
template <typename word_iterator>
|
|
utfchar32_t next16(word_iterator& it)
|
|
{
|
|
utfchar32_t cp = utf8::internal::mask16(*it++);
|
|
if (utf8::internal::is_lead_surrogate(cp))
|
|
return (cp << 10) + *it++ + utf8::internal::SURROGATE_OFFSET;
|
|
return cp;
|
|
}
|
|
|
|
template <typename octet_iterator>
|
|
utfchar32_t prior(octet_iterator& it)
|
|
{
|
|
while (utf8::internal::is_trail(*(--it))) ;
|
|
octet_iterator temp = it;
|
|
return utf8::unchecked::next(temp);
|
|
}
|
|
|
|
template <typename octet_iterator, typename distance_type>
|
|
void advance(octet_iterator& it, distance_type n)
|
|
{
|
|
const distance_type zero(0);
|
|
if (n < zero) {
|
|
// backward
|
|
for (distance_type i = n; i < zero; ++i)
|
|
utf8::unchecked::prior(it);
|
|
} else {
|
|
// forward
|
|
for (distance_type i = zero; i < n; ++i)
|
|
utf8::unchecked::next(it);
|
|
}
|
|
}
|
|
|
|
template <typename octet_iterator>
|
|
typename std::iterator_traits<octet_iterator>::difference_type
|
|
distance(octet_iterator first, octet_iterator last)
|
|
{
|
|
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
|
for (dist = 0; first < last; ++dist)
|
|
utf8::unchecked::next(first);
|
|
return dist;
|
|
}
|
|
|
|
template <typename u16bit_iterator, typename octet_iterator>
|
|
octet_iterator utf16to8(u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
|
{
|
|
while (start != end) {
|
|
utfchar32_t cp = utf8::internal::mask16(*start++);
|
|
// Take care of surrogate pairs first
|
|
if (utf8::internal::is_lead_surrogate(cp)) {
|
|
if (start == end)
|
|
return result;
|
|
utfchar32_t trail_surrogate = utf8::internal::mask16(*start++);
|
|
cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
|
|
}
|
|
result = utf8::unchecked::append(cp, result);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
template <typename u16bit_iterator, typename octet_iterator>
|
|
u16bit_iterator utf8to16(octet_iterator start, octet_iterator end, u16bit_iterator result)
|
|
{
|
|
while (start < end) {
|
|
utfchar32_t cp = utf8::unchecked::next(start);
|
|
if (cp > 0xffff) { //make a surrogate pair
|
|
*result++ = static_cast<utfchar16_t>((cp >> 10) + internal::LEAD_OFFSET);
|
|
*result++ = static_cast<utfchar16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
|
|
}
|
|
else
|
|
*result++ = static_cast<utfchar16_t>(cp);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
template <typename octet_iterator, typename u32bit_iterator>
|
|
octet_iterator utf32to8(u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
|
{
|
|
while (start != end)
|
|
result = utf8::unchecked::append(*(start++), result);
|
|
|
|
return result;
|
|
}
|
|
|
|
template <typename octet_iterator, typename u32bit_iterator>
|
|
u32bit_iterator utf8to32(octet_iterator start, octet_iterator end, u32bit_iterator result)
|
|
{
|
|
while (start < end)
|
|
(*result++) = utf8::unchecked::next(start);
|
|
|
|
return result;
|
|
}
|
|
|
|
// The iterator class
|
|
template <typename octet_iterator>
|
|
class iterator {
|
|
octet_iterator it;
|
|
public:
|
|
typedef utfchar32_t value_type;
|
|
typedef utfchar32_t* pointer;
|
|
typedef utfchar32_t& reference;
|
|
typedef std::ptrdiff_t difference_type;
|
|
typedef std::bidirectional_iterator_tag iterator_category;
|
|
iterator () {}
|
|
explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
|
|
// the default "big three" are OK
|
|
octet_iterator base () const { return it; }
|
|
utfchar32_t operator * () const
|
|
{
|
|
octet_iterator temp = it;
|
|
return utf8::unchecked::next(temp);
|
|
}
|
|
bool operator == (const iterator& rhs) const
|
|
{
|
|
return (it == rhs.it);
|
|
}
|
|
bool operator != (const iterator& rhs) const
|
|
{
|
|
return !(operator == (rhs));
|
|
}
|
|
iterator& operator ++ ()
|
|
{
|
|
::std::advance(it, utf8::internal::sequence_length(it));
|
|
return *this;
|
|
}
|
|
iterator operator ++ (int)
|
|
{
|
|
iterator temp = *this;
|
|
::std::advance(it, utf8::internal::sequence_length(it));
|
|
return temp;
|
|
}
|
|
iterator& operator -- ()
|
|
{
|
|
utf8::unchecked::prior(it);
|
|
return *this;
|
|
}
|
|
iterator operator -- (int)
|
|
{
|
|
iterator temp = *this;
|
|
utf8::unchecked::prior(it);
|
|
return temp;
|
|
}
|
|
}; // class iterator
|
|
|
|
} // namespace utf8::unchecked
|
|
} // namespace utf8
|
|
|
|
|
|
#endif // header guard
|
|
|