Add undead kraken tentacle tiles (Midn8, #11410)

To track which tentacles are undead tentacles, we set base_type to the
undead type, instead of type; this is *inverted* compared to all other
monsters (not great), but requires only minimal changes to the tentacle
handling code in tilepick.cc; using the reverse (correct) order
requires more extensive refactorings.

Adding multiple first/last-tentacle-tile delimiters isn't great, but is
necessary for the easy conversion from normal- to undead-tentacle tiles.

All of these tiles were automatically generated from the normal kraken
tentacle tiles and could definitely be improved.

Author: aidanholm

crawl-ref/source/mon-tentacle.cc

@@ -45,6 +45,8 @@ static mgen_data _segment_data(const monster& head, coord_def pos,
                                monster_type type)
 {
     mgen_data mg(type, SAME_ATTITUDE((&head)), pos, head.foe, MG_FORCE_PLACE);
+    if (mons_is_zombified(head))
+        mg.base_type = head.type;
     mg.set_summoned(&head, 0, 0, head.god)
       .set_col(head.colour);
     return mg;

crawl-ref/source/rltiles/dc-feat.txt

@@ -653,6 +653,21 @@ kraken_corner_NW KRAKEN_OVERLAY_NW
 kraken_corner_NE KRAKEN_OVERLAY_NE
 kraken_corner_SE KRAKEN_OVERLAY_SE
 kraken_corner_SW KRAKEN_OVERLAY_SW
+%sdir mon/tentacles/kraken_zombie_corners
+kraken_zombie_corner_NW KRAKEN_ZOMBIE_OVERLAY_NW
+kraken_zombie_corner_NE KRAKEN_ZOMBIE_OVERLAY_NE
+kraken_zombie_corner_SE KRAKEN_ZOMBIE_OVERLAY_SE
+kraken_zombie_corner_SW KRAKEN_ZOMBIE_OVERLAY_SW
+%sdir mon/tentacles/kraken_simulacrum_corners
+kraken_simulacrum_corner_NW KRAKEN_SIMULACRUM_OVERLAY_NW
+kraken_simulacrum_corner_NE KRAKEN_SIMULACRUM_OVERLAY_NE
+kraken_simulacrum_corner_SE KRAKEN_SIMULACRUM_OVERLAY_SE
+kraken_simulacrum_corner_SW KRAKEN_SIMULACRUM_OVERLAY_SW
+%sdir mon/tentacles/kraken_spectral_corners
+kraken_spectral_corner_NW KRAKEN_SPECTRAL_OVERLAY_NW
+kraken_spectral_corner_NE KRAKEN_SPECTRAL_OVERLAY_NE
+kraken_spectral_corner_SE KRAKEN_SPECTRAL_OVERLAY_SE
+kraken_spectral_corner_SW KRAKEN_SPECTRAL_OVERLAY_SW
 %sdir mon/tentacles/eldritch_corners
 eldritch_corner_NW ELDRITCH_OVERLAY_NW
 eldritch_corner_NE ELDRITCH_OVERLAY_NE

crawl-ref/source/rltiles/dc-tentacles.txt

@@ -79,6 +79,204 @@ error MONS_KRAKEN_TENTACLE_SEGMENT_S_SW
 error MONS_KRAKEN_TENTACLE_SEGMENT_W_SW
 error MONS_KRAKEN_TENTACLE_SEGMENT_W_NW
 
+## Tentacles/segments emerging from water (zombie)
+
+## Tentacle ends
+%sdir mon/tentacles/kraken_zombie_ends
+
+kraken_zombie_tentacle1 MONS_KRAKEN_ZOMBIE_TENTACLE_WATER
+%syn FIRST_ZOMBIE_TENTACLE_IN_WATER
+kraken_zombie_tentacle2
+kraken_zombie_tentacle3
+kraken_zombie_tentacle4
+kraken_zombie_tentacle5
+kraken_zombie_tentacle6
+
+## Segments
+%sdir mon/tentacles/kraken_zombie_segments
+
+## Tentacle segments ending in water
+kraken_zombie_tentacle_segment_water_water MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_WATER
+kraken_zombie_tentacle_segment_water_N MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_N
+kraken_zombie_tentacle_segment_water_S MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_S
+kraken_zombie_tentacle_segment_water_E MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E
+kraken_zombie_tentacle_segment_water_W MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_W
+kraken_zombie_tentacle_segment_water_NE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NE
+kraken_zombie_tentacle_segment_water_NW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NW
+kraken_zombie_tentacle_segment_water_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_SE
+kraken_zombie_tentacle_segment_water_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_SW
+%syn LAST_ZOMBIE_TENTACLE_IN_WATER
+
+## Tentacles connected to another segment
+%sdir mon/tentacles/kraken_zombie_ends
+kraken_zombie_tentacle_N MONS_KRAKEN_ZOMBIE_TENTACLE_N
+kraken_zombie_tentacle_S MONS_KRAKEN_ZOMBIE_TENTACLE_S
+kraken_zombie_tentacle_E MONS_KRAKEN_ZOMBIE_TENTACLE_E
+kraken_zombie_tentacle_W MONS_KRAKEN_ZOMBIE_TENTACLE_W
+kraken_zombie_tentacle_NE MONS_KRAKEN_ZOMBIE_TENTACLE_NE
+kraken_zombie_tentacle_NW MONS_KRAKEN_ZOMBIE_TENTACLE_NW
+kraken_zombie_tentacle_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SE
+kraken_zombie_tentacle_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SW
+
+## Fully connected tentacle segments
+%sdir mon/tentacles/kraken_zombie_segments
+
+### (a) straight ones
+kraken_zombie_tentacle_segment_E_W MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E_W
+kraken_zombie_tentacle_segment_N_S MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_N_S
+kraken_zombie_tentacle_segment_NE_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NE_SW
+kraken_zombie_tentacle_segment_NW_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NW_SE
+### (b) curved ones
+kraken_zombie_tentacle_segment_E_N MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E_N
+kraken_zombie_tentacle_segment_E_S MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E_S
+kraken_zombie_tentacle_segment_N_W MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_N_W
+kraken_zombie_tentacle_segment_S_W MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_S_W
+kraken_zombie_tentacle_segment_NE_NW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NE_NW
+kraken_zombie_tentacle_segment_NE_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NE_SE
+kraken_zombie_tentacle_segment_NW_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_NW_SW
+kraken_zombie_tentacle_segment_SE_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_SE_SW
+### (c) connecting edges and corners
+kraken_zombie_tentacle_segment_N_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_N_SE
+kraken_zombie_tentacle_segment_N_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_N_SW
+kraken_zombie_tentacle_segment_S_NE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_S_NE
+kraken_zombie_tentacle_segment_S_NW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_S_NW
+kraken_zombie_tentacle_segment_E_NW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E_NW
+kraken_zombie_tentacle_segment_E_SW MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_E_SW
+kraken_zombie_tentacle_segment_W_NE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_W_NE
+kraken_zombie_tentacle_segment_W_SE MONS_KRAKEN_ZOMBIE_TENTACLE_SEGMENT_W_SE
+
+## Tentacles/segments emerging from water (simulacrum)
+
+## Tentacle ends
+%sdir mon/tentacles/kraken_simulacrum_ends
+
+kraken_simulacrum_tentacle1 MONS_KRAKEN_SIMULACRUM_TENTACLE_WATER
+%syn FIRST_SIMULACRUM_TENTACLE_IN_WATER
+kraken_simulacrum_tentacle2
+kraken_simulacrum_tentacle3
+kraken_simulacrum_tentacle4
+kraken_simulacrum_tentacle5
+kraken_simulacrum_tentacle6
+
+## Segments
+%sdir mon/tentacles/kraken_simulacrum_segments
+
+## Tentacle segments ending in water
+kraken_simulacrum_tentacle_segment_water_water MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_WATER
+kraken_simulacrum_tentacle_segment_water_N MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_N
+kraken_simulacrum_tentacle_segment_water_S MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_S
+kraken_simulacrum_tentacle_segment_water_E MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E
+kraken_simulacrum_tentacle_segment_water_W MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_W
+kraken_simulacrum_tentacle_segment_water_NE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NE
+kraken_simulacrum_tentacle_segment_water_NW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NW
+kraken_simulacrum_tentacle_segment_water_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_SE
+kraken_simulacrum_tentacle_segment_water_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_SW
+%syn LAST_SIMULACRUM_TENTACLE_IN_WATER
+
+## Tentacles connected to another segment
+%sdir mon/tentacles/kraken_simulacrum_ends
+kraken_simulacrum_tentacle_N MONS_KRAKEN_SIMULACRUM_TENTACLE_N
+kraken_simulacrum_tentacle_S MONS_KRAKEN_SIMULACRUM_TENTACLE_S
+kraken_simulacrum_tentacle_E MONS_KRAKEN_SIMULACRUM_TENTACLE_E
+kraken_simulacrum_tentacle_W MONS_KRAKEN_SIMULACRUM_TENTACLE_W
+kraken_simulacrum_tentacle_NE MONS_KRAKEN_SIMULACRUM_TENTACLE_NE
+kraken_simulacrum_tentacle_NW MONS_KRAKEN_SIMULACRUM_TENTACLE_NW
+kraken_simulacrum_tentacle_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SE
+kraken_simulacrum_tentacle_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SW
+
+## Fully connected tentacle segments
+%sdir mon/tentacles/kraken_simulacrum_segments
+
+### (a) straight ones
+kraken_simulacrum_tentacle_segment_E_W MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E_W
+kraken_simulacrum_tentacle_segment_N_S MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_N_S
+kraken_simulacrum_tentacle_segment_NE_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NE_SW
+kraken_simulacrum_tentacle_segment_NW_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NW_SE
+### (b) curved ones
+kraken_simulacrum_tentacle_segment_E_N MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E_N
+kraken_simulacrum_tentacle_segment_E_S MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E_S
+kraken_simulacrum_tentacle_segment_N_W MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_N_W
+kraken_simulacrum_tentacle_segment_S_W MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_S_W
+kraken_simulacrum_tentacle_segment_NE_NW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NE_NW
+kraken_simulacrum_tentacle_segment_NE_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NE_SE
+kraken_simulacrum_tentacle_segment_NW_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_NW_SW
+kraken_simulacrum_tentacle_segment_SE_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_SE_SW
+### (c) connecting edges and corners
+kraken_simulacrum_tentacle_segment_N_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_N_SE
+kraken_simulacrum_tentacle_segment_N_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_N_SW
+kraken_simulacrum_tentacle_segment_S_NE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_S_NE
+kraken_simulacrum_tentacle_segment_S_NW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_S_NW
+kraken_simulacrum_tentacle_segment_E_NW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E_NW
+kraken_simulacrum_tentacle_segment_E_SW MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_E_SW
+kraken_simulacrum_tentacle_segment_W_NE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_W_NE
+kraken_simulacrum_tentacle_segment_W_SE MONS_KRAKEN_SIMULACRUM_TENTACLE_SEGMENT_W_SE
+
+## Tentacles/segments emerging from water (spectral)
+
+## Tentacle ends
+%sdir mon/tentacles/kraken_spectral_ends
+
+kraken_spectral_tentacle1 MONS_KRAKEN_SPECTRAL_TENTACLE_WATER
+%syn FIRST_SPECTRAL_TENTACLE_IN_WATER
+kraken_spectral_tentacle2
+kraken_spectral_tentacle3
+kraken_spectral_tentacle4
+kraken_spectral_tentacle5
+kraken_spectral_tentacle6
+
+## Segments
+%sdir mon/tentacles/kraken_spectral_segments
+
+## Tentacle segments ending in water
+kraken_spectral_tentacle_segment_water_water MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_WATER
+kraken_spectral_tentacle_segment_water_N MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_N
+kraken_spectral_tentacle_segment_water_S MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_S
+kraken_spectral_tentacle_segment_water_E MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E
+kraken_spectral_tentacle_segment_water_W MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_W
+kraken_spectral_tentacle_segment_water_NE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NE
+kraken_spectral_tentacle_segment_water_NW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NW
+kraken_spectral_tentacle_segment_water_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_SE
+kraken_spectral_tentacle_segment_water_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_SW
+%syn LAST_SPECTRAL_TENTACLE_IN_WATER
+
+## Tentacles connected to another segment
+%sdir mon/tentacles/kraken_spectral_ends
+kraken_spectral_tentacle_N MONS_KRAKEN_SPECTRAL_TENTACLE_N
+kraken_spectral_tentacle_S MONS_KRAKEN_SPECTRAL_TENTACLE_S
+kraken_spectral_tentacle_E MONS_KRAKEN_SPECTRAL_TENTACLE_E
+kraken_spectral_tentacle_W MONS_KRAKEN_SPECTRAL_TENTACLE_W
+kraken_spectral_tentacle_NE MONS_KRAKEN_SPECTRAL_TENTACLE_NE
+kraken_spectral_tentacle_NW MONS_KRAKEN_SPECTRAL_TENTACLE_NW
+kraken_spectral_tentacle_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SE
+kraken_spectral_tentacle_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SW
+
+## Fully connected tentacle segments
+%sdir mon/tentacles/kraken_spectral_segments
+
+### (a) straight ones
+kraken_spectral_tentacle_segment_E_W MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E_W
+kraken_spectral_tentacle_segment_N_S MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_N_S
+kraken_spectral_tentacle_segment_NE_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NE_SW
+kraken_spectral_tentacle_segment_NW_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NW_SE
+### (b) curved ones
+kraken_spectral_tentacle_segment_E_N MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E_N
+kraken_spectral_tentacle_segment_E_S MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E_S
+kraken_spectral_tentacle_segment_N_W MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_N_W
+kraken_spectral_tentacle_segment_S_W MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_S_W
+kraken_spectral_tentacle_segment_NE_NW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NE_NW
+kraken_spectral_tentacle_segment_NE_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NE_SE
+kraken_spectral_tentacle_segment_NW_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_NW_SW
+kraken_spectral_tentacle_segment_SE_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_SE_SW
+### (c) connecting edges and corners
+kraken_spectral_tentacle_segment_N_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_N_SE
+kraken_spectral_tentacle_segment_N_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_N_SW
+kraken_spectral_tentacle_segment_S_NE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_S_NE
+kraken_spectral_tentacle_segment_S_NW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_S_NW
+kraken_spectral_tentacle_segment_E_NW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E_NW
+kraken_spectral_tentacle_segment_E_SW MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_E_SW
+kraken_spectral_tentacle_segment_W_NE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_W_NE
+kraken_spectral_tentacle_segment_W_SE MONS_KRAKEN_SPECTRAL_TENTACLE_SEGMENT_W_SE
+
 ## Eldritch tentacles
 
 ## Tentacle ends