From f38bf28b9e14076d7109cd655089e1954f22ea49 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sat, 12 Dec 2020 01:54:00 +0100 Subject: [PATCH] Go over the default.cfg's of all the example games. Make it so that Skill_GetValue() requires a default value set. --- cstrike/data.pk3dir/default.cfg | 52 +--------- gearbox/data.pk3dir/default.cfg | 52 +--------- hunger/data.pk3dir/default.cfg | 52 +--------- .../base_postproc.pk3dir/postproc_none.cfg | 62 +----------- platform/platform_default.cfg | 96 +++++++++++++++++++ poke646/data.pk3dir/default.cfg | 52 +--------- scihunt/data.pk3dir/default.cfg | 52 +--------- src/gs-entbase/server/basemonster.h | 2 +- .../shared/env_projectedtexture.cpp | 2 + src/menu-fn/defs.h | 1 - src/menu-fn/entry.cpp | 20 ---- src/menu-fn/m_customgame.cpp | 1 - src/server/skill.c | 5 +- src/server/skill.h | 2 +- src/server/valve/item_battery.cpp | 2 +- src/server/valve/monster_alien_grunt.cpp | 2 +- src/server/valve/monster_alien_slave.cpp | 2 +- src/server/valve/monster_apache.cpp | 2 +- src/server/valve/monster_barnacle.cpp | 2 +- src/server/valve/monster_barney.cpp | 2 +- src/server/valve/monster_bigmomma.cpp | 2 +- src/server/valve/monster_bullchicken.cpp | 2 +- src/server/valve/monster_gargantua.cpp | 2 +- src/server/valve/monster_headcrab.cpp | 4 +- src/server/valve/monster_houndeye.cpp | 2 +- src/server/valve/monster_human_assassin.cpp | 2 +- src/server/valve/monster_human_grunt.cpp | 2 +- src/server/valve/monster_nihilanth.cpp | 2 +- src/server/valve/monster_scientist.cpp | 2 +- src/server/valve/monster_sentry.cpp | 2 +- src/server/valve/monster_zombie.cpp | 2 +- src/server/valve/player.c | 2 +- src/shared/hunger/w_silencer.c | 4 +- src/shared/hunger/w_spanner.c | 2 +- src/shared/hunger/w_tnt.c | 2 +- src/shared/poke646/w_pipebomb.c | 2 +- src/shared/scihunt/w_cannon.c | 4 +- src/shared/scihunt/w_chainsaw.c | 2 +- src/shared/scihunt/w_hammer.c | 6 +- src/shared/valve/w_crossbow.c | 4 +- src/shared/valve/w_crowbar.c | 2 +- src/shared/valve/w_glock.c | 4 +- src/shared/valve/w_handgrenade.c | 2 +- src/shared/valve/w_hornetgun.c | 2 +- src/shared/valve/w_mp5.c | 6 +- src/shared/valve/w_python.c | 2 +- src/shared/valve/w_rpg.c | 2 +- src/shared/valve/w_satchel.c | 2 +- src/shared/valve/w_shotgun.c | 4 +- src/shared/valve/w_snark.c | 4 +- src/shared/valve/w_tripmine.c | 2 +- tfc/data.pk3dir/default.cfg | 57 +---------- valve/data.pk3dir/default.cfg | 52 +--------- 53 files changed, 177 insertions(+), 479 deletions(-) create mode 100644 platform/platform_default.cfg diff --git a/cstrike/data.pk3dir/default.cfg b/cstrike/data.pk3dir/default.cfg index 9a0d3723..86970fae 100755 --- a/cstrike/data.pk3dir/default.cfg +++ b/cstrike/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,6 +34,8 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" +bind "f1" "vote yes" +bind "f2" "vote no" // Counter-Strike Binds bind "b" "buy" @@ -57,55 +61,7 @@ seta "fcs_maxmoney" "16000" seta "fcs_fillweapons" "0" seta "fcs_autoreload" "0" -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "4" -serverinfo "phy_maxspeed" "240" - // 2D/HUD Variables seta "con_color" "255 150 0" seta "vgui_color" "255 170 0" seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/gearbox/data.pk3dir/default.cfg b/gearbox/data.pk3dir/default.cfg index c76bbd65..2d73cc1d 100755 --- a/gearbox/data.pk3dir/default.cfg +++ b/gearbox/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,6 +34,8 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" +bind "f1" "vote yes" +bind "f2" "vote no" // Game Variables seta "hostname" "Opposing Force Server" @@ -39,55 +43,7 @@ name "Shephard" model shephard seta "maxplayers" "8" -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" - // 2D/HUD Variables seta "con_color" "0 255 0" seta "vgui_color" "0 255 0" seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/hunger/data.pk3dir/default.cfg b/hunger/data.pk3dir/default.cfg index eec59f3f..4b7f8665 100755 --- a/hunger/data.pk3dir/default.cfg +++ b/hunger/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,6 +34,8 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" +bind "f1" "vote yes" +bind "f2" "vote no" // Game Variables seta "hostname" "They Hunger Server" @@ -39,55 +43,7 @@ name "Einar" model nypdcop seta "maxplayers" "8" -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" - // 2D/HUD Variables seta "con_color" "255 0 0" seta "vgui_color" "255 0 0" seta "cross_color" "255 0 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/platform/base_postproc.pk3dir/postproc_none.cfg b/platform/base_postproc.pk3dir/postproc_none.cfg index 0b36cab6..d34e1ed3 100644 --- a/platform/base_postproc.pk3dir/postproc_none.cfg +++ b/platform/base_postproc.pk3dir/postproc_none.cfg @@ -1,67 +1,7 @@ // fake 3dfx voodoo settings // aesthetic feature only -seta gl_texturemode GL_LINEAR_MIPMAP_LINEAR -seta d_mipcap 0 1000 - -// no limitations -seta gl_max_size 8192 - -// make sure those gl vars are set to a minimal setting -seta gl_affinemodels 0 -seta gl_blendsprites 0 -seta gl_flashblend 0 -seta gl_overbright 2 -seta gl_picmip 0 -seta gl_polyblend 1 -seta gl_specular 0 -seta gl_texture_anisotropic_filtering 0 -seta gl_kdither 0 - -// interpolation -seta cl_nolerp 0 -seta r_noframegrouplerp 0 -seta r_nolerp 0 - -// lighting -seta r_lightmap 0 -seta r_lightmap_format e5bgr9 -seta r_lightmap_saturation 1 -seta r_nolightdir 0 -seta r_loadlit 1 - -// FBO settings -seta r_renderscale 1 - -// glsl trickery -seta r_glsl_offsetmapping 0 -seta r_softwarebanding 0 -seta r_postprocshader "" -seta gl_ldr 0 - -// colormap related -seta r_fb_bmodels 1 -seta r_fb_models 1 - -// shadows -seta r_shadows 1 -seta r_shadow_realtime_dlight 1 -seta r_shadow_realtime_dlight_shadows 1 -seta r_shadow_realtime_world 1 - -// rest of the video gang -seta r_bloom 0 -seta r_coronas 0 -seta r_deluxemapping 1 -seta r_drawflame 1 -seta r_drawflat 0 -seta r_dynamic 1 -seta r_fastsky 0 -seta r_lavastyle 1 -seta r_stains 0 -seta r_waterstyle 1 -seta r_waterwarp 1 -seta vid_hardwaregamma 1 +exec platform_default.cfg // apply vid_reload diff --git a/platform/platform_default.cfg b/platform/platform_default.cfg new file mode 100644 index 00000000..fc43e710 --- /dev/null +++ b/platform/platform_default.cfg @@ -0,0 +1,96 @@ +seta con_textsize -12 +seta scr_conalpha 1 +seta cl_idlefps 0 +seta r_ignoreentpvs 0 +seta allow_download_packages 0 +seta _pext_infoblobs 1 +seta _q3bsp_bihtraces 1 +seta sv_gameplayfix_setmodelsize_qw 1 +seta sv_gameplayfix_setmodelrealbox 1 +seta gl_font 0 +seta gl_font CONCHARS?fmt=h + +seta gl_texturemode GL_LINEAR_MIPMAP_LINEAR +seta d_mipcap 0 1000 + +// no limitations +seta gl_max_size 8192 + +// make sure those gl vars are set to a minimal setting +seta gl_affinemodels 0 +seta gl_blendsprites 0 +seta gl_flashblend 0 +seta gl_overbright 2 +seta gl_picmip 0 +seta gl_polyblend 1 +seta gl_specular 0 +seta gl_texture_anisotropic_filtering 0 +seta gl_kdither 0 +seta gl_mindist 4 + +// interpolation +seta cl_nolerp 0 +seta r_noframegrouplerp 0 +seta r_nolerp 0 + +// lighting +seta r_lightmap 0 +seta r_lightmap_format e5bgr9 +seta r_lightmap_saturation 1 +seta r_nolightdir 0 +seta r_loadlit 1 + +// FBO settings +seta r_renderscale 1 + +// glsl trickery +seta r_glsl_offsetmapping 0 +seta r_softwarebanding 0 +seta r_postprocshader "" +seta gl_ldr 0 + +// colormap related +seta r_fb_bmodels 1 +seta r_fb_models 1 + +// shadows +seta r_shadows 1 +seta r_shadow_realtime_dlight 1 +seta r_shadow_realtime_dlight_shadows 1 +seta r_shadow_realtime_world 1 + +// rest of the video gang +seta r_bloom 0 +seta r_coronas 0 +seta r_deluxemapping 1 +seta r_drawflame 1 +seta r_drawflat 0 +seta r_dynamic 1 +seta r_fastsky 0 +seta r_lavastyle 1 +seta r_stains 0 +seta r_waterstyle 1 +seta r_waterwarp 1 +seta "r_particledesc" "default" +seta vid_hardwaregamma 1 +seta "cl_cursor_scale" "1" +seta "cl_bob" "0" +seta "maxpitch" "89" +seta "minpitch" "-89" +seta "r_meshpitch" "1" +seta "v_bob" "0.01" +seta "v_bobcycle" "0.8" +seta "v_bobup" "0.5" +seta "v_contentblend" "0" + +// Misc defaults +seta "cfg_save_auto" "1" +seta "cl_idlefps" "60" +seta "cl_maxfps" "250" +seta "com_nogamedirnativecode" "0" +seta "con_logcenterprint" "0" +seta "con_notifylines" "0" +seta "lang" "en_us" +seta "r_imageexensions" "tga bmp pcx png jpg" +seta "scr_sshot_type" "tga" +seta "media_repeat "0" diff --git a/poke646/data.pk3dir/default.cfg b/poke646/data.pk3dir/default.cfg index ea644e9a..4fa8a6f0 100755 --- a/poke646/data.pk3dir/default.cfg +++ b/poke646/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,56 +34,10 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" - -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" +bind "f1" "vote yes" +bind "f2" "vote no" // 2D/HUD Variables seta "con_color" "193 207 204" seta "vgui_color" "0 255 0" seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/scihunt/data.pk3dir/default.cfg b/scihunt/data.pk3dir/default.cfg index d2ad396a..da7fdcdc 100644 --- a/scihunt/data.pk3dir/default.cfg +++ b/scihunt/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,60 +34,14 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" +bind "f1" "vote yes" +bind "f2" "vote no" // Game Variables seta "hostname" "FreeSH Server" seta "maxplayers" "8" -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" - // 2D/HUD Variables seta "con_color" "255 255 215" seta "vgui_color" "255 255 215" seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/src/gs-entbase/server/basemonster.h b/src/gs-entbase/server/basemonster.h index 7b288dc7..9bb56bec 100644 --- a/src/gs-entbase/server/basemonster.h +++ b/src/gs-entbase/server/basemonster.h @@ -98,7 +98,7 @@ class CBaseMonster:CBaseEntity int m_iFlags; vector base_mins; vector base_maxs; - int base_health; + float base_health; float m_flChaseSpeed; diff --git a/src/gs-entbase/shared/env_projectedtexture.cpp b/src/gs-entbase/shared/env_projectedtexture.cpp index a3429f91..094358ef 100644 --- a/src/gs-entbase/shared/env_projectedtexture.cpp +++ b/src/gs-entbase/shared/env_projectedtexture.cpp @@ -22,6 +22,7 @@ "texturename" Name of the texture to be cast as a light. "farz" Distance to which this projected light will be cast. "nearz" Clipping distance for near objects that won't get lit. +"pattern" Sets a custom pattern. 'style' overrides this. Inputs: "TurnOff" Turns the entity off. @@ -32,6 +33,7 @@ Inputs: "SetLightStyle" Sets the light appearance integer. "SetNearZ" Sets clipping distance for near objects that won't get lit. "SetFarZ" Sets distance to which this projected light will be cast. +"SetPattern" Sets the style pattern of the light to a custom one. Textured light projected. This is the type of lighting that's used for flashlights, lamp spotlights and so on. diff --git a/src/menu-fn/defs.h b/src/menu-fn/defs.h index fc0b7fe0..8fc8da8e 100644 --- a/src/menu-fn/defs.h +++ b/src/menu-fn/defs.h @@ -149,4 +149,3 @@ enum }; void m_hide(void); -void cvar_init(void); diff --git a/src/menu-fn/entry.cpp b/src/menu-fn/entry.cpp index fb1e3d8c..59fb1e61 100644 --- a/src/menu-fn/entry.cpp +++ b/src/menu-fn/entry.cpp @@ -35,25 +35,6 @@ IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING\ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\ =============================================================================="; -void -cvar_init(void) -{ - /* TODO: Shove these into defaults.cfg instead of forcing them */ - localcmd("seta con_textsize -12\n"); - localcmd("seta scr_conalpha 1\n"); - localcmd("seta cl_idlefps 0\n"); - localcmd("seta r_ignoreentpvs 0\n"); - localcmd("seta allow_download_packages 0\n"); - localcmd("seta gl_mindist 4\n"); // Thanks Valve for v_shotgun.mdl - localcmd("seta _pext_infoblobs 1\n"); - localcmd("seta r_shadow_realtime_dlight 1"); - localcmd("seta r_shadow_realtime_dlight_shadows 1"); - - /* Hack! */ - localcmd("seta gl_font 0\n"); - localcmd("seta gl_font CONCHARS?fmt=h\n"); -} - var int autocvar_r_autoscale = TRUE; void Menu_AutoScale(void) @@ -108,7 +89,6 @@ m_init(void) localcmd("plug_load ffmpeg\n"); - cvar_init(); shaderforname("logo_avi", "{\n{\nvideomap av:media/logo.avi\n}\n}"); for (int i = 0; i < g_bmp.length; i++) { diff --git a/src/menu-fn/m_customgame.cpp b/src/menu-fn/m_customgame.cpp index 7e9e726a..84befee4 100644 --- a/src/menu-fn/m_customgame.cpp +++ b/src/menu-fn/m_customgame.cpp @@ -367,7 +367,6 @@ customgame_btnactivate_start(void) localcmd("menu_restart\n"); localcmd("menu_customgame\n"); localcmd("menu_musicstart\n"); - cvar_init(); } void diff --git a/src/server/skill.c b/src/server/skill.c index 45c85583..cd0e6e7e 100644 --- a/src/server/skill.c +++ b/src/server/skill.c @@ -25,8 +25,9 @@ Skill_Init(void) } float -Skill_GetValue(string variable) +Skill_GetValue(string variable, float defaultvalue) { float skill = cvar("skill"); - return cvar(sprintf("sk_%s%d", variable, skill)); + float val = fabs(cvar(sprintf("sk_%s%d", variable, skill))); + return (val == 0) ? defaultvalue : val; } diff --git a/src/server/skill.h b/src/server/skill.h index a8a1ac12..e23b8d71 100644 --- a/src/server/skill.h +++ b/src/server/skill.h @@ -16,4 +16,4 @@ */ void Skill_Init(void); -float Skill_GetValue(string); +float Skill_GetValue(string, float); diff --git a/src/server/valve/item_battery.cpp b/src/server/valve/item_battery.cpp index 9807809f..b25ea35f 100644 --- a/src/server/valve/item_battery.cpp +++ b/src/server/valve/item_battery.cpp @@ -46,7 +46,7 @@ void item_battery::touch(void) return; } /* Move this somewhere else? */ - pl.armor += Skill_GetValue("battery"); + pl.armor += Skill_GetValue("battery", 15); if (pl.armor > 100) { pl.armor = 100; } diff --git a/src/server/valve/monster_alien_grunt.cpp b/src/server/valve/monster_alien_grunt.cpp index 96cf421c..2220c02e 100644 --- a/src/server/valve/monster_alien_grunt.cpp +++ b/src/server/valve/monster_alien_grunt.cpp @@ -147,6 +147,6 @@ monster_alien_grunt::monster_alien_grunt(void) model = "models/agrunt.mdl"; base_mins = [-32,-32,0]; base_maxs = [32,32,64]; - base_health = Skill_GetValue("agrunt_health"); + base_health = Skill_GetValue("agrunt_health", 90); CBaseMonster::CBaseMonster(); } diff --git a/src/server/valve/monster_alien_slave.cpp b/src/server/valve/monster_alien_slave.cpp index 4298987a..7dea1a54 100644 --- a/src/server/valve/monster_alien_slave.cpp +++ b/src/server/valve/monster_alien_slave.cpp @@ -246,7 +246,7 @@ monster_alien_slave::monster_alien_slave(void) netname = "Alien Slave"; model = "models/islave.mdl"; - base_health = Skill_GetValue("islave_health"); + base_health = Skill_GetValue("islave_health", 30); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; m_iAlliance = MAL_ALIEN; diff --git a/src/server/valve/monster_apache.cpp b/src/server/valve/monster_apache.cpp index 35a5446a..ff09a44f 100644 --- a/src/server/valve/monster_apache.cpp +++ b/src/server/valve/monster_apache.cpp @@ -43,6 +43,6 @@ void monster_apache::monster_apache(void) model = "models/apache.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - base_health = Skill_GetValue("apache_health"); + base_health = Skill_GetValue("apache_health", 250); CBaseMonster::CBaseMonster(); } diff --git a/src/server/valve/monster_barnacle.cpp b/src/server/valve/monster_barnacle.cpp index 9e77cf84..5dbaab9e 100644 --- a/src/server/valve/monster_barnacle.cpp +++ b/src/server/valve/monster_barnacle.cpp @@ -78,6 +78,6 @@ void monster_barnacle::monster_barnacle(void) model = "models/barnacle.mdl"; base_mins = [-16,-16,-36]; base_maxs = [16,16,0]; - base_health = Skill_GetValue("barnacle_health"); + base_health = Skill_GetValue("barnacle_health", 25); CBaseMonster::CBaseMonster(); } diff --git a/src/server/valve/monster_barney.cpp b/src/server/valve/monster_barney.cpp index c7aa3af4..67e37c67 100644 --- a/src/server/valve/monster_barney.cpp +++ b/src/server/valve/monster_barney.cpp @@ -201,7 +201,7 @@ monster_barney::monster_barney(void) model = "models/barney.mdl"; netname = "Barney"; - base_health = Skill_GetValue("barney_health"); + base_health = Skill_GetValue("barney_health", 35); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; m_iAlliance = MAL_FRIEND; diff --git a/src/server/valve/monster_bigmomma.cpp b/src/server/valve/monster_bigmomma.cpp index 12a221c7..705f45dd 100644 --- a/src/server/valve/monster_bigmomma.cpp +++ b/src/server/valve/monster_bigmomma.cpp @@ -125,7 +125,7 @@ void monster_bigmomma::monster_bigmomma(void) netname = "Gonarch"; model = "models/big_mom.mdl"; /* health is based on factor, for it's not killable until last stage */ - base_health = Skill_GetValue("bigmomma_health_factor") * 300; + base_health = Skill_GetValue("bigmomma_health_factor", 1.5) * 300; base_mins = [-95,-95,0]; base_maxs = [95,95,190]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_bullchicken.cpp b/src/server/valve/monster_bullchicken.cpp index fed539ad..2ab5ae23 100644 --- a/src/server/valve/monster_bullchicken.cpp +++ b/src/server/valve/monster_bullchicken.cpp @@ -148,7 +148,7 @@ void monster_bullchicken::monster_bullchicken(void) Sound_Precache("monster_bullchicken.pain"); netname = "Bullsquid"; model = "models/bullsquid.mdl"; - base_health = Skill_GetValue("bullsquid_health"); + base_health = Skill_GetValue("bullsquid_health", 40); base_mins = [-32,-32,0]; base_maxs = [32,32,64]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_gargantua.cpp b/src/server/valve/monster_gargantua.cpp index f37e1b65..736d0004 100644 --- a/src/server/valve/monster_gargantua.cpp +++ b/src/server/valve/monster_gargantua.cpp @@ -131,7 +131,7 @@ void monster_gargantua::monster_gargantua(void) Sound_Precache("monster_gargantua.step"); netname = "Gargantua"; model = "models/garg.mdl"; - base_health = Skill_GetValue("gargantua_health"); + base_health = Skill_GetValue("gargantua_health", 800); base_mins = [-32,-32,0]; base_maxs = [32,32,128]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_headcrab.cpp b/src/server/valve/monster_headcrab.cpp index d5ea59f1..00f0cd22 100644 --- a/src/server/valve/monster_headcrab.cpp +++ b/src/server/valve/monster_headcrab.cpp @@ -167,11 +167,11 @@ monster_headcrab::monster_headcrab(void) if (classname == "monster_babycrab") { netname = "Baby Headcrab"; model = "models/baby_headcrab.mdl"; - base_health = Skill_GetValue ("headcrab_health") /4; + base_health = Skill_GetValue ("headcrab_health", 10) /4; } else { netname = "Headcrab"; model = "models/headcrab.mdl"; - base_health = Skill_GetValue("headcrab_health"); + base_health = Skill_GetValue("headcrab_health", 10); } base_mins = [-16,-16,0]; diff --git a/src/server/valve/monster_houndeye.cpp b/src/server/valve/monster_houndeye.cpp index 617d083e..7a6cc0ba 100644 --- a/src/server/valve/monster_houndeye.cpp +++ b/src/server/valve/monster_houndeye.cpp @@ -194,7 +194,7 @@ monster_houndeye::monster_houndeye(void) Sound_Precache("monster_houndeye.pain"); netname = "Houndeye"; model = "models/houndeye.mdl"; - base_health = Skill_GetValue("houndeye_health"); + base_health = Skill_GetValue("houndeye_health", 20); base_mins = [-16,-16,0]; base_maxs = [16,16,36]; m_iAlliance = MAL_ALIEN; diff --git a/src/server/valve/monster_human_assassin.cpp b/src/server/valve/monster_human_assassin.cpp index 0d7510c1..bda6378f 100644 --- a/src/server/valve/monster_human_assassin.cpp +++ b/src/server/valve/monster_human_assassin.cpp @@ -87,7 +87,7 @@ monster_human_assassin::monster_human_assassin(void) { netname = "Assassin"; model = "models/hassassin.mdl"; - base_health = Skill_GetValue("hassassin_health"); + base_health = Skill_GetValue("hassassin_health", 50); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_human_grunt.cpp b/src/server/valve/monster_human_grunt.cpp index d1d471f4..dd6981ba 100644 --- a/src/server/valve/monster_human_grunt.cpp +++ b/src/server/valve/monster_human_grunt.cpp @@ -311,7 +311,7 @@ void monster_human_grunt::monster_human_grunt(void) netname = "Grunt"; model = "models/hgrunt.mdl"; - base_health = Skill_GetValue("hgrunt_health"); + base_health = Skill_GetValue("hgrunt_health", 50); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; m_iAlliance = MAL_ENEMY; diff --git a/src/server/valve/monster_nihilanth.cpp b/src/server/valve/monster_nihilanth.cpp index 531f3975..0e8c620b 100644 --- a/src/server/valve/monster_nihilanth.cpp +++ b/src/server/valve/monster_nihilanth.cpp @@ -127,7 +127,7 @@ void monster_nihilanth::monster_nihilanth(void) Sound_Precache("monster_nihilanth.recharge"); netname = "Nihilanth"; model = "models/nihilanth.mdl"; - base_health = Skill_GetValue("nihilanth_health"); + base_health = Skill_GetValue("nihilanth_health", 800); base_mins = [-192,-192,-32]; base_maxs = [192,192,384]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_scientist.cpp b/src/server/valve/monster_scientist.cpp index a0ac72c6..25d9ae2f 100644 --- a/src/server/valve/monster_scientist.cpp +++ b/src/server/valve/monster_scientist.cpp @@ -206,7 +206,7 @@ monster_scientist::monster_scientist(void) model = "models/scientist.mdl"; base_mins = [-16,-16,0]; base_maxs = [16,16,72]; - base_health = Skill_GetValue("scientist_health"); + base_health = Skill_GetValue("scientist_health", 20); CBaseNPC::CBaseNPC(); diff --git a/src/server/valve/monster_sentry.cpp b/src/server/valve/monster_sentry.cpp index f4d7e0d5..89253867 100644 --- a/src/server/valve/monster_sentry.cpp +++ b/src/server/valve/monster_sentry.cpp @@ -71,7 +71,7 @@ void monster_sentry::monster_sentry(void) Sound_Precache("monster_sentry.retract"); netname = "Sentry"; model = "models/sentry.mdl"; - base_health = Skill_GetValue("sentry_health"); + base_health = Skill_GetValue("sentry_health", 40); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; CBaseMonster::CBaseMonster(); diff --git a/src/server/valve/monster_zombie.cpp b/src/server/valve/monster_zombie.cpp index 013a7822..98065310 100644 --- a/src/server/valve/monster_zombie.cpp +++ b/src/server/valve/monster_zombie.cpp @@ -214,7 +214,7 @@ monster_zombie::monster_zombie(void) Sound_Precache("monster_zombie.pain"); netname = "Zombie"; model = "models/zombie.mdl"; - base_health = Skill_GetValue("zombie_health"); + base_health = Skill_GetValue("zombie_health", 50); base_mins = [-16,-16,0]; base_maxs = [16,16,72]; m_iAlliance = MAL_ALIEN; diff --git a/src/server/valve/player.c b/src/server/valve/player.c index adc34f72..a11d2638 100644 --- a/src/server/valve/player.c +++ b/src/server/valve/player.c @@ -47,7 +47,7 @@ void Player_UseDown(void) vecSrc = self.origin + self.view_ofs; self.hitcontentsmaski = CONTENTBITS_POINTSOLID; - traceline(vecSrc, vecSrc + (v_forward * 64), MOVE_NORMAL, self); + traceline(vecSrc, vecSrc + (v_forward * 64), MOVE_HITMODEL, self); if (trace_ent.PlayerUse) { diff --git a/src/shared/hunger/w_silencer.c b/src/shared/hunger/w_silencer.c index b236af50..5e1ecd26 100644 --- a/src/shared/hunger/w_silencer.c +++ b/src/shared/hunger/w_silencer.c @@ -129,11 +129,11 @@ w_silencer_primary(void) /* Different sound & accuracy without silencer */ if (pl.a_ammo3 == 1) { - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.01, 0.01], WEAPON_GLOCK); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet", 8), [0.01, 0.01], WEAPON_GLOCK); Sound_Play(pl, CHAN_WEAPON, "weapon_silencer.fire"); } else { - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.1,0.1], WEAPON_GLOCK); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet", 8), [0.1,0.1], WEAPON_GLOCK); Sound_Play(pl, CHAN_WEAPON, "weapon_glock.fire"); } diff --git a/src/shared/hunger/w_spanner.c b/src/shared/hunger/w_spanner.c index a719f93c..2d27bdda 100644 --- a/src/shared/hunger/w_spanner.c +++ b/src/shared/hunger/w_spanner.c @@ -123,7 +123,7 @@ w_spanner_primary(void) } if (trace_ent.takedamage) { - Damage_Apply(trace_ent, pl, Skill_GetValue("plr_crowbar"), WEAPON_CROWBAR, DMG_BLUNT); + Damage_Apply(trace_ent, pl, Skill_GetValue("plr_crowbar", 10), WEAPON_CROWBAR, DMG_BLUNT); if (!trace_ent.iBleeds) { return; diff --git a/src/shared/hunger/w_tnt.c b/src/shared/hunger/w_tnt.c index 1ac41326..30b58da4 100644 --- a/src/shared/hunger/w_tnt.c +++ b/src/shared/hunger/w_tnt.c @@ -67,7 +67,7 @@ void w_tnt_throw(void) { static void WeaponFrag_Throw_Explode(void) { - float dmg = Skill_GetValue("plr_hand_grenade"); + float dmg = Skill_GetValue("plr_hand_grenade", 100); FX_Explosion(self.origin); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HANDGRENADE); sound(self, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/src/shared/poke646/w_pipebomb.c b/src/shared/poke646/w_pipebomb.c index 2b66469b..6b219fc7 100644 --- a/src/shared/poke646/w_pipebomb.c +++ b/src/shared/poke646/w_pipebomb.c @@ -116,7 +116,7 @@ void s_pipebomb_detonate(entity master) { for (entity b = world; (b = find(b, ::classname, "satchel"));) { if (b.owner == master) { - float dmg = Skill_GetValue("plr_satchel"); + float dmg = Skill_GetValue("plr_satchel", 150); FX_Explosion(b.origin); Damage_Radius(b.origin, master, dmg, dmg * 2.5f, TRUE, WEAPON_SATCHEL); sound(b, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/src/shared/scihunt/w_cannon.c b/src/shared/scihunt/w_cannon.c index 979210ef..56edf05a 100644 --- a/src/shared/scihunt/w_cannon.c +++ b/src/shared/scihunt/w_cannon.c @@ -145,7 +145,7 @@ void w_cannon_primary(void) return; } - dmg = Skill_GetValue("plr_cannon"); + dmg = Skill_GetValue("plr_cannon", 5); TraceAttack_FireBullets(20, pl.origin + pl.view_ofs, dmg, [0.08716,0.04362], WEAPON_CANNON); pl.cannon_mag -= 2; Weapons_PlaySound(pl, CHAN_WEAPON, "cannon/fire.wav", 1, ATTN_NORM); @@ -178,7 +178,7 @@ void w_cannon_secondary(void) return; } - dmg = Skill_GetValue("plr_cannon"); + dmg = Skill_GetValue("plr_cannon", 5); TraceAttack_FireBullets(10, pl.origin + pl.view_ofs, dmg, [0.08716,0.04362], WEAPON_CANNON); pl.cannon_mag--; Weapons_PlaySound(pl, CHAN_WEAPON, "cannon/fire.wav", 1, ATTN_NORM); diff --git a/src/shared/scihunt/w_chainsaw.c b/src/shared/scihunt/w_chainsaw.c index ff65264c..c8a88969 100644 --- a/src/shared/scihunt/w_chainsaw.c +++ b/src/shared/scihunt/w_chainsaw.c @@ -102,7 +102,7 @@ void w_chainsaw_primary(void) /* Push the player towards the victim */ pl.velocity = normalize(trace_ent.origin - pl.origin) * 240; } - dmg = Skill_GetValue("plr_chainsaw"); + dmg = Skill_GetValue("plr_chainsaw", 10); Damage_Apply(trace_ent, self, dmg, WEAPON_CHAINSAW, DMG_BLUNT); Weapons_PlaySound(pl, CHAN_WEAPON, "sh/chainsaw_cutintoflesh.wav", 1, ATTN_NORM); } else { diff --git a/src/shared/scihunt/w_hammer.c b/src/shared/scihunt/w_hammer.c index a79dbb84..67e0ca22 100644 --- a/src/shared/scihunt/w_hammer.c +++ b/src/shared/scihunt/w_hammer.c @@ -130,9 +130,9 @@ void w_hammer_release(void) /* players only take half damage */ if (trace_ent.classname == "player") - hdmg = Skill_GetValue("plr_hammer") / 2; + hdmg = Skill_GetValue("plr_hammer", 100) / 2; else - hdmg = Skill_GetValue("plr_hammer"); + hdmg = Skill_GetValue("plr_hammer", 100); Damage_Apply(trace_ent, self, hdmg, WEAPON_HAMMER, DMG_BLUNT); @@ -154,7 +154,7 @@ void w_hammer_release(void) #ifdef SERVER if (trace_ent.takedamage) { hitsound = floor(random(1, 4)); - hdmg = Skill_GetValue("plr_hammeralt"); + hdmg = Skill_GetValue("plr_hammeralt", 200); Damage_Apply(trace_ent, self, hdmg, WEAPON_HAMMER, DMG_BLUNT); } else { if (trace_fraction < 1.0) { diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index 0a50214a..8f3d1570 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -117,7 +117,7 @@ w_crossbow_holster(void) void Crossbolt_Touch(void) { /* explode mode, multiplayer */ if (self.weapon) { - float dmg = Skill_GetValue("plr_xbow_bolt_monster"); + float dmg = Skill_GetValue("plr_xbow_bolt_monster", 50); FX_Explosion(self.origin); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_CROSSBOW); if (random() < 0.5) { @@ -138,7 +138,7 @@ void Crossbolt_Touch(void) { } /* anything else that can take damage */ - Damage_Apply(other, self.owner, Skill_GetValue("plr_xbow_bolt_monster"), WEAPON_CROSSBOW, DMG_BLUNT); + Damage_Apply(other, self.owner, Skill_GetValue("plr_xbow_bolt_monster", 50), WEAPON_CROSSBOW, DMG_BLUNT); Sound_Play(self, 1, "weapon_crossbow.hitbody"); if (other.iBleeds == FALSE) { diff --git a/src/shared/valve/w_crowbar.c b/src/shared/valve/w_crowbar.c index 3efad79c..74060a12 100644 --- a/src/shared/valve/w_crowbar.c +++ b/src/shared/valve/w_crowbar.c @@ -148,7 +148,7 @@ w_crowbar_primary(void) } if (trace_ent.takedamage) { - Damage_Apply(trace_ent, pl, Skill_GetValue("plr_crowbar"), WEAPON_CROWBAR, DMG_BLUNT); + Damage_Apply(trace_ent, pl, Skill_GetValue("plr_crowbar", 10), WEAPON_CROWBAR, DMG_BLUNT); if (trace_ent.iBleeds) { Sound_Play(self, CHAN_WEAPON, "weapon_crowbar.hitbody"); } diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index fb4d9b53..98c8422f 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -154,7 +154,7 @@ w_glock_primary(void) } #else pl.glock_mag--; - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.01,0.01], WEAPON_GLOCK); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet", 8), [0.01,0.01], WEAPON_GLOCK); Sound_Play(pl, CHAN_WEAPON, "weapon_glock.fire"); if (self.flags & FL_CROUCHING) @@ -199,7 +199,7 @@ w_glock_secondary(void) } #else pl.glock_mag--; - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet"), [0.1,0.1], WEAPON_GLOCK); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_9mm_bullet", 8), [0.1,0.1], WEAPON_GLOCK); Sound_Play(pl, CHAN_WEAPON, "weapon_glock.fire"); if (self.flags & FL_CROUCHING) diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c index 38c3b869..6f11eaf1 100644 --- a/src/shared/valve/w_handgrenade.c +++ b/src/shared/valve/w_handgrenade.c @@ -83,7 +83,7 @@ void w_handgrenade_throw(void) { static void WeaponFrag_Throw_Explode(void) { - float dmg = Skill_GetValue("plr_hand_grenade"); + float dmg = Skill_GetValue("plr_hand_grenade", 150); FX_Explosion(self.origin); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HANDGRENADE); sound(self, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index 1eeb35f3..ce2cb406 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -106,7 +106,7 @@ w_hornetgun_shoothornet(void) { static void Hornet_Touch(void) { if (other.takedamage == DAMAGE_YES) { - Damage_Apply(other, self.owner, Skill_GetValue("plr_hornet"), WEAPON_HORNETGUN, DMG_GENERIC); + Damage_Apply(other, self.owner, Skill_GetValue("plr_hornet", 10), WEAPON_HORNETGUN, DMG_GENERIC); Sound_Play(other, CHAN_VOICE, "weapon_hornetgun.hit"); } else { Sound_Play(self, CHAN_VOICE, "weapon_hornetgun.buzz"); diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index 1f4dcba5..e12e46e8 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -150,9 +150,9 @@ w_mp5_primary(void) #else /* singleplayer is more accurate */ if (cvar("sv_playerslots") == 1) { - TraceAttack_FireBullets(1, Weapons_GetCameraPos(), Skill_GetValue("plr_9mmAR_bullet"), [0.025,0.025], WEAPON_MP5); + TraceAttack_FireBullets(1, Weapons_GetCameraPos(), Skill_GetValue("plr_9mmAR_bullet", 5), [0.025,0.025], WEAPON_MP5); } else { - TraceAttack_FireBullets(1, Weapons_GetCameraPos(), Skill_GetValue("plr_9mmAR_bullet"), [0.05,0.05], WEAPON_MP5); + TraceAttack_FireBullets(1, Weapons_GetCameraPos(), Skill_GetValue("plr_9mmAR_bullet", 5), [0.05,0.05], WEAPON_MP5); } Sound_Play(pl, CHAN_WEAPON, "weapon_mp5.shoot"); @@ -193,7 +193,7 @@ w_mp5_secondary(void) Weapons_ViewAnimation(MP5_GRENADE); #else static void Grenade_ExplodeTouch(void) { - float dmg = Skill_GetValue("plr_9mmAR_grenade"); + float dmg = Skill_GetValue("plr_9mmAR_grenade", 100); FX_Explosion(self.origin); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_MP5); diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index e1cce7bf..b9ed6fdb 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -156,7 +156,7 @@ w_python_primary(void) Weapons_ViewAnimation(PYTHON_FIRE1); #else pl.python_mag--; - TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_357_bullet"), [0.008, 0.008], WEAPON_PYTHON); + TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, Skill_GetValue("plr_357_bullet", 40), [0.008, 0.008], WEAPON_PYTHON); Sound_Play(pl, CHAN_WEAPON, "weapon_357.shoot"); #endif diff --git a/src/shared/valve/w_rpg.c b/src/shared/valve/w_rpg.c index 82dcb315..7d1f1d5f 100644 --- a/src/shared/valve/w_rpg.c +++ b/src/shared/valve/w_rpg.c @@ -125,7 +125,7 @@ void w_rpg_primary(void) Weapons_ViewPunchAngle([-10,0,0]); #else static void Rocket_Touch(void) { - float dmg = Skill_GetValue("plr_rpg"); + float dmg = Skill_GetValue("plr_rpg", 100); FX_Explosion(self.origin); Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_RPG); sound(self, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/src/shared/valve/w_satchel.c b/src/shared/valve/w_satchel.c index d1bf87d0..143d55fc 100644 --- a/src/shared/valve/w_satchel.c +++ b/src/shared/valve/w_satchel.c @@ -73,7 +73,7 @@ s_satchel_detonate(entity master) { for (entity b = world; (b = find(b, ::classname, "satchel"));) { if (b.owner == master) { - float dmg = Skill_GetValue("plr_satchel"); + float dmg = Skill_GetValue("plr_satchel", 150); FX_Explosion(b.origin); Damage_Radius(b.origin, master, dmg, dmg * 2.5f, TRUE, WEAPON_SATCHEL); sound(b, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/src/shared/valve/w_shotgun.c b/src/shared/valve/w_shotgun.c index 6bb83a85..52b47369 100644 --- a/src/shared/valve/w_shotgun.c +++ b/src/shared/valve/w_shotgun.c @@ -130,9 +130,9 @@ void w_shotgun_primary(void) #ifdef SERVER /* Singleplayer is more accurate */ if (cvar("sv_playerslots") == 1) { - TraceAttack_FireBullets(6, pl.origin + pl.view_ofs, Skill_GetValue("plr_buckshot"), [0.08716,0.08716], WEAPON_SHOTGUN); + TraceAttack_FireBullets(6, pl.origin + pl.view_ofs, Skill_GetValue("plr_buckshot", 5), [0.08716,0.08716], WEAPON_SHOTGUN); } else { - TraceAttack_FireBullets(4, pl.origin + pl.view_ofs, Skill_GetValue("plr_buckshot"), [0.08716,0.04362], WEAPON_SHOTGUN); + TraceAttack_FireBullets(4, pl.origin + pl.view_ofs, Skill_GetValue("plr_buckshot", 5), [0.08716,0.04362], WEAPON_SHOTGUN); } Sound_Play(pl, CHAN_WEAPON, "weapon_shotgun.single"); pl.shotgun_mag--; diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index b783a854..dad17538 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -86,7 +86,7 @@ monster_snark::customphysics(void) if (trace_ent.takedamage == DAMAGE_YES) { Sound_Play(this, CHAN_BODY, "weapon_snark.deploy"); - Damage_Apply(trace_ent, real_owner, Skill_GetValue("snark_dmg_bite"), WEAPON_SNARK, DMG_GENERIC); + Damage_Apply(trace_ent, real_owner, Skill_GetValue("snark_dmg_bite", 10), WEAPON_SNARK, DMG_GENERIC); FX_Blood(origin + [0,0,16], [1,0,0]); } @@ -102,7 +102,7 @@ monster_snark::customphysics(void) void monster_snark::Death(void) { - float dmg = Skill_GetValue("snark_dmg_pop"); + float dmg = Skill_GetValue("snark_dmg_pop", 5); Damage_Radius(origin, goalentity, dmg, dmg * 2.5f, TRUE, WEAPON_SNARK); FX_Blood(origin + [0,0,16], [203,183,15] / 255); Sound_Play(this, CHAN_VOICE, "weapon_snark.die"); diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index 03c581ea..ec28a333 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -81,7 +81,7 @@ monster_tripmine::Trip(int walkthrough) Death = Pain = __NULL__; takedamage = DAMAGE_NO; - dmg = Skill_GetValue("plr_tripmine"); + dmg = Skill_GetValue("plr_tripmine", 150); FX_Explosion(origin); Damage_Radius(origin, real_owner, dmg, dmg * 2.5f, TRUE, WEAPON_TRIPMINE); sound(this, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); diff --git a/tfc/data.pk3dir/default.cfg b/tfc/data.pk3dir/default.cfg index 291e26fa..770e7a95 100755 --- a/tfc/data.pk3dir/default.cfg +++ b/tfc/data.pk3dir/default.cfg @@ -1,3 +1,5 @@ +exec platform_default.cfg + // Generic Binds bind "ESC" "togglemenu" bind "w" "+forward" @@ -32,60 +34,9 @@ bind "y" "messagemode" bind "u" "messagemode2" bind "t" "impulse 201" bind "f" "impulse 100" +bind "f1" "vote yes" +bind "f2" "vote no" // Game Variables seta "hostname" "FreeTF Server" seta "maxplayers" "8" - -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" - -// 2D/HUD Variables -seta "con_color" "255 150 0" -seta "vgui_color" "255 170 0" -seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx" -seta "scr_sshot_type" "tga" diff --git a/valve/data.pk3dir/default.cfg b/valve/data.pk3dir/default.cfg index cf03b758..29d0e4a7 100755 --- a/valve/data.pk3dir/default.cfg +++ b/valve/data.pk3dir/default.cfg @@ -1,4 +1,4 @@ -exec skill.cfg +exec platform_default.cfg // Generic Binds bind "ESC" "togglemenu" @@ -41,57 +41,7 @@ bind "f2" "vote no" seta "hostname" "FreeHL Server" seta "maxplayers" "8" -// Physics Variables -serverinfo "phy_stepheight" "18" -serverinfo "phy_airstepheight" "18" -serverinfo "phy_friction" "4" -serverinfo "phy_edgefriction" "1" -serverinfo "phy_stopspeed" "75" -serverinfo "phy_gravity" "800" -serverinfo "phy_airaccelerate" "10" -serverinfo "phy_accelerate" "8" -serverinfo "phy_maxspeed" "270" - // 2D/HUD Variables seta "con_color" "255 150 0" seta "vgui_color" "255 170 0" seta "cross_color" "0 255 0" -seta "vid_conautoscale" "1" -seta "con_textsize" "12" -seta "cl_cursor_scale" "1" -seta "vid_conautoscale" "1" -seta "scr_conalpha" "1" - -// View Variables -seta "cl_bob" "0" -seta "maxpitch" "89" -seta "minpitch" "-89" -seta "r_meshpitch" "1" -seta "v_bob" "0.01" -seta "v_bobcycle" "0.8" -seta "v_bobup" "0.5" -seta "v_contentblend" "0" - -// 3D World Variables -seta "gl_blacklist_debug_glsl" "0" -seta "gl_overbright" "0" -seta "r_fb_models" "0" -seta "r_fullbrightSkins" "0" -seta "r_particledesc" "default" -seta "r_polygonoffset_submodel_factor" "0" -seta "r_polygonoffset_submodel_offset" "0" -seta "r_shadow_realtime_dlight_shadows" "0" -seta "r_shadow_realtime_world_shadows" "0" - -// Misc defaults -seta "cfg_save_auto" "1" -seta "cl_idlefps" "60" -seta "cl_maxfps" "250" -seta "com_nogamedirnativecode" "0" -seta "con_logcenterprint" "0" -seta "con_notifylines" "0" -seta "lang" "en_us" -seta "r_imageexensions" "tga bmp pcx png jpg" -seta "scr_sshot_type" "tga" -seta "media_repeat "0" -seta net_masterextra1 "master.frag-net.com:27950"