汇总合并 rAthena 官方最新代码 - 2024年05月06日

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
+# https://github.com/rathena/rathena/commit/637ae9a4dcde0d5885a18841d2f3875e06893c30
+637ae9a4dcde0d5885a18841d2f3875e06893c30
+# Applied AStyle code formating as discussed on tid:74602.
+# https://github.com/rathena/rathena/commit/a7c32653f70bd420bdf5a621acdf3aea5c6e6002
+a7c32653f70bd420bdf5a621acdf3aea5c6e6002
+# Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
+# https://github.com/rathena/rathena/commit/a2bdc47dafb32f6d18ed350d8bbe79b8f679a049
+a2bdc47dafb32f6d18ed350d8bbe79b8f679a049

.github/workflows/build_servers_gcc.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        gcc: [9, 10, 11]
+        gcc: [9, 10, 11, 12, 13]
 
     steps:
       - name: Checkout repository

3rdparty/breakpad/src/client/linux/handler/minidump_descriptor.h

@@ -38,6 +38,9 @@
 #include "client/linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"
 
+// A temporary solution to the issue of GCC-13 reporting the symbol uintptr_t as undefined.
+#include <cstdint>
+
 // This class describes how a crash dump should be generated, either:
 // - Writing a full minidump to a file in a given directory (the actual path,
 //   inside the directory, is determined by this class).

conf/battle/exp.conf

@@ -85,6 +85,7 @@ max_exp_gain_rate: 0
 // 击杀魔物之后, 获得经验的计算方式:
 // 0 = 经验分配比例 = 玩家造成的伤害 / 魔物受到的总伤害 (jAthena方式)
 // 1 = 经验分配比例 = 玩家造成的伤害 / 魔物的最大血量 (eAthena方式)
+// 2 = 使用 0 的计算方式 + 第一个攻击者获得双倍经验
 // 提示: 若设置为 1 那么当有多人攻击同一魔物的时候, 禁止第一个攻击者获得双倍经验.
 // 
 // 算法举例:

conf/battle/monster.conf

@@ -94,10 +94,10 @@ monster_chase_refresh: 30
 // 那么这个选项可以填写 6 (因为 2 + 4 = 6)
 mob_warp: 0
 
-// If these are set above 0, they define the time (in ms) during which monsters
-// will have their 'AI' active after all players have left their vicinity.
-mob_active_time: 0
-boss_active_time: 0
+// Defines the time (in ms) during which monsters will have their AI active
+// after all players have left their vicinity.
+mob_active_time: 5000
+boss_active_time: 5000
 
 // 魔物和宠物的视野范围倍率调整 (即 mob_db 中的 range2 字段) [百分比选项]
 // 主动攻击的魔物, 只会对视野范围内的玩家发起攻击. 
@@ -369,3 +369,8 @@ slave_stick_with_master: no
 //
 // 默认值为: 1000 (KRO 官方值)
 mob_respawn_time: 1000
+
+// Defines the time (in ms) after which a monster unlocks its target when trapped.
+// During this time monsters will still be in idle mode and use idle skills on random
+// targets, but they continue chasing their original target when no longer trapped.
+mob_unlock_time: 2000