Skip to content

Commit f0995d7

Browse files
BitlBitl
committed
add 2007 knife model and fix lighting. balance changes. add econ_allow_paint_tint
1 parent 8470095 commit f0995d7

File tree

8 files changed

+328
-5
lines changed

8 files changed

+328
-5
lines changed

‎game/mod_tf/materials/models/weapons/w_knife/w_knife.vmt‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
"VertexLitGeneric"
2+
{
3+
"$baseTexture" "models\weapons\v_knife/v_knife"
4+
5+
// "$bumpmap" "models/weapons\v_knife\v_knife_normal"
6+
7+
$BASEMAPALPHAPHONGMASK 1
8+
9+
"$normalmapalphaenvmapmask" 1
10+
"$envmap" "env_cubemap"
11+
"$envmaptint" "[.35 .35 .35]"
12+
13+
"$phong" "1"
14+
"$phongexponent" "25"
15+
"$phongboost" "5"
16+
"$lightwarptexture" "models\lightwarps\weapon_lightwarp"
17+
"$phongfresnelranges" "[.25 .5 1]"
18+
19+
20+
"$tempvar" "0"
21+
22+
"$basephongexponent" "25"
23+
"$basephongboost" "5"
24+
25+
"$commadd_phongexponent" "30"
26+
"$commadd_phongboost" "22.5"
27+
"$commweapon" "0"
28+
29+
"$rimlight" "1"
30+
"$rimlightexponent" "4"
31+
"$rimlightboost" "2"
32+
33+
34+
"$glowcolor" "1"
35+
36+
// Cloaking
37+
"$cloakPassEnabled" "1"
38+
"$sheenPassEnabled" "1"
39+
40+
"$sheenmap" "cubemaps\cubemap_sheen001"
41+
"$sheenmapmask" "Effects\AnimatedSheen\animatedsheen0"
42+
"$sheenmaptint" "[ 1 1 1 ]"
43+
"$sheenmapmaskframe" "0"
44+
"$sheenindex" "0"
45+
46+
"$yellow" "0"
47+
48+
"Proxies"
49+
{
50+
"AnimatedWeaponSheen"
51+
{
52+
"animatedtexturevar" "$sheenmapmask"
53+
"animatedtextureframenumvar" "$sheenmapmaskframe"
54+
"animatedtextureframerate" "40"
55+
}
56+
"invis"
57+
{
58+
}
59+
"ModelGlowColor"
60+
{
61+
"resultVar" "$glowcolor"
62+
}
63+
"Equals"
64+
{
65+
"srcVar1" "$glowcolor"
66+
"resultVar" "$selfillumtint"
67+
}
68+
"Equals"
69+
{
70+
"srcVar1" "$glowcolor"
71+
"resultVar" "$color2"
72+
}
73+
"YellowLevel"
74+
{
75+
"resultVar" "$yellow"
76+
}
77+
"Multiply"
78+
{
79+
"srcVar1" "$color2"
80+
"srcVar2" "$yellow"
81+
"resultVar" "$color2"
82+
}
83+
}
84+
}

‎game/mod_tf/materials/models/weapons/w_knife/w_knife_gold.vmt‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
"VertexLitGeneric"
2+
{
3+
"$baseTexture" "models\weapons\v_knife/v_knife_gold"
4+
5+
// Begin GOLD look
6+
"$envmap" "cubemaps/cubemap_gold001"
7+
"$envmaptint" "[2.5 2.5 1.15]"
8+
9+
"$phong" "1"
10+
"$phongexponent" "155"
11+
"$phongboost" "5"
12+
"$lightwarptexture" "models\lightwarps\weapon_lightwarp"
13+
"$phongfresnelranges" "[.25 .5 1]"
14+
15+
"$tempvar" "0"
16+
17+
"$rimlight" "1"
18+
"$rimlightexponent" "10"
19+
"$rimlightboost" "2"
20+
21+
22+
"$glowcolor" "1"
23+
24+
// Cloaking
25+
"$cloakPassEnabled" "1"
26+
"$sheenPassEnabled" "1"
27+
28+
"$sheenmap" "cubemaps\cubemap_sheen001"
29+
"$sheenmapmask" "Effects\AnimatedSheen\animatedsheen0"
30+
"$sheenmaptint" "[ 1 1 1 ]"
31+
"$sheenmapmaskframe" "0"
32+
"$sheenindex" "0"
33+
34+
"$yellow" "0"
35+
36+
"Proxies"
37+
{
38+
"AnimatedWeaponSheen"
39+
{
40+
"animatedtexturevar" "$sheenmapmask"
41+
"animatedtextureframenumvar" "$sheenmapmaskframe"
42+
"animatedtextureframerate" "40"
43+
}
44+
"invis"
45+
{
46+
}
47+
"ModelGlowColor"
48+
{
49+
"resultVar" "$glowcolor"
50+
}
51+
"Equals"
52+
{
53+
"srcVar1" "$glowcolor"
54+
"resultVar" "$selfillumtint"
55+
}
56+
"Equals"
57+
{
58+
"srcVar1" "$glowcolor"
59+
"resultVar" "$color2"
60+
}
61+
"YellowLevel"
62+
{
63+
"resultVar" "$yellow"
64+
}
65+
"Multiply"
66+
{
67+
"srcVar1" "$color2"
68+
"srcVar2" "$yellow"
69+
"resultVar" "$color2"
70+
}
71+
}
72+
}

