diff --git a/packages/logic/src/triggers/special/personality/che_대의.ts b/packages/logic/src/triggers/special/personality/che_대의.ts
index bdb9228f..0e7ee593 100644
--- a/packages/logic/src/triggers/special/personality/che_대의.ts
+++ b/packages/logic/src/triggers/special/personality/che_대의.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -10,20 +10,34 @@ export const traitModule: TraitModule = {
     kind: 'personality',
     getName: () => '대의',
     getInfo: () => '명성 +10%, 훈련 -5',
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 1.1;
-            }
-            if (statName === 'bonusTrain') {
-                return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (typeof value === 'number') {
+                if (statName === 'experience') {
+                    return value * 1.1;
+                }
+                if (statName === 'bonusTrain') {
+                    return value - 5;
+                }
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_안전.ts b/packages/logic/src/triggers/special/personality/che_안전.ts
index 2b0a90e2..ea42e821 100644
--- a/packages/logic/src/triggers/special/personality/che_안전.ts
+++ b/packages/logic/src/triggers/special/personality/che_안전.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,15 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (statName === 'bonusAtmos' && typeof value === 'number') {
-            return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'bonusAtmos' && typeof value === 'number') {
+                return value - 5;
+            }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_왕좌.ts b/packages/logic/src/triggers/special/personality/che_왕좌.ts
index 2846452e..9a7cea60 100644
--- a/packages/logic/src/triggers/special/personality/che_왕좌.ts
+++ b/packages/logic/src/triggers/special/personality/che_왕좌.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -10,20 +10,34 @@ export const traitModule: TraitModule = {
     kind: 'personality',
     getName: () => '왕좌',
     getInfo: () => '명성 +10%, 사기 -5',
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 1.1;
-            }
-            if (statName === 'bonusAtmos') {
-                return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (typeof value === 'number') {
+                if (statName === 'experience') {
+                    return value * 1.1;
+                }
+                if (statName === 'bonusAtmos') {
+                    return value - 5;
+                }
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_유지.ts b/packages/logic/src/triggers/special/personality/che_유지.ts
index d8956d70..de302beb 100644
--- a/packages/logic/src/triggers/special/personality/che_유지.ts
+++ b/packages/logic/src/triggers/special/personality/che_유지.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,15 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (statName === 'bonusTrain' && typeof value === 'number') {
-            return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'bonusTrain' && typeof value === 'number') {
+                return value - 5;
+            }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_은둔.ts b/packages/logic/src/triggers/special/personality/che_은둔.ts
index 0351a2f5..bf3212df 100644
--- a/packages/logic/src/triggers/special/personality/che_은둔.ts
+++ b/packages/logic/src/triggers/special/personality/che_은둔.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,26 +16,40 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 0.9;
-            }
-            if (statName === 'dedication') {
-                return value * 0.9;
-            }
-            if (statName === 'bonusAtmos') {
-                return value - 5;
-            }
-            if (statName === 'bonusTrain') {
-                return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (typeof value === 'number') {
+                if (statName === 'experience') {
+                    return value * 0.9;
+                }
+                if (statName === 'dedication') {
+                    return value * 0.9;
+                }
+                if (statName === 'bonusAtmos') {
+                    return value - 5;
+                }
+                if (statName === 'bonusTrain') {
+                    return value - 5;
+                }
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_의협.ts b/packages/logic/src/triggers/special/personality/che_의협.ts
index 6a9033ed..e85b26a2 100644
--- a/packages/logic/src/triggers/special/personality/che_의협.ts
+++ b/packages/logic/src/triggers/special/personality/che_의협.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,20 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 0.9;
-            }
-            if (statName === 'bonusAtmos') {
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'bonusAtmos' && typeof value === 'number') {
                 return value + 5;
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_재간.ts b/packages/logic/src/triggers/special/personality/che_재간.ts
index 11c6dec9..6001a20b 100644
--- a/packages/logic/src/triggers/special/personality/che_재간.ts
+++ b/packages/logic/src/triggers/special/personality/che_재간.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,15 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (statName === 'experience' && typeof value === 'number') {
-            return value * 0.9;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'experience' && typeof value === 'number') {
+                return value * 0.9;
+            }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_정복.ts b/packages/logic/src/triggers/special/personality/che_정복.ts
index acf5d5f6..7e458ccc 100644
--- a/packages/logic/src/triggers/special/personality/che_정복.ts
+++ b/packages/logic/src/triggers/special/personality/che_정복.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -10,20 +10,34 @@ export const traitModule: TraitModule = {
     kind: 'personality',
     getName: () => '정복',
     getInfo: () => '명성 -10%, 사기 +5',
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 0.9;
-            }
-            if (statName === 'bonusAtmos') {
-                return value + 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (typeof value === 'number') {
+                if (statName === 'experience') {
+                    return value * 0.9;
+                }
+                if (statName === 'bonusAtmos') {
+                    return value + 5;
+                }
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_출세.ts b/packages/logic/src/triggers/special/personality/che_출세.ts
index 2a4759dc..0d48d6ab 100644
--- a/packages/logic/src/triggers/special/personality/che_출세.ts
+++ b/packages/logic/src/triggers/special/personality/che_출세.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,20 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'experience' && typeof value === 'number') {
                 return value * 1.1;
             }
-            if (statName === 'bonusTrain') {
-                return value + 5;
-            }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_패권.ts b/packages/logic/src/triggers/special/personality/che_패권.ts
index fa1a63f1..cbdf8a4e 100644
--- a/packages/logic/src/triggers/special/personality/che_패권.ts
+++ b/packages/logic/src/triggers/special/personality/che_패권.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -16,20 +16,29 @@ export const traitModule: TraitModule = {
         }
         return value;
     },
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 1.1;
-            }
-            if (statName === 'bonusAtmos') {
-                return value - 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (statName === 'bonusTrain' && typeof value === 'number') {
+                return value + 5;
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/personality/che_할거.ts b/packages/logic/src/triggers/special/personality/che_할거.ts
index 9004c9b0..c5dfc8aa 100644
--- a/packages/logic/src/triggers/special/personality/che_할거.ts
+++ b/packages/logic/src/triggers/special/personality/che_할거.ts
@@ -1,4 +1,4 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
 import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
@@ -10,20 +10,34 @@ export const traitModule: TraitModule = {
     kind: 'personality',
     getName: () => '할거',
     getInfo: () => '명성 -10%, 훈련 +5',
-    onCalcStat: ((
-        _context: GeneralActionContext | WarActionContext,
-        statName: GeneralStatName | WarStatName,
-        value: number | [number, number],
-        _aux?: unknown
-    ): number | [number, number] => {
-        if (typeof value === 'number') {
-            if (statName === 'experience') {
-                return value * 0.9;
-            }
-            if (statName === 'bonusTrain') {
-                return value + 5;
+    onCalcStat: (() => {
+        function onCalcStat(
+            _context: GeneralActionContext,
+            statName: GeneralStatName,
+            value: number,
+            _aux?: unknown
+        ): number;
+        function onCalcStat(
+            _context: WarActionContext,
+            statName: WarStatName,
+            value: number | [number, number],
+            _aux?: unknown
+        ): number | [number, number];
+        function onCalcStat(
+            _context: GeneralActionContext | WarActionContext,
+            statName: GeneralStatName | WarStatName,
+            value: number | [number, number]
+        ): number | [number, number] {
+            if (typeof value === 'number') {
+                if (statName === 'experience') {
+                    return value * 0.9;
+                }
+                if (statName === 'bonusTrain') {
+                    return value + 5;
+                }
             }
+            return value;
         }
-        return value;
-    }) as unknown as TraitOnCalcStat,
+        return onCalcStat;
+    })() as Exclude<TraitModule['onCalcStat'], undefined>,
 };
diff --git a/packages/logic/src/triggers/special/types.ts b/packages/logic/src/triggers/special/types.ts
index 2cddcce8..c88fccf4 100644
--- a/packages/logic/src/triggers/special/types.ts
+++ b/packages/logic/src/triggers/special/types.ts
@@ -1,8 +1,6 @@
 import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js';
 import type { GeneralActionModule } from '@sammo-ts/logic/triggers/general-action.js';
-import type { WarActionModule, WarActionContext } from '@sammo-ts/logic/war/actions.js';
-import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionModule } from '@sammo-ts/logic/war/actions.js';
 
 export type TraitKind = 'domestic' | 'war' | 'personality';
 
@@ -13,32 +11,9 @@ export interface TraitSpec {
     kind: TraitKind;
 }
 
-export interface TraitOnCalcStat<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
-    (context: GeneralActionContext<TriggerState>, statName: GeneralStatName, value: number, aux?: unknown): number;
-    (
-        context: WarActionContext<TriggerState>,
-        statName: WarStatName,
-        value: number | [number, number],
-        aux?: unknown
-    ): number | [number, number];
-}
-
-export interface TraitOnCalcOpposeStat<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
-    (context: GeneralActionContext<TriggerState>, statName: GeneralStatName, value: number, aux?: unknown): number;
-    (
-        context: WarActionContext<TriggerState>,
-        statName: WarStatName,
-        value: number | [number, number],
-        aux?: unknown
-    ): number | [number, number];
-}
-
 export type TraitModule<TriggerState extends GeneralTriggerState = GeneralTriggerState> = TraitSpec &
-    Omit<GeneralActionModule<TriggerState>, 'onCalcStat' | 'onCalcOpposeStat'> &
-    Omit<WarActionModule<TriggerState>, 'onCalcStat' | 'onCalcOpposeStat'> & {
-        onCalcStat?: TraitOnCalcStat<TriggerState> | undefined;
-        onCalcOpposeStat?: TraitOnCalcOpposeStat<TriggerState> | undefined;
-    };
+    GeneralActionModule<TriggerState> &
+    WarActionModule<TriggerState>;
 
 export interface TraitModuleExport<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
     traitModule: TraitModule<TriggerState>;
diff --git a/packages/logic/src/triggers/special/war/che_격노.ts b/packages/logic/src/triggers/special/war/che_격노.ts
index 0e750e9a..e5cccf8a 100644
--- a/packages/logic/src/triggers/special/war/che_격노.ts
+++ b/packages/logic/src/triggers/special/war/che_격노.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 import { LogFormat } from '@sammo-ts/logic/logging/types.js';
@@ -74,14 +74,21 @@ class che_격노발동 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     _statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_격노',
diff --git a/packages/logic/src/triggers/special/war/che_견고.ts b/packages/logic/src/triggers/special/war/che_견고.ts
index a2308e01..84565faf 100644
--- a/packages/logic/src/triggers/special/war/che_견고.ts
+++ b/packages/logic/src/triggers/special/war/che_견고.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitOnCalcOpposeStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 
@@ -21,29 +21,21 @@ class che_부상무효 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     _statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     return value;
-}) as unknown as TraitOnCalcStat;
-
-const onCalcOpposeStat = ((
-    _context: GeneralActionContext | WarActionContext,
-    statName: GeneralStatName | WarStatName,
-    value: number | [number, number],
-    _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
-        return value - 0.1;
-    }
-    if (statName === 'warCriticalRatio' && typeof value === 'number') {
-        return value - 0.2;
-    }
-    return value;
-}) as unknown as TraitOnCalcOpposeStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_견고',
@@ -52,7 +44,15 @@ export const traitModule: TraitModule = {
     kind: 'war',
     getName: () => '견고',
     getInfo: () => '[전투] 상대 필살 확률 -20%p, 상대 계략 시도시 성공 확률 -10%p, 부상 없음, 아군 피해 -10%',
-    onCalcOpposeStat,
+    onCalcOpposeStat: ((_context, statName, value, _aux) => {
+        if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
+            return value - 0.1;
+        }
+        if (statName === 'warCriticalRatio' && typeof value === 'number') {
+            return value - 0.2;
+        }
+        return value;
+    }) as TraitModule['onCalcOpposeStat'],
     getBattleInitTriggerList: (_context) => {
         if (!_context.unit) return null;
         return new WarTriggerCaller(new che_부상무효(_context.unit));
diff --git a/packages/logic/src/triggers/special/war/che_공성.ts b/packages/logic/src/triggers/special/war/che_공성.ts
index 14347dff..80190adb 100644
--- a/packages/logic/src/triggers/special/war/che_공성.ts
+++ b/packages/logic/src/triggers/special/war/che_공성.ts
@@ -1,17 +1,24 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 import { WarUnitCity } from '@sammo-ts/logic/war/units.js';
 import { getAuxArmType, parseWarDexAux } from './aux.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     if (!('unit' in context) || !context.unit) {
         return value;
     }
@@ -34,7 +41,7 @@ const onCalcStat = ((
         }
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 // 전투 특기: 공성
 export const traitModule: TraitModule = {
diff --git a/packages/logic/src/triggers/special/war/che_궁병.ts b/packages/logic/src/triggers/special/war/che_궁병.ts
index da5d9c42..47670801 100644
--- a/packages/logic/src/triggers/special/war/che_궁병.ts
+++ b/packages/logic/src/triggers/special/war/che_궁병.ts
@@ -1,18 +1,25 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 import { getAuxArmType, parseWarDexAux } from './aux.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warAvoidRatio' && typeof value === 'number') {
-        return value + 0.2;
+): number | [number, number] {
+    if (statName === 'warAvoidRatio') {
+        return (value as number) + 0.2;
     }
 
     if (!('unit' in context) || !context.unit) {
@@ -37,7 +44,7 @@ const onCalcStat = ((
         }
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 // 전투 특기: 궁병
 export const traitModule: TraitModule = {
diff --git a/packages/logic/src/triggers/special/war/che_기병.ts b/packages/logic/src/triggers/special/war/che_기병.ts
index 7882e511..d28a9795 100644
--- a/packages/logic/src/triggers/special/war/che_기병.ts
+++ b/packages/logic/src/triggers/special/war/che_기병.ts
@@ -1,16 +1,23 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 import { getAuxArmType, parseWarDexAux } from './aux.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     if (!('unit' in context) || !context.unit) {
         return value;
     }
@@ -33,7 +40,7 @@ const onCalcStat = ((
         }
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 // 전투 특기: 기병
 export const traitModule: TraitModule = {
diff --git a/packages/logic/src/triggers/special/war/che_돌격.ts b/packages/logic/src/triggers/special/war/che_돌격.ts
index 5d2db612..dc660b21 100644
--- a/packages/logic/src/triggers/special/war/che_돌격.ts
+++ b/packages/logic/src/triggers/special/war/che_돌격.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 
@@ -37,17 +37,24 @@ class che_돌격지속 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'initWarPhase' && typeof value === 'number') {
-        return value + 2;
+): number | [number, number] {
+    if (statName === 'initWarPhase') {
+        return (value as number) + 2;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_돌격',
diff --git a/packages/logic/src/triggers/special/war/che_무쌍.ts b/packages/logic/src/triggers/special/war/che_무쌍.ts
index a4344925..ea7a07fa 100644
--- a/packages/logic/src/triggers/special/war/che_무쌍.ts
+++ b/packages/logic/src/triggers/special/war/che_무쌍.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 
 import { WarUnit } from '@sammo-ts/logic/war/units.js';
@@ -11,19 +11,26 @@ type WarUnitWithGeneral = WarUnit & { getGeneral: () => { meta: Record<string, u
 const hasGeneral = (unit: WarUnit): unit is WarUnitWithGeneral =>
     'getGeneral' in unit && typeof (unit as { getGeneral?: unknown }).getGeneral === 'function';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     const isAttacker = typeof aux === 'object' && aux !== null && (aux as { isAttacker?: unknown }).isAttacker === true;
 
     if (statName === 'warCriticalRatio' && isAttacker && typeof value === 'number') {
         return value + 0.1;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_무쌍',
diff --git a/packages/logic/src/triggers/special/war/che_반계.ts b/packages/logic/src/triggers/special/war/che_반계.ts
index 6957ffde..ea1d5261 100644
--- a/packages/logic/src/triggers/special/war/che_반계.ts
+++ b/packages/logic/src/triggers/special/war/che_반계.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitOnCalcOpposeStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 import { LogFormat } from '@sammo-ts/logic/logging/types.js';
@@ -72,29 +72,24 @@ class che_반계발동 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessDamage' && aux === '반목' && typeof value === 'number') {
-        return value + 0.9;
+): number | [number, number] {
+    if (statName === 'warMagicSuccessDamage' && aux === '반목') {
+        return (value as number) + 0.9;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
-
-const onCalcOpposeStat = ((
-    _context: GeneralActionContext | WarActionContext,
-    statName: GeneralStatName | WarStatName,
-    value: number | [number, number],
-    _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
-        return value - 0.1;
-    }
-    return value;
-}) as unknown as TraitOnCalcOpposeStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_반계',
@@ -104,7 +99,12 @@ export const traitModule: TraitModule = {
     getName: () => '반계',
     getInfo: () =>
         '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +150%)',
-    onCalcOpposeStat,
+    onCalcOpposeStat: ((_context, statName, value, _aux) => {
+        if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
+            return value - 0.1;
+        }
+        return value;
+    }) as TraitModule['onCalcOpposeStat'],
     getBattlePhaseTriggerList: (_context) => {
         if (!_context.unit) return null;
         return new WarTriggerCaller(new che_반계시도(_context.unit), new che_반계발동(_context.unit));
diff --git a/packages/logic/src/triggers/special/war/che_보병.ts b/packages/logic/src/triggers/special/war/che_보병.ts
index 809937e5..7a6834f6 100644
--- a/packages/logic/src/triggers/special/war/che_보병.ts
+++ b/packages/logic/src/triggers/special/war/che_보병.ts
@@ -1,16 +1,23 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 import { getAuxArmType, parseWarDexAux } from './aux.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     if (!('unit' in context) || !context.unit) {
         return value;
     }
@@ -33,7 +40,7 @@ const onCalcStat = ((
         }
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 // 전투 특기: 보병
 export const traitModule: TraitModule = {
diff --git a/packages/logic/src/triggers/special/war/che_신산.ts b/packages/logic/src/triggers/special/war/che_신산.ts
index f6781b30..d056130e 100644
--- a/packages/logic/src/triggers/special/war/che_신산.ts
+++ b/packages/logic/src/triggers/special/war/che_신산.ts
@@ -1,22 +1,29 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicTrialProb' && typeof value === 'number') {
-        return value + 0.2;
+): number | [number, number] {
+    if (statName === 'warMagicTrialProb') {
+        return (value as number) + 0.2;
     }
-    if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
-        return value + 0.2;
+    if (statName === 'warMagicSuccessProb') {
+        return (value as number) + 0.2;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_신산',
diff --git a/packages/logic/src/triggers/special/war/che_신중.ts b/packages/logic/src/triggers/special/war/che_신중.ts
index 5d29e1e2..afa0a63d 100644
--- a/packages/logic/src/triggers/special/war/che_신중.ts
+++ b/packages/logic/src/triggers/special/war/che_신중.ts
@@ -1,19 +1,26 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
-        return value + 1;
+): number | [number, number] {
+    if (statName === 'warMagicSuccessProb') {
+        return (value as number) + 1;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_신중',
diff --git a/packages/logic/src/triggers/special/war/che_위압.ts b/packages/logic/src/triggers/special/war/che_위압.ts
index 8651e150..ee68581f 100644
--- a/packages/logic/src/triggers/special/war/che_위압.ts
+++ b/packages/logic/src/triggers/special/war/che_위압.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 import { LogFormat } from '@sammo-ts/logic/logging/types.js';
@@ -61,14 +61,21 @@ class che_위압발동 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     _statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_위압',
diff --git a/packages/logic/src/triggers/special/war/che_저격.ts b/packages/logic/src/triggers/special/war/che_저격.ts
index 3b22c9b7..9de1a6d4 100644
--- a/packages/logic/src/triggers/special/war/che_저격.ts
+++ b/packages/logic/src/triggers/special/war/che_저격.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 import { LogFormat } from '@sammo-ts/logic/logging/types.js';
@@ -99,14 +99,21 @@ class che_저격발동 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     _statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_저격',
diff --git a/packages/logic/src/triggers/special/war/che_집중.ts b/packages/logic/src/triggers/special/war/che_집중.ts
index 8ec2d1ab..a630876e 100644
--- a/packages/logic/src/triggers/special/war/che_집중.ts
+++ b/packages/logic/src/triggers/special/war/che_집중.ts
@@ -1,19 +1,26 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessDamage' && typeof value === 'number') {
-        return value * 1.5;
+): number | [number, number] {
+    if (statName === 'warMagicSuccessDamage') {
+        return (value as number) * 1.5;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_집중',
diff --git a/packages/logic/src/triggers/special/war/che_징병.ts b/packages/logic/src/triggers/special/war/che_징병.ts
index 26364b37..9845b51c 100644
--- a/packages/logic/src/triggers/special/war/che_징병.ts
+++ b/packages/logic/src/triggers/special/war/che_징병.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
 const RECRUIT_TRAIN = 70;
 const CONSCRIPT_TRAIN = 84;
@@ -17,17 +17,23 @@ const resolveLeadershipBonus = (
     return value + base * 0.25;
 };
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
-    value: number | [number, number],
-    _aux?: unknown
-): number | [number, number] => {
+    value: number | [number, number]
+): number | [number, number] {
     if (statName !== 'leadership') {
         return value;
     }
     return resolveLeadershipBonus(context, value);
-}) as unknown as TraitOnCalcStat;
+}
 
 // 전투 특기: 징병
 export const traitModule: TraitModule = {
diff --git a/packages/logic/src/triggers/special/war/che_척사.ts b/packages/logic/src/triggers/special/war/che_척사.ts
index 58e67d96..5dc0e55f 100644
--- a/packages/logic/src/triggers/special/war/che_척사.ts
+++ b/packages/logic/src/triggers/special/war/che_척사.ts
@@ -1,16 +1,23 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     _statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
+): number | [number, number] {
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_척사',
diff --git a/packages/logic/src/triggers/special/war/che_필살.ts b/packages/logic/src/triggers/special/war/che_필살.ts
index 0c8b1cd9..f3f11fa2 100644
--- a/packages/logic/src/triggers/special/war/che_필살.ts
+++ b/packages/logic/src/triggers/special/war/che_필살.ts
@@ -1,7 +1,7 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js';
 import type { WarUnit } from '@sammo-ts/logic/war/units.js';
 
@@ -25,21 +25,28 @@ class che_필살강화_회피불가 extends BaseWarUnitTrigger {
     }
 }
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warCriticalRatio' && typeof value === 'number') {
-        return value + 0.3;
+): number | [number, number] {
+    if (statName === 'warCriticalRatio') {
+        return (value as number) + 0.3;
     }
-    if (statName === 'criticalDamageRange' && Array.isArray(value)) {
-        const [rangeMin, rangeMax] = value;
+    if (statName === 'criticalDamageRange') {
+        const [rangeMin, rangeMax] = value as [number, number];
         return [(rangeMin + rangeMax) / 2, rangeMax];
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_필살',
diff --git a/packages/logic/src/triggers/special/war/che_환술.ts b/packages/logic/src/triggers/special/war/che_환술.ts
index 30a4312b..6c841ccf 100644
--- a/packages/logic/src/triggers/special/war/che_환술.ts
+++ b/packages/logic/src/triggers/special/war/che_환술.ts
@@ -1,22 +1,29 @@
-import type { TraitOnCalcStat, TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js';
-import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { GeneralStatName, WarStatName } from '@sammo-ts/logic/triggers/types.js';
+import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
+import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 
-const onCalcStat = ((
+function onCalcStat(context: GeneralActionContext, statName: GeneralStatName, value: number, aux?: unknown): number;
+function onCalcStat(
+    context: WarActionContext,
+    statName: WarStatName,
+    value: number | [number, number],
+    aux?: unknown
+): number | [number, number];
+function onCalcStat(
     _context: GeneralActionContext | WarActionContext,
     statName: GeneralStatName | WarStatName,
     value: number | [number, number],
     _aux?: unknown
-): number | [number, number] => {
-    if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
-        return value + 0.1;
+): number | [number, number] {
+    if (statName === 'warMagicSuccessProb') {
+        return (value as number) + 0.1;
     }
-    if (statName === 'warMagicSuccessDamage' && typeof value === 'number') {
-        return value * 1.3;
+    if (statName === 'warMagicSuccessDamage') {
+        return (value as number) * 1.3;
     }
     return value;
-}) as unknown as TraitOnCalcStat;
+}
 
 export const traitModule: TraitModule = {
     key: 'che_환술',