From 62adba55025b25f196b60a663acf9527b9a17ff0 Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Fri, 18 Nov 2022 20:31:34 +0100 Subject: [PATCH] Revert code and set the inverted settings --- qcsrc/common/mutators/mutator/overkill/oknex.qc | 2 +- qcsrc/common/weapons/weapon/vortex.qc | 2 +- xonotic-common.cfg | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 881ff5dfe..4e001a65c 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -17,7 +17,7 @@ METHOD(OverkillNex, wr_glow, vector(OverkillNex this, entity actor, entity wepen g.x = f * autocvar_g_weapon_charge_colormod_red_half; g.y = f * autocvar_g_weapon_charge_colormod_green_half; g.z = f * autocvar_g_weapon_charge_colormod_blue_half; - if (charge < animlimit) + if (charge > animlimit) { f = autocvar_g_weapon_charge_colormod_hdrmultiplier * (charge - animlimit) / (1 - animlimit); g.x += f * autocvar_g_weapon_charge_colormod_red_full; diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index a8f82df1c..98762a03e 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -22,7 +22,7 @@ METHOD(Vortex, wr_glow, vector(Vortex this, entity actor, entity wepent)) g.x = f * autocvar_g_weapon_charge_colormod_red_half; g.y = f * autocvar_g_weapon_charge_colormod_green_half; g.z = f * autocvar_g_weapon_charge_colormod_blue_half; - if (charge < animlimit) + if (charge > animlimit) { f = autocvar_g_weapon_charge_colormod_hdrmultiplier * (charge - animlimit) / (1 - animlimit); g.x += f * autocvar_g_weapon_charge_colormod_red_full; diff --git a/xonotic-common.cfg b/xonotic-common.cfg index 96c7d83e6..56536a807 100644 --- a/xonotic-common.cfg +++ b/xonotic-common.cfg @@ -125,9 +125,9 @@ mod_q3shader_default_polygonfactor 0 // random charge stuff :P set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" -set g_weapon_charge_colormod_red_half 0 -set g_weapon_charge_colormod_green_half 0.5 -set g_weapon_charge_colormod_blue_half 1 +set g_weapon_charge_colormod_red_half 1 +set g_weapon_charge_colormod_green_half 0 +set g_weapon_charge_colormod_blue_half 0 set g_weapon_charge_colormod_red_full -1 set g_weapon_charge_colormod_green_full 0.5 set g_weapon_charge_colormod_blue_full 1 -- 2.39.2