zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/win32/zdoom.rc
This commit is contained in:
Rachael Alexanderson 2016-12-22 06:24:47 -05:00
commit fa66ca214e
7 changed files with 174 additions and 416 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/c_console.cpp
View file

@ -1527,8 +1527,6 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
buffer.Text.StripLeftRight();
Printf(127, TEXTCOLOR_WHITE "]%s\n", buffer.Text.GetChars());
AddCommandString(buffer.Text.LockBuffer());
buffer.Text.UnlockBuffer();
if (buffer.Text.Len() == 0)
{
@ -1572,7 +1570,21 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
}
}
HistPos = NULL;
buffer.SetString("");
{
// Work with a copy of command to avoid side effects caused by
// exception raised during execution, like with 'error' CCMD.
// It's problematic to maintain FString's lock symmetry.
static TArray<char> command;
const size_t length = buffer.Text.Len();
command.Resize(length + 1);
memcpy(&command[0], buffer.Text.GetChars(), length);
command[length] = '\0';
buffer.SetString("");
AddCommandString(&command[0]);
}
TabbedLast = false;
TabbedList = false;
break;

11
src/gl/renderer/gl_lightdata.cpp
View file

@ -46,12 +46,6 @@ int fogdensity;
int outsidefogdensity;
int skyfog;
CUSTOM_CVAR (Int, gl_light_ambient, 20, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{
// ambient of 0 does not work correctly because light level 0 is special.
if (self < 1) self = 1;
}
CVAR(Int, gl_weaponlight, 8, CVAR_ARCHIVE);
CUSTOM_CVAR(Bool, gl_enhanced_nightvision, true, CVAR_ARCHIVE|CVAR_NOINITCALL)
{
@ -209,11 +203,6 @@ int gl_CalcLightLevel(int lightlevel, int rellight, bool weapon)
light=lightlevel;
}
if (light<gl_light_ambient && glset.lightmode != 8) // ambient clipping only if not using software lighting model.
{
light = gl_light_ambient;
if (rellight<0) rellight>>=1;
}
return clamp(light+rellight, 0, 255);
}

1
wadsrc/static/menudef.zz
View file

@ -239,7 +239,6 @@ OptionMenu "GLPrefOptions"
Option "$GLPREFMNU_SPRBILLBOARD", gl_billboard_mode, "BillboardModes"
Option "$GLPREFMNU_SPRBILLFACECAMERA", gl_billboard_faces_camera, "OnOff"
Option "$GLPREFMNU_PARTICLESTYLE", gl_particles_style, "Particles"
Slider "$GLPREFMNU_AMBLIGHT", gl_light_ambient, 1.0, 255.0, 5.0
Option "$GLPREFMNU_RENDERQUALITY", gl_render_precise, "Precision"
Option "$GLPREFMNU_VRMODE", vr_mode, "VRMode"
Option "$GLPREFMNU_VRQUADSTEREO", vr_enable_quadbuffered, "OnOff"

121
wadsrc_bm/brightmaps.vcproj
View file

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="wadsrc-brightmaps"
ProjectGUID="{087B206F-F49E-4EFB-92CB-E1F6E32D1278}"
RootNamespace="wadsrc"
Keyword="MakeFileProj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking brightmaps.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(SolutionDir)..\brightmaps.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking brightmaps.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(SolutionDir)..\brightmaps.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking brightmaps.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(SolutionDir)..\brightmaps.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking brightmaps.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)brightmaps.pk3&quot; &quot;$(SolutionDir)..\brightmaps.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\CMakeLists.txt"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

121
wadsrc_lights/lights.vcproj
View file

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="wadsrc-lights"
ProjectGUID="{31090871-A623-4BBC-A167-DE821CD1240C}"
RootNamespace="wadsrc"
Keyword="MakeFileProj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking lights.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)lights.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)lights.pk3&quot; &quot;$(SolutionDir)..\lights.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking lights.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)lights.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)lights.pk3&quot; &quot;$(SolutionDir)..\lights.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking lights.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)lights.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)lights.pk3&quot; &quot;$(SolutionDir)..\lights.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking lights.pk3..."
CommandLine="&quot;$(SolutionDir)tools\zipdir\zipdir.exe&quot; -ud &quot;$(InputDir)lights.pk3&quot; &quot;$(InputDir)static&quot;&#x0D;&#x0A;copy &quot;$(InputDir)lights.pk3&quot; &quot;$(SolutionDir)..\lights.pk3&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\CMakeLists.txt"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

130
wadsrc_lights/static/doomdefs.txt
View file

