From 8240b4d447c202f5809b7529ce0594ed841d132d Mon Sep 17 00:00:00 2001 From: Terri00 Date: Mon, 18 Mar 2019 17:52:16 +0000 Subject: [PATCH] correct gradient names --- MCDV/main.cpp | 2 +- MCDV/sample_stuff/de_tavr_test.vmx | 6 +++--- .../{gradientmap.png => gradientmap_0.png} | Bin MCDV/textures/gradients/gradientmap_1.png | Bin 1389 -> 1554 bytes MCDV/textures/gradients/gradientmap_2.png | Bin 1554 -> 1528 bytes MCDV/textures/gradients/gradientmap_3.png | Bin 1528 -> 1389 bytes MCDV/textures/gradients/gradientmap_7.png | Bin 0 -> 1960 bytes tar_entities/tar_entities.fgd | 3 ++- 8 files changed, 6 insertions(+), 5 deletions(-) rename MCDV/textures/gradients/{gradientmap.png => gradientmap_0.png} (100%) create mode 100644 MCDV/textures/gradients/gradientmap_7.png 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_0.png similarity index 100% rename from MCDV/textures/gradients/gradientmap.png rename to MCDV/textures/gradients/gradientmap_0.png diff --git a/MCDV/textures/gradients/gradientmap_1.png b/MCDV/textures/gradients/gradientmap_1.png index 4b5639a0874525ae6a95f68d62502c695be6334e..e238b9440540cfd677adbe2006b4cfd748644860 100644 GIT binary patch delta 555 zcmV+`0@VHO3X%-4^8{biltqwc`J`QTn7bN_$cD|83@j@8rM27B-F z5j++D1%f@j<2hdIH*gX09ItXN?6=tKr#bR?e`K!LAJO%`&J}*@HDCXnALv~?k7qDP z{h@BrkN#ke_}#kOcZoX+dAT3+ZTx6|eqi2A2>|K`+;9*-{#31x${z|^vnFUOiW+-Ialh;O^^CMFB8*4_*7ob zG0uD+s~hh^`LiDJoTpFfac}z8dezJRIUhRcLdWWPAL{Xbn{wlmX8+k2OeeJk6NEg!F_VvR-bsoWxiTB{ITi;KQs@% tp5C^;;^rfI$?7l9JKq|`PxIH~`wOoIl-;)`7Fz%S002ovPDHLkV1oF?C`t?-B1F;5R(<{Z_nbPL*f+?fag6 zndVLE4S7kw)$eiid+N{Y4|(1n&1=s+&)xL$od3+LII3rg7wLaL;d%X9XLz3QA|L+6 zi}bYqm;a99NBz0{Dg70%JBI}xf$FcYz->A=KJf~dd|#2zjqfP$E}q{d9yespD)|(D zm;P_bS3YbFSL(q_u4}xek7J*OD}8c(t5dX13bI5)Nb4Xn4U*~9i_QBqZZ_=mf5}&JmA&%3lb58rf z@r9@PM;#hB@T>UQaO*vjI^sjbrTP1PAm7VA@cipMx$FMsIgsu^AClj~?{anS8aLRp igMRi~`#jER!2JORe9`l*94?Rm0000k0**0DmtQLW^>@Dsr#Cwf-~QZ#kdvU(0j-iOzeS8~IjLZC+E;&;CF!U>`@+}8_=WS6Zse$Q-IwQ;&iv~9+($j&!3TMU&1an({w)vv zYo5kO&2PDe{n&iXInHBw2cGZ8^R@e$?!)$*cwgl}-`h$)>ie*ITh58GAII{|v7Tc; zEB#OI>^||7kA1HS_540+4#46IhX(Wo%@LM&V7G$Qhg-f`2NiApx5~DJjx4w z`lx+P&d@_%?xXTNXXAtS(4F!cAA`R^f4q+yIh9A`zm|RZ3%zT6Wq*LLP=8zPflI}+ z;hwzj#vApG&nusL{biltqwc`J`QTn7bN_$cD|83@j@8rM27B-F z5j++D1%f@j<2hdIH*gX09ItXN?6=tKr#bR?e`K!LAJO%`&J}*@HDCXnALv~?k7qDP z{h@BrkN#ke_}#kOcZoX+dAT3+ZTx6|eqi2A2>|K`+;9*-{#31x${z|^vnFUOiW+-Ialh;O^^CMFB8*4_*7ob zG0uD+s~hh^`LiDJoTpFfac}z8dezJRIUhRcLdWWPAL{Xbn{wlmX8+k2OeeJk6NEg!F_VvR-bsoWxiTB{ITi;KQs@% tp5C^;;^rfI$?7l9JKq|`PxIH~`wOoIl-;)`7Fz%S002ovPDHLkV1g3YC|Cdh diff --git a/MCDV/textures/gradients/gradientmap_3.png b/MCDV/textures/gradients/gradientmap_3.png index a0cf9849e38e1eef7d31d7b8afa4e5abbbf0de9b..4b5639a0874525ae6a95f68d62502c695be6334e 100644 GIT binary patch delta 387 zcmV-}0et@W3+)Q9^aFonNklRj`Di%5$_)0H$3$HR=jCWm1p|x`<{K7 z=1uAic}c(3?{V~d>d)&BdEOt*YtKE;-SqOD|IDj6s%MH9=|6wrdHq^vc%JYgAO6LQ z^tAq$|Bm8E{ki-p{S~h}hXo#i>aVcCZ8|qT@d}rGUy;v^?cLB{YrLk9W1od9eR6%PS9D#d54egx%DW-mO&{7npX!738*p=6@k@2% zf>f{dP5t6L^}&1l<>%1q%lW5s$bJWNNL=e*=V*NP!QP8+(x>SXpR0W#j?=4iPW!;| zg{S#P9U3?AtN7V)>phb?;zPux`TKn!-^)Jm{Odfq>;C3BknTVqlHbDba&_(+H`ud- he)e1YJkDvr{Q(Ai(etewE|35K002ovPDHLkV1nQa*pUDL delta 528 zcmV+r0`L9p3iu1K^aFqINklCyEp*I-+A{Kkn_l!$QzeoLBSS?Ci|m$z?uYuP-nAUXDa$7ta}93`CrI2$?JXn z8~Yl);`j^R?+)JJoh;=8zO~M3VA+&~?BRTq&WSV6?icI_e@Q<26>A@{_g4&E8L*Y!q>+5h4Yhc=Xj&WW)f$MVgwo?|~N z{ZH=fKJk=~eXk1j{61>sLH{u6hfeT0m;d>l`-t<-eRO|PeI(!b{><;7*ZA-}$_st^ zsC`Y&&_iDCqw+jwl}F^imVNmPy=#1Be}J!0e_QQ=OU1L{ zp1kkI8}*IPE1!DgQx9``*LOYTJv&Ev#ro)j`qfXI&$3^==bVO@`szIJo&X72%Og>` S{)hko000O{MNUMnLSTX#8IXksPAt^OIGtX8@Ng*@ERw>-n z*TA>HIW;5GqpB!1xXLdixhgx^GDXSW&Zfc&s5v*aBvGLvHz%*ys=`(YY^D{E4HDK@ zQUEI{$+lH;1X-pK;TxdfoL`ixV5(=Ln`~fUq+qCL00ue=AW9#MbPWuwz(@fKlh+i#(Mch>H3D2mX`VkM*2oZx9+A`{_B z6z70sVD162tz3abSZYx*&|h{2Mn(oU`WV7CV3B~#iqxD4m(1MMJg{OTQ!}VqbQvV| zkqGsM$f}XV$@5`JW*QD3f@EMm1hK6=a}(23!!uJ#GVH)^Mi;a}2>7Jtr2~}#or)m_ zQ56xCTAZI#3Q7fb=0;Fu$bt}Mk=T?W3qq73RE6ecme|3}LledlK;T3HOwxA11Ov-R zc8FYEamT!5bTz9v&PhFvpjPa}UF`1vfMvEtFw#bZ`|B zWO3XO;3AL{(Wi9u|9{r>^!KM7e;S>+_i5XiJ2#G`gnvJA;-zMn#)1E*G8zPpLykoM zoWFjKd-o&LEuG~Ck3Ozm!D(GMvz)>9MM2))9cuUbr8NxgGGZTX-+B0_MpbL_i{dSu zU%KxfS1@LfOY-*|IqRO^~>fRm$<>gug}e1c8KrLk2xrk%^3Gd&HlgC z_+xp6)}3vYN6UY(zCWNhue1KZq95+ue|l7(e^V9s{mtoh{LIGV z`;)KEs+gzo?{L_|Kk9Lr^Obl0O-hrqKOp__e&dhaM;1qBJ#vq@zE4>=>Ri8ap8B?h zUz0iBst8p6VVRxr?EAkZKMLQdhs*q*@BP}s^ZReB^N%fR{|mfc^!98~^RG71kL$NBvU{5xIpbH(e4pCm$4&b8I^6EIOl<%B zd1r32U-50P;;)v~HO*c{wrdniCcIXWbE@&%imcwxOwW-;(;d=7H_kMd~F_On%=zYf%8 z*nVxU-SpzR+n4V5KKIUdxZgM4r+)E&`2Pgq`~5SncOCsR?ed*z$>+Y=oVA|++v(Bg zOYTSKu_c*3oV;ZIakbc+TPkMmS2w*Dd5qaz`|`_mr;X~{Wu$Xstn`w7cI7_#tuXg< zZ9&e0cT4NJ<)8f1co_D{bNz-R>)Pg9o&6h{V){vPbJ=~-nM?Plv#vfl{oUmc+0lol nJ$atCF#Uzy`P%pAp52e{*j4;UMrl?Vs4n$%^>bP0l+XkK2s~Cu literal 0 HcmV?d00001 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" -- 2.25.1