From: Mario Date: Fri, 31 Jul 2015 09:45:40 +0000 (+1000) Subject: Merge branch 'master' into Mario/buff_updates X-Git-Tag: xonotic-v0.8.1~18^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c09a961b8674e3a808889d3f34d71855018d3bc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/buff_updates # Conflicts: # qcsrc/common/stats.qh # qcsrc/server/autocvars.qh # qcsrc/server/g_damage.qc # qcsrc/server/mutators/mutator_buffs.qc # qcsrc/server/mutators/mutator_buffs.qh --- 9c09a961b8674e3a808889d3f34d71855018d3bc diff --cc qcsrc/common/buffs.qh index bebf5ec59,f34373263..bf388df65 --- a/qcsrc/common/buffs.qh +++ b/qcsrc/common/buffs.qh @@@ -1,10 -1,9 +1,13 @@@ #ifndef BUFFS_H #define BUFFS_H +// Welcome to the stuff behind the scenes +// Below, you will find the list of buffs +// Add new buffs here! +// Note: Buffs also need spawnfuncs, which are set below + #include "teams.qh" + #include "util.qh" + entity Buff_Type_first; entity Buff_Type_last; .entity enemy; // internal next pointer diff --cc qcsrc/common/stats.qh index 8f68bafbc,b488df1cf..e6e93a660 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@@ -92,9 -107,9 +107,9 @@@ const int STAT_HEALING_ORB_ALPHA const int STAT_PLASMA = 84; const int STAT_OK_AMMO_CHARGE = 85; const int STAT_OK_AMMO_CHARGEPOOL = 86; - const int STAT_BUFF_TIME = 87; - // 88 empty? - // 89 empty? + const int STAT_FROZEN = 87; + const int STAT_REVIVE_PROGRESS = 88; -// 89 empty? ++const int STAT_BUFF_TIME = 89; // 90 empty? // 91 empty? // 92 empty? diff --cc qcsrc/server/autocvars.qh index e4f02cd90,51b14aa08..fdb014710 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@@ -849,19 -831,21 +831,22 @@@ bool autocvar_g_overkill_ammo_charge float autocvar_g_overkill_ammo_charge_notice; float autocvar_g_overkill_ammo_charge_limit; float autocvar_g_spawn_near_teammate_distance; - float autocvar_g_spawn_near_teammate_ignore_spawnpoint; + bool autocvar_g_spawn_near_teammate_ignore_spawnpoint; float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay; float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death; - float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health; - float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath; + int autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health; + bool autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath; + bool autocvar_g_physics_clientselect; + string autocvar_g_physics_clientselect_options; + string autocvar_g_physics_clientselect_default; +bool autocvar_g_buffs_effects; float autocvar_g_buffs_waypoint_distance; - float autocvar_g_buffs_randomize; + bool autocvar_g_buffs_randomize; float autocvar_g_buffs_random_lifetime; - float autocvar_g_buffs_random_location; - float autocvar_g_buffs_random_location_attempts; - float autocvar_g_buffs_spawn_count; - float autocvar_g_buffs_replace_powerups; + bool autocvar_g_buffs_random_location; + int autocvar_g_buffs_random_location_attempts; + int autocvar_g_buffs_spawn_count; + bool autocvar_g_buffs_replace_powerups; float autocvar_g_buffs_cooldown_activate; float autocvar_g_buffs_cooldown_respawn; float autocvar_g_buffs_resistance_blockpercent; @@@ -886,11 -868,5 +871,12 @@@ float autocvar_g_buffs_vampire_damage_s float autocvar_g_buffs_invisible_alpha; float autocvar_g_buffs_flight_gravity; float autocvar_g_buffs_jump_height; +float autocvar_g_buffs_inferno_burntime_factor; +float autocvar_g_buffs_inferno_burntime_min_time; +float autocvar_g_buffs_inferno_burntime_target_damage; +float autocvar_g_buffs_inferno_burntime_target_time; +float autocvar_g_buffs_inferno_damagemultiplier; +float autocvar_g_buffs_swapper_range; +float autocvar_g_buffs_magnet_range_item; + float autocvar_sv_player_scale; #endif diff --cc qcsrc/server/g_damage.qc index 18d58f4eb,68e8f4f73..c5bbfcab5 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@@ -1,34 -1,29 +1,30 @@@ #include "g_damage.qh" - - #if defined(CSQC) - #elif defined(MENUQC) - #elif defined(SVQC) - #include "../warpzonelib/common.qh" - #include "../common/constants.qh" - #include "../common/buffs.qh" - #include "../common/teams.qh" - #include "../common/util.qh" - #include "../common/weapons/weapons.qh" - #include "weapons/accuracy.qh" - #include "weapons/csqcprojectile.qh" - #include "weapons/selection.qh" - #include "t_items.qh" - #include "autocvars.qh" - #include "constants.qh" - #include "defs.qh" - #include "../common/notifications.qh" - #include "../common/deathtypes.qh" - #include "mutators/mutators_include.qh" - #include "tturrets/include/turrets_early.qh" - #include "vehicles/vehicles_def.qh" - #include "../csqcmodellib/sv_model.qh" - #include "../common/playerstats.qh" - #include "g_hook.qh" - #include "scores.qh" - #include "spawnpoints.qh" - #endif - - float Damage_DamageInfo_SendEntity(entity to, float sf) + #include "_all.qh" + + #include "g_hook.qh" + #include "mutators/mutators_include.qh" + #include "scores.qh" + #include "waypointsprites.qh" + #include "spawnpoints.qh" + #include "tturrets/include/turrets_early.qh" + #include "t_items.qh" + #include "vehicles/vehicle.qh" + #include "weapons/accuracy.qh" + #include "weapons/csqcprojectile.qh" + #include "weapons/selection.qh" ++#include "../common/buffs.qh" + #include "../common/constants.qh" + #include "../common/deathtypes.qh" + #include "../common/notifications.qh" + #include "../common/movetypes/movetypes.qh" + #include "../common/playerstats.qh" + #include "../common/teams.qh" + #include "../common/util.qh" + #include "../common/weapons/all.qh" + #include "../csqcmodellib/sv_model.qh" + #include "../warpzonelib/common.qh" + + float Damage_DamageInfo_SendEntity(entity to, int sf) { WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO); WriteShort(MSG_ENTITY, self.projectiledeathtype); diff --cc qcsrc/server/mutators/mutator_buffs.qc index 7dfdaca62,315a12099..e8366cd31 --- a/qcsrc/server/mutators/mutator_buffs.qc +++ b/qcsrc/server/mutators/mutator_buffs.qc @@@ -933,8 -757,6 +941,7 @@@ void buffs_Initialize( precache_sound("keepaway/respawn.wav"); addstat(STAT_BUFFS, AS_INT, buffs); + addstat(STAT_BUFF_TIME, AS_FLOAT, buff_time); - addstat(STAT_MOVEVARS_JUMPVELOCITY, AS_FLOAT, stat_jumpheight); InitializeEntity(world, buffs_DelayedInit, INITPRIO_FINDTARGET); }