Sortilèges: Regroupement par jet de sauvegarde

Selphira · Mar 6, 2024 · 0836489 · 0836489
1 parent 99f1fab
commit 0836489
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 55 deletions.
diff --git a/AutoDescription/lib/effect.tpp b/AutoDescription/lib/effect.tpp
@@ -36,6 +36,7 @@ DEFINE_PATCH_MACRO ~read_effect_vars~ BEGIN
 	SPRINT target_type ~~
 	SPRINT complex_value ~~
 	SPRINT complex_duration ~~
+	SPRINT complex_save ~~
 END
 
 DEFINE_PATCH_MACRO ~read_external_effect_vars~ BEGIN
@@ -68,6 +69,7 @@ DEFINE_PATCH_MACRO ~read_external_effect_vars~ BEGIN
 	SPRINT target_type ~~
 	SPRINT complex_value ~~
 	SPRINT complex_duration ~~
+	SPRINT complex_save ~~
 END
 
 DEFINE_PATCH_MACRO ~data_to_vars~ BEGIN
@@ -100,6 +102,7 @@ DEFINE_PATCH_MACRO ~data_to_vars~ BEGIN
 	SPRINT target_type ~%data_26%~
 	SPRINT complex_value ~%data_27%~
 	SPRINT complex_duration ~%data_28%~
+	SPRINT complex_save ~%data_29%~
 END
 
 DEFINE_PATCH_MACRO ~data_to_match_vars~ BEGIN
@@ -132,7 +135,7 @@ DEFINE_PATCH_MACRO ~data_to_match_vars~ BEGIN
 	SPRINT match_target_exceptions ~%data_25%~
 	SPRINT match_target_type ~%data_26%~
 	SPRINT match_complex_value ~%data_27%~
-	SPRINT match_complex_duration ~%data_28%~
+	SPRINT match_complex_save ~%data_29%~
 END
 
 
@@ -524,7 +527,7 @@ DEFINE_PATCH_MACRO ~add_opcode~ BEGIN
 	ELSE BEGIN
 		SET $opcodes(~%opcode%~) += 1
 	END
-	SET $EVAL ~opcodes_%opcode%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = 1
+	SET $EVAL ~opcodes_%opcode%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = 1
 END
 
 DEFINE_PATCH_FUNCTION ~delete_opcode~
@@ -576,7 +579,7 @@ BEGIN
 			LPM ~%match_macro%~
 			PATCH_IF NOT match BEGIN
 				SET count += 1
-		        SET $opcodes_xx(~%data_0%~ ~%data_1%~ ~%data_2%~ ~%data_3%~ ~%data_4%~ ~%data_5%~ ~%data_6%~ ~%data_7%~ ~%data_8%~ ~%data_9%~ ~%data_10%~ ~%data_11%~ ~%data_12%~ ~%data_13%~ ~%data_14%~ ~%data_15%~ ~%data_16%~ ~%data_17%~ ~%data_18%~ ~%data_19%~ ~%data_20%~ ~%data_21%~ ~%data_22%~ ~%data_23%~ ~%data_24%~ ~%data_25%~ ~%data_26%~ ~%data_27%~ ~%data_28%~) = 1
+		        SET $opcodes_xx(~%data_0%~ ~%data_1%~ ~%data_2%~ ~%data_3%~ ~%data_4%~ ~%data_5%~ ~%data_6%~ ~%data_7%~ ~%data_8%~ ~%data_9%~ ~%data_10%~ ~%data_11%~ ~%data_12%~ ~%data_13%~ ~%data_14%~ ~%data_15%~ ~%data_16%~ ~%data_17%~ ~%data_18%~ ~%data_19%~ ~%data_20%~ ~%data_21%~ ~%data_22%~ ~%data_23%~ ~%data_24%~ ~%data_25%~ ~%data_26%~ ~%data_27%~ ~%data_28%~ ~%data_29%~) = 1
 	        END
 	    END
 	END

diff --git a/AutoDescription/lib/itm/effects.tpp b/AutoDescription/lib/itm/effects.tpp
@@ -134,8 +134,16 @@ DEFINE_PATCH_MACRO ~add_save~ BEGIN
 				END
 			END
 
