diff --git a/addons/sourcemod/configs/zombie_riot/weapons.cfg b/addons/sourcemod/configs/zombie_riot/weapons.cfg index 346767ecb..7c10f0fe9 100644 --- a/addons/sourcemod/configs/zombie_riot/weapons.cfg +++ b/addons/sourcemod/configs/zombie_riot/weapons.cfg @@ -666,7 +666,7 @@ "classname" "tf_weapon_shotgun_primary" "index" "199" - "attributes" "809 ; 1 ; 2 ; 4.3 ; 4 ; 0.25 ; 6 ; 1.0 ; 97 ; 1.0 ; 45 ; 1.0 ; 106 ; 1.0" + "attributes" "809 ; 1 ; 2 ; 4.3 ; 4 ; 0.45 ; 6 ; 1.0 ; 97 ; 1.0 ; 45 ; 1.0 ; 106 ; 1.0" "ammo" "20" //Shotgun ammo "model" "models/weapons/c_models/c_shotgun/c_shotgun.mdl" // "func_attack" "Weapon_Annabelle" diff --git a/addons/sourcemod/scripting/zombie_riot/music.sp b/addons/sourcemod/scripting/zombie_riot/music.sp index 3ff93b430..55834f8d2 100644 --- a/addons/sourcemod/scripting/zombie_riot/music.sp +++ b/addons/sourcemod/scripting/zombie_riot/music.sp @@ -278,6 +278,8 @@ void PlayTeamDeadSound() void Music_RoundEnd(int victim, bool music = true) { ExcuteRelay("zr_gamelost"); + //lastman fail. end music. + Music_EndLastmann(); for(int client=1; client<=MaxClients; client++) { diff --git a/addons/sourcemod/scripting/zombie_riot/npc/rogue/chaos/npc_finalhunter.sp b/addons/sourcemod/scripting/zombie_riot/npc/rogue/chaos/npc_finalhunter.sp index af401f1e5..3e1196f9c 100644 --- a/addons/sourcemod/scripting/zombie_riot/npc/rogue/chaos/npc_finalhunter.sp +++ b/addons/sourcemod/scripting/zombie_riot/npc/rogue/chaos/npc_finalhunter.sp @@ -260,8 +260,12 @@ static void ClotThink(int iNPC) int health = GetEntProp(target, Prop_Data, "m_iHealth"); if(health > maxhealth) health = maxhealth; - - health -= maxhealth / 60; + float ScalingDo = MultiGlobalHealthBoss; + if(ScalingDo <= 0.75) + ScalingDo = 0.75; + + health -= maxhealth / RoundToNearest(60.0 / ScalingDo); + if(health < 1) { // 300 seconds to kill Goggles diff --git a/addons/sourcemod/scripting/zombie_riot/object/obj_ammobox.sp b/addons/sourcemod/scripting/zombie_riot/object/obj_ammobox.sp index 800d7ee7f..579aa521a 100644 --- a/addons/sourcemod/scripting/zombie_riot/object/obj_ammobox.sp +++ b/addons/sourcemod/scripting/zombie_riot/object/obj_ammobox.sp @@ -91,9 +91,15 @@ static bool ClotInteract(int client, int weapon, ObjectAmmobox npc) // npc.SetActivity("Open", true); // npc.SetPlaybackRate(0.5); // npc.m_flAttackHappens = GetGameTime(npc.index) + 1.4; - if(AmmoboxUsed(client, npc.index)) + int UsedBoxLogic = AmmoboxUsed(client, npc.index); + if(UsedBoxLogic >= 1) { int owner = GetEntPropEnt(npc.index, Prop_Send, "m_hOwnerEntity"); + if(UsedBoxLogic >= 2) + { + Building_GiveRewardsUse(client, owner, 10, true, 0.35, true); + Barracks_TryRegenIfBuilding(client); + } Building_GiveRewardsUse(client, owner, 10, true, 0.35, true); Barracks_TryRegenIfBuilding(client); } @@ -108,7 +114,7 @@ static bool ClotInteract(int client, int weapon, ObjectAmmobox npc) } -bool AmmoboxUsed(int client, int entity) +int AmmoboxUsed(int client, int entity) { int weapon = GetEntPropEnt(client, Prop_Send, "m_hActiveWeapon"); @@ -150,11 +156,11 @@ bool AmmoboxUsed(int client, int entity) if(b_AggreviatedSilence[client]) mana_regen_temp *= 0.30; - mana_regen_temp *= 0.5; + // mana_regen_temp *= 0.5; if(Current_Mana[client] < RoundToCeil(max_mana_temp)) { - Ammo_Count_Used[client] += 1; + Ammo_Count_Used[client] += 2; ClientCommand(client, "playgamesound items/ammo_pickup.wav"); ClientCommand(client, "playgamesound items/ammo_pickup.wav"); if(Current_Mana[client] < RoundToCeil(max_mana_temp)) @@ -167,7 +173,7 @@ bool AmmoboxUsed(int client, int entity) ApplyBuildingCollectCooldown(entity, client, 5.0, true); Mana_Hud_Delay[client] = 0.0; - return true; + return 2; } else { diff --git a/addons/sourcemod/translations/zombieriot.phrases.rogue.paradox.txt b/addons/sourcemod/translations/zombieriot.phrases.rogue.paradox.txt index fd84d1369..a7968fc22 100644 --- a/addons/sourcemod/translations/zombieriot.phrases.rogue.paradox.txt +++ b/addons/sourcemod/translations/zombieriot.phrases.rogue.paradox.txt @@ -428,7 +428,7 @@ } "Empty Fowlbeast Desc" { - "en" "{green}Limited lifetime allies gain +30%% max health and +30%% damage, the owner gains +60%% damage for 10 seconds when summoned." + "en" "{green}Limited lifetime allies (non citizen and barracks) gain +30%% max health and +30%% damage, the owner gains +60%% damage for 10 seconds when summoned." } "Acahuallan Bowl" {