diff --git a/Readme.md b/Readme.md index a975f37..2180b5a 100644 --- a/Readme.md +++ b/Readme.md @@ -3,7 +3,7 @@ What began as a test for importing UT vertex meshes has turned into an actual full UT weapon and item mod. -This mod requires GZDoom 3.4.0 or later. +This mod requires GZDoom 3.5.0 or later. ## Currently implemented @@ -66,6 +66,7 @@ This mod requires GZDoom 3.4.0 or later. - Add ammo counters to Pulsegun, Minigun, Flak Cannon and Rocket Launcher once scripted textures are implemented. - Add player models + weapon attachment support when that is also added in. + - Add option to have UT-like player movement physics. ## Known bugs diff --git a/brightmaps/Chunk_a00.png b/brightmaps/Chunk_a00.png index 7830b54..1b76008 100644 Binary files a/brightmaps/Chunk_a00.png and b/brightmaps/Chunk_a00.png differ diff --git a/brightmaps/Chunk_a01.png b/brightmaps/Chunk_a01.png index cf38e53..7eeb1fb 100644 Binary files a/brightmaps/Chunk_a01.png and b/brightmaps/Chunk_a01.png differ diff --git a/brightmaps/Chunk_a02.png b/brightmaps/Chunk_a02.png index 391ed07..f296114 100644 Binary files a/brightmaps/Chunk_a02.png and b/brightmaps/Chunk_a02.png differ diff --git a/brightmaps/Chunk_a03.png b/brightmaps/Chunk_a03.png index de90579..d8df18b 100644 Binary files a/brightmaps/Chunk_a03.png and b/brightmaps/Chunk_a03.png differ diff --git a/brightmaps/Chunk_a04.png b/brightmaps/Chunk_a04.png index a9033ae..0701737 100644 Binary files a/brightmaps/Chunk_a04.png and b/brightmaps/Chunk_a04.png differ diff --git a/brightmaps/Chunk_a05.png b/brightmaps/Chunk_a05.png index 1019065..4cbfdde 100644 Binary files a/brightmaps/Chunk_a05.png and b/brightmaps/Chunk_a05.png differ diff --git a/brightmaps/Chunk_a06.png b/brightmaps/Chunk_a06.png index 093914a..b96d2ab 100644 Binary files a/brightmaps/Chunk_a06.png and b/brightmaps/Chunk_a06.png differ diff --git a/brightmaps/Chunk_a07.png b/brightmaps/Chunk_a07.png index e768118..526fe05 100644 Binary files a/brightmaps/Chunk_a07.png and b/brightmaps/Chunk_a07.png differ diff --git a/brightmaps/Chunk_a08.png b/brightmaps/Chunk_a08.png index 9f200a4..cab6f3a 100644 Binary files a/brightmaps/Chunk_a08.png and b/brightmaps/Chunk_a08.png differ diff --git a/brightmaps/Chunk_a09.png b/brightmaps/Chunk_a09.png index 70a1f24..49e3c30 100644 Binary files a/brightmaps/Chunk_a09.png and b/brightmaps/Chunk_a09.png differ diff --git a/brightmaps/Chunk_a10.png b/brightmaps/Chunk_a10.png index 70a1f24..49e3c30 100644 Binary files a/brightmaps/Chunk_a10.png and b/brightmaps/Chunk_a10.png differ diff --git a/brightmaps/Chunk_a11.png b/brightmaps/Chunk_a11.png index 70a1f24..49e3c30 100644 Binary files a/brightmaps/Chunk_a11.png and b/brightmaps/Chunk_a11.png differ diff --git a/cvarinfo.txt b/cvarinfo.txt index 938fe54..5dc18f3 100644 --- a/cvarinfo.txt +++ b/cvarinfo.txt @@ -19,3 +19,4 @@ user float flak_weaponsize = 0.8; // 0.2 <-> 1.0 in steps of 0.2 (default 0.8) user float flak_statussize = 1.0; // 0.5 <-> 1.5 in steps of 0.1 (default 1.0) user bool flak_footsteps = true; server bool flak_translocator = false; +user bool flak_noswitchdeemer = true; // don't switch to redeemer when out of ammo diff --git a/gldefs.txt b/gldefs.txt index 6f3f7f2..fc91135 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -50,29 +50,20 @@ Brightmap Texture "FIZZHP23" { Map "brightmaps/fullbright.png" } -/*Brightmap Texture "models/jhbox1.png" -{ - Map "brightmaps/jhbox1.png" -}*/ HardwareShader Texture "models/jhbox1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/jhbox1.png" } -/*Brightmap Texture "models/bossheadT.png" -{ - Map "brightmaps/bossheadT.png" -}*/ HardwareShader Texture "models/bossheadT.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/bossheadT.png" } -/*Brightmap Texture "models/JBRifle2.png" -{ - Map "brightmaps/JBRifle2.png" -}*/ HardwareShader Texture "models/JBRifle2.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JBRifle2.png" } Brightmap Texture "models/JBRifle21.png" { @@ -90,21 +81,15 @@ Brightmap Texture "models/JBRifle24.png" { Map "brightmaps/JBRifle24.png" } -/*Brightmap Texture "models/JBammo1.png" -{ - Map "brightmaps/JBammo1.png" -}*/ HardwareShader Texture "models/JBammo1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JBammo1.png" } -/*Brightmap Texture "models/ASMD_t.png" -{ - Map "brightmaps/ASMD_t.png" -}*/ HardwareShader Texture "models/ASMD_t.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/ASMD_t.png" } Brightmap Texture "models/ASMD_t1.png" { @@ -118,29 +103,20 @@ Brightmap Texture "models/ASMD_t4.png" { Map "brightmaps/ASMD_t4.png" } -/*Brightmap Texture "models/JShockCore.png" -{ - Map "brightmaps/JShockCore.png" -}*/ HardwareShader Texture "models/JShockCore.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JShockCore.png" } -/*Brightmap Texture "models/JShockCore_2.png" -{ - Map "brightmaps/JShockCore_2.png" -}*/ HardwareShader Texture "models/JShockCore_2.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JShockCore_2.png" } -/*Brightmap Texture "models/SASMD_t.png" -{ - Map "brightmaps/ASMD_t.png" -}*/ HardwareShader Texture "models/SASMD_t.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/ASMD_t.png" } Brightmap Texture "models/SASMD_t1.png" { @@ -154,13 +130,10 @@ Brightmap Texture "models/SASMD_t4.png" { Map "brightmaps/ASMD_t4.png" } -/*Brightmap Texture "models/JSShockCore.png" -{ - Map "brightmaps/JShockCore.png" -}*/ HardwareShader Texture "models/JSShockCore.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JShockCore.png" } Brightmap Texture "models/Jwarhead2.png" { @@ -170,33 +143,24 @@ Brightmap Texture "models/Jwarhead4.png" { Map "brightmaps/Jwarhead4.png" } -/*Brightmap Texture "models/Jwhpick1.png" -{ - Map "brightmaps/Jwhpick1.png" -}*/ HardwareShader Texture "models/Jwhpick1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/Jwhpick1.png" } -/*Brightmap Texture "models/JPammo_01.png" -{ - Map "brightmaps/JPammo_01.png" -}*/ HardwareShader Texture "models/JPammo_01.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JPammo_01.png" } Brightmap Texture "models/JPulseGun_02.png" { Map "brightmaps/JPulseGun_02.png" } -/*Brightmap Texture "models/JPulsePickup_01.png" -{ - Map "brightmaps/JPulsePickup_01.png" -}*/ HardwareShader Texture "models/JPulsePickup_01.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JPulsePickup_01.png" } Brightmap Texture "models/AmmoLedBase.png" { @@ -246,53 +210,35 @@ HardwareShader Texture "models/Jmissile_01_.png" { Shader "shaders/glsl/AmbientGlow.fp" } -/*Brightmap Texture "models/AUbelt1.png" -{ - Map "brightmaps/AUbelt1.png" -}*/ HardwareShader Texture "models/AUbelt1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/AUbelt1.png" } -/*Brightmap Texture "models/jinvis.png" -{ - Map "brightmaps/jinvis.png" -}*/ HardwareShader Texture "models/jinvis.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/jinvis.png" } -/*Brightmap Texture "models/Jlboot2.png" -{ - Map "brightmaps/Jlboot2.png" -}*/ HardwareShader Texture "models/Jlboot2.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/Jlboot2.png" } -/*Brightmap Texture "models/JRelicSkull_01b.png" -{ - Map "brightmaps/JRelicSkull_01b.png" -}*/ HardwareShader Texture "models/JRelicSkull_01b.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JRelicSkull_01.png" } -/*Brightmap Texture "models/JRelicSkull_01g.png" -{ - Map "brightmaps/JRelicSkull_01g.png" -}*/ HardwareShader Texture "models/JRelicSkull_01g.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JRelicSkull_01.png" } -/*Brightmap Texture "models/JRelicSkull_01r.png" -{ - Map "brightmaps/JRelicSkull_01r.png" -}*/ HardwareShader Texture "models/JRelicSkull_01r.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JRelicSkull_01.png" } HardwareShader Texture "models/BlueSkin2.png" { @@ -338,13 +284,10 @@ HardwareShader Texture "models/JRifle2.png" { Shader "shaders/glsl/AmbientGlow.fp" } -/*Brightmap Texture "models/JRazorw.png" -{ - Map "brightmaps/JRazorw.png" -}*/ HardwareShader Texture "models/JRazorw.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JRazorw.png" } Brightmap Texture "models/JRazor2.png" { @@ -389,10 +332,12 @@ Brightmap Texture "models/miniammoledbase.png" HardwareShader Texture "models/tloc1_.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/tloc1.png" } HardwareShader Texture "models/tloc2_.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/tloc2.png" } HardwareShader Texture "invis00" { @@ -522,21 +467,15 @@ HardwareShader Texture "invis31" { Shader "shaders/glsl/MeshEnviroMap.fp" } -/*Brightmap Texture "models/JTranslator1.png" -{ - Map "brightmaps/JTranslator1.png" -}*/ HardwareShader Texture "models/JTranslator1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JTranslator1.png" } -/*Brightmap Texture "models/JBigFlash1.png" -{ - Map "brightmaps/JBigFlash1.png" -}*/ HardwareShader Texture "models/JBigFlash1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" + Texture "brighttex" "brightmaps/JBigFlash1.png" } Brightmap Texture "models/Chunk_a00.png" { diff --git a/graphics/M_DOOM.png b/graphics/M_DOOM.png index b5e7a37..67b138d 100644 Binary files a/graphics/M_DOOM.png and b/graphics/M_DOOM.png differ diff --git a/menudef.txt b/menudef.txt index f1e3b8a..06841a1 100644 --- a/menudef.txt +++ b/menudef.txt @@ -23,6 +23,8 @@ OptionMenu "UTOptionMenu" Option "Enforcer Reloading", "flak_enforcerreload", "YesNo" Option "Pulsegun Reloading", "flak_pulsereload", "YesNo" Option "Redeemer Target Visuals", "flak_redeemerreadout", "YesNo" + Option "No Redeemer Autoswitch", "flak_noswitchdeemer", "YesNo" + StaticText " " Option "Enable Translocator", "flak_translocator", "YesNo" Command "Apply Changes", "event refreshtrans" StaticText " " diff --git a/modeldef.impact b/modeldef.impact index 5c19503..8832db6 100644 --- a/modeldef.impact +++ b/modeldef.impact @@ -1,4 +1,3 @@ - Model "ImpactHammer" { Path "models" diff --git a/models/ASMD_t.png b/models/ASMD_t.png index b3ea076..78be174 100644 Binary files a/models/ASMD_t.png and b/models/ASMD_t.png differ diff --git a/models/AUbelt1.png b/models/AUbelt1.png index 0056682..2c57b2b 100644 Binary files a/models/AUbelt1.png and b/models/AUbelt1.png differ diff --git a/models/JBRifle2.png b/models/JBRifle2.png index 9937068..9a01ed8 100644 Binary files a/models/JBRifle2.png and b/models/JBRifle2.png differ diff --git a/models/JBammo1.png b/models/JBammo1.png index c2ace2c..fb5cf71 100644 Binary files a/models/JBammo1.png and b/models/JBammo1.png differ diff --git a/models/JBigFlash1.png b/models/JBigFlash1.png index c623db0..f62569c 100644 Binary files a/models/JBigFlash1.png and b/models/JBigFlash1.png differ diff --git a/models/JPammo_01.png b/models/JPammo_01.png index 13222a9..fa98b92 100644 Binary files a/models/JPammo_01.png and b/models/JPammo_01.png differ diff --git a/models/JPulsePickup_01.png b/models/JPulsePickup_01.png index 593845b..9a85ee9 100644 Binary files a/models/JPulsePickup_01.png and b/models/JPulsePickup_01.png differ diff --git a/models/JRelicSkull_01b.png b/models/JRelicSkull_01b.png index aca6cf2..52182ba 100644 Binary files a/models/JRelicSkull_01b.png and b/models/JRelicSkull_01b.png differ diff --git a/models/JRelicSkull_01g.png b/models/JRelicSkull_01g.png index a408e89..60a925d 100644 Binary files a/models/JRelicSkull_01g.png and b/models/JRelicSkull_01g.png differ diff --git a/models/JRelicSkull_01r.png b/models/JRelicSkull_01r.png index 20ff2a7..e608a56 100644 Binary files a/models/JRelicSkull_01r.png and b/models/JRelicSkull_01r.png differ diff --git a/models/JSShockCore.png b/models/JSShockCore.png index 2d0f151..374f0a9 100644 Binary files a/models/JSShockCore.png and b/models/JSShockCore.png differ diff --git a/models/JShockCore.png b/models/JShockCore.png index c268e73..5ed4111 100644 Binary files a/models/JShockCore.png and b/models/JShockCore.png differ diff --git a/models/JShockCore_2.png b/models/JShockCore_2.png index 2c5fc1f..1a179a3 100644 Binary files a/models/JShockCore_2.png and b/models/JShockCore_2.png differ diff --git a/models/JTranslator1.png b/models/JTranslator1.png index 85990a5..c23f04d 100644 Binary files a/models/JTranslator1.png and b/models/JTranslator1.png differ diff --git a/models/Jhbox1.png b/models/Jhbox1.png index b8d75dd..bd5d6f5 100644 Binary files a/models/Jhbox1.png and b/models/Jhbox1.png differ diff --git a/models/Jlboot2.png b/models/Jlboot2.png index 52cb0e4..ed95c0a 100644 Binary files a/models/Jlboot2.png and b/models/Jlboot2.png differ diff --git a/models/Jwhpick1.png b/models/Jwhpick1.png index 3e3ed65..f2b7669 100644 Binary files a/models/Jwhpick1.png and b/models/Jwhpick1.png differ diff --git a/models/SASMD_t.png b/models/SASMD_t.png index bf24689..fc83191 100644 Binary files a/models/SASMD_t.png and b/models/SASMD_t.png differ diff --git a/models/bossheadT.png b/models/bossheadT.png index fb5ca71..f669912 100644 Binary files a/models/bossheadT.png and b/models/bossheadT.png differ diff --git a/models/jinvis.png b/models/jinvis.png index a565d34..d644ef9 100644 Binary files a/models/jinvis.png and b/models/jinvis.png differ diff --git a/models/sbolt0.png b/models/sbolt0.png index e1ec9ed..98d4f3d 100644 Binary files a/models/sbolt0.png and b/models/sbolt0.png differ diff --git a/models/sbolt1.png b/models/sbolt1.png index 4799655..b5a9b52 100644 Binary files a/models/sbolt1.png and b/models/sbolt1.png differ diff --git a/models/sbolt2.png b/models/sbolt2.png index ad587a0..965c8d5 100644 Binary files a/models/sbolt2.png and b/models/sbolt2.png differ diff --git a/models/sbolt3.png b/models/sbolt3.png index c028198..f5b832f 100644 Binary files a/models/sbolt3.png and b/models/sbolt3.png differ diff --git a/models/sbolt4.png b/models/sbolt4.png index 9ccef7a..61af07a 100644 Binary files a/models/sbolt4.png and b/models/sbolt4.png differ diff --git a/models/tloc1_.png b/models/tloc1_.png index ff794b0..b17dd2f 100644 Binary files a/models/tloc1_.png and b/models/tloc1_.png differ diff --git a/models/tloc2_.png b/models/tloc2_.png index 1651a8f..cf751fb 100644 Binary files a/models/tloc2_.png and b/models/tloc2_.png differ diff --git a/shaders/glsl/AmbientGlow_Brightmapped.fp b/shaders/glsl/AmbientGlow_Brightmapped.fp index fb739d7..d8da495 100644 --- a/shaders/glsl/AmbientGlow_Brightmapped.fp +++ b/shaders/glsl/AmbientGlow_Brightmapped.fp @@ -4,12 +4,12 @@ #define PI 3.14159265 vec4 ProcessLight( vec4 color ) { - float bright = getTexel(vTexCoord.st).a; + float bright = texture(brighttex,vTexCoord.st).x; float glow = (1.0+sin(timer*2*PI))*0.25; return vec4(min(color.rgb+vec3(bright)+vec3(glow),1.0),color.a); } vec4 ProcessTexel() { - return vec4(getTexel(vTexCoord.st).rgb,1.0); + return getTexel(vTexCoord.st); } diff --git a/shaders/glsl/MeshEnviroMap_AmbientGlow.fp b/shaders/glsl/MeshEnviroMap_AmbientGlow.fp index 3c73e00..b7cdab7 100644 --- a/shaders/glsl/MeshEnviroMap_AmbientGlow.fp +++ b/shaders/glsl/MeshEnviroMap_AmbientGlow.fp @@ -2,7 +2,7 @@ #define PI 3.14159265 vec4 ProcessLight( vec4 color ) { - float glow = (1.0+sin(timer*4*PI))*0.25; + float glow = (1.0+sin(timer*2*PI))*0.25; return vec4(min(color.rgb+vec3(glow),1.0),color.a); } diff --git a/sprites/GEX2A0.png b/sprites/GEX2A0.png index e53a61d..26ad46c 100644 Binary files a/sprites/GEX2A0.png and b/sprites/GEX2A0.png differ diff --git a/sprites/GEX2B0.png b/sprites/GEX2B0.png index 6a53aac..cbf9675 100644 Binary files a/sprites/GEX2B0.png and b/sprites/GEX2B0.png differ diff --git a/sprites/GEX2E0.png b/sprites/GEX2E0.png index 6004e4f..9d332af 100644 Binary files a/sprites/GEX2E0.png and b/sprites/GEX2E0.png differ diff --git a/sprites/GEX2F0.png b/sprites/GEX2F0.png index 2148959..6e1efa8 100644 Binary files a/sprites/GEX2F0.png and b/sprites/GEX2F0.png differ diff --git a/sprites/GEX2G0.png b/sprites/GEX2G0.png index 3458b08..1432c31 100644 Binary files a/sprites/GEX2G0.png and b/sprites/GEX2G0.png differ diff --git a/sprites/GEX2H0.png b/sprites/GEX2H0.png index bf4c1a0..60a8413 100644 Binary files a/sprites/GEX2H0.png and b/sprites/GEX2H0.png differ diff --git a/sprites/GEX2I0.png b/sprites/GEX2I0.png index dbbd3b1..9d878a7 100644 Binary files a/sprites/GEX2I0.png and b/sprites/GEX2I0.png differ diff --git a/sprites/GEX2J0.png b/sprites/GEX2J0.png index 8117d0a..4ea38dc 100644 Binary files a/sprites/GEX2J0.png and b/sprites/GEX2J0.png differ diff --git a/sprites/GEX2K0.png b/sprites/GEX2K0.png index 4d8dfe6..20ee7bd 100644 Binary files a/sprites/GEX2K0.png and b/sprites/GEX2K0.png differ diff --git a/sprites/GEX3A0.png b/sprites/GEX3A0.png index bb6c1dd..57c87a1 100644 Binary files a/sprites/GEX3A0.png and b/sprites/GEX3A0.png differ diff --git a/sprites/GEX3C0.png b/sprites/GEX3C0.png index 33ab0dc..4c458ad 100644 Binary files a/sprites/GEX3C0.png and b/sprites/GEX3C0.png differ diff --git a/sprites/GEX3E0.png b/sprites/GEX3E0.png index aa4fbd2..62893f0 100644 Binary files a/sprites/GEX3E0.png and b/sprites/GEX3E0.png differ diff --git a/sprites/GEX3F0.png b/sprites/GEX3F0.png index b97b392..37346d5 100644 Binary files a/sprites/GEX3F0.png and b/sprites/GEX3F0.png differ diff --git a/sprites/GEX3G0.png b/sprites/GEX3G0.png index da90ceb..826ff21 100644 Binary files a/sprites/GEX3G0.png and b/sprites/GEX3G0.png differ diff --git a/sprites/GEX3H0.png b/sprites/GEX3H0.png index 5acc511..d3d4bef 100644 Binary files a/sprites/GEX3H0.png and b/sprites/GEX3H0.png differ diff --git a/sprites/GEX3I0.png b/sprites/GEX3I0.png index ae897a2..15d4675 100644 Binary files a/sprites/GEX3I0.png and b/sprites/GEX3I0.png differ diff --git a/sprites/GEX3J0.png b/sprites/GEX3J0.png index a2e0922..91ab3d9 100644 Binary files a/sprites/GEX3J0.png and b/sprites/GEX3J0.png differ diff --git a/sprites/GEX3K0.png b/sprites/GEX3K0.png index 0cc6081..575acf7 100644 Binary files a/sprites/GEX3K0.png and b/sprites/GEX3K0.png differ diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc index 505599a..0fa59e4 100644 --- a/zscript/warheadlauncher.zsc +++ b/zscript/warheadlauncher.zsc @@ -560,13 +560,17 @@ Class RedeemerHUDHandler : EventHandler Class WarheadLauncher : UTWeapon replaces BFG9000 { + transient CVar noswitchdeemer; Actor guided; override void Tick() { Super.Tick(); - if ( !Owner ) return; + if ( !Owner || !Owner.player ) return; if ( guided ) crosshair = 99; else crosshair = 0; + if ( !noswitchdeemer ) noswitchdeemer = CVar.GetCVar('flak_noswitchdeemer',Owner.player); + if ( noswitchdeemer.GetBool() ) SelectionOrder = int.max; + else SelectionOrder = 0; } action void A_WarheadFire() {