From c99d63accd94586028f01e28f082efbc2ea1db92 Mon Sep 17 00:00:00 2001 From: Pinsplash <39359267+Pinsplash@users.noreply.github.com> Date: Tue, 30 Apr 2024 02:26:41 -0500 Subject: [PATCH] added effect Touch the Grass. requires the game properly finding grass textures so a lot of shit here --- sourcemods/ep1chaos/cfg/autoexec.cfg | 6 +++ .../materials/nature/blendgrassgravel001a.vmt | 11 ++++ sourcemods/ep2chaos/cfg/autoexec.cfg | 6 +++ .../materials/nature/blendgrassdirt01.vmt | 11 ++++ .../nature/blendgrassdirt01_noprop.vmt | 10 ++++ .../materials/nature/blendgrassdirt02.vmt | 10 ++++ .../nature/blendgrassdirt02_noprop.vmt | 9 ++++ .../materials/nature/blendgrassdirt03.vmt | 10 ++++ .../materials/nature/blendgrassgravel002b.vmt | 10 ++++ .../materials/nature/blendgrassgravel003a.vmt | 10 ++++ .../materials/nature/blendgrassgravel01.vmt | 11 ++++ .../materials/nature/blendgrassmud01.vmt | 11 ++++ .../materials/nature/blendgrasspave01.vmt | 13 +++++ .../materials/nature/blendgrasspave02.vmt | 13 +++++ .../materials/nature/forest_grass_01.vmt | 6 +++ sourcemods/hl2chaos/cfg/autoexec.cfg | 6 +++ .../materials/nature/blendcliffgrass001a.vmt | 11 ++++ .../materials/nature/blenddirtgrass001a.vmt | 12 +++++ .../materials/nature/blenddirtgrass001b.vmt | 12 +++++ .../materials/nature/blenddirtgrass005a.vmt | 12 +++++ .../materials/nature/blenddirtgrass006a.vmt | 14 +++++ .../materials/nature/blenddirtgrass008a.vmt | 20 +++++++ .../materials/nature/blenddirtgrass008b.vmt | 19 +++++++ .../materials/nature/blendgrassdirt001a.vmt | 8 +++ .../materials/nature/blendgrassgrass001a.vmt | 8 +++ .../materials/nature/blendgrassgravel001a.vmt | 12 +++++ .../materials/nature/blendgrassgravel001b.vmt | 12 +++++ .../materials/nature/blendgrassgravel002a.vmt | 10 ++++ .../materials/nature/blendrockgrass004a.vmt | 13 +++++ .../materials/nature/blendrocksgrass005a.vmt | 12 +++++ .../materials/nature/blendrocksgrass006a.vmt | 12 +++++ .../materials/nature/blendsandgrass008a.vmt | 13 +++++ .../materials/nature/dirtfloor006a.vmt | 5 ++ .../materials/nature/grassfloor002a.vmt | 6 +++ .../materials/nature/grassfloor003a.vmt | 6 +++ .../hl2chaos/materials/nature/red_grass.vmt | 12 +++++ .../materials/nature/red_grass_thin.vmt | 12 +++++ .../materials/nature/rocks_red_grass.vmt | 12 +++++ .../materials/nature/short_red_grass.vmt | 12 +++++ .../hl2chaos/scripts/surfaceproperties.txt | 7 +++ .../server/env_player_surface_trigger.cpp | 22 ++++++-- .../game/server/env_player_surface_trigger.h | 2 +- sp/src/game/server/hl2/chaos.h | 3 +- sp/src/game/server/hl2/hl2_player.cpp | 54 ++++++++++++------- sp/src/game/shared/decals.h | 4 +- 45 files changed, 483 insertions(+), 27 deletions(-) create mode 100644 sourcemods/ep1chaos/materials/nature/blendgrassgravel001a.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassdirt01.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassdirt01_noprop.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassdirt02.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassdirt02_noprop.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassdirt03.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassgravel002b.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassgravel003a.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassgravel01.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrassmud01.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrasspave01.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/blendgrasspave02.vmt create mode 100644 sourcemods/ep2chaos/materials/nature/forest_grass_01.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendcliffgrass001a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass001a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass001b.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass005a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass006a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass008a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blenddirtgrass008b.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendgrassdirt001a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendgrassgrass001a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendgrassgravel001a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendgrassgravel001b.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendgrassgravel002a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendrockgrass004a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendrocksgrass005a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendrocksgrass006a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/blendsandgrass008a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/dirtfloor006a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/grassfloor002a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/grassfloor003a.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/red_grass.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/red_grass_thin.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/rocks_red_grass.vmt create mode 100644 sourcemods/hl2chaos/materials/nature/short_red_grass.vmt diff --git a/sourcemods/ep1chaos/cfg/autoexec.cfg b/sourcemods/ep1chaos/cfg/autoexec.cfg index 29e518d05..d4663d03e 100644 --- a/sourcemods/ep1chaos/cfg/autoexec.cfg +++ b/sourcemods/ep1chaos/cfg/autoexec.cfg @@ -158,6 +158,9 @@ chaos_time_forest 1 //Teleporter Bullets chaos_time_bullet_teleport 1 +//Touch the Grass +chaos_time_grass_heal 1 + //Ultra Low Detail chaos_time_low_detail 1 @@ -406,6 +409,9 @@ chaos_prob_teleport_random 100 //Teleporter Bullets chaos_prob_bullet_teleport 100 +//Touch the Grass +chaos_prob_grass_heal 100 + //Ultra Low Detail chaos_prob_low_detail 100 diff --git a/sourcemods/ep1chaos/materials/nature/blendgrassgravel001a.vmt b/sourcemods/ep1chaos/materials/nature/blendgrassgravel001a.vmt new file mode 100644 index 000000000..342593ffb --- /dev/null +++ b/sourcemods/ep1chaos/materials/nature/blendgrassgravel001a.vmt @@ -0,0 +1,11 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor006a" + "$basetexture2" "nature/gravelfloor004a" + "$detail" "overlays/macro01a" + "$detailscale" .1 + "%tooltexture" "nature/blendgrassgravel001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" +} diff --git a/sourcemods/ep2chaos/cfg/autoexec.cfg b/sourcemods/ep2chaos/cfg/autoexec.cfg index 29e518d05..d4663d03e 100644 --- a/sourcemods/ep2chaos/cfg/autoexec.cfg +++ b/sourcemods/ep2chaos/cfg/autoexec.cfg @@ -158,6 +158,9 @@ chaos_time_forest 1 //Teleporter Bullets chaos_time_bullet_teleport 1 +//Touch the Grass +chaos_time_grass_heal 1 + //Ultra Low Detail chaos_time_low_detail 1 @@ -406,6 +409,9 @@ chaos_prob_teleport_random 100 //Teleporter Bullets chaos_prob_bullet_teleport 100 +//Touch the Grass +chaos_prob_grass_heal 100 + //Ultra Low Detail chaos_prob_low_detail 100 diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassdirt01.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassdirt01.vmt new file mode 100644 index 000000000..8fb03b6fc --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassdirt01.vmt @@ -0,0 +1,11 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/forest_dirt_02" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} + diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassdirt01_noprop.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassdirt01_noprop.vmt new file mode 100644 index 000000000..1017e1c8f --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassdirt01_noprop.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/forest_dirt_02" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + +} + diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassdirt02.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassdirt02.vmt new file mode 100644 index 000000000..5f557b052 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassdirt02.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/forest_dirt_01" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassdirt02_noprop.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassdirt02_noprop.vmt new file mode 100644 index 000000000..614ce70c6 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassdirt02_noprop.vmt @@ -0,0 +1,9 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/forest_dirt_01" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + +} diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassdirt03.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassdirt03.vmt new file mode 100644 index 000000000..95fd019d7 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassdirt03.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2""nature/forest_dirt_04" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + //"$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassgravel002b.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassgravel002b.vmt new file mode 100644 index 000000000..960d49fef --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassgravel002b.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/gravelfloor002a" + "%detailtype" "forest_floor_01" + "%tooltexture" "nature/blendgrassgravel001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" + "$surfaceprop2" "default" +} diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassgravel003a.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassgravel003a.vmt new file mode 100644 index 000000000..a0b3b075f --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassgravel003a.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/gravelfloor002a" + "$basetexture2" "nature/forest_grass_01" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassgravel01.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassgravel01.vmt new file mode 100644 index 000000000..a245daa31 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassgravel01.vmt @@ -0,0 +1,11 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/forest_dirt_04" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} + diff --git a/sourcemods/ep2chaos/materials/nature/blendgrassmud01.vmt b/sourcemods/ep2chaos/materials/nature/blendgrassmud01.vmt new file mode 100644 index 000000000..0a3586afb --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrassmud01.vmt @@ -0,0 +1,11 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "nature/mudfloor06a" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/blendtexture01" + "%detailtype" "forest_floor_01" + +} + diff --git a/sourcemods/ep2chaos/materials/nature/blendgrasspave01.vmt b/sourcemods/ep2chaos/materials/nature/blendgrasspave01.vmt new file mode 100644 index 000000000..9ec340d3b --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrasspave01.vmt @@ -0,0 +1,13 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "concrete/concretefloor_bunker02a" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/pave_blendtexture01" + "%detailtype" "forest_floor_01" + +} + + + diff --git a/sourcemods/ep2chaos/materials/nature/blendgrasspave02.vmt b/sourcemods/ep2chaos/materials/nature/blendgrasspave02.vmt new file mode 100644 index 000000000..77189ad64 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/blendgrasspave02.vmt @@ -0,0 +1,13 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/forest_grass_01" + "$basetexture2" "concrete/concretefloor_bunker01a" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" + "$blendmodulatetexture" "nature/pave_blendtexture01" + "%detailtype" "forest_floor_01" + +} + + + diff --git a/sourcemods/ep2chaos/materials/nature/forest_grass_01.vmt b/sourcemods/ep2chaos/materials/nature/forest_grass_01.vmt new file mode 100644 index 000000000..dac39c061 --- /dev/null +++ b/sourcemods/ep2chaos/materials/nature/forest_grass_01.vmt @@ -0,0 +1,6 @@ +"LightmappedGeneric" +{ + "$baseTexture" "nature/forest_grass_01" + "$surfaceprop" "grass" + "%keywords" "ep2" +} diff --git a/sourcemods/hl2chaos/cfg/autoexec.cfg b/sourcemods/hl2chaos/cfg/autoexec.cfg index 75c3f1825..cbe898936 100644 --- a/sourcemods/hl2chaos/cfg/autoexec.cfg +++ b/sourcemods/hl2chaos/cfg/autoexec.cfg @@ -158,6 +158,9 @@ chaos_time_forest 1 //Teleporter Bullets chaos_time_bullet_teleport 1 +//Touch the Grass +chaos_time_grass_heal 1 + //Ultra Low Detail chaos_time_low_detail 1 @@ -406,6 +409,9 @@ chaos_prob_teleport_random 100 //Teleporter Bullets chaos_prob_bullet_teleport 100 +//Touch the Grass +chaos_prob_grass_heal 100 + //Ultra Low Detail chaos_prob_low_detail 100 diff --git a/sourcemods/hl2chaos/materials/nature/blendcliffgrass001a.vmt b/sourcemods/hl2chaos/materials/nature/blendcliffgrass001a.vmt new file mode 100644 index 000000000..70ce2d427 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendcliffgrass001a.vmt @@ -0,0 +1,11 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/cliffface002a" + "$basetexture2" "nature/dirtfloor002a" + "%tooltexture" "nature/blendcliffgrass001a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 2 2 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass001a.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass001a.vmt new file mode 100644 index 000000000..334081cc5 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass001a.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor012a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blenddirtgrass001a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + //"%detailtype" "grassland1" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass001b.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass001b.vmt new file mode 100644 index 000000000..8b1276022 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass001b.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor012a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blenddirtgrass001a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%detailtype" "grass01" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass005a.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass005a.vmt new file mode 100644 index 000000000..b528566ff --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass005a.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor011a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blenddirtgrass005a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%detailtype" "coastline_grass01" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass006a.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass006a.vmt new file mode 100644 index 000000000..5ba1106ee --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass006a.vmt @@ -0,0 +1,14 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor012a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blenddirtgrass006a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 2 2 rotate 0 translate 0 0" + "%detailtype" "coastline_grass01" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "$bumpbasetexture2withbumpmap" "0" +// "$bumpmap" "Nature/dirtfloor012a_normal" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass008a.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass008a.vmt new file mode 100644 index 000000000..68570d275 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass008a.vmt @@ -0,0 +1,20 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor012a" + "$basetexture2" "nature/dirtfloor006a" + + "$detail" "overlays/macro01a" + "$detailscale" .1 + + "%tooltexture" "nature/blenddirtgrass008a_tooltexture" + + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 1 1 rotate 10 translate 0 0" + + "%detailtype" "coastline_redgrass01" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +// "$bumpbasetexture2withbumpmap" "0" +// "$bumpmap" "nature/dirtfloor012b_normal" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blenddirtgrass008b.vmt b/sourcemods/hl2chaos/materials/nature/blenddirtgrass008b.vmt new file mode 100644 index 000000000..e010bac57 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blenddirtgrass008b.vmt @@ -0,0 +1,19 @@ +"WorldVertexTransition" +// This is a copy of blenddirtgrass008a, but with a no detailtype -JeffL +{ + "$basetexture" "nature/dirtfloor012a" + "$basetexture2" "nature/dirtfloor006a" + + "$detail" "overlays/macro01a" + "$detailscale" .1 + + "%tooltexture" "nature/blenddirtgrass008a_tooltexture" + + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 1 1 rotate 10 translate 0 0" + + + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendgrassdirt001a.vmt b/sourcemods/hl2chaos/materials/nature/blendgrassdirt001a.vmt new file mode 100644 index 000000000..a1b5d8f23 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendgrassdirt001a.vmt @@ -0,0 +1,8 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/grassfloor001a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blendgrassdirt001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendgrassgrass001a.vmt b/sourcemods/hl2chaos/materials/nature/blendgrassgrass001a.vmt new file mode 100644 index 000000000..d0e3ab0c5 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendgrassgrass001a.vmt @@ -0,0 +1,8 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/grassfloor002a" + "$basetexture2" "nature/grassfloor003a" + "%tooltexture" "nature/blendgrassgrass001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendgrassgravel001a.vmt b/sourcemods/hl2chaos/materials/nature/blendgrassgravel001a.vmt new file mode 100644 index 000000000..9376f32a4 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendgrassgravel001a.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor006a" + "$basetexture2" "nature/gravelfloor004a" + "$detail" "overlays/macro01a" + "$detailscale" .1 + "%detailtype" "coastline_redgrass02" + "%tooltexture" "nature/blendgrassgravel001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendgrassgravel001b.vmt b/sourcemods/hl2chaos/materials/nature/blendgrassgravel001b.vmt new file mode 100644 index 000000000..6acb8e188 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendgrassgravel001b.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor006a" + "$basetexture2" "nature/gravelfloor004a" + "$detail" "overlays/macro01a" + "$detailscale" .1 + "%detailtype" "coastline_redgrass03" + "%tooltexture" "nature/blendgrassgravel001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendgrassgravel002a.vmt b/sourcemods/hl2chaos/materials/nature/blendgrassgravel002a.vmt new file mode 100644 index 000000000..fb8cff8d3 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendgrassgravel002a.vmt @@ -0,0 +1,10 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor006a" + "$basetexture2" "nature/gravelfloor002a" + "%detailtype" "coastline_redgrass02" + "%tooltexture" "nature/blendgrassgravel001a_tooltexture" + "%keywords" "wasteland" + "$surfaceprop" "grass" + "$surfaceprop2" "dirt" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendrockgrass004a.vmt b/sourcemods/hl2chaos/materials/nature/blendrockgrass004a.vmt new file mode 100644 index 000000000..7007cae2f --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendrockgrass004a.vmt @@ -0,0 +1,13 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/rockfloor005a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blendrockgrass004a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 1 1 rotate 10 translate 0 0" + "%detailtype" "coastline_redgrass01" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "%keywords" "coastline" + "$bumpmap" "nature/rockfloor005a_normal" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendrocksgrass005a.vmt b/sourcemods/hl2chaos/materials/nature/blendrocksgrass005a.vmt new file mode 100644 index 000000000..c09717078 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendrocksgrass005a.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/rockwall011d" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blendrocksgrass005a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 8 8 rotate 0 translate 0 0" +// "%detailtype" "rocks1" + "$surfaceprop" "rock" + "$surfaceprop2" "grass" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendrocksgrass006a.vmt b/sourcemods/hl2chaos/materials/nature/blendrocksgrass006a.vmt new file mode 100644 index 000000000..2881fab54 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendrocksgrass006a.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/rockwall011d" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blendrocksgrass006a_tooltexture" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 8 8 rotate 0 translate 0 0" +// "%detailtype" "rocks1" + "$surfaceprop" "rock" + "$surfaceprop2" "grass" + "%keywords" "coastline" +} diff --git a/sourcemods/hl2chaos/materials/nature/blendsandgrass008a.vmt b/sourcemods/hl2chaos/materials/nature/blendsandgrass008a.vmt new file mode 100644 index 000000000..08af1e435 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/blendsandgrass008a.vmt @@ -0,0 +1,13 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/sandfloor009a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/blendsandgrass008a_tooltexture" + "$detail" "overlays/macro01a" + "$detailscale" .1 + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "%detailtype" "coastline_grass01" + "$surfaceprop" "antlionsand" + "$surfaceprop2" "sandygrass" +} diff --git a/sourcemods/hl2chaos/materials/nature/dirtfloor006a.vmt b/sourcemods/hl2chaos/materials/nature/dirtfloor006a.vmt new file mode 100644 index 000000000..b33372c8c --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/dirtfloor006a.vmt @@ -0,0 +1,5 @@ +"LightmappedGeneric" +{ + "$basetexture" "Nature/dirtfloor006a" + "$surfaceprop" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/grassfloor002a.vmt b/sourcemods/hl2chaos/materials/nature/grassfloor002a.vmt new file mode 100644 index 000000000..1b9ed2c9b --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/grassfloor002a.vmt @@ -0,0 +1,6 @@ +"LightmappedGeneric" +{ + // Original shader: BaseTimesLightmap + "$basetexture" "Nature/grassfloor002a" + "$surfaceprop" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/grassfloor003a.vmt b/sourcemods/hl2chaos/materials/nature/grassfloor003a.vmt new file mode 100644 index 000000000..5bba3bfe1 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/grassfloor003a.vmt @@ -0,0 +1,6 @@ +"LightmappedGeneric" +{ + // Original shader: BaseTimesLightmap + "$basetexture" "Nature/grassfloor003a" + "$surfaceprop" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/red_grass.vmt b/sourcemods/hl2chaos/materials/nature/red_grass.vmt new file mode 100644 index 000000000..024834246 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/red_grass.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor011a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/dirtfloor011a" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%detailtype" "redgrass" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/red_grass_thin.vmt b/sourcemods/hl2chaos/materials/nature/red_grass_thin.vmt new file mode 100644 index 000000000..34bf710c2 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/red_grass_thin.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor011a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/dirtfloor011a" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" + "%detailtype" "redgrass_light" + "%keywords" "wasteland" +} diff --git a/sourcemods/hl2chaos/materials/nature/rocks_red_grass.vmt b/sourcemods/hl2chaos/materials/nature/rocks_red_grass.vmt new file mode 100644 index 000000000..42f6ba219 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/rocks_red_grass.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor011a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/dirtfloor011a" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%detailtype" "rocks_redgrass" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/materials/nature/short_red_grass.vmt b/sourcemods/hl2chaos/materials/nature/short_red_grass.vmt new file mode 100644 index 000000000..984b768d1 --- /dev/null +++ b/sourcemods/hl2chaos/materials/nature/short_red_grass.vmt @@ -0,0 +1,12 @@ +"WorldVertexTransition" +{ + "$basetexture" "nature/dirtfloor011a" + "$basetexture2" "nature/dirtfloor006a" + "%tooltexture" "nature/dirtfloor011a" + "$basetexturetransform" "center .5 .5 scale 1 1 rotate 0 translate 0 0" + "$basetexturetransform2" "center .5 .5 scale 4 4 rotate 0 translate 0 0" + "%detailtype" "short_redgrass" + "%keywords" "wasteland" + "$surfaceprop" "dirt" + "$surfaceprop2" "grass" +} diff --git a/sourcemods/hl2chaos/scripts/surfaceproperties.txt b/sourcemods/hl2chaos/scripts/surfaceproperties.txt index 62dd3a98c..fa195839d 100644 --- a/sourcemods/hl2chaos/scripts/surfaceproperties.txt +++ b/sourcemods/hl2chaos/scripts/surfaceproperties.txt @@ -246,6 +246,13 @@ "base" "dirt" "stepleft" "Grass.StepLeft" "stepright" "Grass.StepRight" + "gamematerial" "J" +} + +"sandygrass" +{ + "base" "grass" + "gamematerial" "K" } "tile" diff --git a/sp/src/game/server/env_player_surface_trigger.cpp b/sp/src/game/server/env_player_surface_trigger.cpp index e25038ec3..a4e0e6ef3 100644 --- a/sp/src/game/server/env_player_surface_trigger.cpp +++ b/sp/src/game/server/env_player_surface_trigger.cpp @@ -90,10 +90,11 @@ void CEnvPlayerSurfaceTrigger::PlayerSurfaceChanged( CBasePlayer *pPlayer, char return; // Fire the output if we've changed, but only if it involves the target material - if ( gameMaterial != (char)m_iCurrentGameMaterial && - ( gameMaterial == m_iTargetGameMaterial || m_iCurrentGameMaterial == m_iTargetGameMaterial ) ) + char cCurrentGameMaterial = m_iCurrentGameMaterial; + if (gameMaterial != cCurrentGameMaterial && + (IsTargetMaterial(gameMaterial) || IsTargetMaterial(m_iCurrentGameMaterial))) { - DevMsg( 2, "Player changed material to %d (was %d)\n", gameMaterial, m_iCurrentGameMaterial ); + DevMsg("Player changed material to %c (was %c)\n", gameMaterial, cCurrentGameMaterial); m_iCurrentGameMaterial = (int)gameMaterial; @@ -108,7 +109,7 @@ void CEnvPlayerSurfaceTrigger::PlayerSurfaceChanged( CBasePlayer *pPlayer, char //----------------------------------------------------------------------------- void CEnvPlayerSurfaceTrigger::UpdateMaterialThink( void ) { - if ( m_iCurrentGameMaterial == m_iTargetGameMaterial ) + if (IsTargetMaterial(m_iCurrentGameMaterial)) { m_OnSurfaceChangedToTarget.FireOutput( NULL, this ); } @@ -133,3 +134,16 @@ void CEnvPlayerSurfaceTrigger::InputEnable( inputdata_t &inputdata ) { m_bDisabled = false; } + +//for a chaos effect, several textures had their surface props changed (correctly) to grass. +//this affects the texture used in highway 17 for most sand, which is blended with grass. +//that material should still trigger when the player is on grass, so correct that here. +bool CEnvPlayerSurfaceTrigger::IsTargetMaterial(char gameMaterial) +{ + if (gameMaterial == m_iTargetGameMaterial) + return true; + //if targetting sand and player is on our new "sandygrass" surfaceprop, count it as sand + else if (m_iTargetGameMaterial == 'N' && gameMaterial == 'K') + return true; + return false; +} \ No newline at end of file diff --git a/sp/src/game/server/env_player_surface_trigger.h b/sp/src/game/server/env_player_surface_trigger.h index 96eb0810d..bff2bb266 100644 --- a/sp/src/game/server/env_player_surface_trigger.h +++ b/sp/src/game/server/env_player_surface_trigger.h @@ -30,7 +30,7 @@ class CEnvPlayerSurfaceTrigger : public CPointEntity static void SetPlayerSurface( CBasePlayer *pPlayer, char gameMaterial ); void UpdateMaterialThink( void ); - + bool IsTargetMaterial(char gameMaterial); private: void PlayerSurfaceChanged( CBasePlayer *pPlayer, char gameMaterial ); void InputDisable( inputdata_t &inputdata ); diff --git a/sp/src/game/server/hl2/chaos.h b/sp/src/game/server/hl2/chaos.h index 25c4afb59..e9c9f1710 100644 --- a/sp/src/game/server/hl2/chaos.h +++ b/sp/src/game/server/hl2/chaos.h @@ -98,6 +98,7 @@ enum Effect_T EFFECT_YAWROLL, EFFECT_NORMAL_VISION, EFFECT_GIVE_ALL_RPG, + EFFECT_GRASS_HEAL, //EFFECT_EVIL_ELI, //EFFECT_EVIL_BREEN, @@ -494,7 +495,7 @@ class CEQuickclip : public CChaosEffect public: void StartEffect() override; }; -class CEFloorIsLava : public CChaosEffect +class CEFloorEffect : public CChaosEffect { public: void FastThink() override; diff --git a/sp/src/game/server/hl2/hl2_player.cpp b/sp/src/game/server/hl2/hl2_player.cpp index fb7c23481..c4cd6e2e6 100644 --- a/sp/src/game/server/hl2/hl2_player.cpp +++ b/sp/src/game/server/hl2/hl2_player.cpp @@ -5342,6 +5342,7 @@ ConVar chaos_time_steal_health("chaos_time_steal_health", "1"); ConVar chaos_time_yawroll("chaos_time_yawroll", "1"); ConVar chaos_time_zombiespam("chaos_time_zombiespam", "1"); ConVar chaos_time_normalvision("chaos_time_normalvision", "1"); +ConVar chaos_time_grass_heal("chaos_time_grass_heal", "1"); ConVar chaos_prob_zerog("chaos_prob_zerog", "100"); ConVar chaos_prob_superg("chaos_prob_superg", "100"); @@ -5426,6 +5427,7 @@ ConVar chaos_prob_suit_swap("chaos_prob_suit_swap", "100"); ConVar chaos_prob_yawroll("chaos_prob_yawroll", "100"); ConVar chaos_prob_normalvision("chaos_prob_normalvision", "100"); ConVar chaos_prob_giveallrpg("chaos_prob_giveallrpg", "100"); +ConVar chaos_prob_grass_heal("chaos_prob_grass_heal", "100"); //ConVar chaos_prob_evil_eli("chaos_prob_evil_eli", "100"); //ConVar chaos_prob_evil_breen("chaos_prob_evil_breen", "100"); #define ERROR_WEIGHT 1 @@ -5480,7 +5482,7 @@ void CHL2_Player::PopulateEffects() CreateEffect(EFFECT_EVIL_ALYX, MAKE_STRING("Annoying Alyx"), EC_HAS_WEAPON, -1, chaos_prob_evil_alyx.GetInt()); CreateEffect(EFFECT_EVIL_NORIKO, MAKE_STRING("Noriko, No!"), EC_NONE, -1, chaos_prob_evil_noriko.GetInt()); CreateEffect<>(EFFECT_CANT_LEAVE_MAP, MAKE_STRING("Why So Rushed?"), EC_NONE, chaos_time_cant_leave_map.GetFloat(), chaos_prob_cant_leave_map.GetInt()); - CreateEffect(EFFECT_FLOOR_IS_LAVA, MAKE_STRING("Floor Is Lava"), EC_NO_INVULN | EC_QC_OFF, chaos_time_floor_is_lava.GetFloat(), chaos_prob_floor_is_lava.GetInt()); + CreateEffect(EFFECT_FLOOR_IS_LAVA, MAKE_STRING("Floor Is Lava"), EC_NO_INVULN | EC_QC_OFF, chaos_time_floor_is_lava.GetFloat(), chaos_prob_floor_is_lava.GetInt()); CreateEffect(EFFECT_PLAY_MUSIC, MAKE_STRING("Play Random Song"), EC_NONE, -1, chaos_prob_play_music.GetInt()); CreateEffect(EFFECT_USE_SPAM, MAKE_STRING("Grabby"), EC_NO_VEHICLE, chaos_time_use_spam.GetFloat(), chaos_prob_use_spam.GetInt()); CreateEffect<>(EFFECT_ORTHO_CAM, MAKE_STRING("Orthographic Camera"), EC_NONE, chaos_time_ortho_cam.GetFloat(), chaos_prob_ortho_cam.GetInt()); @@ -5515,6 +5517,7 @@ void CHL2_Player::PopulateEffects() CreateEffect<>(EFFECT_YAWROLL, MAKE_STRING("Yaw Is Roll"), EC_NONE, chaos_time_yawroll.GetFloat(), chaos_prob_yawroll.GetInt()); CreateEffect<>(EFFECT_NORMAL_VISION, MAKE_STRING("Normal Vision"), EC_NONE, chaos_time_normalvision.GetFloat(), chaos_prob_normalvision.GetInt()); CreateEffect(EFFECT_GIVE_ALL_RPG, MAKE_STRING("Give Everyone RPGs"), EC_NONE, -1, chaos_prob_giveallrpg.GetInt()); + CreateEffect(EFFECT_GRASS_HEAL, MAKE_STRING("Touch the Grass"), EC_NONE, chaos_time_grass_heal.GetFloat(), chaos_prob_grass_heal.GetInt()); //CreateEffect(EFFECT_EVIL_ELI, MAKE_STRING("Evil Eli"), EC_HAS_WEAPON, -1, chaos_prob_evil_eli.GetInt()); //CreateEffect(EFFECT_EVIL_BREEN, MAKE_STRING("Hands-on Dr. Breen"), EC_HAS_WEAPON, -1, chaos_prob_evil_breen.GetInt()); } @@ -8988,9 +8991,10 @@ void CEQuickclip::StartEffect() break; } } -void CEFloorIsLava::FastThink() +void CEFloorEffect::FastThink() { CBasePlayer* pPlayer = UTIL_GetLocalPlayer(); + int iTicks = 7; bool bSkipThisTick = false; //have to be on solid ground if (pPlayer->IsInAVehicle()) @@ -9023,20 +9027,20 @@ void CEFloorIsLava::FastThink() bSkipThisTick = true; } - //test in center and 4 corners + //test in center trace_t trace2; - //Vector vecCorners[5] = { Vector(0, 0, 0), Vector(-16, -16, 0), Vector(16, -16, 0), Vector(-16, 16, 0), Vector(16, 16, 0) }; - //for (int i = 0; i < 5; i++) - //{ - UTIL_TraceLine(pPlayer->GetAbsOrigin(), pPlayer->GetAbsOrigin() - Vector(0, 0, 20), CONTENTS_SOLID, pPlayer, COLLISION_GROUP_NONE, &trace2); + UTIL_TraceLine(pPlayer->GetAbsOrigin(), pPlayer->GetAbsOrigin() - Vector(0, 0, 20), CONTENTS_SOLID, pPlayer, COLLISION_GROUP_NONE, &trace2); - //if you're on sky or nodraw, then whatever - if ((trace2.surface.flags & SURF_SKY) || (trace2.surface.flags & SURF_NODRAW)) - { - bSkipThisTick = true; - //break; - } - //} + //if you're on sky or nodraw, then whatever + if ((trace2.surface.flags & SURF_SKY) || (trace2.surface.flags & SURF_NODRAW)) + { + bSkipThisTick = true; + //break; + } + + //want grass only + if (m_nID == EFFECT_GRASS_HEAL && pPlayer->m_chTextureType != 'J' && pPlayer->m_chTextureType != 'K') + bSkipThisTick = true; } if (bSkipThisTick) @@ -9056,16 +9060,28 @@ void CEFloorIsLava::FastThink() else { //time to burn again - m_iSkipTicks = 7; + m_iSkipTicks = iTicks; + CTakeDamageInfo infoBurn(pPlayer, pPlayer, 1, DMG_BURN); //apply dmg - CTakeDamageInfo info(pPlayer, pPlayer, 1, DMG_BURN); - pPlayer->TakeDamage(info); + switch (m_nID) + { + case EFFECT_FLOOR_IS_LAVA: + pPlayer->TakeDamage(infoBurn); + case EFFECT_GRASS_HEAL: + pPlayer->TakeHealth(1, DMG_GENERIC); + } } } } -bool CEFloorIsLava::CheckStrike(const CTakeDamageInfo &info) +bool CEFloorEffect::CheckStrike(const CTakeDamageInfo &info) { - return (info.GetDamageType() & DMG_BURN) != 0; + switch (m_nID) + { + case EFFECT_FLOOR_IS_LAVA: + return (info.GetDamageType() & DMG_BURN) != 0; + default: + return false; + } } void CEUseSpam::FastThink() { diff --git a/sp/src/game/shared/decals.h b/sp/src/game/shared/decals.h index 83e70c6f8..62e81994d 100644 --- a/sp/src/game/shared/decals.h +++ b/sp/src/game/shared/decals.h @@ -21,8 +21,8 @@ #define CHAR_TEX_GRATE 'G' #define CHAR_TEX_ALIENFLESH 'H' #define CHAR_TEX_CLIP 'I' -//#define CHAR_TEX_UNUSED 'J' -//#define CHAR_TEX_UNUSED 'K' +#define CHAR_TEX_GRASS 'J' +#define CHAR_TEX_SANDGRASS 'K' #define CHAR_TEX_PLASTIC 'L' #define CHAR_TEX_METAL 'M' #define CHAR_TEX_SAND 'N'