various: fix mismatches in some action stubs and ResourceMgrTask

4 files changed, 9 insertions, 4 deletions

diff --git a/src/Game/AI/Action/actionOff.cpp b/src/Game/AI/Action/actionOff.cpp
index e66a781e..b17d5f60 100644
--- a/src/Game/AI/Action/actionOff.cpp
+++ b/src/Game/AI/Action/actionOff.cpp
@@ -28,7 +28,8 @@ void Off::loadParams_() {
 }
 
 void Off::calc_() {
-    ActionEx::calc_();
+    if (isFinishedAS(*mTargetIdx_s, *mSeqBankIdx_s))
+        setFinished();
 }
 
 }  // namespace uking::action
diff --git a/src/Game/AI/Action/actionOn.cpp b/src/Game/AI/Action/actionOn.cpp
index 80855216..a9f7fb77 100644
--- a/src/Game/AI/Action/actionOn.cpp
+++ b/src/Game/AI/Action/actionOn.cpp
@@ -28,7 +28,8 @@ void On::loadParams_() {
 }
 
 void On::calc_() {
-    ActionEx::calc_();
+    if (isFinishedAS(*mTargetIdx_s, *mSeqBankIdx_s))
+        setFinished();
 }
 
 }  // namespace uking::action
diff --git a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp
index f6a26eee..ea728d26 100644
--- a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp
+++ b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp
@@ -21,7 +21,8 @@ void PlayerStoleOpenBase::loadParams_() {
 }
 
 void PlayerStoleOpenBase::calc_() {
-    ActionEx::calc_();
+    if (isFinishedAS(0, 0))
+        setFinished();
 }
 
 }  // namespace uking::action
diff --git a/src/KingSystem/Resource/resResourceMgrTask.cpp b/src/KingSystem/Resource/resResourceMgrTask.cpp
index dc66c94c..74e845a1 100644
--- a/src/KingSystem/Resource/resResourceMgrTask.cpp
+++ b/src/KingSystem/Resource/resResourceMgrTask.cpp
@@ -681,7 +681,9 @@ void ResourceMgrTask::setCompactionStopped(bool stopped) {
         old_counter = mCompactionCounter.increment();
 
     stubbedLogFunction();
-    if (mCompactionCounter == 0 || old_counter == 0)
+    if (mCompactionCounter == 0)
+        stubbedLogFunction();
+    else if (old_counter == 0)
         stubbedLogFunction();
 }