Skip to content
This repository has been archived by the owner on Apr 28, 2021. It is now read-only.

Commit

Permalink
release 1.35
Browse files Browse the repository at this point in the history
  • Loading branch information
superRaptor911 committed Aug 3, 2020
1 parent 786b5bf commit 46d6750
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Objects/Bots/BullSquid.gd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func _on_navTimer_timeout():
var dist = (T.ref.position - position).length()
if dist < ranged_atk_range:
rpc("rangedAttack")
T.ref.takeDamage(ranged_atk_damage, ranged_attack_name, "Gargantua")
T.ref.takeDamage(ranged_atk_damage, ranged_attack_name, "SCP-682")

remotesync func rangedAttack():
attk_sfx.play()
Expand Down
13 changes: 9 additions & 4 deletions Objects/Game_modes/ZombieMod/ZombieMod.gd
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,12 @@ func on_team_eliminated(team):
# Called when round starts ( server side)
func _on_round_start_dl_timeout():
current_round += 1
rpc("P_roundStarted", current_round)

if current_round % 2 == 0:
bossRound(current_round / 2)
if current_round == 10:
current_round = 1

rpc("P_roundStarted", current_round)
if current_round % 3 == 0:
bossRound(current_round / 3)
return

z_count = getZombieCount()
Expand Down Expand Up @@ -243,6 +245,7 @@ func bossRound(boss_round : int):


remotesync func P_BossRound_1():
showLabel("Boss Round ! Gargantua is comming", Color.red)
var boss0 = zombieBossScenes[1].instance()
var boss1 = zombieBossScenes[1].instance()
var spawn_locs = get_tree().get_nodes_in_group("ZspawnPoints")[0].get_children()
Expand All @@ -256,6 +259,7 @@ remotesync func P_BossRound_1():


remotesync func P_BossRound_2():
showLabel("Boss Round ! Scp 682 is set free", Color.red)
var boss0 = zombieBossScenes[0].instance()
var boss1 = zombieBossScenes[0].instance()
var spawn_locs = get_tree().get_nodes_in_group("ZspawnPoints")[0].get_children()
Expand All @@ -269,6 +273,7 @@ remotesync func P_BossRound_2():


remotesync func P_BossRound_3():
showLabel("Final Round ! prepare for your end", Color.red)
var boss0 = zombieBossScenes[1].instance()
var boss1 = zombieBossScenes[1].instance()
var boss2 = zombieBossScenes[0].instance()
Expand Down

0 comments on commit 46d6750

Please sign in to comment.