incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Ep3 flag to allow interference for human teams

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-12 14:53:16 -07:00
parent 15566f7143
commit a8d09363f1
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/CardSpecial.cc
+2 -2
View File
@@ -3564,7 +3564,7 @@ void CardSpecial::check_for_defense_interference(
}
auto ally_hes = this->server()->ruler_server->get_hand_and_equip_state_for_client_id(target_ally_client_id);
if (!ally_hes || !ally_hes->is_cpu_player) {
if (!ally_hes || (!(this->server()->behavior_flags & BehaviorFlag::ALLOW_NON_COM_INTERFERENCE) && !ally_hes->is_cpu_player)) {
return;
}
@@ -4558,7 +4558,7 @@ void CardSpecial::check_for_attack_interference(shared_ptr<Card> unknown_p2) {
}
auto ally_hes = this->server()->ruler_server->get_hand_and_equip_state_for_client_id(ally_client_id);
if (!ally_hes || !ally_hes->is_cpu_player) {
if (!ally_hes || (!(this->server()->behavior_flags & BehaviorFlag::ALLOW_NON_COM_INTERFERENCE) && !ally_hes->is_cpu_player)) {
return;
}
src/Episode3/DataIndexes.hh
+1
View File
@@ -36,6 +36,7 @@ enum BehaviorFlag : uint32_t {
ENABLE_RECORDING = 0x00000040,
DISABLE_MASKING = 0x00000080,
DISABLE_INTERFERENCE = 0x00000100,
ALLOW_NON_COM_INTERFERENCE = 0x00000200,
};
enum class StatSwapType : uint8_t {