diff --git a/mods/ra/bits/c3.shp b/mods/ra/bits/c11.shp similarity index 100% rename from mods/ra/bits/c3.shp rename to mods/ra/bits/c11.shp diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index f254d5d384..385083d582 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -4,11 +4,20 @@ C1: C2: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice + RenderSprites: + Image: C1 + WithInfantryBody: + Palette: civilian2 + WithDeathAnimation: + DeathSequencePalette: civilian2 + DeathPaletteIsPlayerPalette: false C3: Inherits: ^CivInfantry + Voiced: + VoiceSet: CivilianFemaleVoice + RenderSprites: + Image: C2 C4: Inherits: ^CivInfantry @@ -16,43 +25,79 @@ C4: Image: C2 Voiced: VoiceSet: CivilianFemaleVoice + WithInfantryBody: + Palette: civilian4 + WithDeathAnimation: + DeathSequencePalette: civilian4 + DeathPaletteIsPlayerPalette: false C5: - Inherits: ^CivInfantry - RenderSprites: - Image: C1 - -C6: Inherits: ^CivInfantry RenderSprites: Image: C2 Voiced: VoiceSet: CivilianFemaleVoice + WithInfantryBody: + Palette: civilian5 + WithDeathAnimation: + DeathSequencePalette: civilian5 + DeathPaletteIsPlayerPalette: false + +C6: + Inherits: ^CivInfantry + RenderSprites: + Image: C1 + WithInfantryBody: + Palette: civilian6 + WithDeathAnimation: + DeathSequencePalette: civilian6 + DeathPaletteIsPlayerPalette: false C7: Inherits@1: ^CivInfantry Inherits@2: ^ArmedCivilian RenderSprites: Image: C1 + WithInfantryBody: + Palette: civilian7 + WithDeathAnimation: + DeathSequencePalette: civilian7 + DeathPaletteIsPlayerPalette: false C8: Inherits: ^CivInfantry RenderSprites: - Image: C2 - Voiced: - VoiceSet: CivilianFemaleVoice + Image: C1 + WithInfantryBody: + Palette: civilian8 + WithDeathAnimation: + DeathSequencePalette: civilian8 + DeathPaletteIsPlayerPalette: false C9: Inherits: ^CivInfantry RenderSprites: Image: C1 + WithInfantryBody: + Palette: civilian9 + WithDeathAnimation: + DeathSequencePalette: civilian9 + DeathPaletteIsPlayerPalette: false C10: Inherits: ^CivInfantry RenderSprites: - Image: C2 - Voiced: - VoiceSet: CivilianFemaleVoice + Image: C1 + Tooltip: + Name: Scientist + WithInfantryBody: + Palette: civilian10 + WithDeathAnimation: + DeathSequencePalette: civilian10 + DeathPaletteIsPlayerPalette: false + +C11: + Inherits: ^CivInfantry TECN: Inherits@1: ^CivInfantry diff --git a/mods/ra/rules/palettes.yaml b/mods/ra/rules/palettes.yaml index 1a47a745f4..fa830bbdd6 100644 --- a/mods/ra/rules/palettes.yaml +++ b/mods/ra/rules/palettes.yaml @@ -127,3 +127,43 @@ BaseName: placebuilding BasePalette: player Alpha: 0.65 + IndexedPalette@CIV2: + Name: civilian2 + BasePalette: player + Index: 7, 14, 118, 119, 159, 187, 188 + ReplaceIndex: 209, 12, 187, 188, 209, 167, 13 + IndexedPalette@CIV4: + Name: civilian4 + BasePalette: player + Index: 7, 109, 111, 206, 210 + ReplaceIndex: 187, 118, 119, 188, 182 + IndexedPalette@CIV5: + Name: civilian5 + BasePalette: player + Index: 7, 12, 109, 111, 200, 206, 210 + ReplaceIndex: 109, 131, 177, 178, 111, 111, 182 + IndexedPalette@CIV6: + Name: civilian6 + BasePalette: player + Index: 7, 14, 118, 119, 159 + ReplaceIndex: 120, 238, 236, 206, 111 + IndexedPalette@CIV7: + Name: civilian7 + BasePalette: player + Index: 14, 118, 119, 159, 187, 188 + ReplaceIndex: 131, 157, 212, 7, 118, 119 + IndexedPalette@CIV8: + Name: civilian8 + BasePalette: player + Index: 7, 14, 118, 119, 159, 187, 188, 200 + ReplaceIndex: 182, 131, 215, 7, 182, 198, 199, 111 + IndexedPalette@CIV9: + Name: civilian9 + BasePalette: player + Index: 14, 118, 119, 159, 187, 188 + ReplaceIndex: 7, 163, 165, 200, 111, 13 + IndexedPalette@CIV10: + Name: civilian10 + BasePalette: player + Index: 7, 14, 118, 119, 159, 187, 188 + ReplaceIndex: 137, 15, 129, 131, 137, 163, 165 diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index f370318802..e823187e32 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -1071,7 +1071,7 @@ c2: Facings: 8 Tick: 80 -c3: +c11: stand: Facings: 8 panic-stand: