More dropper changes & birds

LoveTropics · Oct 17, 2024 · 44f1d23 · 44f1d23
1 parent e1b3866
commit 44f1d23
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/data/lt/function/effects/spawn/failguls/remove.mcfunction b/data/lt/function/effects/spawn/failguls/remove.mcfunction
@@ -0,0 +1 @@
+kill @e[tag=spawn.effect.failgull]
diff --git a/data/lt/function/effects/spawn/failguls/spawn.mcfunction b/data/lt/function/effects/spawn/failguls/spawn.mcfunction
@@ -0,0 +1,2 @@
+execute in tropicraft:tropics positioned -207.9612 184 -90.949 run function lt:effects/spawn/failguls/spawn_at
+execute in tropicraft:tropics positioned -184.2434 184 -89.392 run function lt:effects/spawn/failguls/spawn_at
diff --git a/data/lt/function/effects/spawn/failguls/spawn_at.mcfunction b/data/lt/function/effects/spawn/failguls/spawn_at.mcfunction
@@ -0,0 +1 @@
+summon tropicraft:failgull ~ ~ ~ {Tags:["spawn.effect.failgull"],attributes:[{id:"minecraft:generic.scale",base:20}]}
diff --git a/data/lt/function/main/on_load.mcfunction b/data/lt/function/main/on_load.mcfunction
@@ -98,6 +98,9 @@ function lt:world_games/minigolf/core/on_second
 
 # Dropper
 scoreboard objectives add game.dropper.stats dummy "Dropper"
+scoreboard objectives add game.dropper.stats_player_plays dummy "Dropper Plays"
+scoreboard objectives add game.dropper.stats_player_fails dummy "Dropper Fails"
+scoreboard objectives add game.dropper.stats_player_wins dummy "Dropper Wins"
 team add dropper
 team modify dropper collisionRule never
 team modify dropper seeFriendlyInvisibles true
diff --git a/data/lt/function/world_games/dropper/fail.mcfunction b/data/lt/function/world_games/dropper/fail.mcfunction
@@ -1,5 +1,8 @@
 tp @s @e[tag=dropper.fail,limit=1,sort=random]
 execute as @s at @s run playsound minecraft:block.note_block.banjo voice @s ~ ~ ~ 1 .01
 scoreboard players add Fails game.dropper.stats 1
+scoreboard players add Drops game.dropper.stats 1
+scoreboard players add @s game.dropper.stats_player_plays 1
+scoreboard players add @s game.dropper.stats_player_fails 1
 function lt:world_games/dropper/util/update_display
 # scoreboard players add @s dropper.counter 1
diff --git a/data/lt/function/world_games/dropper/on_tick.mcfunction b/data/lt/function/world_games/dropper/on_tick.mcfunction
@@ -1,2 +1,2 @@
-execute as @a[tag=in.dropper] at @s if entity @s[predicate=lt:parkour/is_over_bad_block] in tropicraft:tropics run function lt:world_games/dropper/fail
-execute as @a[tag=in.dropper] at @s if entity @s[predicate=lt:parkour/is_over_win_block] in tropicraft:tropics run function lt:world_games/dropper/win
+execute as @a[tag=in.dropper,tag=!dropper.admin,gamemode=!spectator] at @s if entity @s[predicate=lt:parkour/is_over_bad_block] in tropicraft:tropics run function lt:world_games/dropper/fail
+execute as @a[tag=in.dropper,tag=!dropper.admin,gamemode=!spectator] at @s if entity @s[predicate=lt:parkour/is_over_win_block] in tropicraft:tropics run function lt:world_games/dropper/win
diff --git a/data/lt/function/world_games/dropper/win.mcfunction b/data/lt/function/world_games/dropper/win.mcfunction
@@ -4,6 +4,9 @@ give @s[tag=!dropper.win.coins] ltextras:tropicoin 20
 give @s[tag=dropper.win.coins] ltextras:tropicoin 1
 tag @s add dropper.win.coins
 scoreboard players add Success game.dropper.stats 1
+scoreboard players add Drops game.dropper.stats 1
+scoreboard players add @s game.dropper.stats_player_plays 1
+scoreboard players add @s game.dropper.stats_player_wins 1
 function lt:world_games/dropper/util/update_display
 # scoreboard players set @s dropper.counter 0
 # function lt:game/dropper/gravity/reset