Make all trap types slappable (#3843)

also makes sure the TRAP#_ACTIVATED variable properly updates

Author: Loobinex

src/player_instances.c

@@ -254,17 +254,18 @@ long pinstfe_hand_whip(struct PlayerInfo *player, long *n)
       trapst = get_trap_model_stats(thing->model);
       if ((trapst->slappable > 0) && trap_is_active(thing))
       {
-          struct Thing* trgtng = INVALID_THING;
-          shotst = get_shot_model_stats(trapst->created_itm_model);
-          if (trapst->slappable == 1)
-          {
-              external_activate_trap_shot_at_angle(thing, player->acamera->orient_a, trgtng);
-          } else
-          if (trapst->slappable == 2)
+          activate_trap_by_slap(player, thing);
+
+          struct Dungeon* dungeon = get_dungeon(thing->owner);
+          if (!dungeon_invalid(dungeon))
           {
-              trgtng = get_nearest_enemy_creature_in_sight_and_range_of_trap(thing);
-              external_activate_trap_shot_at_angle(thing, player->acamera->orient_a, trgtng);
+              dungeon->trap_info.activated[thing->trap.flag_number]++;
+              if (thing->trap.flag_number > 0)
+              {
+                  memcpy(&dungeon->last_trap_event_location, &thing->mappos, sizeof(struct Coord3d));
+              }
           }
+          process_trap_charge(thing);
       }
       break;
       case TCls_Object:

src/thing_shots.c

@@ -885,6 +885,16 @@ static TbBool shot_hit_trap_at(struct Thing* shotng, struct Thing* target, struc
         if (((trapst->unstable == 1) && !(shotst->model_flags & ShMF_Disarming)) || trapst->unstable == 2)
         {
             activate_trap(target, target);
+            struct Dungeon* dungeon = get_dungeon(target->owner);
+            if (!dungeon_invalid(dungeon))
+            {
+                dungeon->trap_info.activated[target->trap.flag_number]++;
+                if (target->trap.flag_number > 0)
+                {
+                    memcpy(&dungeon->last_trap_event_location, &target->mappos, sizeof(struct Coord3d));
+                }
+            }
+            process_trap_charge(target);
         }
     }
     if (shotst->destroy_on_first_hit) {

src/thing_traps.c

@@ -629,6 +629,56 @@ void activate_trap(struct Thing *traptng, struct Thing *creatng)
     }
 }
 
+void activate_trap_by_slap(struct PlayerInfo *player, struct Thing* traptng)
+{
+    struct Thing* trgtng = INVALID_THING;
+    struct TrapConfigStats* trapst = get_trap_model_stats(traptng->model);
+    TbBool special_case = false;
+
+    if (trapst->slappable == 2)
+    {
+        trgtng = get_nearest_enemy_creature_in_sight_and_range_of_trap(traptng);
+        activate_trap(traptng, trgtng);
+    }
+    if (trapst->slappable == 1)
+    {
+        switch (trapst->activation_type)
+        {
+        case TrpAcT_EffectonTrap:
+        case TrpAcT_ShotonTrap:
+        case TrpAcT_SlabChange:
+        case TrpAcT_CreatureSpawn:
+        case TrpAcT_Power:
+            activate_trap(traptng, trgtng);
+            break;
+        default:
+            special_case = true;
+            break;
+        }
+
+        if (special_case == true)
+        {
+            traptng->trap.revealed = 1;
+            if (trapst->notify == true)
+            {
+                event_create_event(traptng->mappos.x.val, traptng->mappos.y.val, EvKind_AlarmTriggered, traptng->owner, 0);
+            }
+            thing_play_sample(traptng, trapst->trigger_sound_idx, NORMAL_PITCH, 0, 3, 0, 2, FULL_LOUDNESS);
+
+            switch (trapst->activation_type)
+            {
+            case TrpAcT_HeadforTarget90:
+            case TrpAcT_CreatureShot:
+                external_activate_trap_shot_at_angle(traptng, player->acamera->orient_a, trgtng);
+                break;
+            default:
+                ERRORLOG("Illegal trap activation type %d (idx=%d)", (int)trapst->activation_type, traptng->index);
+                break;
+            }
+        }
+    }
+}
+
 TbBool find_pressure_trigger_trap_target_passing_by_subtile(const struct Thing *traptng, MapSubtlCoord stl_x, MapSubtlCoord stl_y, struct Thing **found_thing)
 {
     struct Map* mapblk = get_map_block_at(stl_x, stl_y);
@@ -1089,7 +1139,6 @@ void external_activate_trap_shot_at_angle(struct Thing *thing, short angle, stru
         && (trapst->activation_type != TrpAcT_HeadforTarget90))
     {
         activate_trap(thing, trgtng);
-        process_trap_charge(thing);
         if (thing->trap.num_shots != INFINITE_CHARGES)
         {
             if (thing->trap.num_shots > 0) {

src/thing_traps.h

@@ -93,6 +93,8 @@ TbBool rearm_trap(struct Thing *traptng);
 TngUpdateRet update_trap(struct Thing *thing);
 void init_traps(void);
 void activate_trap(struct Thing *traptng, struct Thing *creatng);
+void activate_trap_by_slap(struct PlayerInfo* player, struct Thing* traptng);
+void process_trap_charge(struct Thing* traptng);
 
 unsigned long remove_trap(struct Thing *traptng, long *sell_value);
 unsigned long remove_trap_on_subtile(MapSubtlCoord stl_x, MapSubtlCoord stl_y, long *sell_value);