From 5a08b5bce26c5b40afe4faa97b1d74c9479b831c Mon Sep 17 00:00:00 2001 From: L_glandieres Date: Sat, 30 Sep 2023 20:10:05 +0200 Subject: [PATCH] added glowing to flags & changed 5points color to light_blue --- .../scaffolding_rush/functions/__init__.mcfunction | 11 ++++++++++- .../functions/game/flag/__main__.mcfunction | 6 +++--- .../functions/game/flag/animation/__main__.mcfunction | 6 +++--- .../functions/game/flag/banner/give/5.mcfunction | 2 +- .../functions/game/flag/banner/head/5.mcfunction | 2 +- .../functions/game/flag/claim/point/5.mcfunction | 2 +- .../functions/game/flag/grab/any.mcfunction | 2 +- .../functions/game/flag/stack_kill.mcfunction | 3 +++ .../functions/game/flag/summon/1.mcfunction | 7 +++---- .../functions/game/flag/summon/2.mcfunction | 6 +++--- .../functions/game/flag/summon/5.mcfunction | 6 ++++-- .../data/scaffolding_rush/functions/reset.mcfunction | 2 +- 12 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/stack_kill.mcfunction diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/__init__.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/__init__.mcfunction index c126ea37..44232a64 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/__init__.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/__init__.mcfunction @@ -108,11 +108,19 @@ team add yellow team add green team add random +team add purple_glow +team add yellow_glow +team add cyan_glow + + team modify red color red team modify blue color blue team modify yellow color yellow team modify green color green team modify random color dark_purple +team modify purple_glow color dark_purple +team modify yellow_glow color yellow +team modify cyan_glow color aqua team modify red collisionRule never team modify blue collisionRule never @@ -125,6 +133,7 @@ team modify yellow friendlyFire false team modify green friendlyFire false team modify random friendlyFire true + #Score team join blue Blue team join green Green @@ -149,7 +158,7 @@ gamerule doFireTick false gamerule doImmediateRespawn true gamerule doInsomnia false gamerule doLimitedCrafting -gamerule doMobLoot true +gamerule doMobLoot false gamerule doMobSpawning false gamerule doPatrolSpawning false gamerule doTileDrops false diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/__main__.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/__main__.mcfunction index dd1ef80e..8eb896f5 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/__main__.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/__main__.mcfunction @@ -17,11 +17,11 @@ execute if score FlagTakeOverCountdown global >= FlagTakeOverSpawnInterval optio execute run scoreboard players add FlagTakeOverCountdown global 1 #remove flags in lava -execute as @e[type=armor_stand,tag=Flag] at @s if block ~ ~2 ~ magma_block run kill @s +execute as @e[type=armor_stand,tag=Flag] at @s if block ~ ~2 ~ magma_block run function scaffolding_rush:game/flag/stack_kill #grabbing flag -execute as @a[gamemode=adventure,tag=!flag_carry] at @s positioned ~ ~-2 ~ if entity @e[type=armor_stand,tag=Flag,distance=..2] run function scaffolding_rush:game/flag/grab/any -execute as @a[gamemode=survival,tag=!flag_carry] at @s positioned ~ ~-2 ~ if entity @e[type=armor_stand,tag=Flag,distance=..2] run function scaffolding_rush:game/flag/grab/any +execute as @a[gamemode=adventure,tag=!flag_carry] at @s positioned ~ ~-2 ~ if entity @e[type=armor_stand,tag=Flag,distance=..3] run function scaffolding_rush:game/flag/grab/any +execute as @a[gamemode=survival,tag=!flag_carry] at @s positioned ~ ~-2 ~ if entity @e[type=armor_stand,tag=Flag,distance=..3] run function scaffolding_rush:game/flag/grab/any #depositing flag execute as @a[tag=flag_carry,team=blue] at @s if entity @e[type=villager,tag=game_villager,distance=..1, team=blue] run function scaffolding_rush:game/flag/claim/team/blue diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/animation/__main__.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/animation/__main__.mcfunction index 92c35170..6af3a8df 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/animation/__main__.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/animation/__main__.mcfunction @@ -1,3 +1,3 @@ -execute as @e[type=armor_stand,tag=Flag,tag=flagOne] at @s run function scaffolding_rush:game/flag/animation/1 -execute as @e[type=armor_stand,tag=Flag,tag=flagTwo] at @s run function scaffolding_rush:game/flag/animation/2 -execute as @e[type=armor_stand,tag=Flag,tag=flagFive] at @s run function scaffolding_rush:game/flag/animation/5 \ No newline at end of file +execute as @e[type=armor_stand,tag=FlagDisplay,tag=flagOne] at @s run function scaffolding_rush:game/flag/animation/1 +execute as @e[type=armor_stand,tag=FlagDisplay,tag=flagTwo] at @s run function scaffolding_rush:game/flag/animation/2 +execute as @e[type=armor_stand,tag=FlagDisplay,tag=flagFive] at @s run function scaffolding_rush:game/flag/animation/5 \ No newline at end of file diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/give/5.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/give/5.mcfunction index ead973fb..b7bdfcd2 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/give/5.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/give/5.mcfunction @@ -1,5 +1,5 @@ clear @s minecraft:red_banner -item replace entity @s weapon.offhand with minecraft:red_banner{BlockEntityTag:{Patterns:[{Pattern:bs,Color:0},{Pattern:mr,Color:14},{Pattern:ts,Color:0},{Pattern:drs,Color:0},{Pattern:bo,Color:14}]}} +item replace entity @s weapon.offhand with minecraft:light_blue_banner{BlockEntityTag:{Patterns:[{Pattern:bs,Color:0},{Pattern:mr,Color:3},{Pattern:ts,Color:0},{Pattern:drs,Color:0},{Pattern:bo,Color:3}]}} function scaffolding_rush:game/flag/banner/head/5 diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/head/5.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/head/5.mcfunction index 70c34838..149e334e 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/head/5.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/banner/head/5.mcfunction @@ -1 +1 @@ -item replace entity @s armor.head with minecraft:red_banner{BlockEntityTag:{Patterns:[{Pattern:bs,Color:0},{Pattern:mr,Color:14},{Pattern:ts,Color:0},{Pattern:drs,Color:0},{Pattern:bo,Color:14}]}} \ No newline at end of file +item replace entity @s armor.head with minecraft:light_blue_banner{BlockEntityTag:{Patterns:[{Pattern:bs,Color:0},{Pattern:mr,Color:3},{Pattern:ts,Color:0},{Pattern:drs,Color:0},{Pattern:bo,Color:3}]}} \ No newline at end of file diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/claim/point/5.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/claim/point/5.mcfunction index 7cc1cff9..5f3087d0 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/claim/point/5.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/claim/point/5.mcfunction @@ -1,7 +1,7 @@ tag @s remove flagFive title @s times 0 20 0 -title @s title {"text":"+5","color":"dark_red"} +title @s title {"text":"+5","color":"aqua"} execute if entity @s[team=blue] run tellraw @a ["",{"text":"[","color":"blue"},{"selector":"@s","color":"blue"},{"text":"]","color":"blue"},{"text":" +5 points","color":"gray"}] execute if entity @s[team=green] run tellraw @a ["",{"text":"[","color":"green"},{"selector":"@s","color":"green"},{"text":"]","color":"green"},{"text":" +5 points","color":"gray"}] diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/grab/any.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/grab/any.mcfunction index bfba84e9..adb3c47b 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/grab/any.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/grab/any.mcfunction @@ -12,4 +12,4 @@ execute if entity @e[type=armor_stand,tag=processed,tag=flagOne] run function sc execute if entity @e[type=armor_stand,tag=processed,tag=flagTwo] run function scaffolding_rush:game/flag/grab/point/2 execute if entity @e[type=armor_stand,tag=processed,tag=flagFive] run function scaffolding_rush:game/flag/grab/point/5 -kill @e[type=armor_stand,tag=processed] \ No newline at end of file +execute as @e[type=armor_stand,tag=processed] at @s run function scaffolding_rush:game/flag/stack_kill \ No newline at end of file diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/stack_kill.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/stack_kill.mcfunction new file mode 100644 index 00000000..4dac83d9 --- /dev/null +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/stack_kill.mcfunction @@ -0,0 +1,3 @@ + +#kill all entities riding on top of each other in the void (hide the death animation) +tp @s ~ ~-500 ~ \ No newline at end of file diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/1.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/1.mcfunction index 4dc218a4..d64bc60c 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/1.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/1.mcfunction @@ -1,6 +1,5 @@ -summon minecraft:armor_stand ~ ~-2 ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","selected","flagOne"]} +summon armor_stand ~ ~ ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","flagOne"],Passengers:[{id:"minecraft:armor_stand",Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["FlagDisplay","flagOne","selected"]},{id:"minecraft:armor_stand",NoGravity:1b,Invulnerable:1b,Invisible:1b,Passengers:[{id:"minecraft:slime",Invulnerable:1b,Silent:1b,PersistenceRequired:1b,NoAI:1b,Size:0,Passengers:[{id:"minecraft:slime",Team:"purple_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,Passengers:[{id:"minecraft:slime",Team:"purple_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}]}]} +execute as @e[type=armor_stand,tag=selected,tag=FlagDisplay,limit=1] run function scaffolding_rush:game/flag/banner/head/1 -execute as @e[type=armor_stand,tag=selected,tag=Flag,limit=1] run function scaffolding_rush:game/flag/banner/head/1 - -tag @e[type=armor_stand,tag=selected,tag=Flag,limit=1] remove selected +tag @e[type=armor_stand,tag=selected,limit=1] remove selected diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/2.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/2.mcfunction index f9594f4a..771ca6ce 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/2.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/2.mcfunction @@ -1,6 +1,6 @@ -summon minecraft:armor_stand ~ ~-2 ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","selected","flagTwo"]} +summon armor_stand ~ ~ ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","flagTwo"],Passengers:[{id:"minecraft:armor_stand",Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["FlagDisplay","flagTwo","selected"]},{id:"minecraft:armor_stand",NoGravity:1b,Invulnerable:1b,Invisible:1b,Passengers:[{id:"minecraft:slime",Invulnerable:1b,Silent:1b,PersistenceRequired:1b,NoAI:1b,Size:0,Passengers:[{id:"minecraft:slime",Team:"yellow_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,Passengers:[{id:"minecraft:slime",Team:"yellow_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}]}]} -execute as @e[type=armor_stand,tag=selected,tag=Flag,limit=1] run function scaffolding_rush:game/flag/banner/head/2 +execute as @e[type=armor_stand,tag=selected,tag=FlagDisplay,limit=1] run function scaffolding_rush:game/flag/banner/head/2 -tag @e[type=armor_stand,tag=selected,tag=Flag,limit=1] remove selected +tag @e[type=armor_stand,tag=selected,limit=1] remove selected diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/5.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/5.mcfunction index ecda9027..24824b96 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/5.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/flag/summon/5.mcfunction @@ -1,5 +1,7 @@ + +summon armor_stand ~ ~ ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","flagFive"],Passengers:[{id:"minecraft:armor_stand",Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["FlagDisplay","flagFive","selected"]},{id:"minecraft:armor_stand",NoGravity:1b,Invulnerable:1b,Invisible:1b,Passengers:[{id:"minecraft:slime",Invulnerable:1b,Silent:1b,PersistenceRequired:1b,NoAI:1b,Size:0,Passengers:[{id:"minecraft:slime",Team:"cyan_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,Passengers:[{id:"minecraft:slime",Team:"cyan_glow",Invulnerable:1b,Silent:1b,Glowing:1b,PersistenceRequired:1b,NoAI:1b,Size:1,ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}],ActiveEffects:[{Id:14,Amplifier:0,Duration:2147483647}]}]}]} summon minecraft:armor_stand ~ ~-2 ~ {Invisible:1b,NoGravity:1b,Invulnerable:1b,DisabledSlots:0,Tags:["Flag","new","selected","flagFive"]} -execute as @e[type=armor_stand,tag=selected,tag=Flag,limit=1] run function scaffolding_rush:game/flag/banner/head/5 +execute as @e[type=armor_stand,tag=selected,tag=FlagDisplay,limit=1] run function scaffolding_rush:game/flag/banner/head/5 -tag @e[type=armor_stand,tag=selected,tag=Flag,limit=1] remove selected +tag @e[type=armor_stand,tag=selected,limit=1] remove selected diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/reset.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/reset.mcfunction index 42868f0a..5e35b063 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/reset.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/reset.mcfunction @@ -4,7 +4,7 @@ worldborder center 0 0 #remove bases markers kill @e[tag=baseTeam] -kill @e[type=armor_stand,tag=Flag] +execute as @e[type=armor_stand,tag=Flag] at @s run function scaffolding_rush:game/flag/stack_kill function scaffolding_rush:game/summon_markers