diff --git a/ref_vk/data/valve/luchiki/maps/c0a0.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0.bsp.patch new file mode 100644 index 00000000..843525cd --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0.bsp.patch @@ -0,0 +1,98 @@ +// for dev purposes +//{ +//"_xvk_ent_id" "217" // delete fade in entity // not work :( +//"rendercolor" "255 0 0" +//"renderamt" "0" +//} + +// wagonchik +{ +"_xvk_ent_id" "198 192 193 199 203 200 190 191 201 202 194 195 196 197" // remove hack light entity +//"_light" "223 222 248 0" +} +{ +"_xvk_ent_id" "188 189" // remove hack light entity "EXIT" +//"_light" "223 222 248 0" +} + + + + + +// section 1 +{ +"_xvk_ent_id" "88 87 86 89 90" // remove hack "ambient" lights entity +"_light" "100 100 255 0" +} +{ +"_xvk_ent_id" "38 36 40 35 32 30 28 43 27" // remove hack "ambient" lights entity +"_light" "100 100 255 0" +} +{ +"_xvk_ent_id" "92 215 214" // remove hack lights entity +"_light" "146 136 232 0" // 244 252 158 +} +// norm lampochki +{ +"_xvk_ent_id" "39 37 41 34 33 31 29 42 26" +"_xvk_radius" "5" // fix radius +"pitch" "-90" // correct pitch +} +{ +"_xvk_surface_id" "340 468 909 910" //+0~TNNL_LGT1 255 245 110 8000 +"_light" "255 245 110 15000" // correct light +} +{ +"_xvk_surface_id" "398 399" //GENERIC87A GENERIC88A +"_light" "0 0 0 0" // correct light +} + + +// section 2 +{ +"_xvk_ent_id" "52 58 64 70 59 53 65 71 60 54 66 72 63 57 62 69 75 56 74 68 121 61 55 73 67" // remove hack "ambient" lights entity +"_light" "100 100 255 0" +} +{ +"_xvk_ent_id" "93 94 95 96" // remove hack spot light entity +"_light" "131 131 243 0" +} +{ +"_xvk_ent_id" "117 123 124" // remove hack light entity +"_light" "240 230 100 0" +} +{ +"_xvk_ent_id" "5 4" // remove hack light entity +"_light" "170 170 60 0" +} +// lines light +{ +"_xvk_ent_id" "132 133 130 131 128 129 126 127 134 135" // remove hack light entity +"_light" "170 170 60 0" +} +{ +"_xvk_ent_id" "166 167 164 165 156 157 154 155 152 153 150 151 162 163 160 161 159 158" // remove hack light entity +"_light" "170 170 60 0" +} +{ +"_xvk_surface_id" "2257" // SKKYLITE 255 110 40 700 +"_light" "240 230 100 20000" // from hack light entity +} +{ +"_xvk_ent_id" "118 147 148 149 213" // remove hack light entity +"_light" "240 230 100 0" +} + +{ +"_xvk_surface_id" "1573 1576 2207 2216" //+0~FIFTS_LGHT01 230 234 255 3000 +"_light" "230 234 255 7000" // correct light +} +{ +"_xvk_surface_id" "1566 1562" //GENERIC87A GENERIC88A +"_light" "0 0 0 0" // correct light +} +//{ +//"_xvk_surface_id" "1722 2397 2395" //+0~FIFTIES_LGT2 185 195 255 3000 +//"_light" "185 195 255 12000" // correct light +//} + diff --git a/ref_vk/data/valve/luchiki/maps/c0a0a.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0a.bsp.patch new file mode 100644 index 00000000..6132c166 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0a.bsp.patch @@ -0,0 +1,53 @@ +// wagonchik +{ +"_xvk_ent_id" "127 117 121 116 126 119 123 128 125 115 122 118 124 120" // remove hack light entity +} +{ +"_xvk_ent_id" "114 113" // remove hack light entity "EXIT" +} + + +// section 1 +{ +"_xvk_ent_id" "20" // remove hack light +} +{ +"_xvk_surface_id" "661 854" // SKKYLITE 255 110 40 700 +"_light" "255 110 40 4000" +} +//{ +//"_xvk_surface_id" "2179 1927" // SKKYLITE 255 110 40 700 +//"_light" "255 110 40 4000" +//} +{ +"_xvk_ent_id" "22" // remove hack light +} +{ +"_xvk_ent_id" "23" // tune hack light +"origin" "-344 46 85" +"_xvk_radius" "10" +} + +// section 2 +{ +"_xvk_surface_id" "1675 783" // +0~LIGHT2A 255 255 90 2500 +"_light" "255 255 90 8000" // more correct light +} +{ +"_xvk_ent_id" "142" // remove hack light +} +{ +"_xvk_surface_id" "178 167" // SKKYLITE 255 110 40 700 +"_light" "255 110 40 2400" +} +{ +"_xvk_surface_id" "1041 1092" // SKKYLITE 255 110 40 700 +"_light" "255 110 40 2400" +} +{ +"_xvk_ent_id" "101 102 104 103 105 106 107 108 109" // remove hack light +} +{ +"_xvk_surface_id" "1507 1508 1633 1634 1635" // +0~FIFTIES_LGT2 185 195 255 3000 +"_light" "185 195 255 8000" +} \ No newline at end of file diff --git a/ref_vk/data/valve/luchiki/maps/c0a0b.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0b.bsp.patch new file mode 100644 index 00000000..8c852750 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0b.bsp.patch @@ -0,0 +1,118 @@ +// wagonchik +{ +"_xvk_ent_id" "81 73 80 70 81 71 77 82 74 78 72 76 69 79" // remove hack light entity +} +{ +"_xvk_ent_id" "68 67" // remove hack light entity "EXIT" +} + + +// section 0 +{ +"_xvk_ent_id" "28 29 31 30 32 33 34 35 36" // remove hack light +} +{ +"_xvk_surface_id" "2192 2244 2243 2242 2230" // +0~FIFTIES_LGT2 185 195 255 3000 +"_light" "185 195 255 8000" +} + + +// section 1 +{ +"_xvk_ent_id" "8" // remove hack light +} + +// add missing light // ~LIGHT3C 220 210 150 2500 +{ +"classname" "light" +"origin" "-2474 2456 -1530" +"_light" "220 210 150 250" +} +{ +"classname" "light" +"origin" "-1551 2456 -1530" +"_light" "220 210 150 250" +} +{ +"classname" "light" +"origin" "-559 2456 -1530" +"_light" "220 210 150 250" +} +{ +"classname" "light" +"origin" "433 2456 -1530" +"_light" "220 210 150 250" +} +{ +"classname" "light" +"origin" "1426 2456 -1530" +"_light" "220 210 150 250" +} + +{ +"_xvk_ent_id" "55" // remove hack light +} + + +// remove hack light and spotlights for fake godrays +{ +"_xvk_ent_id" "49" // remove hack light +} +{ +"_xvk_ent_id" "57 56" // remove hack light +} + +{ // compromise (wrong light angle) +"classname" "light_environment" +"origin" "-290 2299 -1513" +"_light" "250 210 110 2500" +//"_cone" "1" +//"_cone2" "10" +//"pitch" "-30" +//"angle" "104" +//"pitch" "-30" +//"angle" "120" +"pitch" "-15" +"angle" "90" +} + +{ +//"_xvk_surface_id" "4085 4082 4083 4084 4086 4081" // remove fake bad god rays +} +{ +//"_xvk_surface_id" "4077 4076 4080 4078 4079 4075 4073 4074" // remove fake bad god rays +} + + + + + +// section 2 +{ +"_xvk_ent_id" "1" // sun +"_light" "250 210 110 2500" // original: 250 210 110 150 // need tune for hdr-autoexposure +"pitch" "-30" // original pitch +"angle" "141" // original angle +"pitch" "-30" +"angle" "120" +} + +{ +"_xvk_ent_id" "148 146 149" // remove hack light +} +{ +"_xvk_surface_id" "437 1112" // ~SPOTBLUE 80 190 240 2000 +"_light" "80 190 240 100000" +} + + +// section 3 +{ +"_xvk_ent_id" "124 109 117 112 119 110 118 111 120 121 150" // remove hack light +} +{ +"_xvk_surface_id" "4477 4475 4470 4468 4484 4482 4491 4487" // ~LIGHT3C 220 210 150 2500 +"_light" "220 210 150 10000" +} + + diff --git a/ref_vk/data/valve/luchiki/maps/c0a0c.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0c.bsp.patch new file mode 100644 index 00000000..2195abb9 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0c.bsp.patch @@ -0,0 +1,100 @@ +// wagonchik +{ +"_xvk_ent_id" "354 346 353 343 348 344 350 355 347 351 345 349 342 352" // remove hack light entity +} +{ +"_xvk_ent_id" "340 341" // remove hack light entity "EXIT" +} + +// section 0 +{ +"_xvk_ent_id" "257 252 245 254 248 253 246 247 255 256" // remove hack light +} + +// section 1 +{ +"_xvk_ent_id" "296 297 298 299 300 379 1 326" // remove hack light +} +{ +"_xvk_ent_id" "261 262 265 264 267 268 270 269 272 273 274 275 278 277 279 280 283 282 284 285 288 287 289 290 293 292 382 381 378 380 377 374 376 375" // correct +"_light" "170 90 40 250" // original: 170 90 40 150 +} + +// section 2 +{ +"_xvk_ent_id" "71" // remove hack light +} +{ +"_xvk_ent_id" "72" // remove hack (forgotten) light +} +{ +"_xvk_surface_id" "1866" // +0~LIGHT4A 200 190 130 11000 +"_light" "200 190 130 31000" +} +{ +"_xvk_surface_id" "3428" // +0~TNNL_LGT4 170 90 40 10000 +"_light" "170 90 40 50000" +} + +// section 3 +{ +"_xvk_ent_id" "104 121" // remove hack light +} +// correct position and color +{ +"_xvk_ent_id" "127" +"origin" "2152 1048 1255" +"_light" "255 0 0 100" // green->red +} +{ +"_xvk_ent_id" "125" +"origin" "2152 1048 1231" +"_light" "0 255 0 100" // red->green +} +{ +"_xvk_ent_id" "126" +"origin" "2112 1048 1255" +"_light" "255 0 0 100" // green->red +} +{ +"_xvk_ent_id" "124" +"origin" "2112 1048 1231" +"_light" "0 255 0 100" // red->green +} +{ +"_xvk_ent_id" "137" +"origin" "1743 760 1255" +"_light" "255 0 0 100" // green->red +} +{ +"_xvk_ent_id" "135" +"origin" "1743 760 1231" +"_light" "0 255 0 100" // red->green +} +{ +"_xvk_ent_id" "136" +"origin" "1703 760 1255" +"_light" "255 0 0 100" // green->red +} +{ +"_xvk_ent_id" "134" +"origin" "1703 760 1231" +"_light" "0 255 0 100" // red->green +} +{ +"_xvk_surface_id" "3728 3740 3771 3783" // ~SPOTRED +"_xvk_texture" "+A~GENERIC86B" // red->green +} +{ +"_xvk_surface_id" "3722 3734 3765 3777" // +A~GENERIC86B +"_xvk_texture" "~SPOTRED" // green->red +} + + + + + +// section 4 +{ +"_xvk_ent_id" "147" // remove hack light +} diff --git a/ref_vk/data/valve/luchiki/maps/c0a0d.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0d.bsp.patch new file mode 100644 index 00000000..1ded2fee --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0d.bsp.patch @@ -0,0 +1,33 @@ +// wagonchik +{ +"_xvk_ent_id" "71 63 70 60 65 61 67 72 64 68 62 66 59 69" // remove hack light entity +} +{ +"_xvk_ent_id" "57 58" // remove hack light entity "EXIT" +} + +// section 0 +{ +"_xvk_ent_id" "13" // remove hack light +} +// section 1 +{ +"_xvk_ent_id" "28 31 32 30 29 26 27" // remove hack light +} +// correct light +{ +"_xvk_surface_id" "629 1552" // SKKYLITE 255 110 40 700 +"_light" "255 110 40 100000" +} + +//{ // testing +//"_xvk_surface_id" "980 975 872 881 999 885 886 1883 1852 1763 1709 1723 1724 1750 1728" // !TOXICGRN2 20 255 0 350 +//"_xvk_texture" "" +//} + + +// correct light for gman +{ +"_xvk_surface_id" "1295 1294 1436 1437" // SUBWAY_LIGHTS 190 195 255 1500 +"_light" "190 195 255 5000" +} \ No newline at end of file diff --git a/ref_vk/data/valve/luchiki/maps/c0a0e.bsp.patch b/ref_vk/data/valve/luchiki/maps/c0a0e.bsp.patch new file mode 100644 index 00000000..74d99509 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c0a0e.bsp.patch @@ -0,0 +1,7 @@ +// wagonchik +{ +"_xvk_ent_id" "29 21 25 19 23 16 26 28 20 27 17 22 18 24" // remove hack light entity +} +{ +"_xvk_ent_id" "14 15" // remove hack light entity "EXIT" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a0.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0.bsp.patch new file mode 100644 index 00000000..22e13068 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0.bsp.patch @@ -0,0 +1,86 @@ + +// FOR TESTING (disable light) +//{ +//"_xvk_ent_id" "181" +//} +//{ +//"_xvk_surface_id" "761 762 249 248 742 740 744 428 28 192 749 750 748 430 576 575 577 573 574 571 572 570 568 567 569 564 565 566 645 623 618 350 351 359 26 190 1670 1676" +//"_light" "0 0 0 0" +//} +//{ +//"_xvk_surface_id" "318" // uglovoy komp +//"_light" "255 255 255 20" +//} + + + +// main room and corridor +{ +"_xvk_ent_id" "42 43 44 14 45 46 47" // remove hack lights +} + +// science room +{ +"_xvk_ent_id" "220 221" // remove hack lights +} +// correct light +{ +"_xvk_ent_id" "209" +"origin" "-1059 -765 -51" +} +{ +"_xvk_ent_id" "208" +"origin" "-901 -765 -51" +} +{ +"classname" "light" +"targetname" "office1" +"style" "33" +//"_light" "90 90 110" // 130 130 150 (-40) +"_light" "130 130 150" +"origin" "-1059 -725 -51" +} +{ +"classname" "light" +"targetname" "office1" +"style" "33" +//"_light" "90 90 110" // 130 130 150 (-40) +"_light" "130 130 150" +"origin" "-901 -725 -51" +} +{ +"_xvk_ent_id" "210" +"origin" "-1057 -565 -51" +} +{ +"_xvk_ent_id" "207" +"origin" "-901 -565 -51" +} +{ +"classname" "light" +"targetname" "office1" +"style" "33" +"_light" "130 130 150" +"origin" "-1057 -525 -51" +} +{ +"classname" "light" +"targetname" "office1" +"style" "33" +"_light" "130 130 150" +"origin" "-901 -525 -51" +} + +// servernaya +{ +"_xvk_ent_id" "10 17 9 18 51 15 12 11 19 13 16" // remove hack lights +} + + +// end + +{ +"_xvk_ent_id" "20" // tune hack light entity +"_cone" "0" +"_cone2" "50" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a0a.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0a.bsp.patch new file mode 100644 index 00000000..5ad8f2c3 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0a.bsp.patch @@ -0,0 +1,35 @@ +{ +"_xvk_ent_id" "6 4 7 5" // remove hack lights entity +} +{ +"_xvk_surface_id" "3010" // +0~LIGHT5A 80 150 200 10000 +"_light" "80 150 200 120000" +} +{ +"_xvk_surface_id" "198" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 100000" +} + +{ +"_xvk_ent_id" "205 204" // fix z-fighting +"origin" "-0.1 0 0" +} + + +{ +"_xvk_ent_id" "10 1 3 12 13" // remove hack lights entity +} + +{ +"_xvk_ent_id" "103 28 29 30 31 32 107" // remove hack lights entity +} + +{ +"_xvk_surface_id" "2010 2009 2008 2007 2006" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 40000" +} + + +{ +"_xvk_ent_id" "195" // remove hack lights entity +} \ No newline at end of file diff --git a/ref_vk/data/valve/luchiki/maps/c1a0b.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0b.bsp.patch new file mode 100644 index 00000000..17f3eb30 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0b.bsp.patch @@ -0,0 +1,59 @@ +{ +"_xvk_ent_id" "239" // remove hack lights entity +} +{ +"_xvk_ent_id" "37 38 39 40" // remove hack lights entity +} + + +{ +"_xvk_ent_id" "135 74 73 72 77 76" // remove hack lights entity +} +{ +"_xvk_ent_id" "146 147" // remove hack lights entity +} + +{ +"_xvk_surface_id" "1774 1773" // +0~LIGHT4A 200 190 130 11000 +"_light" "200 190 130 50000" +} + +{ +"_xvk_surface_id" "1837 2331 2329 2330 2393" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 20000" +} + +{ +"_xvk_surface_id" "888" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 50000" +} + + +{ +"_xvk_ent_id" "18" // remove hack lights entity +"origin" "2160 656 -210" +} + +{ +"_xvk_ent_id" "22 19 20 21" // remove hack lights entity +} +{ +"_xvk_ent_id" "134 133" // remove hack lights entity +} +{ +"_xvk_ent_id" "199 198 201 200" // remove hack lights entity +} + +{ +"_xvk_ent_id" "191 190 192 189" // remove hack unused lights entity +} + + +{ +"_xvk_surface_id" "2817 2832 2827 2822" // +ALAB1_W6 255 255 255 100 +"_light" "255 255 255 3000" +} +{ +"_xvk_surface_id" "3558 3540 3546 3552" // +0~DRKMTLS2 80 60 30 1000 +"_light" "80 60 30 80000" +} \ No newline at end of file diff --git a/ref_vk/data/valve/luchiki/maps/c1a0c.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0c.bsp.patch new file mode 100644 index 00000000..801ea833 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0c.bsp.patch @@ -0,0 +1,56 @@ +// section 1 +{ +"_xvk_ent_id" "17 152 20" // remove hack lights entity +} +{ +"_xvk_ent_id" "24 21 18 23" // remove hack lights entity +} +{ +"_xvk_surface_id" "53 303 348 364" // +0~GENERIC86R 128 0 0 60000 +"_light" "255 0 0 50000" +} +// workaround +{ +"_xvk_surface_id" "93" // +0~DRKMTLS2 80 60 30 1000 +"_light" "255 0 0 200000" +} + +// section 2 +{ +"_xvk_ent_id" "16 15 22 19" // remove hack lights entity +} +{ +{ +"_xvk_ent_id" "113" +"_light" "100 120 160 100" +"_xvk_radius" "10" +} +{ +"_xvk_surface_id" "3287" // +ALAB1_W6B 215 180 95 0 +"_light" "215 180 95 6000" +} + +// lift/elevator +{ +"_xvk_ent_id" "335 354" // remove hack lights entity +} + + +// section 3 + +{ +"_xvk_ent_id" "167 163 164 165 166 186" // remove hack lights entity +} +{ +"_xvk_surface_id" "2390 2326 2327 2328 1704" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 20000" +} +{ +"_xvk_surface_id" "1628" // +0~LIGHT4A 200 190 130 11000 +"_light" "200 190 130 21000" +} + +// section 4 +{ +"_xvk_ent_id" "162" // remove hack lights entity +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a0d.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0d.bsp.patch new file mode 100644 index 00000000..24404a6f --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0d.bsp.patch @@ -0,0 +1,75 @@ +// remove hack lights in kuhnya +{ +"_xvk_ent_id" "253" // remove hack lights entity +} + + +// TESTED +{ +//"_xvk_surface_id" "1234 4011 4017 4023 4029 4035 4010 4031 4033 4027 4021 4015 4009 4030 4024 4018 4012 4006 1225 4028 1232 1230 1231 4034 4019 4016 4025 4007 4022 1229 4013 1233 1227" // generic105 +"_light" "0 0 0 0" // disable light from junk surfaces +} +{ +//"_xvk_surface_id" "4040 4041 4047 4053 4059 4065 4039 4045 4051 4057 4063 4036 4042 4048 4054 4060 4061 1206 1207 1208 1205 4058 4049 4064 4046 4055 4037 4052 4043 1204" // generic106 +"_light" "0 0 0 0" // disable light from junk surfaces +} +{ +//"_xvk_surface_id" "1224 1175 1173 1174 1219 1218 1220 1215 1216 4008 4014 4020 4026 4032 1217 1221 1179 1180" // generic105 +"_light" "0 0 0 0" // disable light from soda vending machine +} +{ +//"_xvk_surface_id" "1191 1176 1194 1193 1186 1185 1187 1182 1183 4038 4044 4050 4056 4062 1184 1188" // generic106 +"_light" "0 0 0 0" // disable light from soda vending machine +} + +// mirror in toilet +{ +"_xvk_surface_id" "2057" +//"_xvk_texture" "mirror" +"_xvk_texture" "pbr/colors/white.png" // HACK +} + + + + +// correct position spotlight in suit room +{ +"_xvk_ent_id" "220" +"origin" "-3648 832 -188" +"_xvk_radius" "2" +} +{ +"_xvk_ent_id" "221" +"origin" "-3648 960 -188" +"_xvk_radius" "2" +} +{ +"_xvk_ent_id" "223" +"origin" "-3648 960 -188" +"_xvk_radius" "5" // focus +} +{ +"_xvk_ent_id" "224" +"origin" "-3648 1088 -188" +"_xvk_radius" "2" +} + +// remove hack light in razdevalka +{ +"_xvk_ent_id" "231 229" +} + +//{ +//"_xvk_surface_id" "1507 1508" // +A~FIFTIES_LGT2 160 170 220 4000 +//"_light" "160 170 220 8000" +//} + + + +// remove hack light in servernya (for perfomance? this room out of reach player) +{ +"_xvk_ent_id" "122 128 121 129 135 126 124 123 130 125 127" +} + + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a0e.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a0e.bsp.patch new file mode 100644 index 00000000..a6ac36cf --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a0e.bsp.patch @@ -0,0 +1,105 @@ +{ +"_xvk_ent_id" "59 58 60 57" // remove hack lights entity +} +{ +"_xvk_ent_id" "95" // remove hack lights entity +} + +// don't uncomment, need for green state +//{ +//"_xvk_ent_id" "199 200 201 198" // remove hack lights entity +//} +//{ +//"_xvk_surface_id" "2070 2055 2060 2065" // +ALAB1_W6 255 255 255 100 +//"_light" "255 255 255 3000" +//} + +{ +"_xvk_surface_id" "2467 2473 2455 2461" // +0~DRKMTLS2 80 60 30 1000 +"_light" "80 60 30 80000" +} + +{ +"_xvk_ent_id" "490 172 488 489 173 487 175 486 174" // remove hack lights entity +} +{ +"_xvk_ent_id" "97" +"origin" "1848 226 168" +} +{ +"_xvk_ent_id" "56" +"origin" "2164 656 -213" +} + + + + +// red flashing lights (does not work now) +//{ +//"classname" "light" +//"targetname" "red" +//"spawnflags" "1" +//"style" "33" +//"_light" "255 0 0 100" +//"origin" "1323 562 -277" +//"_xvk_radius" "2" +//} +//{ +//"classname" "light" +//"targetname" "red" +//"spawnflags" "1" +//"style" "33" +//"_light" "255 0 0 100" +//"origin" "1323 678 -277" +//"_xvk_radius" "2" +//} +//{ +//"classname" "light" +//"targetname" "red" +//"spawnflags" "1" +//"style" "33" +//"_light" "255 0 0 100" +//"origin" "1146 582 -281" +//"_xvk_radius" "2" +//} +//{ +//"classname" "light" +//"targetname" "red" +//"spawnflags" "1" +//"style" "33" +//"_light" "255 0 0 100" +//"origin" "1146 658 -281" +//"_xvk_radius" "2" +//} + +{ // remove bad texture faces +"_xvk_surface_id" "2105 2106 2104" // {ladder2 +} + + +// missing xen lights +{ +"classname" "light" +"_light" "0 50 255 300" +"origin" "-1419 -2640 3071" +"_xvk_radius" "2" +} +{ +"classname" "light" +"_light" "0 50 255 300" +"origin" "-1150 -2445 3083" +"_xvk_radius" "2" +} +{ +"classname" "light" +"_light" "0 50 255 300" +"origin" "-2918 -2295 3174" +"_xvk_radius" "2" +} + + + + + + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a1.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1.bsp.patch new file mode 100644 index 00000000..bae9597b --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1.bsp.patch @@ -0,0 +1,53 @@ +// section 1 +{ +"_xvk_ent_id" "117 116 115 113 142" // remove hack lights entity +} +{ +"_xvk_surface_id" "2681 2700 2703" // +0~GENERIC86B 60 220 170 10000 +"_light" "60 220 170 20000" +} + +{ +"_xvk_surface_id" "2997 2994 2999 2993 2998" // +0~LIGHT6A 150 5 5 25000 +"_light" "150 5 5 125000" +} + +// section 2 +{ +"_xvk_ent_id" "131 43 44 45 9 10" // remove hack lights entity +} + +// section 3 +{ +"_xvk_ent_id" "85 77" // remove hack lights entity +} + +// section 4 // lift/elevator +{ +"_xvk_ent_id" "5 4 6" // remove hack lights entity +} +{ // TODO: animate texture +"_xvk_ent_id" "354 355" // remove hack lights entity +} +//{ +//"_xvk_surface_id" "1183" // +0~DRKMTLS1 205 0 0 6000 +//"_light" "205 0 0 10000" +//"_xvk_texture" "RED1_ANIMATE" +//} +{ +"_xvk_ent_id" "55 54 53 52 51" // remove hack lights entity +} +{ // disable light for broken elevator +"_xvk_surface_id" "3484" // ++0~LIGHT5A 80 150 200 10000 +"_light" "80 150 200 0" +} + +// section 5 +{ +"_xvk_ent_id" "2 3 7" // remove hack lights entity +} +{ +"_xvk_ent_id" "109" // remove hack lights entity +} + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a1a.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1a.bsp.patch new file mode 100644 index 00000000..181b8721 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1a.bsp.patch @@ -0,0 +1,18 @@ +// section 1 +{ +"_xvk_ent_id" "191 181" // remove hack lights entity +} + + + +// razdevalka +{ +"_xvk_ent_id" "310 255" // remove hack lights entity +} + +// mirror in toilet +{ +"_xvk_surface_id" "1936 1934 1933" +//"_xvk_texture" "mirror" +"_xvk_texture" "pbr/colors/white.png" // HACK +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a1b.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1b.bsp.patch new file mode 100644 index 00000000..b5be73aa --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1b.bsp.patch @@ -0,0 +1,64 @@ +// section 0 +{ // TODO: animate texture +"_xvk_ent_id" "140" // remove hack lights entity +} + +// section 1 +// TODO: correct brightness +{ +"_xvk_ent_id" "19" // remove hack lights entity +} +{ +"_xvk_surface_id" "2298" // +A~FIFTIES_LGT2 160 170 220 5000 +"_light" "160 170 220 0" +} + + +// section ... +{ +"_xvk_ent_id" "17 18" // remove hack lights entity +} +{ +"_xvk_ent_id" "25" // remove hack lights entity +} +{ +"_xvk_ent_id" "20" // remove hack lights entity +"_light" "80 80 160 500" +"origin" "1392 -10 35" +} +{ +"_xvk_ent_id" "27" // remove hack lights entity +} +{ +"_xvk_ent_id" "26" // remove hack lights entity +"_light" "80 80 160 500" +"origin" "1761 -1034 57" +} + +{ +"_xvk_ent_id" "110 109 108 23" // remove hack lights entity +} + +{ +"_xvk_ent_id" "22 21 24" // remove hack lights entity +} + + +// canalization +{ +"_xvk_ent_id" "366 365 364 363 362 367 368 369 370 371" // remove hack lights entity +} +{ // focus +"_xvk_ent_id" "361" +"origin" "2348 -1186 -288" +"_light" "247 249 157 150" +} + +// section ... +{ +"_xvk_ent_id" "267 266" // remove hack lights entity +} +{ // FIXME: color should take from translucent texture +"_xvk_surface_id" "9" // +0LAB1_W6B 150 160 210 4000 +"_light" "70 200 110 4000" // color from hack light +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a1c.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1c.bsp.patch new file mode 100644 index 00000000..251a183e --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1c.bsp.patch @@ -0,0 +1,137 @@ +// section 0 +{ +"_xvk_ent_id" "211 210" // remove hack lights entity +} +{ // FIXME: color should take from translucent texture +"_xvk_surface_id" "3506" // +0LAB1_W6B 150 160 210 4000 +"_light" "70 200 110 4000" // color from hack light +} + +// section 1 +{ +"_xvk_ent_id" "112 111 115 114 121 116 109 110 113 95" // remove hack lights entity +} +{ +"_xvk_ent_id" "36 38 41 37 39" +"origin" "0 0 -7" +} + +// section 2 (elevator) +{ +"_xvk_ent_id" "93 102 92 101 99" // remove hack lights entity +} + +// section 3 +{ +"_xvk_ent_id" "100 166 108 94" // remove hack lights entity +} +{ +"_xvk_ent_id" "96 149 150 152 151 147 144" // remove hack lights entity +} +{ +"_xvk_surface_id" "531" // +0~LIGHT4A 200 190 130 11000 +"_light" "200 190 130 35000" +} +{ +"_xvk_surface_id" "421 736" // ~TRN_LT1 160 170 220 10000 +"_light" "160 170 220 30000" +} + +{ +"_xvk_ent_id" "104" +"origin" "216 -1128 -2409" +} +{ +"_xvk_ent_id" "119" +"origin" "-8 -1128 -2409" +} +{ +"_xvk_ent_id" "120" +"origin" "-8 -904 -2409" +} +{ +"_xvk_ent_id" "118" +"origin" "216 -904 -2409" +} + +// section 4 +{ // TODO: tune origin +"_xvk_ent_id" "390 389 445 444" // remove hack lights entity +} +// section 5 +{ +"_xvk_ent_id" "445 404 397 396" // remove hack lights entity +} +// section 6 +{ +"_xvk_ent_id" "288 289" // remove hack lights entity +} +// section 7 +{ +"_xvk_ent_id" "172 169" // remove hack lights entity +} +{ +"_xvk_ent_id" "105" +"origin" "-408 446 -2911" +} +{ +"_xvk_ent_id" "117" +"origin" "-1845 449 -2911" +} +{ +"_xvk_ent_id" "103" +"origin" "-2188 444 -2911" +} +{ +"_xvk_ent_id" "98 97" // remove hack lights entity +} +{ +"_xvk_ent_id" "107" +"origin" "-2797 376 -2959" +} +{ +"_xvk_ent_id" "106" +"origin" "-2797 688 -2959" +} +{ +"_xvk_ent_id" "293 292 297" // remove hack lights entity +} + +// section 8 +{ +"_xvk_ent_id" "174" // remove hack lights entity +} + +// section 9 +{ +"_xvk_ent_id" "451 450 457 456" // remove hack lights entity +} +{ +"_xvk_ent_id" "449" +"origin" "-1231 1040 -2597" +} +{ +"_xvk_ent_id" "448" +"origin" "-1231 1304 -2597" +} +{ +"_xvk_ent_id" "455" +"origin" "-1322 1558 -2595" +} +{ +"_xvk_ent_id" "454" +"origin" "-1586 1558 -2595" +} + +// section 10 +{ +"_xvk_ent_id" "330 331 328 329" // remove hack lights entity +} +{ +"_xvk_ent_id" "339 324 326 325" // remove hack lights entity +} + +{ +"_xvk_surface_id" "1973 1972 1971 1974" // ELEV2_CIEL 255 200 100 2000 +"_light" "255 200 100 7000" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a1d.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1d.bsp.patch new file mode 100644 index 00000000..9edaf23c --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1d.bsp.patch @@ -0,0 +1,29 @@ +// section 0 +{ +"_xvk_ent_id" "48" // remove hack lights entity +} +{ +"_xvk_ent_id" "34" // remove hack lights entity +} +// section 1 +{ +"_xvk_ent_id" "30 29 26 27 31 32 28 25" // remove hack lights entity +} +{ +"_xvk_surface_id" "896 907 775 761 753 754 147 100" // +A~FIFTIES_LGT2 160 170 220 5000 +"_light" "160 170 220 25000" +} + +// section 2 +{ +"_xvk_ent_id" "49" // remove hack lights entity +} +// section 3 +{ +"_xvk_ent_id" "39" // ? +"origin" "1144 914 -123" +} +// section 4 +{ +"_xvk_ent_id" "43 44" // remove hack lights entity +} \ No newline at end of file diff --git a/ref_vk/data/valve/luchiki/maps/c1a1f.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a1f.bsp.patch new file mode 100644 index 00000000..69ee9da2 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a1f.bsp.patch @@ -0,0 +1,117 @@ +// section 0 +{ +//"_xvk_ent_id" "294" // remove hack lights entity +} + +// section 1 +{ +"_xvk_ent_id" "274 295 272 276 279" // remove hack lights entity +} + +// section 2 +{ +"_xvk_ent_id" "280 281" // remove hack lights entity +} +{ // another red light +"_xvk_ent_id" "284" // remove hack lights entity +} +{ +"_xvk_ent_id" "290" +"origin" "202 524 -32" +//"style" "1" +//"style" "32" +//"pattern" "abcdefghijklmnopqrstuvwxyzyxwvutsrqponmlkjihgfedcba" +//"pattern" "amammamaamamama" +"_light" "255 0 0 150" // TODO: lightstyle +} +{ +"_xvk_ent_id" "287" +//"origin" "63 50 -75" +} +{ +"_xvk_ent_id" "285" +//"origin" "-161 50 -76" +} +{ +"_xvk_ent_id" "289" +//"origin" "-53 356 -142" +} +{ +"_xvk_ent_id" "288" +"origin" "-53 285 -142" +} + +// section 3 +{ +"_xvk_ent_id" "283 296 275 278 291 273 292 271" // remove hack lights entity +} + +{ +"_xvk_surface_id" "4592 4593 4594 4591 4589" // remove additive "god rays" fade2 +"_xvk_texture" "" +} + +// section 4 +{ +"_xvk_ent_id" "400" // remove hack lights entity +} +{ +"_xvk_ent_id" "299 303 304 305" // remove hack lights entity +} +// TODO: animate texture +{ +"classname" "light"// hack hack light entity +"_xvk_radius" "2" +"style" "10" +"origin" "-671 -521 -65" +"_light" "40 60 70 180" +} +{ +"classname" "light"// hack hack light entity +"_xvk_radius" "2" +"style" "10" +"origin" "-671 -486 -65" +"_light" "40 60 70 180" +} +{ +"classname" "light"// hack hack light entity +"_xvk_radius" "2" +"style" "10" +"origin" "-671 -450 -65" +"_light" "40 60 70 180" +} +{ +"_xvk_ent_id" "306" // remove hack lights entity +} +{ +"_xvk_ent_id" "302 300" // remove hack lights entity +} +{ +"_xvk_surface_id" "3035 3052" // ~SPOTBLUE 7 163 245 18000 +"_light" "7 163 245 25000" +} + +// section 5 +{ +"_xvk_ent_id" "377" // remove hack lights entity +// TODO: animate texture +} +{ +"_xvk_ent_id" "297 301" // remove hack lights entity +} + +// fix wrong textures +{ +"_xvk_surface_id" "2362 2363 2352 2351 2386 2389 2562 2563 1002 1003 1013 1014" +"_xvk_texture" "crete4_flr03" +} +//{ // FIXME: need fix texture coordinates +//"_xvk_surface_id" "999 1010" // LITEPANEL1 +//"_xvk_texture" "+0LAB1_W6" +//"_light" "255 255 255 4000" +//} +{ // TODO: need fix texture coordinates +"_xvk_surface_id" "975 2354 974 2357" // +0~FIFTS_LGHT01 +"_xvk_texture" "+0~FIFTIES_LGT2" +"_light" "255 255 255 3000" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a2.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a2.bsp.patch new file mode 100644 index 00000000..e92c5743 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a2.bsp.patch @@ -0,0 +1,109 @@ +// section 0 +{ +"_xvk_ent_id" "330 331 328 329" // remove hack lights entity +} +{ +"_xvk_ent_id" "323 324 326 325" // remove hack lights entity +} +{ +"_xvk_surface_id" "723 722 903 902" // ELEV2_CIEL 255 200 100 2000 +"_light" "255 200 100 7000" +} + +// section 1 +{ +"_xvk_ent_id" "501" // remove hack lights entity +} +{ +"_xvk_ent_id" "502" +"_light" "160 170 220 100" +} +{ // TODO: better design light +"_xvk_ent_id" "378" +"_cone" "1" +"_cone2" "300" +//"targetname" "flickerlight" +//"style" "10" +} +{ // FIXME: remove and recreate by points light with lightstyle (when it will work) +"_xvk_ent_id" "276" +"_cone" "1" +"_cone2" "200" +//"style" "10" +"origin" "1833 -674 -521" +"pitch" "120" +"_light" "255 255 255 170" +} + +{ +"_xvk_ent_id" "379" +"_light" "160 170 220 250" +"_cone" "1" +"_cone2" "300" +} +//{ +//"_xvk_surface_id" "1719" // +A~FIFTS_LGHT4 +//"_light" "160 170 220 100" +//} + + +// section 2 +{ +"_xvk_ent_id" "15 493 178" // remove hack lights entity +} +{ +"_xvk_ent_id" "214 222" // remove hack lights entity +} +{ +"_xvk_ent_id" "220 225" // remove hack lights entity +} +{ +"_xvk_ent_id" "420" +"origin" "2942 -996 -539" +"_light" "255 255 255 150" // correct light +"pitch" "10" +"angle" "315" +} + +// section 3 +{ +"_xvk_ent_id" "169 170 70 71 68 69 66 65 64" // remove hack lights entity +} + +// section 4 +{ +"_xvk_ent_id" "181" +"origin" "358 -524 -540" +"_light" "40 80 40 700" // correct light +} + +// section 5 +{ +"_xvk_ent_id" "602 504" +} + +// section 6 +{ +"_xvk_ent_id" "248" +"origin" "38 -1046 -461" +} +{ +"_xvk_ent_id" "246" +"origin" "-203 -1174 -461" +} +{ +"_xvk_ent_id" "245" +"origin" "-515 -1103 -461" +} +{ +"_xvk_ent_id" "247" +"origin" "-196 -1024 -461" +} +{ +"_xvk_ent_id" "498" +} +{ +"_xvk_ent_id" "184" +} + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a2a.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a2a.bsp.patch new file mode 100644 index 00000000..6ee9ac2f --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a2a.bsp.patch @@ -0,0 +1,48 @@ +// more correct hack +{ +"_xvk_ent_id" "52" +"origin" "-56 -624 -140" +"_light" "120 130 180" // 160 170 220 (-40) +} +{ +"classname" "light" +"origin" "-84 -624 -140" +"targetname" "scilights" +"style" "33" +"_light" "120 130 180" // 160 170 220 (-40) +} + + +{ +"_xvk_ent_id" "120 119" // remove hack lights entity +} + +{ +"_xvk_ent_id" "126 127" // remove hack lights entity +} + +{ +"_xvk_surface_id" "2412" // generic88a +//"_xvk_texture" "black" // fix texture +"_light" "0 0 0 0" +} + + +// more correct hack +{ +"_xvk_ent_id" "50" +"origin" "1062 -892 -140" +"_light" "120 120 145" // 160 160 185 (-40) +} +{ +"classname" "light" +"origin" "1094 -892 -140" +"targetname" "barnlights" +"style" "32" +"_light" "120 120 145" // 160 160 185 (-40) +} + + +{ +"_xvk_ent_id" "83" // remove hack lights entity +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a2b.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a2b.bsp.patch new file mode 100644 index 00000000..c7c85f0b --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a2b.bsp.patch @@ -0,0 +1,113 @@ +// section 0 +{ +"_xvk_ent_id" "99" // remove hack lights entity +} + +// section 1 +{ +"_xvk_ent_id" "458 459" // remove hack lights entity +} + +{ +"_xvk_ent_id" "284 285" // remove hack lights entity +} +{ +"_xvk_surface_id" "1974 298" // +0~TNNL_LGT2 190 255 255 12000 +"_light" "190 255 255 100000" +} + +{ +"_xvk_ent_id" "146 145" // remove hack lights entity +} + +// correct lights +{ +"_xvk_ent_id" "192" +"origin" "1040 -156 31" +"_light" "244 252 158 125" // 244 252 158 175 +"_cone" "64" +"_cone2" "128" +} +{ +"_xvk_ent_id" "195" +"origin" "1040 -420 31" +"_light" "244 252 158 125" // 244 252 158 175 +"_cone" "64" +"_cone2" "128" +} + +{ +"_xvk_ent_id" "147 151 148 149 150" // remove hack lights entity +} + +// section 1.5 + +// correct lights +{ +"_xvk_ent_id" "385" +"origin" "1099 -57 176" +"_light" "244 252 158 105" // "244 252 158 175" +"_cone" "64" +"_cone2" "128" +} +{ +"_xvk_ent_id" "388" +"origin" "1099 -320 176" +"_light" "244 252 158 105" // 244 252 158 175 +"_cone" "64" +"_cone2" "128" +} + + +{ // TODO: fix 2 side texture coordinates +"_xvk_surface_id" "7011 7010" // {gratestep2 +"_xvk_texture" "" // remove broken texture +} + + + +// section 2 + +{ +"_xvk_ent_id" "437 436 434 435" // remove hack lights entity +} + +{ +"_xvk_ent_id" "432 431 433 430" +//"_light" "160 170 220 250" // 160 170 220 250 +} + + +// section 3 +{ +"_xvk_ent_id" "106 105" // remove hack lights entity +} +{ +"_xvk_ent_id" "99" // remove hack lights entity +} + + +// section 4 +{ +"_xvk_ent_id" "380 381" // remove hack lights entity +} + +// section 5 +{ +"_xvk_ent_id" "229" // remove hack lights entity +} +{ +"_xvk_ent_id" "246" // remove hack lights entity +} + + +// section 6 +{ +"_xvk_ent_id" "471" // gman exit light +"_light" "255 0 0 120" // 255 0 0 35 +"origin" "833 -1279 481" +} + + + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a2c.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a2c.bsp.patch new file mode 100644 index 00000000..f140f16a --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a2c.bsp.patch @@ -0,0 +1,83 @@ +// section 0 +{ +"_xvk_ent_id" "106 108 105 107" // remove hack lights entity +} +// section 1 +{ +"_xvk_ent_id" "289" // remove hack lights entity +} +{ +"_xvk_ent_id" "104" // remove hack lights entity +} +// section 2 +{ +"_xvk_ent_id" "124 123 133" // remove hack lights entity +} +{ +"_xvk_surface_id" "1035 1022" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 15000" +} +{ +"_xvk_ent_id" "131 122 130 120" // remove hack lights entity +} +{ +"_xvk_surface_id" "1036 1140" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 15000" +} + +{ +"_xvk_ent_id" "125 126" // remove hack lights entity +} + +{ +"_xvk_ent_id" "125 126" // remove hack lights entity +} + +{ +"_xvk_ent_id" "132 129" // remove hack lights entity +} +{ +"_xvk_surface_id" "1719" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 15000" +} + +{ +"_xvk_ent_id" "128" // remove hack lights entity +} + +{ +"_xvk_ent_id" "127 121" // remove hack lights entity +} + +{ +"_xvk_surface_id" "1576" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 15000" +} + +{ +"_xvk_ent_id" "103" // remove hack lights entity +} +{ +"_xvk_surface_id" "2073" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 15000" +} +{ +"_xvk_surface_id" "2055" // +0~FIFTIES_LGT2 160 170 220 4000 // 5000? +"_light" "160 170 220 10000" +} + +{ +"_xvk_ent_id" "138" // remove hack lights entity +} + +// section 3 + +{ +"_xvk_ent_id" "181" // remove hack lights entity +} + + +{ +"_xvk_surface_id" "656" // +0~GENERIC86B 60 220 170 20000 +"_light" "60 220 170 2500" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a2d.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a2d.bsp.patch new file mode 100644 index 00000000..5d0614f5 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a2d.bsp.patch @@ -0,0 +1,23 @@ +// section 0 +{ +"_xvk_ent_id" "70" // remove hack lights entity +} + +// section 1 +{ +"_xvk_ent_id" "51 52" // remove hack lights entity +} +{ +"_xvk_ent_id" "45" // remove hack lights entity +} +{ +"_xvk_surface_id" "297" // +0~FIFTIES_LGT2 160 170 220 5000 +"_light" "160 170 220 10000" // focus +} +{ +"_xvk_ent_id" "32 31 11 12" // remove hack lights entity +} +{ +"_xvk_surface_id" "949" // +0~FIFTS_LGHT01 160 170 220 4000 +"_light" "160 170 220 8000" // focus +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a3.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a3.bsp.patch new file mode 100644 index 00000000..eea769ce --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a3.bsp.patch @@ -0,0 +1,138 @@ +// section 1 +{ +"_xvk_ent_id" "409 491" // remove hack lights entity +} +//{ +//"_xvk_surface_id" "3875 3874" // BLACK +//"_xvk_texture" "c1a3yellow" +//} + +// alarm lights +{ +"_xvk_ent_id" "11" +"origin" "186 832 72" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "8" +"origin" "186 640 72" +"_light" "233 186 0 80" +} + + +// section 2 +{ +"_xvk_ent_id" "257" +"origin" "-304 200 240" +} +{ +"_xvk_ent_id" "258" +"origin" "-304 296 240" +} +{ +"_xvk_ent_id" "259" +"origin" "-304 488 240" +} + +// spot lights +{ +"_xvk_ent_id" "254" +"origin" "-536 200 240" +} +{ +"_xvk_ent_id" "261" +"origin" "-536 392 240" +} +{ +"_xvk_ent_id" "256" +"origin" "-776 200 240" +} +{ +"_xvk_ent_id" "255" +"origin" "-776 392 240" +} +{ +"_xvk_ent_id" "262" +"origin" "-1016 296 240" +} + +// alarm lights +{ +"_xvk_ent_id" "98" +"origin" "-1216 557 72" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "99" +"origin" "-1408 557 72" +"_light" "233 186 0 80" +} + +// soda machine +// FIXME +{ +"classname" "light" +"origin" "-1400 -480 63" +"_light" "255 100 100 100" // GENERIC105 255 100 100 1000 +"targetname" "busted_soda_spawner_1" +//"style" "33" +} +{ +"classname" "light" +"origin" "-1400 -400 63" +"_light" "50 180 50 100" // GEN_VEND1 50 180 50 1000 +"targetname" "busted_soda_spawner_2" +//"style" "33" +} + + +// spot lights +{ +"_xvk_ent_id" "408" +"origin" "-840 -376 112" +} + +{ +"_xvk_ent_id" "260" +"origin" "-560 -152 112" +} +{ +"_xvk_ent_id" "247" +"origin" "-368 -152 112" +} + +{ +"_xvk_ent_id" "253" +"origin" "-560 -376 112" +} +{ +"_xvk_ent_id" "248" +"origin" "-368 -376 112" +} +{ +"_xvk_ent_id" "249" +"origin" "-560 -624 224" +} +{ +"_xvk_ent_id" "250" +"origin" "-368 -152 112" +} + +{ +"_xvk_ent_id" "251" +"origin" "-560 -856 224" +} + +// alarm lights +{ +"_xvk_ent_id" "167" +"origin" "-88 -924 -56" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "171" +"origin" "104 -924 -56" +"_light" "233 186 0 80" +} + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a3a.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a3a.bsp.patch new file mode 100644 index 00000000..31ad838f --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a3a.bsp.patch @@ -0,0 +1,90 @@ +// section 1 +// spot lights +{ +"_xvk_ent_id" "388" +"origin" "904 -1288 112" +} +{ +"_xvk_ent_id" "387" +"origin" "760 -1288 112" +} +{ +"_xvk_ent_id" "385" +"origin" "904 -1576 112" +} +{ +"_xvk_ent_id" "386" +"origin" "760 -1576 112" +} + +// alarm lights +{ +"_xvk_ent_id" "368" +"origin" "568 -1803 72" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "365" +"origin" "376 -1804 72" +"_light" "233 186 0 80" +} + +{ +"_xvk_ent_id" "469 468" // remove hack lights entity +} + + +// section 2 +{ +"_xvk_surface_id" "657 656" // +0~LIGHT6A 150 5 5 25000 +"_light" "150 5 5 50000" // for barnacle +} +{ +"_xvk_surface_id" "794 1092" // +0~LIGHT3A 180 180 230 10000 +"_light" "180 180 230 2000" // for barnacle +} + + +// section 3 +// alarm lights +{ +"_xvk_ent_id" "323" +"origin" "-1669 -3096 -56" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "320" +"origin" "-1669 -3288 -56" +"_light" "233 186 0 80" +} + +// section 4 +{ +"_xvk_ent_id" "482" // remove hack lights entity +} + +// section 5 +{ +"_xvk_ent_id" "477 476" // remove hack lights entity +} + +// spot lights +{ +"_xvk_ent_id" "398" +"origin" "-2464 -1680 112" +} + +// section 6 +// spot lights +{ +"_xvk_ent_id" "449" +"origin" "-536 -768 916" +} +{ +"_xvk_ent_id" "452" +"origin" "-536 -568 916" +} +{ +"_xvk_ent_id" "453" +"origin" "-376 -568 916" +} diff --git a/ref_vk/data/valve/luchiki/maps/c1a3b.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a3b.bsp.patch new file mode 100644 index 00000000..ade3de75 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a3b.bsp.patch @@ -0,0 +1,33 @@ +// section 1 +// spot lights +{ +"_xvk_ent_id" "109" +"origin" "136 -848 916" +} +{ +"_xvk_ent_id" "111" +"origin" "136 -648 916" +} +{ +"_xvk_ent_id" "112" +"origin" "296 -648 916" +} + +{ +"_xvk_ent_id" "5" // sun +"_light" "179 158 211 80" // original // need tune for hdr-autoexposure +"_light" "210 200 120 1750" // demo lights // 210 200 120 175 // need tune for hdr-autoexposure +"pitch" "-45" +"angle" "15" // from demo c1a3c (better sun angle) +} + + + +// section 1 +// for demo map +{ +"_xvk_surface_id" "1684" // {ladder3a +} + + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a3c.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a3c.bsp.patch new file mode 100644 index 00000000..b2fcb9e0 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a3c.bsp.patch @@ -0,0 +1,20 @@ +// section 1 + + +{ +"_xvk_ent_id" "123 122" // remove hack lights entity +} + + + +{ +"_xvk_ent_id" "20" // sun +"_light" "210 200 120 1750" // original: 210 200 120 175 // need tune for hdr-autoexposure +"pitch" "-45" +"angle" "15" // restore missing angle from demo (better sun angle) +} + + + + + diff --git a/ref_vk/data/valve/luchiki/maps/c1a3d.bsp.patch b/ref_vk/data/valve/luchiki/maps/c1a3d.bsp.patch new file mode 100644 index 00000000..25536e77 --- /dev/null +++ b/ref_vk/data/valve/luchiki/maps/c1a3d.bsp.patch @@ -0,0 +1,28 @@ +// section 1 +// spot lights +{ +"_xvk_ent_id" "143" +"origin" "800 -280 881" +} + +// alarm lights +{ +"_xvk_ent_id" "43" +"origin" "960 -212 713" +"_light" "233 186 0 80" +} +{ +"_xvk_ent_id" "44" +"origin" "1152 -212 713" +"_light" "233 186 0 80" +} + + +// section 2 +{ +"_xvk_ent_id" "198" // remove hack lights entity +} + +{ +"_xvk_surface_id" "1744 1647" // {ladder1 +} diff --git a/ref_vk/rad/README.txt b/ref_vk/data/valve/maps/README.txt similarity index 100% rename from ref_vk/rad/README.txt rename to ref_vk/data/valve/maps/README.txt diff --git a/ref_vk/rad/c0a0.rad b/ref_vk/data/valve/maps/c0a0.rad similarity index 77% rename from ref_vk/rad/c0a0.rad rename to ref_vk/data/valve/maps/c0a0.rad index 2f8b360c..61e288f8 100644 --- a/ref_vk/rad/c0a0.rad +++ b/ref_vk/data/valve/maps/c0a0.rad @@ -3,12 +3,10 @@ GENERIC87A 100 255 100 1000 GENERIC88A 255 100 100 1000 RED 255 0 0 2000 -YELLOW 255 244 202 1000 +//YELLOW 255 244 202 1000 +0~FIFTIES_LGT2 185 195 255 3000 SKKYLITE 255 110 40 700 +0~FIFTS_LGHT01 230 234 255 3000 SUBWAY_LIGHTS 190 195 255 1500 - -//hack -EXIT1 255 0 0 200 +EXIT1 255 0 0 1000 diff --git a/ref_vk/rad/c0a0a.rad b/ref_vk/data/valve/maps/c0a0a.rad similarity index 80% rename from ref_vk/rad/c0a0a.rad rename to ref_vk/data/valve/maps/c0a0a.rad index 07150ead..682f4db6 100644 --- a/ref_vk/rad/c0a0a.rad +++ b/ref_vk/data/valve/maps/c0a0a.rad @@ -5,6 +5,4 @@ RED 255 0 0 2000 SKKYLITE 255 110 40 700 SUBWAY_LIGHTS 190 195 255 1500 - -//hack -EXIT1 255 0 0 2000 \ No newline at end of file +EXIT1 255 0 0 1000 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c0a0b.rad b/ref_vk/data/valve/maps/c0a0b.rad new file mode 100644 index 00000000..dc57f110 --- /dev/null +++ b/ref_vk/data/valve/maps/c0a0b.rad @@ -0,0 +1,9 @@ +RED 255 0 0 2000 // FIXME: perfomance, need remore light from some surfaces ++0~FIFTIES_LGT2 185 195 255 3000 +~LIGHT3C 220 210 150 0 // 2500 // for perfomance ++0~LIGHT6A 150 5 5 25000 +~SPOTBLUE 80 190 240 2000 ++0~TNNL_LGT4 170 90 40 10000 +SUBWAY_LIGHTS 190 195 255 1500 + +EXIT1 255 0 0 1000 \ No newline at end of file diff --git a/ref_vk/rad/c0a0c.rad b/ref_vk/data/valve/maps/c0a0c.rad similarity index 87% rename from ref_vk/rad/c0a0c.rad rename to ref_vk/data/valve/maps/c0a0c.rad index 88d595e0..33978538 100644 --- a/ref_vk/rad/c0a0c.rad +++ b/ref_vk/data/valve/maps/c0a0c.rad @@ -12,7 +12,4 @@ SUBWAY_LIGHTS 190 195 255 1500 //+A~GENERIC86B //+0~GENERIC86B 60 220 170 0 - - -//hack -EXIT1 255 0 0 200 \ No newline at end of file +EXIT1 255 0 0 1000 \ No newline at end of file diff --git a/ref_vk/rad/c0a0d.rad b/ref_vk/data/valve/maps/c0a0d.rad similarity index 89% rename from ref_vk/rad/c0a0d.rad rename to ref_vk/data/valve/maps/c0a0d.rad index 83d01919..9b1622c3 100644 --- a/ref_vk/rad/c0a0d.rad +++ b/ref_vk/data/valve/maps/c0a0d.rad @@ -15,6 +15,4 @@ SUBWAY_LIGHTS 190 195 255 1500 +0~LAB_CRT2 255 255 255 20 - -//hack -EXIT1 255 0 0 200 \ No newline at end of file +EXIT1 255 0 0 1000 \ No newline at end of file diff --git a/ref_vk/rad/c0a0e.rad b/ref_vk/data/valve/maps/c0a0e.rad similarity index 84% rename from ref_vk/rad/c0a0e.rad rename to ref_vk/data/valve/maps/c0a0e.rad index 64d7877a..86b27988 100644 --- a/ref_vk/rad/c0a0e.rad +++ b/ref_vk/data/valve/maps/c0a0e.rad @@ -8,6 +8,4 @@ SUBWAY_LIGHTS 190 195 255 1500 +0~LAB_CRT2 255 255 255 20 - -//hack -EXIT1 255 0 0 200 \ No newline at end of file +EXIT1 255 0 0 1000 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a0.rad b/ref_vk/data/valve/maps/c1a0.rad new file mode 100644 index 00000000..fd8eb75d --- /dev/null +++ b/ref_vk/data/valve/maps/c1a0.rad @@ -0,0 +1,45 @@ ++0~GENERIC65 255 255 255 14000 ++0~GENERIC85 110 160 220 25500 // 11000 16000 22000 ++0~GENERIC86R 128 0 0 60000 ++0~LIGHT3A 255 255 255 25000 ++0~DRKMTLS1 255 10 10 14000 ++0~LIGHT4A 231 223 82 20000 ++0~LIGHT5A 80 150 200 10000 ++0~FIFTS_LGHT01 160 170 220 4000 ++0~FIFTS_LGHT06 255 255 255 8000 ++0~FIFTIES_LGT2 255 255 255 20000 +~LIGHT3B 84 118 198 14000 +~LIGHT3A 190 20 20 14000 +~LIGHT3C 198 215 74 14000 +~SPOTYELLOW 189 231 253 20000 +~SPOTBLUE 7 163 245 18000 +LAB1_COMP3D 255 255 255 20 +~LAB1_COMP7 255 255 255 20 + +CRYS_2TOP 171 254 168 14000 + +DRKMTL_SCRN3 1 111 220 200 + ++0~LAB1_CMP2 255 255 255 20 ++1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet ++2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet + ++0~LAB_CRT8 50 50 255 200 ++1~LAB_CRT8 50 50 255 200 // hack, because no inheritance yet + ++0DRKMTL_SCRN 60 80 255 200 ++1DRKMTL_SCRN 60 80 255 200 ++2DRKMTL_SCRN 60 80 255 200 + +FIFTIES_MON1B 100 100 180 0 + +~LAB_CRT9A 225 150 150 100 +~LAB_CRT9B 100 100 255 100 +~LAB_CRT9C 100 200 150 100 + +LITEPANEL1 190 170 120 2500 + + ++0~FIFTS_LGHT4 160 170 220 0 // NO NEED + + diff --git a/ref_vk/rad/c1a0a.rad b/ref_vk/data/valve/maps/c1a0a.rad similarity index 71% rename from ref_vk/rad/c1a0a.rad rename to ref_vk/data/valve/maps/c1a0a.rad index 6601bb03..64c37c0d 100644 --- a/ref_vk/rad/c1a0a.rad +++ b/ref_vk/data/valve/maps/c1a0a.rad @@ -3,4 +3,6 @@ +0~FIFTIES_LGT2 255 255 255 20000 +0~GENERIC85 120 170 235 20000 ~TRN_LT1 160 170 220 1500 -+0~GENERIC86B 60 220 170 10000 \ No newline at end of file ++0~GENERIC86B 60 220 170 10000 + ++0~LIGHT5A 80 150 200 10000 \ No newline at end of file diff --git a/ref_vk/rad/c1a0e.rad b/ref_vk/data/valve/maps/c1a0b.rad similarity index 73% rename from ref_vk/rad/c1a0e.rad rename to ref_vk/data/valve/maps/c1a0b.rad index 87cce995..7b485fd8 100644 --- a/ref_vk/rad/c1a0e.rad +++ b/ref_vk/data/valve/maps/c1a0b.rad @@ -1,12 +1,14 @@ -RED 255 0 0 10000 -+0~GENERIC86B 60 220 170 10000 -+0~LAB1_CMP2 255 255 255 20 -~LIGHT3C 220 210 150 2500 -+A~FIFTIES_LGT2 160 170 220 4000 -+0~FIFTIES_LGT2 160 170 220 10000 -FLATBED_HLITE2 150 200 220 10000 -+0~DRKMTLS2 80 60 30 1000 -C1A3YELLOW 255 200 100 100 -+ALAB1_W6 255 255 255 100 -+0~GENERIC86R 128 16 16 60000 -XENO_18 0 50 255 10000 \ No newline at end of file ++0~GENERIC86B 60 220 170 10000 ++0~LAB1_CMP2 255 255 255 20 +~LIGHT3C 220 210 150 2500 ++A~FIFTIES_LGT2 160 170 220 4000 ++0~FIFTIES_LGT2 160 170 220 10000 +FLATBED_HLITE2 150 200 220 10000 ++0~DRKMTLS2 80 60 30 1000 +//C1A3YELLOW 255 200 100 100 ++ALAB1_W6 255 255 255 100 ++0~GENERIC86R 128 16 16 60000 + ++0~LIGHT4A 200 190 130 11000 + +RED 255 0 0 0 // for optimization \ No newline at end of file diff --git a/ref_vk/rad/c1a0c.rad b/ref_vk/data/valve/maps/c1a0c.rad similarity index 63% rename from ref_vk/rad/c1a0c.rad rename to ref_vk/data/valve/maps/c1a0c.rad index a33de48c..b0162abe 100644 --- a/ref_vk/rad/c1a0c.rad +++ b/ref_vk/data/valve/maps/c1a0c.rad @@ -1,5 +1,4 @@ +A~FIFTIES_LGT2 160 170 220 5000 -//+ALAB1_W6B 215 180 95 2000 // need patch for specific brush +ALAB1_W6B 215 180 95 0 +0~DRKMTLS2 80 60 30 1000 +ALAB1_W6 255 255 255 4000 @@ -7,3 +6,9 @@ FLATBED_HLITE2 150 200 220 10000 +0~LIGHT1 70 100 150 5000 +0~GENERIC86B 60 220 170 10000 + ++0~GENERIC86R 128 0 0 60000 + ++0~LIGHT4A 200 190 130 11000 ++0~LIGHT5A 80 150 200 10000 ++0~LIGHT6A 150 5 5 25000 diff --git a/ref_vk/rad/c1a0d.rad b/ref_vk/data/valve/maps/c1a0d.rad similarity index 67% rename from ref_vk/rad/c1a0d.rad rename to ref_vk/data/valve/maps/c1a0d.rad index b10b876a..d34d4191 100644 --- a/ref_vk/rad/c1a0d.rad +++ b/ref_vk/data/valve/maps/c1a0d.rad @@ -1,6 +1,5 @@ +0~LIGHT3A 255 255 255 25000 ~LIGHT3B 84 118 198 14000 -+0~DRKMTLS2C 255 200 100 10 ~LIGHT3A 190 20 20 14000 ~LIGHT3C 198 215 74 14000 +0~LIGHT4A 231 223 82 20000 @@ -19,6 +18,16 @@ LITEPANEL1 190 170 120 2500 +0~GENERIC85 110 160 220 25500 // 11000 16000 22000 ~SPOTBLUE 7 163 245 18000 +0~LAB1_CMP2 255 255 255 20 ++1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet ++2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet LAB1_COMP3D 255 255 255 20 ~LAB1_COMP7 255 255 255 20 -+0~FIFTS_LGHT5 255 255 255 10000 \ No newline at end of file ++0~FIFTS_LGHT5 255 255 255 10000 + +GENERIC105 255 100 100 0 +GENERIC105A 255 100 100 30 +GENERIC106 120 120 100 0 +GENERIC106A 120 120 100 30 + +// hack +//+0GENERIC_113 255 255 255 1000 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a0e.rad b/ref_vk/data/valve/maps/c1a0e.rad new file mode 100644 index 00000000..8e7def3f --- /dev/null +++ b/ref_vk/data/valve/maps/c1a0e.rad @@ -0,0 +1,20 @@ +//RED 255 0 0 10000 +RED 255 0 0 0 // no need ++0~GENERIC86B 60 220 170 10000 ++0~LAB1_CMP2 255 255 255 20 +~LIGHT3C 220 210 150 2500 ++A~FIFTIES_LGT2 160 170 220 4000 ++0~FIFTIES_LGT2 160 170 220 10000 +FLATBED_HLITE2 150 200 220 10000 ++0~DRKMTLS2 80 60 30 1000 +C1A3YELLOW 255 200 100 100 ++ALAB1_W6 255 255 255 100 ++0~GENERIC86R 128 16 16 60000 +XENO_18 0 50 255 10000 + +CRYS_3TOP 255 152 79 10000 ++0~LIGHT1 40 60 150 10000 ++0LAB1_W6 150 160 210 8800 +LAB1_COMP3D 255 255 255 0 // no need (for optimization) ++0~DRKMTLS2 150 120 20 30000 + diff --git a/ref_vk/data/valve/maps/c1a1.rad b/ref_vk/data/valve/maps/c1a1.rad new file mode 100644 index 00000000..62d88648 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1.rad @@ -0,0 +1,11 @@ ++0~FIFTS_LGHT3 160 170 220 0 ++A~FIFTIES_LGT2 160 170 220 5000 ++0~GENERIC86B 60 220 170 10000 + ++0~LIGHT5A 80 150 200 10000 ++0~LIGHT6A 150 5 5 25000 + ++ALAB1_W6 150 160 210 0 + ++0~DRKMTLS1 205 0 0 6000 ++1~DRKMTLS1 205 0 0 0 // TODO: animate texture \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a1a.rad b/ref_vk/data/valve/maps/c1a1a.rad new file mode 100644 index 00000000..56ece83f --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1a.rad @@ -0,0 +1,22 @@ +//+A~FIFTIES_LGT2 160 170 220 5000 ++A~FIFTIES_LGT2 160 170 220 4000 ++0~GENERIC86B 60 220 170 10000 + ++0~LAB1_CMP2 255 255 255 0 ++1~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet ++2~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet + +LAB1_COMP3D 255 255 255 0 + +// TODO: optimization +GENERIC105 255 100 100 1000 +GENERIC105A 255 100 100 30 +GENERIC106 120 120 100 1000 +GENERIC106A 120 120 100 30 + +LITEPANEL1 190 170 120 2500 + +~LIGHT3F 200 190 140 2500 + + + diff --git a/ref_vk/data/valve/maps/c1a1b.rad b/ref_vk/data/valve/maps/c1a1b.rad new file mode 100644 index 00000000..150ce16a --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1b.rad @@ -0,0 +1,10 @@ ++A~FIFTIES_LGT2 160 170 220 5000 +//+A~FIFTIES_LGT2 160 170 220 0 ++ALAB1_W6 150 160 210 0 ++0LAB1_W6B 150 160 210 4000 + +// +0~FIFTS_LGHT01 in c1a1f ++0~FIFTIES_LGT2 255 255 255 3000 + +// LITEPANEL1 in c1a1f ++0LAB1_W6 255 255 255 4000 diff --git a/ref_vk/data/valve/maps/c1a1c.rad b/ref_vk/data/valve/maps/c1a1c.rad new file mode 100644 index 00000000..6c16f972 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1c.rad @@ -0,0 +1,21 @@ ++A~FIFTIES_LGT2 160 170 220 5000 ++ALAB1_W6 150 160 210 0 ++0LAB1_W6B 150 160 210 4000 + +// FIXME: need emissive mask or emissive texture ++0MEDKIT 255 192 128 100 +MEDKITEDGE1 255 192 128 100 ++0RECHARGE 255 192 0 30 +RECHARGEEDGE1 255 192 0 30 + ++0~LIGHT3A 180 180 230 50000 + +//~LIGHT3C 220 210 150 14000 +~LIGHT3C 220 210 150 4000 + +// for optimization ++0~DRKMTLS2C 255 200 100 0 + ++0~LIGHT4A 200 190 130 11000 + +~TRN_LT1 160 170 220 10000 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a1d.rad b/ref_vk/data/valve/maps/c1a1d.rad new file mode 100644 index 00000000..18ebf3b8 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1d.rad @@ -0,0 +1,9 @@ +//~LIGHT3C 220 210 150 14000 +~LIGHT3C 220 210 150 4000 + +LITEPANEL1 190 170 120 5000 +//LITEPANEL1 190 170 120 2500 + ++A~FIFTIES_LGT2 160 170 220 5000 + +ELEV2_CIEL 255 200 100 2000 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a1f.rad b/ref_vk/data/valve/maps/c1a1f.rad new file mode 100644 index 00000000..50505ba8 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a1f.rad @@ -0,0 +1,26 @@ +//+0~LAB1_CMP2 255 255 255 0 +//+1~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet +//+2~LAB1_CMP2 255 255 255 0 // hack, because no inheritance yet + +LAB1_COMP3D 255 255 255 0 + ++0DRKMTL_SCRN 60 80 255 200 ++1DRKMTL_SCRN 60 80 255 200 ++2DRKMTL_SCRN 60 80 255 200 + +DRKMTL_SCRN3 1 111 220 200 + ++0~GENERIC86 255 230 125 50000 + ++1FLICKERMON 255 255 255 10000 ++3FLICKERMON 255 255 255 1000 ++4FLICKERMON 255 255 255 10000 ++6FLICKERMON 255 255 255 1000 ++8FLICKERMON 255 255 255 10000 ++9FLICKERMON 255 255 255 1000 + +// +0~FIFTIES_LGT2 in c1a1b ++0~FIFTS_LGHT01 255 255 255 3000 + +// +0LAB1_W6 in c1a1b +LITEPANEL1 255 255 255 4000 \ No newline at end of file diff --git a/ref_vk/rad/c1a2.rad b/ref_vk/data/valve/maps/c1a2.rad similarity index 100% rename from ref_vk/rad/c1a2.rad rename to ref_vk/data/valve/maps/c1a2.rad diff --git a/ref_vk/data/valve/maps/c1a2a.rad b/ref_vk/data/valve/maps/c1a2a.rad new file mode 100644 index 00000000..2608a91e --- /dev/null +++ b/ref_vk/data/valve/maps/c1a2a.rad @@ -0,0 +1,10 @@ ++0~LIGHT2A 255 250 130 2000 // 3000? TODO: compare by QRAD ++0DRKMTL_SCRN 100 200 170 200 ++1DRKMTL_SCRN 100 200 170 200 ++2DRKMTL_SCRN 100 200 170 200 + +// from hack light (0 255 0 35) +// TODO: need emissive texture +//+0EXIT 0 255 0 0 +//+AEXIT 0 255 0 200 ++AEXIT 255 255 255 30 \ No newline at end of file diff --git a/ref_vk/data/valve/maps/c1a2b.rad b/ref_vk/data/valve/maps/c1a2b.rad new file mode 100644 index 00000000..5c2d5ac9 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a2b.rad @@ -0,0 +1,13 @@ +// from hack light (0 255 0 35) +// TODO: need emissive texture +//+0EXIT 0 255 0 0 +//+AEXIT 0 255 0 200 ++AEXIT 255 255 255 30 + ++0~TNNL_LGT2 190 255 255 12000 + ++0~FIFTIES_LGT2 160 170 220 5000 + + ++0~FIFTS_LGHT06 255 255 255 1000 + diff --git a/ref_vk/data/valve/maps/c1a2c.rad b/ref_vk/data/valve/maps/c1a2c.rad new file mode 100644 index 00000000..77838c42 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a2c.rad @@ -0,0 +1,7 @@ +//+0~FIFTIES_LGT2 255 255 255 20000 ++0~FIFTIES_LGT2 160 170 220 4000 // 5000? + ++0~FIFTS_LGHT01 160 170 220 4000 + + ++0~GENERIC86B 60 220 170 20000 diff --git a/ref_vk/data/valve/maps/c1a2d.rad b/ref_vk/data/valve/maps/c1a2d.rad new file mode 100644 index 00000000..6ad79ac9 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a2d.rad @@ -0,0 +1,4 @@ ++0~FIFTIES_LGT2 160 170 220 5000 +//+0~FIFTIES_LGT2 255 255 255 20000 + ++0~FIFTS_LGHT01 160 170 220 4000 diff --git a/ref_vk/data/valve/maps/c1a3.rad b/ref_vk/data/valve/maps/c1a3.rad new file mode 100644 index 00000000..2784d8c7 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a3.rad @@ -0,0 +1,15 @@ +~SPOTBLUE 7 163 245 0 ++0~LIGHT3A 180 180 230 20000 + ++0~DRKMTLS2C 255 200 100 0 +C1A3YELLOW 255 255 128 2000 + +// for optimization +GENERIC105 255 100 100 0 +GENERIC105A 255 100 100 0 +GEN_VEND1 50 180 50 0 + +//+0~FIFTIES_LGT2 255 255 255 20000 ++0~FIFTIES_LGT2 180 180 160 20000 + ++0~GENERIC65 255 255 255 7500 diff --git a/ref_vk/data/valve/maps/c1a3a.rad b/ref_vk/data/valve/maps/c1a3a.rad new file mode 100644 index 00000000..b5e19b29 --- /dev/null +++ b/ref_vk/data/valve/maps/c1a3a.rad @@ -0,0 +1,13 @@ ++0~DRKMTLS2C 255 200 100 0 +C1A3YELLOW 255 255 128 2000 + +//+0~FIFTIES_LGT2 255 255 255 20000 ++0~FIFTIES_LGT2 180 180 160 20000 + ++0~LIGHT1 10 10 150 2000 // 10000 ++0~LIGHT3A 180 180 230 18000 // 10000 ++0~LIGHT2A 255 250 130 0 ++0~LIGHT4A 200 190 130 15000 + +~LIGHT3C 180 210 180 10000 +~LIGHT5B 210 245 255 0 diff --git a/ref_vk/data/valve/maps/c1a3d.rad b/ref_vk/data/valve/maps/c1a3d.rad new file mode 100644 index 00000000..da3a300b --- /dev/null +++ b/ref_vk/data/valve/maps/c1a3d.rad @@ -0,0 +1,3 @@ ++0~DRKMTLS2C 255 200 100 0 +C1A3YELLOW 255 255 128 2000 + diff --git a/ref_vk/data/valve/maps/c3a1b.rad b/ref_vk/data/valve/maps/c3a1b.rad new file mode 100644 index 00000000..e8c5edbe --- /dev/null +++ b/ref_vk/data/valve/maps/c3a1b.rad @@ -0,0 +1,3 @@ +GLASSGREEN 0 255 0 300 +~LIGHT3E 220 210 150 2500 +//~LIGHT3E 90 190 140 14000 diff --git a/ref_vk/data/valve/maps/hldemo1.rad b/ref_vk/data/valve/maps/hldemo1.rad new file mode 100644 index 00000000..ee95e80e --- /dev/null +++ b/ref_vk/data/valve/maps/hldemo1.rad @@ -0,0 +1,14 @@ ++0~DRKMTLS2C 255 255 0 0 +C1A3YELLOW 255 255 128 2000 + + +//+0SCRN 255 255 255 60 +//+1SCRN 255 255 255 60 +//+2SCRN 255 255 255 60 +//SCRN3 24 30 252 70 + ++0~LIGHT3A 180 180 230 4000 +//+0~LIGHT3A 180 180 230 0 // for perfomance + + ++0~FIFTS_LGHT01 160 170 220 3000 diff --git a/ref_vk/data/valve/maps/hldemo2.rad b/ref_vk/data/valve/maps/hldemo2.rad new file mode 100644 index 00000000..bcf89838 --- /dev/null +++ b/ref_vk/data/valve/maps/hldemo2.rad @@ -0,0 +1,10 @@ ++0~FIFTS_LGHT01 160 170 220 3000 ++0~LIGHT6A 150 5 5 25000 + + +// FIXME: need emissive mask or emissive texture ++0MEDKIT 255 192 128 100 // reused +MEDKITEDGE1 255 192 128 100 + ++0RECHARGE 255 192 0 30 +RECHARGEEDGE1 255 192 0 30 \ No newline at end of file diff --git a/ref_vk/rad/lights.rad b/ref_vk/data/valve/maps/lights.rad similarity index 85% rename from ref_vk/rad/lights.rad rename to ref_vk/data/valve/maps/lights.rad index 49fcb171..6377b167 100644 --- a/ref_vk/rad/lights.rad +++ b/ref_vk/data/valve/maps/lights.rad @@ -2,9 +2,12 @@ //!TOXICGRN 20 255 0 300 //!TOXICGRN2 20 255 0 300 +0BUTTONLITE 255 0 0 220 -+0DRKMTL_SCRN 60 80 255 10000 -+1DRKMTL_SCRN 60 80 255 10000 // hack, because no inheritance yet -+2DRKMTL_SCRN 60 80 255 10000 // hack, because no inheritance yet +//+0DRKMTL_SCRN 60 80 255 10000 +//+1DRKMTL_SCRN 60 80 255 10000 // hack, because no inheritance yet +//+2DRKMTL_SCRN 60 80 255 10000 ++0DRKMTL_SCRN 60 80 255 200 ++1DRKMTL_SCRN 60 80 255 200 ++2DRKMTL_SCRN 60 80 255 200 +1FLICKERMON 255 255 255 1000 +3FLICKERMON 255 255 255 300 +4FLICKERMON 255 255 255 1000 @@ -39,8 +42,9 @@ +0~GYMLIGHT 255 230 150 2500 +0~LAB_CRT8 50 50 255 100 +1~LAB_CRT8 50 50 255 100 // hack, because no inheritance yet -//+0~LAB1_CMP2 255 255 255 20 -+0~LAB1_CMP2 255 255 255 100 ++0~LAB1_CMP2 255 255 255 20 ++1~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet ++2~LAB1_CMP2 255 255 255 20 // hack, because no inheritance yet //+0~LIGHT1 40 60 150 3000 +0~LIGHT1 40 60 150 10000 +0~LIGHT2A 255 250 130 2000 @@ -58,7 +62,8 @@ C1A3C_MAP 100 100 255 100 C3A2_LIGHT 234 195 0 500 C3A2_LIGHT2 234 195 0 500 -DRKMTL_SCRN3 0 110 220 500 +//DRKMTL_SCRN3 0 110 220 500 +DRKMTL_SCRN3 1 111 220 200 ELEV2_CIEL 255 200 100 2000 EMERGLIGHT 255 200 100 50000 EMERGLIGHTC 101 255 170 8000 @@ -71,9 +76,9 @@ FLATBED_LITE1 215 180 95 2000 //FLATBED_LITE2 215 180 95 2000 FLATBED_TLITE2 215 0 0 2000 GENERIC105 255 100 100 1000 -GENERIC105A 255 100 100 30 +GENERIC105A 255 100 100 300 GENERIC106 120 120 100 1000 -GENERIC106A 120 120 100 30 +GENERIC106A 120 120 100 300 GENERIC107 180 50 180 1000 GENERIC107A 180 50 180 30 GENERIC87A 100 255 100 1000 @@ -84,9 +89,9 @@ GENERIC99B 0 215 200 30 GENERIC99C 105 0 0 30 GEN_VEND1 50 180 50 1000 //GLASSGREEN 50 255 50 200 -LAB1_COMP3D 255 255 255 20 //LITEPANEL1 190 170 120 1100 -LITEPANEL1 190 170 120 5000 +//LITEPANEL1 190 170 120 5000 +LITEPANEL1 190 170 120 2500 PANELLITE1 190 210 210 2000 RED 255 0 0 1000 SKKYLITE 165 230 255 1000 @@ -94,7 +99,8 @@ SKKYLITE2 190 210 210 2000 SKKYLITEDAWN 210 175 195 2000 SUBWAY_LIGHTS 255 250 202 2000 //WHITE 255 255 255 100 -YELLOW 255 200 100 2000 +//YELLOW 255 200 100 2000 +LAB1_COMP3D 255 255 255 20 ~GENERIC87 205 230 255 550 ~GENERIC88 205 230 255 550 ~LAB_CRT9A 225 150 150 100 @@ -105,7 +111,7 @@ YELLOW 255 200 100 2000 //~LIGHT3B 155 155 235 2000 ~LIGHT3B 84 118 198 14000 //~LIGHT3C 220 210 150 2500 -~LIGHT3C 220 210 150 14000 +~LIGHT3C 220 210 150 14000 ~LIGHT3D 45 245 10 2000 //~LIGHT3E 90 190 140 6000 ~LIGHT3E 90 190 140 14000 diff --git a/ref_vk/rad/t0a0b1.rad b/ref_vk/data/valve/maps/t0a0b1.rad similarity index 100% rename from ref_vk/rad/t0a0b1.rad rename to ref_vk/data/valve/maps/t0a0b1.rad diff --git a/ref_vk/rad/t0a0b2.rad b/ref_vk/data/valve/maps/t0a0b2.rad similarity index 100% rename from ref_vk/rad/t0a0b2.rad rename to ref_vk/data/valve/maps/t0a0b2.rad diff --git a/ref_vk/rad/t0a0c.rad b/ref_vk/data/valve/maps/t0a0c.rad similarity index 100% rename from ref_vk/rad/t0a0c.rad rename to ref_vk/data/valve/maps/t0a0c.rad diff --git a/ref_vk/rad/c0a0b.rad b/ref_vk/rad/c0a0b.rad deleted file mode 100644 index ae900f18..00000000 --- a/ref_vk/rad/c0a0b.rad +++ /dev/null @@ -1,10 +0,0 @@ -RED 255 0 0 2000 -+0~FIFTIES_LGT2 185 195 255 3000 -~LIGHT3C 220 210 150 2500 -+0~LIGHT6A 150 5 5 25000 -~SPOTBLUE 80 190 240 2000 -+0~TNNL_LGT4 170 90 40 10000 -SUBWAY_LIGHTS 190 195 255 1500 - -//hack -EXIT1 255 0 0 200 \ No newline at end of file diff --git a/ref_vk/rad/c1a0.rad b/ref_vk/rad/c1a0.rad deleted file mode 100644 index 184a2da3..00000000 --- a/ref_vk/rad/c1a0.rad +++ /dev/null @@ -1,18 +0,0 @@ -+0~GENERIC65 255 255 255 14000 -+0~LIGHT3A 255 255 255 25000 -~LIGHT3B 84 118 198 14000 -+0~DRKMTLS2C 255 200 100 10 -~LIGHT3A 190 20 20 14000 -~LIGHT3C 198 215 74 14000 -+0~LIGHT4A 231 223 82 20000 -+0~FIFTS_LGHT06 255 255 255 8000 -+0~FIFTIES_LGT2 255 255 255 20000 -~SPOTYELLOW 189 231 253 20000 -~SPOTBLUE 7 163 245 18000 -+0~DRKMTLS1 255 10 10 14000 -CRYS_2TOP 171 254 168 14000 -+0~GENERIC85 110 160 220 25500 // 11000 16000 22000 -+0~LAB1_CMP2 255 255 255 20 -LAB1_COMP3D 255 255 255 20 -~LAB1_COMP7 255 255 255 20 -DRKMTL_SCRN3 1 111 220 500 \ No newline at end of file diff --git a/ref_vk/rad/c1a0b.rad b/ref_vk/rad/c1a0b.rad deleted file mode 100644 index c32abd9a..00000000 --- a/ref_vk/rad/c1a0b.rad +++ /dev/null @@ -1,10 +0,0 @@ -+0~GENERIC86B 60 220 170 10000 -+0~LAB1_CMP2 255 255 255 20 -~LIGHT3C 220 210 150 2500 -+A~FIFTIES_LGT2 160 170 220 4000 -+0~FIFTIES_LGT2 160 170 220 10000 -FLATBED_HLITE2 150 200 220 10000 -+0~DRKMTLS2 80 60 30 1000 -C1A3YELLOW 255 200 100 100 -+ALAB1_W6 255 255 255 100 -+0~GENERIC86R 128 16 16 60000 \ No newline at end of file diff --git a/ref_vk/rad/c1a1.rad b/ref_vk/rad/c1a1.rad deleted file mode 100644 index 8408177d..00000000 --- a/ref_vk/rad/c1a1.rad +++ /dev/null @@ -1,2 +0,0 @@ -+0~FIFTS_LGHT3 160 170 220 0 -+A~FIFTIES_LGT2 160 170 220 5000 diff --git a/ref_vk/rad/c1a1a.rad b/ref_vk/rad/c1a1a.rad deleted file mode 100644 index e18e53ec..00000000 --- a/ref_vk/rad/c1a1a.rad +++ /dev/null @@ -1 +0,0 @@ -+A~FIFTIES_LGT2 160 170 220 5000 diff --git a/ref_vk/rad/c1a1b.rad b/ref_vk/rad/c1a1b.rad deleted file mode 100644 index 099dac10..00000000 --- a/ref_vk/rad/c1a1b.rad +++ /dev/null @@ -1,16 +0,0 @@ -+A~FIFTIES_LGT2 160 170 220 5000 -+ALAB1_W6 150 160 210 0 - - -// from 1f to 1b -//LITEPANEL1 190 170 120 5000 // 1f from lights -//+0LAB1_W6 150 160 210 8800 // 1b from lights -+0LAB1_W6 190 170 120 5000 // sync - -//+0~FIFTS_LGHT01 160 170 220 4000 // 1f from lights -//+0~FIFTIES_LGT2 255 255 255 20000 // 1b from lights -+0~FIFTIES_LGT2 160 170 220 4000 // sync - - -// TODO: +0LAB1_W6 (237 243 255) <-> LITEPANEL1 (255, 255, 255) -// current 255 255 229 is wrong \ No newline at end of file diff --git a/ref_vk/vk_mapents.c b/ref_vk/vk_mapents.c index cf2be1e3..38f4db8c 100644 --- a/ref_vk/vk_mapents.c +++ b/ref_vk/vk_mapents.c @@ -357,7 +357,7 @@ static void addPatchSurface( const entity_props_t *props, uint32_t have_fields ) } if (have_fields & Field__light) { - VectorCopy(props->_light, psurf->emissive); + VectorScale(props->_light, 0.1f, psurf->emissive); psurf->flags |= Patch_Surface_Emissive; gEngine.Con_Reportf("Patch for surface %d: assign emissive %f %f %f\n", index, psurf->emissive[0], diff --git a/ref_vk/wscript b/ref_vk/wscript index c3cbd807..4005a914 100644 --- a/ref_vk/wscript +++ b/ref_vk/wscript @@ -123,4 +123,7 @@ def build(bld): glslcflags = '--target-env=vulkan1.2' ) - bld.install_files(bld.env.LIBDIR + '/valve/maps', bld.path.ant_glob('rad/*.rad')) + bld.install_files(bld.env.LIBDIR, + bld.path.ant_glob('data/**'), + cwd=bld.path.find_dir('data/'), + relative_trick=True) \ No newline at end of file