@ -38,7 +38,7 @@ pointlight ROCKET
flickerlight ROCKET_X1
{
color 1.0 0.7 0.0
color 1.0 0.7 0.5
size 64
secondarySize 72
chance 0.3
@ -46,7 +46,7 @@ flickerlight ROCKET_X1
flickerlight ROCKET_X2
{
color 0.5 0.1 0.0
color 0.5 0.3 0.2
size 80
secondarySize 88
chance 0.3
@ -54,7 +54,7 @@ flickerlight ROCKET_X2
flickerlight ROCKET_X3
{
color 0.3 0.0 0.0
color 0.3 0.1 0.1
size 96
secondarySize 104
chance 0.3
@ -72,13 +72,13 @@ object Rocket
// Plasma
pointlight PLASMABALL
{
color 0.0 0.1 1.0
color 0.5 0.5 1.0
size 56
}
flickerlight PLASMA_X1
{
color 0.2 0.2 1.0
color 0.5 0.5 1.0
size 64
secondarySize 72
chance 0.4
@ -86,7 +86,7 @@ flickerlight PLASMA_X1
flickerlight PLASMA_X2
{
color 0.2 0.2 0.8
color 0.4 0.4 0.8
size 80
secondarySize 88
chance 0.4
@ -94,7 +94,7 @@ flickerlight PLASMA_X2
flickerlight PLASMA_X3
{
color 0.1 0.1 0.5
color 0.25 0.25 0.5
size 64
secondarySize 72
chance 0.4
@ -102,7 +102,7 @@ flickerlight PLASMA_X3
flickerlight PLASMA_X4
{
color 0.0 0.0 0.2
color 0.1 0.1 0.2
size 8
secondarySize 16
chance 0.4
@ -215,13 +215,13 @@ object PlasmaBall2
// BFG
pointlight BFGBALL
{
color 0.0 1.0 0.0
color 0.5 1.0 0.5
size 80
}
flickerlight BFGBALL_X1
{
color 0.2 1.0 0.2
color 0.5 1.0 0.5
size 80
secondarySize 88
chance 0.3
@ -229,7 +229,7 @@ flickerlight BFGBALL_X1
flickerlight BFGBALL_X2
{
color 0.3 1.0 0.3
color 0.6 1.0 0.6
size 104
secondarySize 112
chance 0.3
@ -237,7 +237,7 @@ flickerlight BFGBALL_X2
flickerlight BFGBALL_X3
{
color 0.5 1.0 0.5
color 0.7 1.0 0.7
size 120
secondarySize 128
chance 0.3
@ -245,7 +245,7 @@ flickerlight BFGBALL_X3
flickerlight BFGBALL_X4
{
color 0.2 0.7 0.2
color 0.4 0.7 0.4
size 56
secondarySize 64
chance 0.3
@ -353,7 +353,7 @@ object TechLamp
// Tall red torch
flickerlight2 BIGREDTORCH
{
color 1.0 0.3 0.0
color 1.0 0.5 0.2
size 64
secondarySize 72
interval 0.1
@ -368,7 +368,7 @@ object RedTorch
// Tall green torch
flickerlight2 BIGGREENTORCH
{
color 0.0 1.0 0.0
color 0.3 1.0 0.3
size 64
secondarySize 72
interval 0.1
@ -383,7 +383,7 @@ object GreenTorch
// Tall blue torch
flickerlight2 BIGBLUETORCH
{
color 0.0 0.0 1.0
color 0.3 0.3 1.0
size 64
secondarySize 72
interval 0.1
@ -398,7 +398,7 @@ object BlueTorch
// Small red torch
flickerlight2 SMALLREDTORCH
{
color 1.0 0.3 0.0
color 1.0 0.5 0.2
size 48
secondarySize 54
interval 0.1
@ -413,7 +413,7 @@ object ShortRedTorch
// Small green torch
flickerlight2 SMALLGREENTORCH
{
color 0.0 1.0 0.0
color 0.3 1.0 0.3
size 48
secondarySize 54
interval 0.1
@ -428,7 +428,7 @@ object ShortGreenTorch
// Small blue torch
flickerlight2 SMALLBLUETORCH
{
color 0.0 0.0 1.0
color 0.3 0.3 1.0
size 48
secondarySize 54
interval 0.1
@ -443,7 +443,7 @@ object ShortBlueTorch
// Burning barrel
flickerlight2 FIREBARREL
{
color 1.0 0.9 0.0
color 1.0 0.9 0.4
size 48
secondarySize 54
interval 0.1
@ -458,7 +458,7 @@ object BurningBarrel
// Skulls w/candles
flickerlight2 SKULLCANDLES
{
color 1.0 1.0 0.0
color 1.0 1.0 0.3
size 32
secondarySize 34
interval 0.1
@ -473,7 +473,7 @@ object HeadCandles
// Candle
pointlight CANDLE
{
color 1.0 1.0 0.0
color 1.0 1.0 0.3
size 16
offset 0 16 0
}
@ -486,7 +486,7 @@ object Candlestick
// Candelabra
pointlight CANDELABRA
{
color 1.0 1.0 0.0
color 1.0 1.0 0.3
size 48
offset 0 52 0
}
@ -505,7 +505,7 @@ object Candelabra
// Soul Sphere
pulselight SOULSPHERE
{
color 0.0 0.0 1.0
color 0.3 0.3 1.0
size 40
secondarySize 42
interval 2.0
@ -520,7 +520,7 @@ object SoulSphere
// Invulnerability Sphere
pulselight INVULN
{
color 0.0 1.0 0.0
color 0.3 1.0 0.3
size 40
secondarySize 42
interval 2.0
@ -595,7 +595,7 @@ object HealthBonus
// Armour Helmet
pulselight ARMORBONUS
{
color 0.0 0.6 0.0
color 0.2 0.6 0.2
size 16
secondarySize 14
interval 1.0
@ -735,14 +735,14 @@ object DoomPlayer
// Doom Imp Fireball
pointlight IMPBALL
{
color 1.0 0.5 0.0
color 1.0 0.7 0.4
size 64
}
// Doom imp fireball explosion
flickerlight IMPBALL_X1
{
color 0.7 0.2 0.0
color 0.7 0.4 0.25
size 80
secondarySize 88
chance 0.25
@ -750,7 +750,7 @@ flickerlight IMPBALL_X1
flickerlight IMPBALL_X2
{
color 0.4 0.0 0.0
color 0.4 0.2 0.1
size 96
secondarySize 104
chance 0.25
@ -758,7 +758,7 @@ flickerlight IMPBALL_X2
flickerlight IMPBALL_X3
{
color 0.2 0.0 0.0
color 0.2 0.1 0.0
size 112
secondarySize 120
chance 0.25
@ -792,7 +792,7 @@ object Spectre
// Cacodemon fireball
flickerlight CACOBALL
{
color 1.0 0.2 0.6
color 1.0 0.5 0.8
size 56
secondarySize 64
chance 0.5
@ -800,7 +800,7 @@ flickerlight CACOBALL
flickerlight CACOBALL_X1
{
color 0.9 0.1 0.4
color 0.9 0.4 0.7
size 72
secondarySize 80
chance 0.25
@ -808,7 +808,7 @@ flickerlight CACOBALL_X1
flickerlight CACOBALL_X2
{
color 0.6 0.0 0.1
color 0.6 0.3 0.5
size 88
secondarySize 96
chance 0.25
@ -816,7 +816,7 @@ flickerlight CACOBALL_X2
flickerlight CACOBALL_X3
{
color 0.3 0.0 0.0
color 0.3 0.1 0.1
size 104
secondarySize 112
chance 0.25
@ -841,7 +841,7 @@ pointlight BARONBALL
flickerlight BARONBALL_X1
{
color 0.0 0.7 0.0
color 0.6 0.9 0.6
size 80
secondarySize 88
chance 0.25
@ -849,7 +849,7 @@ flickerlight BARONBALL_X1
flickerlight BARONBALL_X2
{
color 0.0 0.4 0.0
color 0.45 0.6 0.45
size 96
secondarySize 104
chance 0.25
@ -857,7 +857,7 @@ flickerlight BARONBALL_X2
flickerlight BARONBALL_X3
{
color 0.0 0.2 0.0
color 0.2 0.3 0.2
size 112
secondarySize 120
chance 0.25
@ -876,7 +876,7 @@ object BaronBall
// Lost Soul
flickerlight LOSTSOUL
{
color 1.0 0.3 0.0
color 1.0 0.6 0.3
size 56
secondarysize 64
chance 0.1
@ -884,7 +884,7 @@ flickerlight LOSTSOUL
flickerlight LOSTSOUL_X1
{
color 0.8 0.3 0.0
color 0.8 0.5 0.3
size 72
secondarySize 80
chance 0.25
@ -892,7 +892,7 @@ flickerlight LOSTSOUL_X1
flickerlight LOSTSOUL_X2
{
color 0.6 0.2 0.0
color 0.6 0.3 0.2
size 88
secondarySize 96
chance 0.25
@ -944,13 +944,13 @@ object FatShot
// Arachnotron Fireball
pointlight ARACHPLAS
{
color 0.6 1.0 0.0
color 0.6 1.0 0.4
size 56
}
flickerlight ARACHPLAS_X1
{
color 0.4 0.8 0.0
color 0.4 0.8 0.3
size 72
secondarySize 80
chance 0.3
@ -958,7 +958,7 @@ flickerlight ARACHPLAS_X1
flickerlight ARACHPLAS_X2
{
color 0.6 0.6 0.0
color 0.6 0.6 0.3
size 88
secondarySize 96
chance 0.3
@ -966,7 +966,7 @@ flickerlight ARACHPLAS_X2
flickerlight ARACHPLAS_X3
{
color 0.4 0.4 0.0
color 0.4 0.4 0.2
size 48
secondarySize 32
chance 0.3
@ -974,7 +974,7 @@ flickerlight ARACHPLAS_X3
flickerlight ARACHPLAS_X4
{
color 0.2 0.2 0.0
color 0.2 0.2 0.1
size 24
secondarySize 16
chance 0.3
@ -995,13 +995,13 @@ object ArachnotronPlasma
// Revenant tracer
pointlight TRACER
{
color 1.0 0.3 0.0
color 1.0 0.5 0.3
size 48
}
flickerlight TRACER_X1
{
color 1.0 0.2 0.0
color 1.0 0.5 0.2
size 64
secondarySize 72
chance 0.25
@ -1009,7 +1009,7 @@ flickerlight TRACER_X1
flickerlight TRACER_X2
{
color 0.6 0.0 0.0
color 0.6 0.3 0.1
size 80
secondarySize 88
chance 0.25
@ -1017,7 +1017,7 @@ flickerlight TRACER_X2
flickerlight TRACER_X3
{
color 0.3 0.0 0.0
color 0.3 0.1 0.0
size 96
secondarySize 104
chance 0.25
@ -1036,7 +1036,7 @@ object RevenantTracer
// Arch Vile Fire
flickerlight ARCHFIRE1
{
color 1.0 1.0 0.0
color 1.0 1.0 0.5
size 24
secondarySize 32
chance 0.3
@ -1045,7 +1045,7 @@ flickerlight ARCHFIRE1
flickerlight ARCHFIRE2
{
color 1.0 1.0 0.0
color 1.0 1.0 0.5
size 40
secondarySize 48
chance 0.3
@ -1054,7 +1054,7 @@ flickerlight ARCHFIRE2
flickerlight ARCHFIRE3
{
color 1.0 1.0 0.0
color 1.0 1.0 0.5
size 64
secondarySize 72
chance 0.3
@ -1063,7 +1063,7 @@ flickerlight ARCHFIRE3
flickerlight ARCHFIRE4
{
color 0.8 0.8 0.0
color 0.8 0.8 0.4
size 64
secondarySize 72
chance 0.3
@ -1072,7 +1072,7 @@ flickerlight ARCHFIRE4
flickerlight ARCHFIRE5
{
color 0.8 0.8 0.0
color 0.8 0.8 0.4
size 64
secondarySize 72
chance 0.3
@ -1081,7 +1081,7 @@ flickerlight ARCHFIRE5
flickerlight ARCHFIRE6
{
color 0.6 0.6 0.0
color 0.6 0.6 0.3
size 48
secondarySize 56
chance 0.3
@ -1090,7 +1090,7 @@ flickerlight ARCHFIRE6
flickerlight ARCHFIRE7
{
color 0.4 0.4 0.0
color 0.4 0.4 0.2
size 32
secondarySize 40
chance 0.3
@ -1099,7 +1099,7 @@ flickerlight ARCHFIRE7
flickerlight ARCHFIRE8
{
color 0.2 0.2 0.0
color 0.2 0.2 0.1
size 16
secondarySize 24
chance 0.3
@ -1121,7 +1121,7 @@ object ArchvileFire
// Arch-vile
flickerlight ARCHATK1
{
color 1.0 1.0 0.0
color 1.0 1.0 0.4
size 32
secondarySize 48
chance 0.3
@ -1130,7 +1130,7 @@ flickerlight ARCHATK1
flickerlight ARCHATK2
{
color 1.0 1.0 0.0
color 1.0 1.0 0.4
size 56
secondarySize 64
chance 0.3
@ -1139,7 +1139,7 @@ flickerlight ARCHATK2
flickerlight ARCHATK3
{
color 1.0 1.0 0.0
color 1.0 1.0 0.4
size 56
secondarySize 64
chance 0.3
@ -1148,7 +1148,7 @@ flickerlight ARCHATK3
flickerlight ARCHATK4
{
color 1.0 1.0 0.0
color 1.0 1.0 0.4
size 64
secondarySize 72
chance 0.3
@ -1157,7 +1157,7 @@ flickerlight ARCHATK4
flickerlight ARCHATK5
{
color 1.0 1.0 0.0
color 1.0 1.0 0.4
size 80
secondarySize 88
chance 0.3
@ -1166,7 +1166,7 @@ flickerlight ARCHATK5
flickerlight ARCHATK6
{
color 0.7 0.7 0.0
color 0.7 0.7 0.3
size 96
secondarySize 104
chance 0.3
@ -1175,7 +1175,7 @@ flickerlight ARCHATK6
flickerlight ARCHATK7
{
color 0.3 0.3 0.0
color 0.3 0.3 0.1
size 104
secondarySize 112
chance 0.3
@ -1184,7 +1184,7 @@ flickerlight ARCHATK7
pulselight ARCHRES
{
color 0.6 0.0 0.0
color 0.6 0.3 0.3
size 64
secondarySize 70
interval 0.5

188
wadsrc_lights/static/hticdefs.txt
View file

@ -9,25 +9,25 @@
// Wand puffs
pointlight WANDPUFF1
{
color 1.0 1.0 0.0
color 0.9 0.9 0.5
size 32
}
pointlight WANDPUFF2
{
color 0.7 0.7 0.0
color 0.6 0.6 0.35
size 24
}
pointlight WANDPUFF3
{
color 0.4 0.4 0.0
color 0.3 0.3 0.2
size 16
}
pointlight WANDPUFF4
{
color 0.2 0.2 0.0
color 0.15 0.15 0.1
size 8
}
@ -48,31 +48,31 @@ object GoldWandPuff2
// Tomed wand projectile
pointlight WANDBALL
{
color 1.0 1.0 0.0
color 0.9 0.9 0.5
size 24
}
pointlight WANDBALL_X1
{
color 0.8 0.8 0.0
color 0.72 0.72 0.4
size 32
}
pointlight WANDBALL_X2
{
color 0.6 0.6 0.0
color 0.54 0.54 0.3
size 34
}
pointlight WANDBALL_X3
{
color 0.4 0.4 0.0
color 0.36 0.36 0.2
size 36
}
pointlight WANDBALL_X4
{
color 0.2 0.2 0.0
color 0.18 0.18 0.1
size 38
}
@ -90,13 +90,13 @@ object GoldWandFX2
// Crossbow secondary projectile
pointlight SMALLBOWBOLT
{
color 0.0 1.0 0.0
color 0.5 1.0 0.5
size 40
}
flickerlight SMALLBOWBOLT_X1
{
color 0.0 0.7 0.0
color 0.35 0.7 0.35
size 48
secondarySize 52
chance 0.3
@ -104,7 +104,7 @@ flickerlight SMALLBOWBOLT_X1
flickerlight SMALLBOWBOLT_X2
{
color 0.0 0.4 0.0
color 0.2 0.4 0.2
size 40
secondarySize 44
chance 0.3
@ -112,7 +112,7 @@ flickerlight SMALLBOWBOLT_X2
flickerlight SMALLBOWBOLT_X3
{
color 0.0 0.2 0.0
color 0.1 0.2 0.1
size 32
secondarySize 36
chance 0.3
@ -130,13 +130,13 @@ object CrossbowFX3
// Crossbow primary proectile
pointlight BIGBOWBOLT
{
color 0.7 1.0 0.0
color 0.8 1.0 0.5
size 64
}
flickerlight BIGBOWBOLT_X1
{
color 0.4 0.8 0.0
color 0.48 0.8 0.4
size 72
secondarySize 74
chance 0.3
@ -144,7 +144,7 @@ flickerlight BIGBOWBOLT_X1
flickerlight BIGBOWBOLT_X2
{
color 0.4 0.6 0.0
color 0.44 0.6 0.3
size 56
secondarySize 64
chance 0.3
@ -152,7 +152,7 @@ flickerlight BIGBOWBOLT_X2
flickerlight BIGBOWBOLT_X3
{
color 0.2 0.4 0.0
color 0.22 0.4 0.2
size 32
secondarySize 40
chance 0.3
@ -276,13 +276,13 @@ object BlasterFX1
// Hellstaff bolt
pointlight HELLSTAFFBALL
{
color 1.0 0.2 0.2
color 1.0 0.5 0.5
size 56
}
flickerlight HELLSTAFFBALL_X1
{
color 1.0 0.4 0.4
color 1.0 0.7 0.7
size 56
secondarySize 64
chance 0.3
@ -290,7 +290,7 @@ flickerlight HELLSTAFFBALL_X1
flickerlight HELLSTAFFBALL_X2
{
color 0.8 0.3 0.3
color 0.8 0.5 0.5
size 64
secondarySize 72
chance 0.3
@ -298,7 +298,7 @@ flickerlight HELLSTAFFBALL_X2
flickerlight HELLSTAFFBALL_X3
{
color 0.6 0.2 0.2
color 0.6 0.3 0.3
size 80
secondarySize 88
chance 0.3
@ -306,7 +306,7 @@ flickerlight HELLSTAFFBALL_X3
flickerlight HELLSTAFFBALL_X4
{
color 0.4 0.1 0.1
color 0.4 0.2 0.2
size 88
secondarySize 96
chance 0.3
@ -314,7 +314,7 @@ flickerlight HELLSTAFFBALL_X4
flickerlight HELLSTAFFBALL_X5
{
color 0.2 0.0 0.0
color 0.2 0.1 0.1
size 96
secondarySize 104
chance 0.3
@ -391,7 +391,7 @@ object RainPillar
// Phoenix rod shot
pointlight PHOENIXSHOT
{
color 1.0 0.6 0.0
color 1.0 0.6 0.4
size 64
}
@ -405,7 +405,7 @@ flickerlight PHOENIX_X1
flickerlight PHOENIX_X2
{
color 1.0 0.6 0.0
color 1.0 0.6 0.3
size 88
secondarySize 96
chance 0.3
@ -413,7 +413,7 @@ flickerlight PHOENIX_X2
flickerlight PHOENIX_X3
{
color 0.8 0.6 0.0
color 0.8 0.6 0.25
size 72
secondarySize 80
chance 0.3
@ -421,7 +421,7 @@ flickerlight PHOENIX_X3
flickerlight PHOENIX_X4
{
color 0.6 0.4 0.0
color 0.6 0.4 0.2
size 56
secondarySize 64
chance 0.3
@ -429,7 +429,7 @@ flickerlight PHOENIX_X4
flickerlight PHOENIX_X5
{
color 0.4 0.2 0.0
color 0.4 0.2 0.1
size 40
secondarySize 48
chance 0.3
@ -437,7 +437,7 @@ flickerlight PHOENIX_X5
flickerlight PHOENIX_X6
{
color 0.2 0.0 0.0
color 0.2 0.1 0.0
size 24
secondarySize 32
chance 0.3
@ -460,7 +460,7 @@ object PhoenixFX1
// Phoenix rod flamethrower
flickerlight PHOENIXFLAME
{
color 0.7 0.4 0.0
color 0.7 0.4 0.2
size 48
secondarySize 56
chance 0.5
@ -468,7 +468,7 @@ flickerlight PHOENIXFLAME
flickerlight PHOENIXFLAME2
{
color 0.5 0.2 0.0
color 0.5 0.2 0.1
size 24
secondarySize 32
chance 0.5
@ -494,7 +494,7 @@ object PhoenixFX2
// Mace ball explosion
flickerlight MACEBALL_X1
{
color 0.8 0.8 0.2
color 0.8 0.8 0.4
size 64
secondarySize 72
chance 0.3
@ -502,7 +502,7 @@ flickerlight MACEBALL_X1
flickerlight MACEBALL_X2
{
color 0.6 0.6 0.1
color 0.6 0.6 0.3
size 48
secondarySize 56
chance 0.3
@ -510,7 +510,7 @@ flickerlight MACEBALL_X2
flickerlight MACEBALL_X3
{
color 0.4 0.4 0.0
color 0.4 0.4 0.2
size 32
secondarySize 40
chance 0.3
@ -518,7 +518,7 @@ flickerlight MACEBALL_X3
flickerlight MACEBALL_X4
{
color 0.2 0.2 0.0
color 0.2 0.2 0.1
size 16
secondarySize 24
chance 0.3
@ -563,13 +563,13 @@ object MaceFX4
// Heretic imp fireball
pointlight HIMPBALL
{
color 1.0 0.8 0.0
color 1.0 0.8 0.4
size 32
}
flickerlight HIMPBALL_X1
{
color 0.8 0.5 0.0
color 0.8 0.5 0.33
size 48
secondarySize 56
chance 0.3
@ -577,7 +577,7 @@ flickerlight HIMPBALL_X1
flickerlight HIMPBALL_X2
{
color 0.6 0.3 0.0
color 0.6 0.4 0.27
size 40
secondarySize 48
chance 0.3
@ -606,7 +606,7 @@ object HereticImpBall
// Mummy
flickerlight MUMMYATK
{
color 1.0 1.0 0.0
color 1.0 1.0 0.5
size 48
secondarySize 56
chance 0.4
@ -625,7 +625,7 @@ object MummyLeaderGhost
// Mummy fireball
flickerlight MUMMYBALL
{
color 1.0 1.0 0.0
color 1.0 1.0 0.5
size 40
secondarySize 48
chance 0.4
@ -633,7 +633,7 @@ flickerlight MUMMYBALL
flickerlight MUMMYBALL_X1
{
color 0.7 0.7 0.0
color 0.7 0.7 0.35
size 48
secondarySize 56
chance 0.4
@ -641,7 +641,7 @@ flickerlight MUMMYBALL_X1
flickerlight MUMMYBALL_X2
{
color 0.4 0.4 0.0
color 0.4 0.4 0.2
size 56
secondarySize 64
chance 0.4
@ -649,7 +649,7 @@ flickerlight MUMMYBALL_X2
flickerlight MUMMYBALL_X3
{
color 0.2 0.2 0.0
color 0.2 0.2 0.1
size 64
secondarySize 72
chance 0.4
@ -669,13 +669,13 @@ object MummyFX1
// Green flying axe
pointlight GREENAXE
{
color 0.0 1.0 0.0
color 0.4 1.0 0.4
size 32
}
flickerlight GREENAXE_X1
{
color 0.0 0.7 0.0
color 0.3 0.7 0.3
size 32
secondarySize 48
chance 0.3
@ -683,7 +683,7 @@ flickerlight GREENAXE_X1
flickerlight GREENAXE_X2
{
color 0.0 0.4 0.0
color 0.2 0.4 0.2
size 48
secondarySize 56
chance 0.3
@ -711,13 +711,13 @@ object KnightAxe
// Red flying axe
pointlight REDAXE
{
color 1.0 0.0 0.0
color 1.0 0.5 0.5
size 32
}
flickerlight REDAXE_X1
{
color 0.7 0.0 0.0
color 0.7 0.3 0.3
size 32
secondarySize 48
chance 0.3
@ -725,7 +725,7 @@ flickerlight REDAXE_X1
flickerlight REDAXE_X2
{
color 0.4 0.0 0.0
color 0.4 0.2 0.2
size 48
secondarySize 56
chance 0.3
@ -733,7 +733,7 @@ flickerlight REDAXE_X2
flickerlight REDAXE_X3
{
color 0.2 0.0 0.0
color 0.2 0.1 0.1
size 56
secondarySize 64
chance 0.3
@ -752,7 +752,7 @@ object RedAxe
// Disciple fireball
flickerlight DISCIPLEBALL
{
color 1.0 0.0 1.0
color 1.0 0.5 1.0
size 32
secondarySize 40
chance 0.3
@ -760,7 +760,7 @@ flickerlight DISCIPLEBALL
flickerlight DISCIPLEBALL_X1
{
color 0.7 0.0 0.7
color 0.7 0.3 0.7
size 16
secondarySize 24
chance 0.3
@ -768,7 +768,7 @@ flickerlight DISCIPLEBALL_X1
flickerlight DISCIPLEBALL_X2
{
color 0.3 0.0 0.3
color 0.3 0.17 0.3
size 8
secondarySize 16
chance 0.3
@ -852,7 +852,7 @@ pointlight FROSTBALL_X2
pointlight FROSTBALL_X3
{
color 0.0 0.0 0.4
color 0.1 0.1 0.4
size 48
}
@ -891,7 +891,7 @@ object HeadFX2
// Ironlich fire wall
flickerlight LICHFIRE
{
color 1.0 0.7 0.0
color 1.0 0.7 0.4
size 48
secondarySize 56
chance 0.5
@ -899,7 +899,7 @@ flickerlight LICHFIRE
flickerlight LICHFIRE_X1
{
color 0.9 0.4 0.0
color 0.9 0.4 0.3
size 56
secondarySize 64
chance 0.5
@ -907,7 +907,7 @@ flickerlight LICHFIRE_X1
flickerlight LICHFIRE_X2
{
color 0.7 0.1 0.0
color 0.7 0.1 0.2
size 48
secondarySize 56
chance 0.5
@ -915,7 +915,7 @@ flickerlight LICHFIRE_X2
flickerlight LICHFIRE_X3
{
color 0.4 0.0 0.0
color 0.4 0.1 0.1
size 40
secondarySize 48
chance 0.5
@ -1000,7 +1000,7 @@ object Beast
// Weredragon fireball
flickerlight BEASTBALL
{
color 1.0 0.4 0.0
color 1.0 0.5 0.3
size 48
secondarySize 56
chance 0.3
@ -1008,7 +1008,7 @@ flickerlight BEASTBALL
flickerlight BEASTBALL_X1
{
color 0.8 0.2 0.0
color 0.8 0.4 0.24
size 48
secondarySize 56
chance 0.3
@ -1016,7 +1016,7 @@ flickerlight BEASTBALL_X1
flickerlight BEASTBALL_X2
{
color 0.6 0.0 0.0
color 0.6 0.3 0.2
size 40
secondarySize 48
chance 0.3
@ -1024,7 +1024,7 @@ flickerlight BEASTBALL_X2
flickerlight BEASTBALL_X3
{
color 0.4 0.0 0.0
color 0.4 0.2 0.1
size 32
secondarySize 40
chance 0.3
@ -1067,7 +1067,7 @@ flickerlight SNAKESHOT1_X1
flickerlight SNAKESHOT1_X2
{
color 0.4 0.1 0.7
color 0.4 0.2 0.7
size 24
secondarySize 26
chance 0.3
@ -1075,7 +1075,7 @@ flickerlight SNAKESHOT1_X2
flickerlight SNAKESHOT1_X3
{
color 0.3 0.0 0.5
color 0.3 0.1 0.5
size 28
secondarySize 30
chance 0.3
@ -1105,13 +1105,13 @@ object SnakeProjA
// Large ophidian shot
pointlight SNAKESHOT2
{
color 1.0 0.6 0.0
color 1.0 0.6 0.4
size 32
}
flickerlight SNAKESHOT2_X1
{
color 1.0 0.6 0.0
color 1.0 0.6 0.4
size 40
secondarySize 48
chance 0.3
@ -1119,7 +1119,7 @@ flickerlight SNAKESHOT2_X1
flickerlight SNAKESHOT2_X2
{
color 0.6 0.3 0.0
color 0.6 0.3 0.25
size 48
secondarySize 52
chance 0.3
@ -1127,7 +1127,7 @@ flickerlight SNAKESHOT2_X2
flickerlight SNAKESHOT2_X3
{
color 0.3 0.0 0.0
color 0.3 0.1 0.1
size 44
secondarySize 48
chance 0.3
@ -1146,7 +1146,7 @@ object SnakeProjB
// Maulotaur fireball
flickerlight MAULBALL
{
color 1.0 0.7 0.0
color 1.0 0.7 0.5
size 40
secondarySize 48
chance 0.5
@ -1154,7 +1154,7 @@ flickerlight MAULBALL
flickerlight MAULBALL_X1
{
color 0.8 0.6 0.0
color 0.8 0.6 0.4
size 56
secondarySize 64
chance 0.3
@ -1162,7 +1162,7 @@ flickerlight MAULBALL_X1
flickerlight MAULBALL_X2
{
color 0.8 0.4 0.0
color 0.8 0.4 0.3
size 56
secondarySize 64
chance 0.3
@ -1170,7 +1170,7 @@ flickerlight MAULBALL_X2
flickerlight MAULBALL_X3
{
color 0.6 0.2 0.0
color 0.6 0.3 0.2
size 40
secondarySize 48
chance 0.3
@ -1200,7 +1200,7 @@ object MinotaurFX1
// Maulotaur ground flame
pulselight MAULFLAME
{
color 1.0 0.7 0.0
color 1.0 0.7 0.5
size 1
secondarySize 64
interval 6.0
@ -1208,7 +1208,7 @@ pulselight MAULFLAME
flickerlight MAULFLAME_X1
{
color 1.0 0.7 0.0
color 1.0 0.7 0.5
size 48
secondarySize 56
chance 0.3
@ -1216,7 +1216,7 @@ flickerlight MAULFLAME_X1
flickerlight MAULFLAME_X2
{
color 1.0 0.7 0.0
color 1.0 0.7 0.5
size 56
secondarySize 64
chance 0.3
@ -1224,7 +1224,7 @@ flickerlight MAULFLAME_X2
flickerlight MAULFLAME_X3
{
color 0.7 0.4 0.0
color 0.7 0.4 0.3
size 64
secondarySize 68
chance 0.3
@ -1232,7 +1232,7 @@ flickerlight MAULFLAME_X3
flickerlight MAULFLAME_X4
{
color 0.5 0.1 0.0
color 0.5 0.3 0.1
size 68
secondarySize 72
chance 0.3
@ -1266,7 +1266,7 @@ object MinotaurFX3
// D'Sparil serpent fireball
flickerlight SERPENTBALL
{
color 1.0 0.95 0.0
color 1.0 0.95 0.5
size 56
secondarySize 64
chance 0.5
@ -1274,7 +1274,7 @@ flickerlight SERPENTBALL
flickerlight SERPENTBALL_X1
{
color 1.0 0.95 0.0
color 1.0 0.95 0.5
size 64
secondarySize 72
chance 0.5
@ -1282,7 +1282,7 @@ flickerlight SERPENTBALL_X1
flickerlight SERPENTBALL_X2
{
color 0.8 0.8 0.0
color 0.8 0.8 0.4
size 72
secondarySize 80
chance 0.5
@ -1290,7 +1290,7 @@ flickerlight SERPENTBALL_X2
flickerlight SERPENTBALL_X3
{
color 0.5 0.5 0.0
color 0.5 0.5 0.25
size 88
secondarySize 96
chance 0.5
@ -1298,7 +1298,7 @@ flickerlight SERPENTBALL_X3
flickerlight SERPENTBALL_X4
{
color 0.2 0.2 0.0
color 0.2 0.2 0.1
size 96
secondarySize 104
chance 0.5
@ -1320,7 +1320,7 @@ object SorcererFX1
// D'Sparil blue bolt
flickerlight DSPARILBALL
{
color 0.3 0.3 1.0
color 0.5 0.5 1.0
size 56
secondarySize 64
chance 0.5
@ -1328,7 +1328,7 @@ flickerlight DSPARILBALL
flickerlight DSPARILBALL_X1
{
color 0.3 0.3 1.0
color 0.5 0.5 1.0
size 64
secondarySize 72
chance 0.3
@ -1336,7 +1336,7 @@ flickerlight DSPARILBALL_X1
flickerlight DSPARILBALL_X2
{
color 0.2 0.2 0.8
color 0.4 0.4 0.8
size 80
secondarySize 88
chance 0.3
@ -1344,7 +1344,7 @@ flickerlight DSPARILBALL_X2
flickerlight DSPARILBALL_X3
{
color 0.1 0.1 0.6
color 0.3 0.3 0.6
size 88
secondarySize 92
chance 0.3
@ -1352,7 +1352,7 @@ flickerlight DSPARILBALL_X3
flickerlight DSPARILBALL_X4
{
color 0.0 0.0 0.4
color 0.2 0.2 0.4
size 82
secondarySize 86
chance 0.3
@ -1360,7 +1360,7 @@ flickerlight DSPARILBALL_X4
flickerlight DSPARILBALL_X5
{
color 0.0 0.0 0.2
color 0.1 0.1 0.2
size 82
secondarySize 86
chance 0.3
@ -1503,7 +1503,7 @@ object Pod
// Big volcano fireball
flickerlight VOLCANOBALL1
{
color 1.0 0.5 0.0
color 1.0 0.7 0.5
size 56
secondarySize 64
chance 0.5
@ -1574,7 +1574,7 @@ object KeyGizmoGreen
// Time bomb explosion
flickerlight TIMEBOMB_X1
{
color 1.0 0.6 0.0
color 1.0 0.6 0.4
size 48
secondarySize 56
chance 0.3
@ -1582,7 +1582,7 @@ flickerlight TIMEBOMB_X1
flickerlight TIMEBOMB_X1
{
color 0.8 0.4 0.0
color 0.8 0.4 0.3
size 56
secondarySize 64
chance 0.3
@ -1590,7 +1590,7 @@ flickerlight TIMEBOMB_X1
flickerlight TIMEBOMB_X1
{
color 0.6 0.2 0.0
color 0.6 0.3 0.2
size 64
secondarySize 72
chance 0.3
@ -1598,7 +1598,7 @@ flickerlight TIMEBOMB_X1
flickerlight TIMEBOMB_X1
{
color 0.4 0.0 0.0
color 0.4 0.2 0.1
size 72
secondarySize 80
chance 0.3
@ -1606,7 +1606,7 @@ flickerlight TIMEBOMB_X1
flickerlight TIMEBOMB_X1
{
color 0.2 0.0 0.0
color 0.2 0.1 0.0
size 80
secondarySize 88
chance 0.3