‎game/quiver/info_changelog.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ Details:
119119
- Implemented NeoDement's Missing Killicons Pack.
120120
- Pyro bots can now reflect most projectiles.
121121
- Re-enabled stun for taunt kills.
122+
- Removed the Railgun's headshot charge penalty.
123+
- Restored the original 2007 knife model.
122124

123125
Quiver Private Alpha 1.1.0:
124126
Whitelists:

‎game/quiver/materials/models/weapons/w_knife/w_knife.vmt‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
"VertexLitGeneric"
2+
{
3+
"$baseTexture" "models\weapons\v_knife/v_knife"
4+
5+
// "$bumpmap" "models/weapons\v_knife\v_knife_normal"
6+
7+
$BASEMAPALPHAPHONGMASK 1
8+
9+
"$normalmapalphaenvmapmask" 1
10+
"$envmap" "env_cubemap"
11+
"$envmaptint" "[.35 .35 .35]"
12+
13+
"$phong" "1"
14+
"$phongexponent" "25"
15+
"$phongboost" "5"
16+
"$lightwarptexture" "models\lightwarps\weapon_lightwarp"
17+
"$phongfresnelranges" "[.25 .5 1]"
18+
19+
20+
"$tempvar" "0"
21+
22+
"$basephongexponent" "25"
23+
"$basephongboost" "5"
24+
25+
"$commadd_phongexponent" "30"
26+
"$commadd_phongboost" "22.5"
27+
"$commweapon" "0"
28+
29+
"$rimlight" "1"
30+
"$rimlightexponent" "4"
31+
"$rimlightboost" "2"
32+
33+
34+
"$glowcolor" "1"
35+
36+
// Cloaking
37+
"$cloakPassEnabled" "1"
38+
"$sheenPassEnabled" "1"
39+
40+
"$sheenmap" "cubemaps\cubemap_sheen001"
41+
"$sheenmapmask" "Effects\AnimatedSheen\animatedsheen0"
42+
"$sheenmaptint" "[ 1 1 1 ]"
43+
"$sheenmapmaskframe" "0"
44+
"$sheenindex" "0"
45+
46+
"$yellow" "0"
47+
48+
"Proxies"
49+
{
50+
"AnimatedWeaponSheen"
51+
{
52+
"animatedtexturevar" "$sheenmapmask"
53+
"animatedtextureframenumvar" "$sheenmapmaskframe"
54+
"animatedtextureframerate" "40"
55+
}
56+
"invis"
57+
{
58+
}
59+
"ModelGlowColor"
60+
{
61+
"resultVar" "$glowcolor"
62+
}
63+
"Equals"
64+
{
65+
"srcVar1" "$glowcolor"
66+
"resultVar" "$selfillumtint"
67+
}
68+
"Equals"
69+
{
70+
"srcVar1" "$glowcolor"
71+
"resultVar" "$color2"
72+
}
73+
"YellowLevel"
74+
{
75+
"resultVar" "$yellow"
76+
}
77+
"Multiply"
78+
{
79+
"srcVar1" "$color2"
80+
"srcVar2" "$yellow"
81+
"resultVar" "$color2"
82+
}
83+
}
84+
}

