diff --git a/mods/cnc/audio/voices.yaml b/mods/cnc/audio/voices.yaml index c0a5cda929..b0045e5624 100644 --- a/mods/cnc/audio/voices.yaml +++ b/mods/cnc/audio/voices.yaml @@ -41,14 +41,14 @@ CommandoVoice: Voices: Select: yeah1,yes1,yo1 Move: cmon1,onit1,gotit1 - Attack: onit1,gotit1 + Attack: onit1,gotit1,noprblm1 Demolish: bombit1 Die: ramyell1 Burned: ramyell1 Zapped: ramyell1 Poisoned: ramyell1 Build: rokroll1 - Kill: keepem1,laugh1,lefty1 + Kill: keepem1,laugh1,lefty1,tuffguy1 DinoVoice: Voices: diff --git a/mods/cnc/bits/afld.shp b/mods/cnc/bits/afld.shp new file mode 100644 index 0000000000..585711163b Binary files /dev/null and b/mods/cnc/bits/afld.shp differ diff --git a/mods/cnc/bits/afld_d.shp b/mods/cnc/bits/afld_d.shp new file mode 100644 index 0000000000..9d3b133995 Binary files /dev/null and b/mods/cnc/bits/afld_d.shp differ diff --git a/mods/cnc/bits/levelup.shp b/mods/cnc/bits/levelup.shp index eec8a7f72c..04c7581f45 100644 Binary files a/mods/cnc/bits/levelup.shp and b/mods/cnc/bits/levelup.shp differ diff --git a/mods/cnc/bits/rank.shp b/mods/cnc/bits/rank.shp index 958aba6c3a..371227f1ea 100644 Binary files a/mods/cnc/bits/rank.shp and b/mods/cnc/bits/rank.shp differ diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break_of_day.oramap index a9ce6a0d97..aae94e3047 100644 Binary files a/mods/cnc/maps/break_of_day.oramap and b/mods/cnc/maps/break_of_day.oramap differ diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap index 5f17f51de2..360b5a3601 100644 Binary files a/mods/cnc/maps/chokepoint.oramap and b/mods/cnc/maps/chokepoint.oramap differ diff --git a/mods/cnc/maps/necessary_illusions.oramap b/mods/cnc/maps/necessary_illusions.oramap index 6be6780c04..6e31009921 100644 Binary files a/mods/cnc/maps/necessary_illusions.oramap and b/mods/cnc/maps/necessary_illusions.oramap differ diff --git a/mods/cnc/maps/rogue_states.oramap b/mods/cnc/maps/rogue_states.oramap index 3267ee1327..6b1da99fb6 100644 Binary files a/mods/cnc/maps/rogue_states.oramap and b/mods/cnc/maps/rogue_states.oramap differ diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index a5a48706e3..413d247921 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -323,6 +323,8 @@ AFLD: RevealsShroud: Range: 7c0 Bib: + WithIdleOverlay@DISH: + Sequence: idle-dish RallyPoint: RallyPoint: 4,2 Exit@1: diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index 9424e0d78f..f49502ba1c 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -162,19 +162,26 @@ afld: idle: Tick: 120 ZOffset: -1023 - active: - Length: 16 - Tick: 120 - ZOffset: -1023 damaged-idle: Start: 16 Tick: 120 ZOffset: -1023 + active: + Length: 16 + Tick: 120 + ZOffset: -1023 damaged-active: Start: 16 Length: 16 Tick: 120 ZOffset: -1023 + idle-dish: afld_d + Length: 16 + Tick: 160 + damaged-idle-dish: afld_d + Start: 16 + Length: 16 + Tick: 160 dead: Start: 32 ZOffset: -1023