rain-plus/zombiesurvival-evolved
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #120 from BClark09/master

Browse source 
Added class name notification of the next boss
This commit is contained in:
William Moodhe / JetBoom 2015-02-05 19:00:03 -05:00
commit 6b4a310373
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gamemodes/zombiesurvival/gamemode/cl_init.lua
View file

@ -781,11 +781,12 @@ function GM:ZombieHUD()
local y = ScrH() * 0.3 local y = ScrH() * 0.3
draw_SimpleTextBlur(translate.Get("waiting_for_next_wave"), "ZSHUDFont", x, y, COLOR_DARKRED, TEXT_ALIGN_CENTER) draw_SimpleTextBlur(translate.Get("waiting_for_next_wave"), "ZSHUDFont", x, y, COLOR_DARKRED, TEXT_ALIGN_CENTER)
local pl = GAMEMODE.NextBossZombie local pl = GAMEMODE.NextBossZombie
local bossname = GAMEMODE.NextBossZombieClass
if pl and pl:IsValid() then if pl and pl:IsValid() then
if pl == MySelf then if pl == MySelf then
draw_SimpleTextBlur(translate.Get("you_will_be_next_boss_zombie"), "ZSHUDFont", x, y+th, COLOR_RED, TEXT_ALIGN_CENTER) draw_SimpleTextBlur(translate.Format("you_will_be_x_soon", "'"..bossname.."'"), "ZSHUDFont", x, y+th, COLOR_RED, TEXT_ALIGN_CENTER)
else else
draw_SimpleTextBlur(translate.Format("x_will_be_next_boss_zombie", pl:Name()), "ZSHUDFont", x, y+th, COLOR_GRAY, TEXT_ALIGN_CENTER) draw_SimpleTextBlur(translate.Format("x_will_be_y_soon", pl:Name(), "'"..bossname.."'"), "ZSHUDFont", x, y+th, COLOR_GRAY, TEXT_ALIGN_CENTER)
end end
end end
if MySelf:GetZombieClassTable().NeverAlive then if MySelf:GetZombieClassTable().NeverAlive then
@ -1644,6 +1645,7 @@ end)
net.Receive("zs_nextboss", function(length) net.Receive("zs_nextboss", function(length)
GAMEMODE.NextBossZombie = net.ReadEntity() GAMEMODE.NextBossZombie = net.ReadEntity()
GAMEMODE.NextBossZombieClass = net.ReadString()
end) end)
net.Receive("zs_zvols", function(length) net.Receive("zs_zvols", function(length)

4
gamemodes/zombiesurvival/gamemode/init.lua
View file

@ -998,9 +998,11 @@ function GM:CalculateNextBoss()
end end
table.sort(zombies, BossZombieSort) table.sort(zombies, BossZombieSort)
local newboss = zombies[1] local newboss = zombies[1]
if not newboss or newboss ~= GAMEMODE.NextBossZombie then if newboss and newboss:IsValid() then
local newbossclass = GAMEMODE.ZombieClasses[newboss:GetBossZombieIndex()].Name
net.Start("zs_nextboss") net.Start("zs_nextboss")
net.WriteEntity(newboss) net.WriteEntity(newboss)
net.WriteString(newbossclass)
net.Broadcast() net.Broadcast()
end end
return newboss return newboss

4
gamemodes/zombiesurvival/gamemode/languages/english.lua
View file

@ -103,8 +103,8 @@ LANGUAGE.intermission = "Intermission"
LANGUAGE.press_f2_for_the_points_shop = "Press F2 for the Points Shop!" LANGUAGE.press_f2_for_the_points_shop = "Press F2 for the Points Shop!"
LANGUAGE.breath = "Breath" LANGUAGE.breath = "Breath"
LANGUAGE.zombie_volunteers = "Zombie Volunteers" LANGUAGE.zombie_volunteers = "Zombie Volunteers"
LANGUAGE.x_will_be_next_boss_zombie = "%s will become a boss zombie soon!" LANGUAGE.x_will_be_y_soon = "%s will become %s soon!"
LANGUAGE.you_will_be_next_boss_zombie = "You will become a boss zombie soon!" LANGUAGE.you_will_be_x_soon = "You will become %s soon!"
LANGUAGE.x_discount_for_buying_between_waves = "%d%% discount for buying between waves!" LANGUAGE.x_discount_for_buying_between_waves = "%d%% discount for buying between waves!"
LANGUAGE.number_of_initial_zombies_this_game = "Number of initial zombies this game (%d%%): %d" LANGUAGE.number_of_initial_zombies_this_game = "Number of initial zombies this game (%d%%): %d"
LANGUAGE.humans_closest_to_spawns_are_zombies = "The humans closest to the zombie spawns will start as zombies." LANGUAGE.humans_closest_to_spawns_are_zombies = "The humans closest to the zombie spawns will start as zombies."