diff --git a/.github/workflows/build_linux_x86.yml b/.github/workflows/build_linux_x86.yml index 534f4ef3e..55b222701 100644 --- a/.github/workflows/build_linux_x86.yml +++ b/.github/workflows/build_linux_x86.yml @@ -134,8 +134,8 @@ jobs: # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) permissions: - contents: read - actions: write + contents: write + actions: read runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build_linux_x86_64.yml b/.github/workflows/build_linux_x86_64.yml index 260c2eb51..bb7ecea64 100644 --- a/.github/workflows/build_linux_x86_64.yml +++ b/.github/workflows/build_linux_x86_64.yml @@ -89,8 +89,8 @@ jobs: # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) permissions: - contents: read - actions: write + contents: write + actions: read runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build_osx_arm.yml b/.github/workflows/build_osx_arm.yml index 416d72397..3de3f25d8 100644 --- a/.github/workflows/build_osx_arm.yml +++ b/.github/workflows/build_osx_arm.yml @@ -79,8 +79,8 @@ jobs: needs: macos-arm64 # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) permissions: - contents: read - actions: write + contents: write + actions: read runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build_osx_x86_64.yml b/.github/workflows/build_osx_x86_64.yml index 281f5e91f..295bad2af 100644 --- a/.github/workflows/build_osx_x86_64.yml +++ b/.github/workflows/build_osx_x86_64.yml @@ -75,8 +75,8 @@ jobs: upload_github_release: needs: macos-x86_64 permissions: - contents: read - actions: write + contents: write + actions: read # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) diff --git a/.github/workflows/build_win_x86.yml b/.github/workflows/build_win_x86.yml index ff9380608..913e10cf2 100644 --- a/.github/workflows/build_win_x86.yml +++ b/.github/workflows/build_win_x86.yml @@ -59,8 +59,8 @@ jobs: # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) permissions: - contents: read - actions: write + contents: write + actions: read runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build_win_x86_64.yml b/.github/workflows/build_win_x86_64.yml index 65aa0b0fd..e20b6e4d8 100644 --- a/.github/workflows/build_win_x86_64.yml +++ b/.github/workflows/build_win_x86_64.yml @@ -59,8 +59,8 @@ jobs: # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches if: contains(fromJson('["master", "main"]'), github.ref_name) permissions: - contents: read - actions: write + contents: write + actions: read runs-on: ubuntu-latest steps: diff --git a/src/game/chars/CChar.cpp b/src/game/chars/CChar.cpp index 412f89309..23fb559ba 100644 --- a/src/game/chars/CChar.cpp +++ b/src/game/chars/CChar.cpp @@ -902,6 +902,11 @@ void CChar::SetVisualRange(byte newSight) } } +void CChar::ResetVisualRange() +{ + m_iVisualRange = g_Cfg.m_iMapViewSize; +} + // Clean up weird flags. // fix Weirdness. // NOTE: diff --git a/src/game/chars/CChar.h b/src/game/chars/CChar.h index f2417e2f8..eba4ebb03 100644 --- a/src/game/chars/CChar.h +++ b/src/game/chars/CChar.h @@ -385,8 +385,9 @@ public: void StatFlag_Mod(uint64 uiStatFlag, bool fMod) noexcept; [[nodiscard]] virtual int GetVisualRange() const override; void SetVisualRange(byte newSight); + void ResetVisualRange(); - virtual bool IsResourceMatch( const CResourceID& rid, dword dwArg ) const override; + virtual bool IsResourceMatch( const CResourceID& rid, dword dwArg ) const override; bool IsResourceMatch( const CResourceID& rid, dword dwArg, dword dwArgResearch ) const; bool IsSpeakAsGhost() const; diff --git a/src/game/clients/CClientMsg.cpp b/src/game/clients/CClientMsg.cpp index 80e81ad30..2fa3dd67a 100644 --- a/src/game/clients/CClientMsg.cpp +++ b/src/game/clients/CClientMsg.cpp @@ -1497,6 +1497,7 @@ void CClient::addPlayerStart( CChar * pChar ) */ new PacketPlayerStart(this); + pChar->ResetVisualRange(); addMapDiff(); m_pChar->MoveToChar(pt, true, false, false, false); // make sure we are in active list m_pChar->Update(); diff --git a/src/sphereCrypt.ini b/src/sphereCrypt.ini index 6b50d4465..3dcdab69b 100644 --- a/src/sphereCrypt.ini +++ b/src/sphereCrypt.ini @@ -24,6 +24,8 @@ ENC_LOGIN 4 // Rotation cipher used for the Login Server crypt by every client, [SPHERECRYPT] // Classic Clients. +70011300 0374860ED 0ACD9FE7F ENC_TFISH // 7.0.113.00 +70011200 03771A2FD 0ACDF527F ENC_TFISH // 7.0.112.00 70011100 037BBE10D 0ACB53E7F ENC_TFISH // 7.0.111.00 70011000 037DD2B1D 0ACEFA27F ENC_TFISH // 7.0.110.00 70010900 03817712D 0AB101E7F ENC_TFISH // 7.0.109.00 @@ -235,6 +237,8 @@ ENC_LOGIN 4 // Rotation cipher used for the Login Server crypt by every client, 1232700 0D47BD45C 034081CD6 ENC_LOGIN // 1.23.27 // Enhanced Clients. +6790011300 0154860ED 0BDD9FE7F ENC_TFISH // 4.0.113.00 +6790011200 01571A2FD 0BDDF527F ENC_TFISH // 4.0.112.00 6790011100 015BBE10D 0BDB53E7F ENC_TFISH // 4.0.111.00 6790011000 015DD2B1D 0BDEFA27F ENC_TFISH // 4.0.110.00 6790010900 01A17712D 0BA101E7F ENC_TFISH // 4.0.109.00