Skip to content

Commit

Permalink
Merge pull request #24 from Flubberschnub/indev
Browse files Browse the repository at this point in the history 
green
  • Loading branch information
@Flubberschnub
Flubberschnub committed Oct 18, 2020
2 parents 2c0392f + a16d798 commit b360b6d
Show file tree
Hide file tree
Showing 51 changed files with 1,103 additions and 376 deletions.
5 changes: 5 additions & 0 deletions data/lc/functions/color/batoncolor/4/green.mcfunction
View file
@@ -0,0 +1,5 @@
##blue baton
scoreboard players set @s aestd.item.cmd 43
scoreboard players set @s aestd.item.slot -1
function aestd1:item/set_custom_model_data
tag @s add batoncolormatch
1 change: 1 addition & 0 deletions data/lc/functions/color/batoncolor/4/match.mcfunction
View file
@@ -1,3 +1,4 @@
##match color
execute unless score @s circuitcolor matches 2.. run function lc:color/batoncolor/4/blue
execute if score @s circuitcolor matches 2 run function lc:color/batoncolor/4/orange
execute if score @s circuitcolor matches 3 run function lc:color/batoncolor/4/green
5 changes: 5 additions & 0 deletions data/lc/functions/color/batoncolor/5/green.mcfunction
View file
@@ -0,0 +1,5 @@
##blue baton
scoreboard players set @s aestd.item.cmd 53
scoreboard players set @s aestd.item.slot -1
function aestd1:item/set_custom_model_data
tag @s add batoncolormatch
1 change: 1 addition & 0 deletions data/lc/functions/color/batoncolor/5/match.mcfunction
View file
@@ -1,3 +1,4 @@
##match color
execute unless score @s circuitcolor matches 2.. run function lc:color/batoncolor/5/blue
execute if score @s circuitcolor matches 2 run function lc:color/batoncolor/5/orange
execute if score @s circuitcolor matches 3 run function lc:color/batoncolor/5/green
11 changes: 11 additions & 0 deletions data/lc/functions/derez/animate/color/green/4.mcfunction
View file
@@ -0,0 +1,11 @@
##g5 animation
execute if score @s rezanimate matches 1 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:342}
execute if score @s rezanimate matches 2 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:343}
execute if score @s rezanimate matches 3 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:344}
execute if score @s rezanimate matches 4 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:345}
execute if score @s rezanimate matches 5 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:346}
execute if score @s rezanimate matches 7 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:347}
execute if score @s rezanimate matches 9 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:348}
execute if score @s rezanimate matches 11 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:349}
execute if score @s rezanimate matches 13 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:3410}
execute if score @s rezanimate matches 15 run replaceitem entity @s armor.head minecraft:redstone{CustomModelData:34}
11 changes: 11 additions & 0 deletions data/lc/functions/derez/animate/color/green/5.mcfunction
View file
@@ -0,0 +1,11 @@
##g5 animation
execute if score @s rezanimate matches 1 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:352}
execute if score @s rezanimate matches 2 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:353}
execute if score @s rezanimate matches 3 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:354}
execute if score @s rezanimate matches 4 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:355}
execute if score @s rezanimate matches 5 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:356}
execute if score @s rezanimate matches 7 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:357}
execute if score @s rezanimate matches 9 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:358}
execute if score @s rezanimate matches 11 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:359}
execute if score @s rezanimate matches 13 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:3510}
execute if score @s rezanimate matches 15 run replaceitem entity @s armor.head minecraft:diamond{CustomModelData:35}
3 changes: 3 additions & 0 deletions data/lc/functions/derez/animate/tick.mcfunction
View file
Expand Up @@ -9,4 +9,7 @@ execute if score @s CycleType matches 73 run function lc:derez/animate/73
execute if score @s CycleType matches 5 if score @s circuitcolor matches 2 run function lc:derez/animate/color/orange/5
execute if score @s CycleType matches 4 if score @s circuitcolor matches 2 run function lc:derez/animate/color/orange/4

execute if score @s CycleType matches 5 if score @s circuitcolor matches 3 run function lc:derez/animate/color/green/5
execute if score @s CycleType matches 4 if score @s circuitcolor matches 3 run function lc:derez/animate/color/green/4

execute if score @s rezanimate matches ..0 run function lc:match/cyclestand/derez
13 changes: 9 additions & 4 deletions data/lc/functions/gauges/speedometer.mcfunction
View file
Expand Up @@ -5,7 +5,12 @@ execute unless score @s circuitcolor matches 2.. if score @s CycleType matches 4
execute unless score @s circuitcolor matches 2.. if score @s CycleType matches 73 run function lc:gauges/speedometer/blue/73

