Merge pull request #226 from WhiteCloud0123/develop

ZOMBIE_FUSE: 不要让身为宠物的放荡吞噬者融合身为宠物的丧尸
WhiteCloud0123 · Jul 31, 2023 · d7db9d0 · d7db9d0
2 parents 77e03e8 + 8d8e05d
commit d7db9d0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/monattack.cpp b/src/monattack.cpp
@@ -6041,6 +6041,13 @@ bool mattack::zombie_fuse( monster *z )
  effect_grown_of_fuse ).get_max_intensity() ) ) ) {
  return false;
  }
+
+ if( z->has_effect(effect_pet) && critter->has_effect(effect_pet)) {
+
+ return false;
+
+ }
+
  add_msg_if_player_sees( *z, _( "The %1$s fuses with the %2$s." ),
  critter->name(), z->name() );
  z->moves -= 200;