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

fix UNKNOWN_07 and NOT_SC condition codes

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-08 20:09:49 -07:00
parent d663472aae
commit 9dcdece1f9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/RulerServer.cc
+2 -2
View File
@@ -1008,14 +1008,14 @@ bool RulerServer::check_usability_or_condition_apply(
case CriterionCode::UNKNOWN_07:
// Like NOT_SC, but for ce3 instead of ce2
this->server()->base()->log.debug("check_usability_or_condition_apply: UNKNOWN_07: ce3 type is %s", ce3 ? name_for_card_type(ce3->def.type) : "missing");
if (ce3 && (ce3->def.type != CardType::HUNTERS_SC) && (ce3->def.type != CardType::ARKZ_SC)) {
if (!ce3 || ((ce3->def.type != CardType::HUNTERS_SC) && (ce3->def.type != CardType::ARKZ_SC))) {
this->server()->base()->log.debug("check_usability_or_condition_apply: UNKNOWN_07: returned %s", ret ? "true" : "false");
return ret;
}
this->server()->base()->log.debug("check_usability_or_condition_apply: UNKNOWN_07: did not pass");
break;
case CriterionCode::NOT_SC:
if (ce2 && (ce2->def.type != CardType::HUNTERS_SC) && (ce2->def.type != CardType::ARKZ_SC)) {
if (!ce2 || ((ce2->def.type != CardType::HUNTERS_SC) && (ce2->def.type != CardType::ARKZ_SC))) {
return ret;
}
break;
src/Episode3/Server.cc
+6 -6
View File
@@ -1610,7 +1610,7 @@ void Server::handle_6xB3x0B_mulligan_hand(const string& data) {
out_cmd.error_code = error_code;
this->send(out_cmd);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code);
}
void Server::handle_6xB3x0C_end_mulligan_phase(const string& data) {
@@ -1662,7 +1662,7 @@ void Server::handle_6xB3x0C_end_mulligan_phase(const string& data) {
out_cmd_fin.error_code = error_code;
this->send(out_cmd_fin);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd_fin.error_code);
}
void Server::handle_6xB3x0D_end_non_action_phase(const string& data) {
@@ -1716,7 +1716,7 @@ void Server::handle_6xB3x0E_discard_card_from_hand(const string& data) {
out_cmd.error_code = error_code;
this->send(out_cmd);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code);
}
void Server::handle_6xB3x0F_set_card_from_hand(const string& data) {
@@ -1755,7 +1755,7 @@ void Server::handle_6xB3x0F_set_card_from_hand(const string& data) {
out_cmd.error_code = this->ruler_server->error_code1;
this->send(out_cmd);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code);
}
void Server::handle_6xB3x10_move_fc_to_location(const string& data) {
@@ -1790,7 +1790,7 @@ void Server::handle_6xB3x10_move_fc_to_location(const string& data) {
out_cmd.error_code = this->ruler_server->error_code2;
this->send(out_cmd);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code);
}
void Server::handle_6xB3x11_enqueue_attack_or_defense(const string& data) {
@@ -1823,7 +1823,7 @@ void Server::handle_6xB3x11_enqueue_attack_or_defense(const string& data) {
out_cmd.error_code = this->ruler_server->error_code3;
this->send(out_cmd);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code);
}
void Server::handle_6xB3x12_end_attack_list(const string& data) {