‎game/quiver/materials/models/weapons/w_knife/w_knife_gold.vmt‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
"VertexLitGeneric"
2+
{
3+
"$baseTexture" "models\weapons\v_knife/v_knife_gold"
4+
5+
// Begin GOLD look
6+
"$envmap" "cubemaps/cubemap_gold001"
7+
"$envmaptint" "[2.5 2.5 1.15]"
8+
9+
"$phong" "1"
10+
"$phongexponent" "155"
11+
"$phongboost" "5"
12+
"$lightwarptexture" "models\lightwarps\weapon_lightwarp"
13+
"$phongfresnelranges" "[.25 .5 1]"
14+
15+
"$tempvar" "0"
16+
17+
"$rimlight" "1"
18+
"$rimlightexponent" "10"
19+
"$rimlightboost" "2"
20+
21+
22+
"$glowcolor" "1"
23+
24+
// Cloaking
25+
"$cloakPassEnabled" "1"
26+
"$sheenPassEnabled" "1"
27+
28+
"$sheenmap" "cubemaps\cubemap_sheen001"
29+
"$sheenmapmask" "Effects\AnimatedSheen\animatedsheen0"
30+
"$sheenmaptint" "[ 1 1 1 ]"
31+
"$sheenmapmaskframe" "0"
32+
"$sheenindex" "0"
33+
34+
"$yellow" "0"
35+
36+
"Proxies"
37+
{
38+
"AnimatedWeaponSheen"
39+
{
40+
"animatedtexturevar" "$sheenmapmask"
41+
"animatedtextureframenumvar" "$sheenmapmaskframe"
42+
"animatedtextureframerate" "40"
43+
}
44+
"invis"
45+
{
46+
}
47+
"ModelGlowColor"
48+
{
49+
"resultVar" "$glowcolor"
50+
}
51+
"Equals"
52+
{
53+
"srcVar1" "$glowcolor"
54+
"resultVar" "$selfillumtint"
55+
}
56+
"Equals"
57+
{
58+
"srcVar1" "$glowcolor"
59+
"resultVar" "$color2"
60+
}
61+
"YellowLevel"
62+
{
63+
"resultVar" "$yellow"
64+
}
65+
"Multiply"
66+
{
67+
"srcVar1" "$color2"
68+
"srcVar2" "$yellow"
69+
"resultVar" "$color2"
70+
}
71+
}
72+
}

‎game/quiver/scripts/items/items_custom.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,6 @@
417417
"attribute_class" "sniper_fires_tracer"
418418
"value" "1"
419419
}
420-
"sniper no headshot without full charge"
421-
{
422-
"attribute_class" "sniper_no_headshot_without_full_charge"
423-
"value" "1"
424-
}
425420
"crit on hard hit"
426421
{
427422
"attribute_class" "crit_on_hard_hit"

‎game/quiver/scripts/items/items_game.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22074,6 +22074,7 @@
2207422074
"first_sale_date" "2010/09/29"
2207522075
"prefab" "weapon_knife"
2207622076
"baseitem" "1"
22077+
"model_world" "models/weapons/w_models/w_knife.mdl"
2207722078
"use_viewmodels" "1"
2207822079
}
2207922080
"5"

‎src/game/shared/econ/econ_wearable.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ RenderGroup_t CEconWearable::GetRenderGroup()
466466
return BaseClass::GetRenderGroup();
467467
}
468468

469+
#ifdef BDSBASE
470+
ConVar econ_allow_paint_tint("econ_allow_paint_tint", "1", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
471+
#endif
472+
469473
//-----------------------------------------------------------------------------
470474
// Purpose: Wearable tint colors
471475
//-----------------------------------------------------------------------------
@@ -475,6 +479,15 @@ class CProxyItemTintColor : public CResultProxy
475479
void OnBind( void *pC_BaseEntity )
476480
{
477481
Assert( m_pResult );
482+
483+
#ifdef BDSBASE
484+
if (!econ_allow_paint_tint.GetBool())
485+
{
486+
m_pResult->SetVecValue(0, 0, 0);
487+
return;
488+
}
489+
#endif
490+
478491
Vector vResult = Vector( 0, 0, 0 );
479492

480493
if ( pC_BaseEntity )

0 commit comments

Comments
 (0)