Merge branch 'master' of github.com:luciensadi/AwakeMUD

src/handler.cpp

@@ -770,10 +770,10 @@ void affect_total(struct char_data * ch)
                     cyber->obj_flags.bitvector, TRUE);
     }
   }
+
+  // has_trigger was initialized to -1, why not initialize to 0 and not check for has_trigger?
   if (has_wired && has_trigger) {
-    if (has_trigger == -1)
-      has_trigger = 3;
-    has_wired = MIN(has_wired, has_trigger);
+    has_wired = MIN(has_wired, has_trigger == -1 ? 3 : has_trigger);
     GET_INIT_DICE(ch) += has_wired;
     GET_REA(ch) += has_wired * 2;
   }
@@ -1117,7 +1117,7 @@ void affect_total(struct char_data * ch)
       GET_HACKING(ch) += (int)((GET_INT(ch) + ch->persona->decker->mpcp) / 3);
       // a VCR applies a 1 TN penalty to decking and -rating hacking pool, unless disabled via reflex trigger (Matrix, pg 28)
       // assume trigger is attached to VCR and that a rigger will always disable their VCR when decking
-      if (has_rig && !has_trigger) {
+      if (has_rig && (has_trigger == -1)) {
         GET_TARGET_MOD(ch) += 1;
         GET_HACKING(ch) -= has_rig;
       }

src/newfight.cpp

@@ -363,7 +363,9 @@ bool hit_with_multiweapon_toggle(struct char_data *attacker, struct char_data *v
     }
 
     // Setup: If your attacker is closing the distance (running), take a penalty per Core p112.
-    if (!def->is_paralyzed_or_insensate) {
+    // We can't avoid setting AFF_APPROACH in set_fighting for surprised targets since it also
+    // indicates not-in-melee-range, so make an exception since they're probably not moving yet.
+    if (!def->is_paralyzed_or_insensate && !def->is_surprised) {
       if (AFF_FLAGGED(def->ch, AFF_APPROACH))
         att->ranged->modifiers[COMBAT_MOD_DEFENDER_MOVING] += 2;
       else if (!def->ranged_combat_mode && def->ch->in_room == att->ch->in_room && !IS_JACKED_IN(def->ch))