diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index b29243ab73..b55a4a1e47 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -48,7 +48,9 @@ Sequences: mods/cnc/sequences/infantry.yaml mods/cnc/sequences/map.yaml mods/cnc/sequences/misc.yaml - + # Low priority sequences that break the batch when used + mods/cnc/sequences/civilian.yaml + mods/cnc/sequences/campaign.yaml Cursors: mods/cnc/cursors.yaml diff --git a/mods/cnc/sequences/campaign.yaml b/mods/cnc/sequences/campaign.yaml new file mode 100644 index 0000000000..903bf1c040 --- /dev/null +++ b/mods/cnc/sequences/campaign.yaml @@ -0,0 +1,33 @@ +lst: + idle: lstnew + Start: 0 + Facings: 32 + unload: lstnew + Start: 0 + Facings: 32 + roof: lstnew2 + Start: 0 + Facings: 32 +boat: + left: + Start: 0 + Facings: 32 + left-damaged: + Start: 32 + left-critical: + Start: 64 + left-wake: wake + Start: 6 + Length: 6 + right: + Start: 96 + Facings: 32 + right-damaged: + Start: 128 + Facings: 32 + right-critical: + Start: 160 + Facings: 32 + right-wake: wake + Start: 0 + Length: 6 \ No newline at end of file diff --git a/mods/cnc/sequences/civilian.yaml b/mods/cnc/sequences/civilian.yaml new file mode 100644 index 0000000000..ade9cd0903 --- /dev/null +++ b/mods/cnc/sequences/civilian.yaml @@ -0,0 +1,498 @@ +c1: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 +c2: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c3: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c4: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c5: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c6: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + prone-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c7: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c8: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c9: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 + +c10: + stand: + Start: 0 + Facings: 8 + panic-stand: + Start: 8 + Length: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + shoot: + Start: 205 + Length: 4 + Facings: 8 + cheer: + Start: 200 + Length: 3 + Facings: 8 + Tick: 120 + die1: + Start: 329 + Length: 8 + Tick: 80 + die2: + Start: 337 + Length: 8 + Tick: 80 + die3: + Start: 337 + Length: 8 + Tick: 80 + die4: + Start: 345 + Length: 12 + Tick: 80 + die5: + Start: 357 + Length: 18 + Tick: 80 + die6: + Start: 182 + Length: 4 + Tick: 80 \ No newline at end of file diff --git a/mods/cnc/sequences/infantry.yaml b/mods/cnc/sequences/infantry.yaml index 24ab47508c..af7ac5dce9 100644 --- a/mods/cnc/sequences/infantry.yaml +++ b/mods/cnc/sequences/infantry.yaml @@ -498,7 +498,6 @@ e6: Length: 4 Tick: 80 - rmbo: stand: Start: 0 @@ -538,556 +537,4 @@ rmbo: Facings: 8 idle1: Start: 192 - Length: 16 - Tick: 120 - idle2: - Start: 208 - Length: 16 - Tick: 120 - idle3: - Start: 224 - Length: 15 - Tick: 120 - cheer: - Start: 396 - Length: 3 - Facings: 8 - Tick: 120 - # Shot - die1: - Start: 318 - Length: 8 - Tick: 80 - # Explode - die2: - Start: 326 - Length: 8 - Tick: 80 - # Fly and explode in air - die3: - Start: 334 - Length: 8 - Tick: 80 - # Fly through air squish on ground - die4: - Start: 342 - Length: 12 - Tick: 80 - # Burn - die5: - Start: 354 - Length: 18 - Tick: 80 - # Tib - die6: - Start: 308 - Length: 4 - Tick: 80 - -c1: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 -c2: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c3: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c4: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c5: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c6: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - prone-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c7: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c8: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c9: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -c10: - stand: - Start: 0 - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - -fire: - 1: fire1 - Start: 0 - Length: * - 2: fire2 - Start: 0 - Length: * diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index 81516f9927..16d4d960c4 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -1,5 +1,8 @@ -clock: - idle: hclock +fire: + 1: fire1 + Start: 0 + Length: * + 2: fire2 Start: 0 Length: * @@ -7,94 +10,6 @@ clock: idle: Start: 0 -atomicup: - idle: - Start: 0 - Length: * - -atomicdn: - idle: - Start: 0 - Length: * - -explosion: - 1: piff - Start: 0 - Length: * - 2: piffpiff - Start: 0 - Length: * - 3: napalm2 - Start: 0 - Length: * - 4: veh-hit3 - Start: 0 - Length: * - 5: veh-hit2 - Start: 0 - Length: * - 6: atomsfx - Start: 0 - Length: * - 6w: atomsfx - Start: 0 - Length: * - 1w: piff - Start: 0 - Length: * - 2w: piffpiff - Start: 0 - Length: * - 3w: napalm2 - Start: 0 - Length: * - 4w: veh-hit3 - Start: 0 - Length: * - 5w: veh-hit2 - Start: 0 - Length: * - 8: art-exp1 - Start: 0 - Length: * - building: fball1 - Start: 0 - Length: * - -pips: - ready: hpips - Start: 3 - hold: hpips - Start: 4 - pip-empty: hpips - Start: 0 - pip-green: hpips - Start: 1 - pip-yellow: hpips - Start: 5 - pip-gray: hpips - Start: 6 - pip-red: hpips - Start: 7 - tag-primary: hpips - Start: 2 - groups: pdigits - Start: 0 - Length: * - -rank: - rank: - Start: 0 - Length: * - -rallypoint: - flag:flagfly - Start: 0 - Length: * - circles:fpls - Start: 0 - Length: * - smoke_m: idle: Start: 0 @@ -131,27 +46,66 @@ patriot: Start: 0 Facings: 32 -moveflsh: - idle: +explosion: + 1: piff + Start: 0 + Length: * + 2: piffpiff + Start: 0 + Length: * + 3: napalm2 + Start: 0 + Length: * + 4: veh-hit3 + Start: 0 + Length: * + 5: veh-hit2 + Start: 0 + Length: * + 1w: piff + Start: 0 + Length: * + 2w: piffpiff + Start: 0 + Length: * + 3w: napalm2 + Start: 0 + Length: * + 4w: veh-hit3 + Start: 0 + Length: * + 5w: veh-hit2 + Start: 0 + Length: * + 8: art-exp1 + Start: 0 + Length: * + building: fball1 + Start: 0 + Length: * + 6: atomsfx + Start: 0 + Length: * + 6w: atomsfx + Start: 0 + Length: * +rank: + rank: Start: 0 Length: * -miss: - idle: +rallypoint: + flag:flagfly Start: 0 - damaged-idle: - Start: 2 + Length: * + circles:fpls + Start: 0 + Length: * select: repair: Start: 2 -tabs: - left-normal: htabs - Start: 0 - left-pressed: htabs - Start: 1 - crate: idle: wcrate Start: 0 @@ -189,7 +143,18 @@ crate-effects: Length: * Tick: 200 -ionsfx: +miss: + idle: + Start: 0 + damaged-idle: + Start: 2 + +atomicup: + idle: + Start: 0 + Length: * + +atomicdn: idle: Start: 0 Length: * @@ -202,6 +167,11 @@ atomic: Start: 0 Length: * +ionsfx: + idle: + Start: 0 + Length: * + bomblet: idle: Start: 0 @@ -215,4 +185,29 @@ mpspawn: waypoint: idle: Start: 0 - Length: * \ No newline at end of file + Length: * + +clock: + idle: hclock + Start: 0 + Length: * +pips: + ready: hpips + Start: 3 + hold: hpips + Start: 4 + pip-empty: hpips + Start: 0 + pip-green: hpips + Start: 1 + pip-yellow: hpips + Start: 5 + pip-gray: hpips + Start: 6 + pip-red: hpips + Start: 7 + tag-primary: hpips + Start: 2 + groups: pdigits + Start: 0 + Length: * diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 93bfde4505..12d286bc8d 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -183,40 +183,6 @@ apc: unload: Start: 32 -lst: - idle: lstnew - Start: 0 - Facings: 32 - unload: lstnew - Start: 0 - Facings: 32 - roof: lstnew2 - Start: 0 - Facings: 32 -boat: - left: - Start: 0 - Facings: 32 - left-damaged: - Start: 32 - left-critical: - Start: 64 - left-wake: wake - Start: 6 - Length: 6 - right: - Start: 96 - Facings: 32 - right-damaged: - Start: 128 - Facings: 32 - right-critical: - Start: 160 - Facings: 32 - right-wake: wake - Start: 0 - Length: 6 - a10: idle: Start: 0