Skip to content

与NPC交互时是否对交互超时进行判断 [聽風] #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

与NPC交互时是否对交互超时进行判断 [聽風] #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd8bd6d
与NPC交互时是否对交互超时进行判断 [聽風]
michaelwoooo Mar 21, 2023
4c59acd
Update battle.cpp
michaelwoooo Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions conf/battle/pandas.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,4 +489,10 @@ mob_default_damagemotion: 0
// 默认值为: yes
mob_setunitdata_persistence: yes

// 与NPC交互时是否对交互超时进行判断 [聽風]
// 如果设置此选项为 no 则玩家与NPC对话永远不会超时

// 默认值为: yes
npc_timeout: yes

// PYHELP - BATTLECONFIG - INSERT POINT - <Section 4>
4 changes: 4 additions & 0 deletions src/config/pandas.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@
// 是否启用 mob_setunitdata_persistence 配置选项及其功能 [Sola丶小克]
// 此选项用于控制是否高优先级持久化保存 setunitdata 对魔物的设置
#define Pandas_BattleConfig_Mob_SetUnitData_Persistence

// 是否启用 npc_timeout 配置选项及其功能 [聽風]
// 与NPC交互时是否对交互超时进行判断
#define Pandas_BattleConfig_Npc_Timeout
// PYHELP - BATTLECONFIG - INSERT POINT - <Section 1>
#endif // Pandas_BattleConfigure

Expand Down
3 changes: 3 additions & 0 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10661,6 +10661,9 @@ static const struct _battle_data {
#ifdef Pandas_BattleConfig_Mob_SetUnitData_Persistence
{ "mob_setunitdata_persistence", &battle_config.mob_setunitdata_persistence, 1, 0, 1, },
#endif // Pandas_BattleConfig_Mob_SetUnitData_Persistence
#ifdef Pandas_BattleConfig_Npc_Timeout
{ "npc_timeout", &battle_config.npc_timeout, 0, 0, 1, },
#endif // Pandas_BattleConfig_Npc_Timeout
// PYHELP - BATTLECONFIG - INSERT POINT - <Section 3>
#include "../custom/battle_config_init.inc"
};
Expand Down
3 changes: 3 additions & 0 deletions src/map/battle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,9 @@ struct Battle_Config
#ifdef Pandas_BattleConfig_Mob_SetUnitData_Persistence
int mob_setunitdata_persistence; // 是否高优先级持久化保存 setunitdata 对魔物的设置
#endif // Pandas_BattleConfig_Mob_SetUnitData_Persistence
#ifdef Pandas_BattleConfig_Npc_Timeout // 与NPC交互时是否对交互超时进行判断
int npc_timeout;
#endif // Pandas_BattleConfig_Npc_Timeout
// PYHELP - BATTLECONFIG - INSERT POINT - <Section 2>
#include "../custom/battle_config_struct.inc"
};
Expand Down
6 changes: 5 additions & 1 deletion src/map/npc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,11 @@ TIMER_FUNC(npc_secure_timeout_timer){
}

if( DIFF_TICK(cur_tick,sd->npc_idle_tick) > (timeout*1000) ) {
pc_close_npc(sd,1);
#ifdef Pandas_BattleConfig_Npc_Timeout
if (battle_config.npc_timeout) {
pc_close_npc(sd, 1);
}
#endif // Pandas_BattleConfig_Npc_Timeout
} else if(sd->st && (sd->st->state == END || sd->st->state == CLOSE)){
// stop timer the script is already ending
if( sd->npc_idle_timer != INVALID_TIMER ){
Expand Down