Traps are visibly disabled when they cannot shoot (#3257)

- AttackAnimationID displays based on the duration of the shot/effect on activation_type 2 and 3. (Shot/effect on trap)
- Bundled traps now visible inactive while they cannot be triggered (but are not shooting)
- Comes with new trapdoors.zip in the alpha package

config/fxdata/trapdoor.cfg

@@ -270,6 +270,8 @@ Shots = 12
 TimeBetweenShots = 2000
 SellingValue = 250
 AnimationID = 844
+AttackAnimationID = 844
+RechargeAnimationID = TRAP_RED_DIS
 ModelSize = 256
 AnimationSpeed = 256
 TriggerType = 2
@@ -306,6 +308,8 @@ Shots = 5
 TimeBetweenShots = 200
 SellingValue = 350
 AnimationID = 845
+AttackAnimationID = 845
+RechargeAnimationID = TRAP_BLUE_DIS
 ModelSize = 256
 AnimationSpeed = 256
 TriggerType = 2
@@ -341,6 +345,8 @@ Shots = 6
 TimeBetweenShots = 140
 SellingValue = 500
 AnimationID = 846
+AttackAnimationID = 846
+RechargeAnimationID = TRAP_PURPLE_DIS
 ModelSize = 256
 AnimationSpeed = 256
 TriggerType = 2
@@ -376,6 +382,8 @@ Shots = 3
 TimeBetweenShots = 84
 SellingValue = 750
 AnimationID = 844
+AttackAnimationID = 844
+RechargeAnimationID = TRAP_RED_DIS
 ModelSize = 256
 AnimationSpeed = 256
 TriggerType = 2
@@ -411,6 +419,7 @@ Shots = 1
 TimeBetweenShots = 0
 SellingValue = 750
 AnimationID = 845
+RechargeAnimationID = TRAP_BLUE_DIS
 ModelSize = 256
 AnimationSpeed = 256
 TriggerType = 2

src/thing_traps.c

@@ -708,7 +708,19 @@ void process_trap_charge(struct Thing* traptng)
     traptng->trap.rearm_turn = game.play_gameturn + mconf->shots_delay;
     if (game.conf.trap_stats[traptng->model].attack_sprite_anim_idx != 0)
     {
-        GameTurnDelta trigger_duration = get_lifespan_of_animation(trapstat->attack_sprite_anim_idx, trapstat->anim_speed);
+        GameTurnDelta trigger_duration;
+        if (trapstat->activation_type == 2) //Effect stays on trap, so the attack animation remains visible for as long as the effect is alive
+        {
+            trigger_duration = get_effect_model_stats(trapstat->created_itm_model)->start_health;
+        } else
+        if (trapstat->activation_type == 3) //Shot stays on trap, so the attack animation remains visible for as long as the trap is alive
+        {
+            trigger_duration = get_shot_model_stats(trapstat->created_itm_model)->health;
+        }
+        else
+        {
+            trigger_duration = get_lifespan_of_animation(trapstat->attack_sprite_anim_idx, trapstat->anim_speed);
+        }
         traptng->trap.shooting_finished_turn = (game.play_gameturn + trigger_duration);
         traptng->current_frame = 0;
         traptng->anim_time = 0;