From 7fd763707f6a1e618563d33b0dd78250b7a5bcc0 Mon Sep 17 00:00:00 2001 From: Lena | Dunkel <7890309+DarkView@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:03:43 +0100 Subject: [PATCH] Switch Shield asset names, add Regen Shield --- .../assets/shields/{Shield50.webp => Heavy.webp} | Bin .../{Shield50Green.svg => HeavyGreen.svg} | 0 .../shields/{Shield50Red.svg => HeavyRed.svg} | 0 .../assets/shields/{Shield25.webp => Light.webp} | Bin .../{Shield25Green.svg => LightGreen.svg} | 0 .../shields/{Shield25Red.svg => LightRed.svg} | 0 .../assets/shields/{Shield0.webp => None.webp} | Bin .../shields/{Shield0Green.svg => NoneGreen.svg} | 0 .../shields/{Shield0Red.svg => NoneRed.svg} | 0 public/assets/shields/Regen.webp | Bin 0 -> 8636 bytes public/assets/shields/RegenGreen.svg | 3 +++ public/assets/shields/RegenRed.svg | 3 +++ .../combat/playercard/playercard.component.html | 2 +- .../playerscore/playerscore.component.html | 2 +- .../player-controller.component.ts | 14 +++++++------- 15 files changed, 15 insertions(+), 9 deletions(-) rename public/assets/shields/{Shield50.webp => Heavy.webp} (100%) rename public/assets/shields/{Shield50Green.svg => HeavyGreen.svg} (100%) rename public/assets/shields/{Shield50Red.svg => HeavyRed.svg} (100%) rename public/assets/shields/{Shield25.webp => Light.webp} (100%) rename public/assets/shields/{Shield25Green.svg => LightGreen.svg} (100%) rename public/assets/shields/{Shield25Red.svg => LightRed.svg} (100%) rename public/assets/shields/{Shield0.webp => None.webp} (100%) rename public/assets/shields/{Shield0Green.svg => NoneGreen.svg} (100%) rename public/assets/shields/{Shield0Red.svg => NoneRed.svg} (100%) create mode 100644 public/assets/shields/Regen.webp create mode 100644 public/assets/shields/RegenGreen.svg create mode 100644 public/assets/shields/RegenRed.svg diff --git a/public/assets/shields/Shield50.webp b/public/assets/shields/Heavy.webp similarity index 100% rename from public/assets/shields/Shield50.webp rename to public/assets/shields/Heavy.webp diff --git a/public/assets/shields/Shield50Green.svg b/public/assets/shields/HeavyGreen.svg similarity index 100% rename from public/assets/shields/Shield50Green.svg rename to public/assets/shields/HeavyGreen.svg diff --git a/public/assets/shields/Shield50Red.svg b/public/assets/shields/HeavyRed.svg similarity index 100% rename from public/assets/shields/Shield50Red.svg rename to public/assets/shields/HeavyRed.svg diff --git a/public/assets/shields/Shield25.webp b/public/assets/shields/Light.webp similarity index 100% rename from public/assets/shields/Shield25.webp rename to public/assets/shields/Light.webp diff --git a/public/assets/shields/Shield25Green.svg b/public/assets/shields/LightGreen.svg similarity index 100% rename from public/assets/shields/Shield25Green.svg rename to public/assets/shields/LightGreen.svg diff --git a/public/assets/shields/Shield25Red.svg b/public/assets/shields/LightRed.svg similarity index 100% rename from public/assets/shields/Shield25Red.svg rename to public/assets/shields/LightRed.svg diff --git a/public/assets/shields/Shield0.webp b/public/assets/shields/None.webp similarity index 100% rename from public/assets/shields/Shield0.webp rename to public/assets/shields/None.webp diff --git a/public/assets/shields/Shield0Green.svg b/public/assets/shields/NoneGreen.svg similarity index 100% rename from public/assets/shields/Shield0Green.svg rename to public/assets/shields/NoneGreen.svg diff --git a/public/assets/shields/Shield0Red.svg b/public/assets/shields/NoneRed.svg similarity index 100% rename from public/assets/shields/Shield0Red.svg rename to public/assets/shields/NoneRed.svg diff --git a/public/assets/shields/Regen.webp b/public/assets/shields/Regen.webp new file mode 100644 index 0000000000000000000000000000000000000000..dfc2cb3346c93937774fba4de00c92c7ad94cd11 GIT binary patch literal 8636 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 O58|n=vLSKA00018KI=IE literal 0 HcmV?d00001 diff --git a/public/assets/shields/RegenGreen.svg b/public/assets/shields/RegenGreen.svg new file mode 100644 index 0000000..b4f552b --- /dev/null +++ b/public/assets/shields/RegenGreen.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/public/assets/shields/RegenRed.svg b/public/assets/shields/RegenRed.svg new file mode 100644 index 0000000..5467d78 --- /dev/null +++ b/public/assets/shields/RegenRed.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/combat/playercard/playercard.component.html b/src/app/combat/playercard/playercard.component.html index 747b71b..3d485e3 100644 --- a/src/app/combat/playercard/playercard.component.html +++ b/src/app/combat/playercard/playercard.component.html @@ -13,7 +13,7 @@
- +
{{player.money}}
diff --git a/src/app/scoreboard/playerscore/playerscore.component.html b/src/app/scoreboard/playerscore/playerscore.component.html index 60c13ec..cf1725b 100644 --- a/src/app/scoreboard/playerscore/playerscore.component.html +++ b/src/app/scoreboard/playerscore/playerscore.component.html @@ -18,7 +18,7 @@
- +

diff --git a/src/app/testing/player-controller/player-controller.component.ts b/src/app/testing/player-controller/player-controller.component.ts index c400241..c4425ec 100644 --- a/src/app/testing/player-controller/player-controller.component.ts +++ b/src/app/testing/player-controller/player-controller.component.ts @@ -33,7 +33,7 @@ export class PlayerControllerComponent { isAttacking = false; weaponOrder = ["Vandal", "Operator", "Classic", "Spectre"]; moneyOrder = [2900, 4700, 0, 1600]; - shieldOrder = [50, 25, 0]; + armorOrder = ["Heavy", "Regen", "Light", "None"]; static agentIndex = [0, 0]; static agentOrder = [["Vampire", "Killjoy", "Guide", "Stealth", "Rift"], ["Grenadier", "Deadeye", "Sprinter", "BountyHunter", "Mage"]]; @@ -48,7 +48,7 @@ export class PlayerControllerComponent { isAlive: true, agentInternal: "Wushu", isObserved: false, - initialShield: this.shieldOrder[0], + armorName: this.armorOrder[0], money: 2100, moneySpent: 2900, highestWeapon: this.weaponOrder[0], @@ -81,12 +81,12 @@ export class PlayerControllerComponent { kill(): void { this.playerObject.isAlive = false; this.stopSpectate(); - this.playerObject.initialShield = this.shieldOrder[2]; + this.playerObject.armorName = this.armorOrder[3]; } revive(): void { this.playerObject.isAlive = true; - this.playerObject.initialShield = this.shieldOrder[0]; + this.playerObject.armorName = this.armorOrder[0]; } giveUltPoint(): void { @@ -144,10 +144,10 @@ export class PlayerControllerComponent { } changeShield(): void { - var i = this.shieldOrder.findIndex(e => e == this.playerObject.initialShield); + var i = this.armorOrder.findIndex(e => e == this.playerObject.armorName); i++; - i %= this.shieldOrder.length; - this.playerObject.initialShield = this.shieldOrder[i]; + i %= this.armorOrder.length; + this.playerObject.armorName = this.armorOrder[i]; } changeStats(): void {