-			PATCH_IF saveBonus != 0 BEGIN
-				LPF ~signed_value~ INT_VAR value = EVAL ~%saveBonus%~ RET saveBonus = value END
+			PATCH_IF saveBonus != 0 OR NOT ~%complex_save%~ STRING_EQUAL ~~ BEGIN
+				PATCH_IF NOT ~%complex_save%~ STRING_EQUAL ~~ BEGIN
+					SPRINT saveBonus ~%complex_save%~
+					PATCH_IF complex_value_int < 0 BEGIN
+						SPRINT saveBonus ~-%saveBonus%~
+					END
+				END
+				ELSE BEGIN
+					LPF ~signed_value~ INT_VAR value = EVAL ~%saveBonus%~ RET saveBonus = value END
+				END
 				PATCH_IF saveForHalf BEGIN
 					SPRINT saveStr @101184 // ~jet de sauvegarde à %saveBonus% %saveTypeStr% pour réduire de moitié~
 				END

diff --git a/AutoDescription/lib/itm/opcodes.tpp b/AutoDescription/lib/itm/opcodes.tpp
@@ -16206,6 +16206,34 @@ DEFINE_PATCH_MACRO ~opcode_match_except_duration~ BEGIN
     )
 END
 
+DEFINE_PATCH_MACRO ~opcode_match_except_saveBonus~ BEGIN
+	SET match = (
+			match_isExternal   == isExternal
+        AND match_target       == target
+        AND match_power        == power
+        AND match_parameter1   == parameter1
+        AND match_parameter2   == parameter2
+        AND match_duration     == duration
+        AND match_timingMode   == timingMode
+        AND match_resistance   == resistance
+        AND match_probability  == probability
+        AND match_probability1 == probability1
+        AND match_probability2 == probability2
+        AND match_diceCount    == diceCount
+        AND match_diceSides    == diceSides
+        AND match_saveType     == saveType
+        // AND match_saveBonus    == saveBonus
+        AND match_special      == special
+        AND match_parameter3   == parameter3
+        AND match_parameter4   == parameter4
+        AND match_custom_int   == custom_int
+        AND ~%match_resref%~     STRING_EQUAL_CASE ~%resref%~
+        AND ~%match_resref2%~    STRING_EQUAL_CASE ~%resref2%~
+        AND ~%match_resref3%~    STRING_EQUAL_CASE ~%resref3%~
+        AND ~%match_custom_str%~ STRING_EQUAL_CASE ~%custom_str%~
+    )
+END
+
 DEFINE_PATCH_MACRO ~opcode_match_diceCount_and_diceSides_and_power_and_probability1_and_probability2_and_resistance_and_saveBonus_and_saveType_and_target~ BEGIN
 	SET match = (
             match_target       == target

diff --git a/AutoDescription/lib/spl/extended_effects.tpp b/AutoDescription/lib/spl/extended_effects.tpp
@@ -71,7 +71,7 @@ BEGIN
 		    PATCH_PHP_EACH ~opcodes_%opcode%~ AS data => _ BEGIN
 		        LPM ~data_to_vars~
 		        SET count_leveled_opcodes += 1
-				SET $leveled_opcodes(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = opcode
+				SET $leveled_opcodes(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = opcode
 		    END
 	    END
 	END
@@ -157,7 +157,7 @@ BEGIN
 
 						// On ne désactive pas l'opcode du niveau 0
 						PATCH_IF level > 0 BEGIN
-							SET $effects_to_disabled(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%level%~) = level
+							SET $effects_to_disabled(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~ ~%level%~) = level
 						END
 					END
 				END
@@ -304,6 +304,7 @@ DEFINE_PATCH_FUNCTION ~get_spell_effects_description~
 BEGIN
 	LPM ~group_identical_spell_effects_between_level~
 	LPM ~group_spell_effects_by_duration~
+	LPM ~group_spell_effects_by_saving_throw~
 	LPM ~group_spell_effects_by_parameters~
 	LPM ~group_spell_effects_by_damage~
 
@@ -486,12 +487,12 @@ BEGIN
 					END
 				END
 				PATCH_IF minRequiredLevel == 1 AND maxRequiredLevel == 99 BEGIN
-					SET $EVAL ~leveled_opcodes_zero~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = opcode
+					SET $EVAL ~leveled_opcodes_zero~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = opcode
 				END
 				ELSE BEGIN
 					SET key = ((minRequiredLevel + 100) * 100) + maxRequiredLevel
 					SET $groups_level_effects(~%key%~) = 1
-					SET $EVAL ~grouped_level_effects_%key%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = opcode
+					SET $EVAL ~grouped_level_effects_%key%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = opcode
 				END
 			END
 		END
@@ -602,7 +603,7 @@ DEFINE_PATCH_MACRO ~group_identical_spell_effects_between_level~ BEGIN
 		PATCH_IF inAllLevel == 1 BEGIN
 			SET $tmpPositions(~%requiredLevel%-%position%~) = 1
 			// On place l'effet dans les effets globaux du sort
-			SET $EVAL ~leveled_opcodes_zero~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = opcode
+			SET $EVAL ~leveled_opcodes_zero~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = opcode
 
 			PATCH_PHP_EACH level_effects AS index => tmpRequiredLevel BEGIN
 				PATCH_PHP_EACH ~leveled_opcodes_%tmpRequiredLevel%~ AS data => tmpOpcode BEGIN
@@ -618,7 +619,7 @@ DEFINE_PATCH_MACRO ~group_identical_spell_effects_between_level~ BEGIN
 		PATCH_PHP_EACH ~leveled_opcodes_%requiredLevel%~ AS data => opcode BEGIN
 	        LPM ~data_to_vars~
 	        PATCH_IF VARIABLE_IS_SET $positions(~%requiredLevel%-%position%~) AND $positions(~%requiredLevel%-%position%~) == 1 BEGIN
-	            SET $EVAL ~leveled_opcodes_%requiredLevel%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = 0 - opcode - 1
+	            SET $EVAL ~leveled_opcodes_%requiredLevel%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = 0 - opcode - 1
 	        END
 		END
 	END
@@ -670,7 +671,7 @@ DEFINE_PATCH_MACRO ~group_identical_spell_effects_between_level~ BEGIN
 			PATCH_IF opcode >= 0 BEGIN
 		        LPM ~data_to_vars~
 		        PATCH_IF VARIABLE_IS_SET $positions(~%requiredLevel%-%position%~) AND $positions(~%requiredLevel%-%position%~) == 1 BEGIN
-		            SET $EVAL ~leveled_opcodes_%requiredLevel%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = 0 - opcode - 1
+		            SET $EVAL ~leveled_opcodes_%requiredLevel%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = 0 - opcode - 1
 		        END
 	        END
 		END
@@ -1003,14 +1004,55 @@ DEFINE_PATCH_MACRO ~group_spell_effects_by_parameters~ BEGIN
 	END
 END
 
+DEFINE_PATCH_MACRO ~group_spell_effects_by_saving_throw~ BEGIN
+	SET level = $level_effects(~0~)
+	PATCH_PHP_EACH ~leveled_opcodes_%level%~ AS data => opcode BEGIN
+		CLEAR_ARRAY effects_to_disabled
+		PATCH_IF opcode >= 0 BEGIN
+		    LPM ~data_to_vars~
+		    LPM ~data_to_match_vars~
+
+		    LPF spell_has_same_effects_on_all_levels_except_duration
+				INT_VAR
+					match_opcode match_isExternal match_target match_power match_parameter1 match_parameter2
+					match_timingMode match_resistance match_duration match_probability match_probability1
+					match_probability2 match_diceCount match_diceSides match_saveType match_saveBonus match_special
+					match_parameter3 match_parameter4 match_custom_int
+				STR_VAR
+					match_resref match_resref2 match_resref3 match_custom_str
+					match_macro = ~opcode_match_except_saveBonus~
+					return_parameter = ~saveBonus~
+		        RET
+		            inAllLevels total total_durations
+		        RET_ARRAY
+		            effects_to_disabled all_durations all_effects
+		    END
+
+		    PATCH_IF inAllLevels AND total > 1 BEGIN
+				LPF ~get_complex_value~
+					STR_VAR
+						array_name = ~all_effects~
+					RET
+						is_valid
+						complex_save = complex_value
+						complex_value_int
+				END
+		        PATCH_IF is_valid == 1 BEGIN
+		            LPM ~group_spell_effects_disable~
+		        END
+		    END
+		END
+	END
+END
+
 DEFINE_PATCH_MACRO ~group_spell_effects_disable~ BEGIN
-	SET $leveled_opcodes_zero(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = opcode
+	SET $leveled_opcodes_zero(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = opcode
 	SET leveled_opcodes_count_zero += 1
 
 	// On désactive les effets qui se trouvent dans les niveaux plus importants
 	PATCH_PHP_EACH effects_to_disabled AS data => level2 BEGIN
         LPM ~data_to_vars~
-	    SET $EVAL ~leveled_opcodes_%level2%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~) = ~-1~
+	    SET $EVAL ~leveled_opcodes_%level2%~(~%position%~ ~%isExternal%~ ~%target%~ ~%power%~ ~%parameter1%~ ~%parameter2%~ ~%timingMode%~ ~%resistance%~ ~%duration%~ ~%probability%~ ~%probability1%~ ~%probability2%~ ~%resref%~ ~%diceCount%~ ~%diceSides%~ ~%saveType%~ ~%saveBonus%~ ~%special%~ ~%parameter3%~ ~%parameter4%~ ~%resref2%~ ~%resref3%~ ~%custom_int%~ ~%custom_str%~ ~%cumulable%~ ~%target_exceptions%~ ~%target_type%~ ~%complex_value%~ ~%complex_duration%~ ~%complex_save%~) = ~-1~
 	    SET ~leveled_opcodes_count_%level2%~ -= 1
 	    PATCH_IF ~leveled_opcodes_count_%level2%~ == 0 BEGIN
 	        CLEAR_ARRAY ~leveled_opcodes_%level2%~

diff --git a/AutoDescription/lib/spl/misc.tpp b/AutoDescription/lib/spl/misc.tpp
@@ -1028,7 +1028,7 @@ DEFINE_PATCH_FUNCTION ~spell_saving_throw~ RET description ignoreSavingThrow bas
 				PATCH_IF opcode >= 0 BEGIN
 				    LPM ~data_to_vars~
 					SET saveType = (saveType BAND 0b111111)
-	                PATCH_IF saveType == 0 AND (opcode == 232 OR opcode == 146) BEGIN
+	                PATCH_IF saveType == 0 AND (opcode == 232 OR opcode == 146 OR opcode == 148) BEGIN
 						SET $recursive_resref(~%CURRENT_SOURCE_RES%~) = 1
 						PATCH_IF NOT VARIABLE_IS_SET $recursive_resref(~%resref%~) BEGIN
 							SET $recursive_resref(~%resref%~) = 1

diff --git a/docs/french-bg2ee-all-spells-diff.html b/docs/french-bg2ee-all-spells-diff.html
@@ -14275,26 +14275,7 @@
 
 PARAMÈTRES : 
 
-Au niveau 1
-- Inflige Horreur à la cible (jet de sauvegarde contre les sorts pour annuler)
-
-Entre le niveau 2 et 3
-- Inflige Horreur à la cible (jet de sauvegarde à -1 contre les sorts pour annuler)
-
-Entre le niveau 4 et 5
-- Inflige Horreur à la cible (jet de sauvegarde à -2 contre les sorts pour annuler)
-
-Entre le niveau 6 et 7
-- Inflige Horreur à la cible (jet de sauvegarde à -3 contre les sorts pour annuler)
-
-Entre le niveau 8 et 9
-- Inflige Horreur à la cible (jet de sauvegarde à -4 contre les sorts pour annuler)
-
-Entre le niveau 10 et 11
-- Inflige Horreur à la cible (jet de sauvegarde à -5 contre les sorts pour annuler)
-
-À partir du niveau 12
-- Inflige Horreur à la cible (jet de sauvegarde à -6 contre les sorts pour annuler)</pre></td></tr>
+- Inflige Horreur à la cible (jet de sauvegarde à -1 par tranche de 2 niveaux du lanceur/12 contre les sorts pour annuler)</pre></td></tr>
 <tr><th class="title">SPWI201<br/>Flou</th><td class="description before"><pre>Flou
 (Illusion/Fantasme)