Skip to content

Commit

Permalink
finished speedometers
Browse files Browse the repository at this point in the history
  • Loading branch information
InQuognito committed Jan 18, 2025
1 parent 1459707 commit d935bdc
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 109 deletions.
2 changes: 0 additions & 2 deletions data/ssbrc/function/fighter/shadow/kit.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ scoreboard players set @s shadow.meter.hero 0
scoreboard players set @s shadow.meter.dark 0

function ssbrc:fighter/shadow/logic/chaos_meter/update

scoreboard players set @s speedometer 0

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ scoreboard players operation resource.available.counter temp = resource.availabl

function ssbrc:fighter/shadow/logic/chaos_meter/hud/check {color:"red"}

function ssbrc:logic/player/data/temp/set_storage/get {input:"ssbrc:hud temp",output:"hud.2"}
function ssbrc:logic/player/data/temp/set_storage/get {input:"ssbrc:hud temp",output:"hud.3"}

scoreboard players operation @s hud = hud_frequency const
2 changes: 1 addition & 1 deletion data/ssbrc/function/fighter/shadow/logic/hud.mcfunction
Original file line number Diff line number Diff line change
@@ -1 +1 @@
title @s actionbar ["",{"nbt":"player.temp_data.hud.1[]","storage":"ssbrc:temp","interpret":true,"separator":""},{"text":" "},{"nbt":"player.temp_data.hud.2[]","storage":"ssbrc:temp","interpret":true,"separator":""}]
title @s actionbar ["",{"nbt":"player.temp_data.hud.1[]","storage":"ssbrc:temp","interpret":true,"separator":""}," ",{"nbt":"player.temp_data.hud.2","storage":"ssbrc:temp","interpret":true,"separator":""}," ",{"nbt":"player.temp_data.hud.3[]","storage":"ssbrc:temp","interpret":true,"separator":""}]
32 changes: 17 additions & 15 deletions data/ssbrc/function/fighter/shadow/logic/speed/hud.mcfunction
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
execute if score @s flag.sprinting matches 5..8 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/1"}}}
execute if score @s flag.sprinting matches 9..12 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/2"}}}
execute if score @s flag.sprinting matches 13..16 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/3"}}}
execute if score @s flag.sprinting matches 17..20 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/4"}}}
execute if score @s flag.sprinting matches 21..24 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/5"}}}
execute if score @s flag.sprinting matches 25..28 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/6"}}}
execute if score @s flag.sprinting matches 29..32 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/7"}}}
execute if score @s flag.sprinting matches 33..36 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/8"}}}
execute if score @s flag.sprinting matches 37..40 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/9"}}}
execute if score @s flag.sprinting matches 41..44 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/10"}}}
execute if score @s flag.sprinting matches 45..48 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/11"}}}
execute if score @s flag.sprinting matches 49..52 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/12"}}}
execute if score @s flag.sprinting matches 53..56 run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/13"}}}
execute if score @s flag.sprinting matches 57.. run return run item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/14"}}}
execute if score @s flag.sprinting matches ..4 run data modify storage ssbrc:hud temp set value '{"text":"\\uf800","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 5..8 run data modify storage ssbrc:hud temp set value '{"text":"\\uf801","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 9..12 run data modify storage ssbrc:hud temp set value '{"text":"\\uf802","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 13..16 run data modify storage ssbrc:hud temp set value '{"text":"\\uf803","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 17..20 run data modify storage ssbrc:hud temp set value '{"text":"\\uf804","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 21..24 run data modify storage ssbrc:hud temp set value '{"text":"\\uf805","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 25..28 run data modify storage ssbrc:hud temp set value '{"text":"\\uf806","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 29..32 run data modify storage ssbrc:hud temp set value '{"text":"\\uf807","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 33..36 run data modify storage ssbrc:hud temp set value '{"text":"\\uf808","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 37..40 run data modify storage ssbrc:hud temp set value '{"text":"\\uf809","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 41..44 run data modify storage ssbrc:hud temp set value '{"text":"\\uf810","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 45..48 run data modify storage ssbrc:hud temp set value '{"text":"\\uf811","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 49..52 run data modify storage ssbrc:hud temp set value '{"text":"\\uf812","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 53..56 run data modify storage ssbrc:hud temp set value '{"text":"\\uf813","font":"ssbrc:speedometer"}'
execute if score @s flag.sprinting matches 57.. run data modify storage ssbrc:hud temp set value '{"text":"\\uf814","font":"ssbrc:speedometer"}'

item modify entity @s armor.head {function:"minecraft:set_components",components:{"minecraft:equippable":{slot:"head",camera_overlay:"ssbrc:common/sonic_the_hedgehog/speedometer/0"}}}
function ssbrc:logic/player/data/temp/set_storage/get {input:"ssbrc:hud temp",output:"hud.2"}
scoreboard players operation @s hud = hud_frequency const
30 changes: 15 additions & 15 deletions data/ssbrc/function/fighter/sonic/logic/speed/hud.mcfunction
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
execute if score @s flag.sprinting matches 4..6 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"1"}
execute if score @s flag.sprinting matches 7..9 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"2"}
execute if score @s flag.sprinting matches 10..12 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"3"}
execute if score @s flag.sprinting matches 13..15 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"4"}
execute if score @s flag.sprinting matches 16..18 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"5"}
execute if score @s flag.sprinting matches 19..21 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"6"}
execute if score @s flag.sprinting matches 22..24 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"7"}
execute if score @s flag.sprinting matches 25..27 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"8"}
execute if score @s flag.sprinting matches 28..30 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"9"}
execute if score @s flag.sprinting matches 31..33 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"10"}
execute if score @s flag.sprinting matches 34..36 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"11"}
execute if score @s flag.sprinting matches 37..39 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"12"}
execute if score @s flag.sprinting matches 40..42 run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"13"}
execute if score @s flag.sprinting matches 43.. run return run function ssbrc:fighter/sonic/logic/speed/hud/set {n:"14"}
execute if score @s flag.sprinting matches 4..6 run return run title @s actionbar {"text":"\uf801","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 7..9 run return run title @s actionbar {"text":"\uf802","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 10..12 run return run title @s actionbar {"text":"\uf803","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 13..15 run return run title @s actionbar {"text":"\uf804","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 16..18 run return run title @s actionbar {"text":"\uf805","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 19..21 run return run title @s actionbar {"text":"\uf806","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 22..24 run return run title @s actionbar {"text":"\uf807","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 25..27 run return run title @s actionbar {"text":"\uf808","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 28..30 run return run title @s actionbar {"text":"\uf809","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 31..33 run return run title @s actionbar {"text":"\uf810","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 34..36 run return run title @s actionbar {"text":"\uf811","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 37..39 run return run title @s actionbar {"text":"\uf812","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 40..42 run return run title @s actionbar {"text":"\uf813","font":"ssbrc:speedometer"}
execute if score @s flag.sprinting matches 43.. run return run title @s actionbar {"text":"\uf814","font":"ssbrc:speedometer"}

function ssbrc:fighter/sonic/logic/speed/hud/set {n:"0"}
title @s actionbar {"text":"\uf800","font":"ssbrc:speedometer"}
17 changes: 0 additions & 17 deletions data/ssbrc/function/fighter/sonic/logic/speed/hud/set.mcfunction

This file was deleted.

This file was deleted.

31 changes: 0 additions & 31 deletions data/ssbrc/function/logic/game/data/bossbars.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,6 @@ bossbar set ssbrc:timer style progress
bossbar set ssbrc:timer value 1
bossbar set ssbrc:timer visible false

function ssbrc:logic/game/data/bossbar/speedometer {n:"0"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"1"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"2"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"3"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"4"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"5"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"6"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"7"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"8"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"9"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"10"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"11"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"12"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"13"}
function ssbrc:logic/game/data/bossbar/speedometer {n:"14"}
bossbar set ssbrc:speedometer/0 name {"text":"\uf800-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/1 name {"text":"\uf801-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/2 name {"text":"\uf802-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/3 name {"text":"\uf803-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/4 name {"text":"\uf804-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/5 name {"text":"\uf805-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/6 name {"text":"\uf806-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/7 name {"text":"\uf807-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/8 name {"text":"\uf808-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/9 name {"text":"\uf809-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/10 name {"text":"\uf810-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/11 name {"text":"\uf811-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/12 name {"text":"\uf812-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/13 name {"text":"\uf813-","font":"ssbrc:speedometer","color":"#3304f9"}
bossbar set ssbrc:speedometer/14 name {"text":"\uf814-","font":"ssbrc:speedometer","color":"#3304f9"}

function ssbrc:logic/ui/popup/reset {name:"tutorial"}

function ssbrc:logic/fighter/loop {function:"ssbrc:logic/ui/popup/reset"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ scoreboard objectives add slope dummy
scoreboard objectives add snake.capacity dummy
scoreboard objectives add snake.anti_personnel_mine.ammo dummy
scoreboard objectives add snake.smoke_grenade.ammo dummy
scoreboard objectives add speedometer dummy
scoreboard objectives add sprint_distance minecraft.custom:minecraft.sprint_one_cm
scoreboard objectives add stage_select dummy
scoreboard objectives add stage_vote dummy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ scoreboard objectives remove slope
scoreboard objectives remove snake.capacity
scoreboard objectives remove snake.anti_personnel_mine.ammo
scoreboard objectives remove snake.smoke_grenade.ammo
scoreboard objectives remove speedometer
scoreboard objectives remove sprint_distance
scoreboard objectives remove stage_select
scoreboard objectives remove stage_vote
Expand Down

0 comments on commit d935bdc

Please sign in to comment.