juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

double hp and mana alerts (#749)

Browse Source 
* double hp and mana alerts

* Update alerts.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
This commit is contained in:
vladimir.s
2025-01-13 01:05:19 +05:00
committed by GitHub
parent b5f70616c3
commit f5edf03bf6
25 changed files with 294 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs
View File

@@ -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);
}
}

12
Resources/Prototypes/Alerts/alerts.yml
View File

@@ -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

14
Resources/Prototypes/_CP14/Alerts/alerts.yml
View File

@@ -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
maxSeverity: 11

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/health9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

185
Resources/Textures/_CP14/Interface/Alerts/alive.rsi/meta.json
View File

@@ -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
]
]
}

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/mana9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

185
Resources/Textures/_CP14/Interface/Alerts/mana.rsi/meta.json
View File

@@ -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
]
]
}