From: Terri00 Date: Mon, 18 Mar 2019 17:52:16 +0000 (+0000) Subject: correct gradient names X-Git-Url: https://skaterift.com/git/?a=commitdiff_plain;h=8240b4d447c202f5809b7529ce0594ed841d132d;p=tar-legacy.git correct gradient names --- diff --git a/MCDV/main.cpp b/MCDV/main.cpp index bdd5dc5..8ce3997 100644 --- a/MCDV/main.cpp +++ b/MCDV/main.cpp @@ -295,7 +295,7 @@ int app(int argc, const char** argv) { // Color scheme std::string schemeNum = kv::tryGetStringValue(tar_config->keyValues, "colorScheme", "0"); - if (schemeNum == "7") { // Custom color scheme + if (schemeNum == "-1") { // Custom color scheme tar_cfg_gradientMap = new GradientTexture( kv::tryGetStringValue(tar_config->keyValues, "customCol0", "0 0 0 255"), kv::tryGetStringValue(tar_config->keyValues, "customCol1", "128 128 128 255"), diff --git a/MCDV/sample_stuff/de_tavr_test.vmx b/MCDV/sample_stuff/de_tavr_test.vmx index b1237b1..d463c67 100644 --- a/MCDV/sample_stuff/de_tavr_test.vmx +++ b/MCDV/sample_stuff/de_tavr_test.vmx @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8075" - "mapversion" "91" + "mapversion" "94" "formatversion" "100" "prefab" "0" } @@ -38,7 +38,7 @@ viewsettings world { "id" "1" - "mapversion" "91" + "mapversion" "94" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -2375,7 +2375,7 @@ entity "id" "484" "classname" "tar_config" "aoSize" "10" - "colorScheme" "1" + "colorScheme" "-1" "customCol0" "32 68 136" "customCol1" "149 0 0" "customCol2" "179 217 26" diff --git a/MCDV/textures/gradients/gradientmap.png b/MCDV/textures/gradients/gradientmap.png deleted file mode 100644 index 231bf8a..0000000 Binary files a/MCDV/textures/gradients/gradientmap.png and /dev/null differ diff --git a/MCDV/textures/gradients/gradientmap_0.png b/MCDV/textures/gradients/gradientmap_0.png new file mode 100644 index 0000000..231bf8a Binary files /dev/null and b/MCDV/textures/gradients/gradientmap_0.png differ diff --git a/MCDV/textures/gradients/gradientmap_1.png b/MCDV/textures/gradients/gradientmap_1.png index 4b5639a..e238b94 100644 Binary files a/MCDV/textures/gradients/gradientmap_1.png and b/MCDV/textures/gradients/gradientmap_1.png differ diff --git a/MCDV/textures/gradients/gradientmap_2.png b/MCDV/textures/gradients/gradientmap_2.png index e238b94..a0cf984 100644 Binary files a/MCDV/textures/gradients/gradientmap_2.png and b/MCDV/textures/gradients/gradientmap_2.png differ diff --git a/MCDV/textures/gradients/gradientmap_3.png b/MCDV/textures/gradients/gradientmap_3.png index a0cf984..4b5639a 100644 Binary files a/MCDV/textures/gradients/gradientmap_3.png and b/MCDV/textures/gradients/gradientmap_3.png differ diff --git a/MCDV/textures/gradients/gradientmap_7.png b/MCDV/textures/gradients/gradientmap_7.png new file mode 100644 index 0000000..095ce0a Binary files /dev/null and b/MCDV/textures/gradients/gradientmap_7.png differ diff --git a/tar_entities/tar_entities.fgd b/tar_entities/tar_entities.fgd index 0ae2cf0..95d1168 100644 --- a/tar_entities/tar_entities.fgd +++ b/tar_entities/tar_entities.fgd @@ -12,7 +12,8 @@ 4: "Inferno" 5: "Train" 6: "Nuke" - 7: "Custom Scheme" + 7: "Vertigo" + -1: "Custom Scheme" ] customCol0(color255) : "Custom low level color" : "39 56 79" : "What the color of the radar should be at the lowest points of the map"