diff --git a/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs b/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs index dc50114bb9..2043751d6a 100644 --- a/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs +++ b/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs @@ -135,7 +135,7 @@ public partial class SharedCP14MagicEnergySystem : EntitySystem if (ent.Comp.MagicAlert == null) return; - var level = ContentHelpers.RoundToLevels(MathF.Max(0f, (float) ent.Comp.Energy), (float) ent.Comp.MaxEnergy, 6); + var level = ContentHelpers.RoundToLevels(MathF.Max(0f, (float) ent.Comp.Energy), (float) ent.Comp.MaxEnergy, 11); _alerts.ShowAlert(ent, ent.Comp.MagicAlert.Value, (short)level); } } diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 1f86df3762..610cbd5fbf 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -190,6 +190,16 @@ id: HumanHealth category: Health icons: + - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi + state: health9 + - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi + state: health8 + - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi + state: health7 + - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi + state: health6 + - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi + state: health5 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi state: health4 - sprite: /Textures/_CP14/Interface/Alerts/alive.rsi @@ -205,7 +215,7 @@ name: cp14-alerts-health-name #CP14 replaced description: cp14-alerts-health-desc #CP14 replaced minSeverity: 0 - maxSeverity: 5 + maxSeverity: 10 - type: alert id: BorgHealth diff --git a/Resources/Prototypes/_CP14/Alerts/alerts.yml b/Resources/Prototypes/_CP14/Alerts/alerts.yml index ec07f21bcd..f2d921c48f 100644 --- a/Resources/Prototypes/_CP14/Alerts/alerts.yml +++ b/Resources/Prototypes/_CP14/Alerts/alerts.yml @@ -14,8 +14,18 @@ - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi state: mana4 - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi - state: mana4 + state: mana5 + - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi + state: mana6 + - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi + state: mana7 + - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi + state: mana8 + - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi + state: mana9 + - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi #TODO: Without this dublication, alerts never be fully null + state: mana9 name: cp14-alerts-magic-energy-name description: cp14-alerts-magic-energy-desc minSeverity: 0 - maxSeverity: 6 \ No newline at end of file + maxSeverity: 11 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health0.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health0.png index e4131a3e15..25417e7488 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health0.png and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health0.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health1.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health1.png index 5285518866..a48a5f7b9d 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health1.png and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health2.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health2.png index a8ab3a3f9b..905ccc74d6 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health2.png and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health3.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health3.png index fb2675f876..74ce7c6c5f 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health3.png and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health4.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health4.png index a65f2dc9be..f438d1f174 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health4.png and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health4.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health5.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health5.png new file mode 100644 index 0000000000..a8ab3a3f9b Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health5.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health6.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health6.png new file mode 100644 index 0000000000..66afa3560b Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health6.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health7.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health7.png new file mode 100644 index 0000000000..8772d9d6a4 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health7.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health8.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health8.png new file mode 100644 index 0000000000..219c57d3e6 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health8.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health9.png b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health9.png new file mode 100644 index 0000000000..a65f2dc9be Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health9.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/meta.json index 2e92ef173a..f12aa502dd 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/alive.rsi/meta.json @@ -11,16 +11,16 @@ "name": "health0", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -28,16 +28,16 @@ "name": "health1", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -45,16 +45,16 @@ "name": "health2", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -62,16 +62,16 @@ "name": "health3", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -79,16 +79,101 @@ "name": "health4", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "health5", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "health6", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "health7", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "health8", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "health9", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] } diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana0.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana0.png index e911ad725d..a5dc804609 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana0.png and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana0.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana1.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana1.png index 60cf047d0c..d8d1b6de5e 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana1.png and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana2.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana2.png index ba1a193a06..87b797432b 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana2.png and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana3.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana3.png index 3075002ba9..ead4ad2022 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana3.png and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana4.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana4.png index fb976334d2..d609be80af 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana4.png and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana4.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana5.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana5.png new file mode 100644 index 0000000000..44cd7f8732 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana5.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana6.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana6.png new file mode 100644 index 0000000000..bfe8c5f416 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana6.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana7.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana7.png new file mode 100644 index 0000000000..5b80c0ca4d Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana7.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana8.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana8.png new file mode 100644 index 0000000000..23c8d38456 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana8.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana9.png b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana9.png new file mode 100644 index 0000000000..5e3728aba3 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana9.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/meta.json index cb0afda4c9..43ae36df9d 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/mana.rsi/meta.json @@ -11,16 +11,16 @@ "name": "mana0", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -28,16 +28,16 @@ "name": "mana1", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -45,16 +45,16 @@ "name": "mana2", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -62,16 +62,16 @@ "name": "mana3", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }, @@ -79,16 +79,101 @@ "name": "mana4", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "mana5", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "mana6", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "mana7", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "mana8", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "mana9", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 ] ] }