remove MA mod, dont check morale consistency

SurFlurer · Jan 12, 2025 · 432f649 · 432f649
1 parent 33d6f66
commit 432f649
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/cnk-multi-release.yml b/.github/workflows/cnk-multi-release.yml
@@ -186,6 +186,10 @@ jobs:
           del '${{ github.workspace }}\gfx\Ultica_iso\' -Recurse -Force
           del '${{ github.workspace }}\gfx\PenAndPaper\' -Recurse -Force
           del '${{ github.workspace }}\gfx\ChibiUltica\' -Recurse -Force
+      - name: remove_mods(win)
+        if: runner.os == 'Windows'
+        run: |
+          del '${{ github.workspace }}\data\mods\MA\' -Recurse -Force
       - name: udp (Linux)
         if: runner.os != 'Windows'
         run: |

diff --git a/src/morale.cpp b/src/morale.cpp
@@ -849,7 +849,7 @@ bool player_morale::consistent_with( const player_morale &morale ) const
             } );
 
             if( iter == rhs.points.end() || lhp.get_net_bonus() != iter->get_net_bonus() ) {
-                debugmsg( "Morale \"%s\" is inconsistent.", lhp.get_name() );
+                //debugmsg( "Morale \"%s\" is inconsistent.", lhp.get_name() );
                 return false;
             }
         }