##colors
execute if score @s CycleType matches 786 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/red/73
execute if score @s CycleType matches 5 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/red/73
execute if score @s CycleType matches 4 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/red/73
execute if score @s CycleType matches 73 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/red/73
execute if score @s CycleType matches 786 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/orange/73
execute if score @s CycleType matches 5 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/orange/73
execute if score @s CycleType matches 4 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/orange/73
execute if score @s CycleType matches 73 if score @s circuitcolor matches 2 run function lc:gauges/speedometer/orange/73

execute if score @s CycleType matches 786 if score @s circuitcolor matches 3 run function lc:gauges/speedometer/green/73
execute if score @s CycleType matches 5 if score @s circuitcolor matches 3 run function lc:gauges/speedometer/green/73
execute if score @s CycleType matches 4 if score @s circuitcolor matches 3 run function lc:gauges/speedometer/green/73
execute if score @s CycleType matches 73 if score @s circuitcolor matches 3 run function lc:gauges/speedometer/green/73
81 changes: 81 additions & 0 deletions data/lc/functions/gauges/speedometer/green/4.mcfunction
View file
@@ -0,0 +1,81 @@
##786 speedometer
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1..100 run title @s actionbar {"text":"||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 101..200 run title @s actionbar {"text":"||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 201..300 run title @s actionbar {"text":"||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 301..400 run title @s actionbar {"text":"||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 401..500 run title @s actionbar {"text":"||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 501..600 run title @s actionbar {"text":"||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 601..700 run title @s actionbar {"text":"||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 701..800 run title @s actionbar {"text":"||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 801..900 run title @s actionbar {"text":"||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 901..1000 run title @s actionbar {"text":"||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1001..1100 run title @s actionbar {"text":"||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1101..1200 run title @s actionbar {"text":"||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1201..1300 run title @s actionbar {"text":"||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1301..1400 run title @s actionbar {"text":"||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1401..1500 run title @s actionbar {"text":"||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1501..1600 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1601..1700 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1701..1800 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1801..1900 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 1901..2000 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2001..2100 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2101..2200 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2201..2300 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2301..2400 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2401..2500 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2501..2600 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=ribboning] speed matches 2601..2700 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||||||","color":"#15D0B0","bold":true,"italic":false}
##786 speedometer not ribboning
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1..100 run title @s actionbar {"text":"||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 101..200 run title @s actionbar {"text":"||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 201..300 run title @s actionbar {"text":"||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 301..400 run title @s actionbar {"text":"||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 401..500 run title @s actionbar {"text":"||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 501..600 run title @s actionbar {"text":"||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 601..700 run title @s actionbar {"text":"||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 701..800 run title @s actionbar {"text":"||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 801..900 run title @s actionbar {"text":"||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 901..1000 run title @s actionbar {"text":"||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1001..1100 run title @s actionbar {"text":"||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1101..1200 run title @s actionbar {"text":"||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1201..1300 run title @s actionbar {"text":"||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1301..1400 run title @s actionbar {"text":"||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1401..1500 run title @s actionbar {"text":"||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1501..1600 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1601..1700 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1701..1800 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1801..1900 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 1901..2000 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2001..2100 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2101..2200 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2201..2300 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2301..2400 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2401..2500 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2501..2600 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}
execute if score @e[tag=cyclestand,limit=1,tag=matchedid,tag=!ribboning] speed matches 2601..2700 run title @s actionbar {"text":"||||||||||||||||||||||||||||||||||||||||||||||||||||||","color":"white","bold":true,"italic":false}

##speed effect
effect clear @s speed
effect clear @s slowness
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 0..100 run effect give @s slowness 1 3 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 101..200 run effect give @s slowness 1 3 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 201..300 run effect give @s slowness 1 2 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 301..400 run effect give @s slowness 1 2 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 401..500 run effect give @s slowness 1 1 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 501..600 run effect give @s slowness 1 1 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 601..700 run effect give @s slowness 1 0 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 701..800 run effect give @s slowness 1 0 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 801..900 run effect give @s speed 1 0 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 901..1000 run effect give @s speed 1 0 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1001..1100 run effect give @s speed 1 1 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1101..1200 run effect give @s speed 1 1 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1201..1300 run effect give @s speed 1 2 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1301..1400 run effect give @s speed 1 2 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1401..1500 run effect give @s speed 1 3 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1501..1600 run effect give @s speed 1 3 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1601..1700 run effect give @s speed 1 4 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1701..1800 run effect give @s speed 1 4 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1801..1900 run effect give @s speed 1 5 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 1901..2000 run effect give @s speed 1 5 true
execute if score @e[tag=cyclestand,limit=1,tag=matchedid] speed matches 2001.. run effect give @s speed 1 5 true

0 comments on commit b360b6d

Please sign in to comment.