Fix bug: skill Sunder.

andor9 · Jan 6, 2016 · 79ab6e8 · 79ab6e8
1 parent a648608
commit 79ab6e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sim.cpp b/sim.cpp
@@ -1369,7 +1369,7 @@ inline bool skill_predicate<overload>(Field* fd, CardStatus* src, CardStatus* ds
 template<>
 inline bool skill_predicate<rally>(Field* fd, CardStatus* src, CardStatus* dst, const SkillSpec& s)
 {
-    return fd->tapi == dst->m_player ? is_active(dst) && !has_attacked(dst) : is_active_next_turn(dst);
+    return ! dst->m_sundered && (fd->tapi == dst->m_player ? is_active(dst) && !has_attacked(dst) : is_active_next_turn(dst));
 }
 
 template<>

diff --git a/tyrant.h b/tyrant.h
@@ -1,7 +1,7 @@
 #ifndef TYRANT_H_INCLUDED
 #define TYRANT_H_INCLUDED
 
-#define TYRANT_OPTIMIZER_VERSION "2.16.0"
+#define TYRANT_OPTIMIZER_VERSION "2.16.1"
 
 #include <string>
 #include <sstream>