Test Ping Korgent

Procyonae · Nov 26, 2024 · e53fd05 · e53fd05
1 parent 0d9fef6
commit e53fd05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/data/mods/Magiclysm/eoc_spell_difficulty_modifiers.json b/data/mods/Magiclysm/eoc_spell_difficulty_modifiers.json
@@ -13,9 +13,7 @@
     "effect": [
       {
         "math": [
-          "u_spellcasting_adjustment('difficulty', 'mod': 'magiclysm', 'flag_whitelist': 'SOMATIC' )",
-          "=",
-          "(u_effect_intensity('grabbed', 'bodypart': 'arm_l') + u_effect_intensity('grabbed', 'bodypart': 'arm_r') ) / 10"
+          "u_spellcasting_adjustment('difficulty', 'mod': 'magiclysm', 'flag_whitelist': 'SOMATIC' ) = (u_effect_intensity('grabbed', 'bodypart': 'arm_l') + u_effect_intensity('grabbed', 'bodypart': 'arm_r') ) / 10"
         ]
       }
     ]

diff --git a/src/magic.cpp b/src/magic.cpp
@@ -1005,18 +1005,11 @@ std::vector<tripoint_bub_ms> spell::targetable_locations( const Character &sourc
 
     std::vector<tripoint_bub_ms> selectable_targets;
     for( const tripoint_bub_ms &query : here.points_in_radius( char_pos, range( source ) ) ) {
-        if( !ignore_walls && has_obstruction( query ) ) {
-            // it's blocked somewhere!
+        if( ( !ignore_walls && has_obstruction( query ) ) || ( !select_ground && !source.sees( query ) ) ) {
+            // it's blocked somewhere or you can't target a critter you can't see
             continue;
         }
 
-        if( !select_ground ) {
-            if( !source.sees( query ) ) {
-                // can't target a critter you can't see
-                continue;
-            }
-        }
-
         if( is_valid_target( source, query ) ) {
             selectable_targets.push_back( query );
         }