From a52185f7497d4cf955e01d4f4c04c2c6fcaa91a7 Mon Sep 17 00:00:00 2001 From: unfa Date: Sat, 25 Sep 2021 15:53:12 +0200 Subject: [PATCH] Implemented "Fisrt Blood" --- Game/Assets/Announcer/Announcer.gd | 3 ++- Game/Assets/Weapons/Weapon.gd | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Announcer/Announcer.gd b/Game/Assets/Announcer/Announcer.gd index 2dd5910..39fd925 100644 --- a/Game/Assets/Announcer/Announcer.gd +++ b/Game/Assets/Announcer/Announcer.gd @@ -7,7 +7,8 @@ extends AudioStreamPlayer @onready var getready = preload("res://Assets/Announcer/GetReady.wav") @onready var victory2 = preload("res://Assets/Announcer/MercilessVictory.wav") @onready var defeat2 = preload("res://Assets/Announcer/EmbarrassingDefeat.wav") - +@onready var firstblood = preload("res://Assets/Announcer/FirstBlood.wav") +@onready var yousuck = preload("res://Assets/Announcer/YouSuck.wav") # Declare member variables here. Examples: # var a = 2 # var b = "text" diff --git a/Game/Assets/Weapons/Weapon.gd b/Game/Assets/Weapons/Weapon.gd index 1b113a4..73bd41d 100644 --- a/Game/Assets/Weapons/Weapon.gd +++ b/Game/Assets/Weapons/Weapon.gd @@ -45,7 +45,16 @@ var impact_player = preload("res://Assets/Effects/ImpactBlood.tscn") main.rpc(&'player_list_update', main.player_list.get(player.get_multiplayer_authority()).serialize(), player.get_multiplayer_authority()) hud.get_node("Crosshair").kill() main.check_game_win_condition() - # update local HUD + + # check for firstblood + if main.player_list.players[player.get_multiplayer_authority()].score == 1: + var firstblood = true + for i in main.player_list.players.keys(): + if i != player.get_multiplayer_authority() and main.player_list.players[i].score > 0: + firstblood = false + if firstblood: + main.get_node("Announcer").speak(main.get_node("Announcer").firstblood) + else: hud.get_node("Crosshair").hit()