summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2018-02-12 22:54:17 +0100
committerPaweł Redman <pawel.redman@gmail.com>2018-02-12 22:54:17 +0100
commit5e432a842757ed9a0448c26a92ce2e608a2a71c2 (patch)
treeb792cb62b93c7330c6d14584ad46d198f31b0efd
parent68d5304d048180b1f70e94c5fdefe659d6fb9f5a (diff)
More decorations in p8.
-rw-r--r--maps/p8_outside.map60
-rw-r--r--scripts/analmango.shader15
-rw-r--r--textures/analmango/poster_monika.tgabin0 -> 285467 bytes
3 files changed, 69 insertions, 6 deletions
diff --git a/maps/p8_outside.map b/maps/p8_outside.map
index 60e5642..ac96341 100644
--- a/maps/p8_outside.map
+++ b/maps/p8_outside.map
@@ -6994,12 +6994,12 @@ niveus/trembru_s
}
// brush 679
{
-( -946.0834960938 1056 -92.9957427979 ) ( -961.7640991211 1024 -89.8146514893 ) ( -961.7640991211 1056 -89.8146514893 ) common/caulk 14.1790771484 0 0 -0.459392935 0.125 0 0 0
-( -957.9563598633 1056 -131.4019317627 ) ( -937.5041503906 1056 -111.0621337891 ) ( -953.184753418 1056 -107.8810577393 ) analmango/poster_gems 65.8410568237 15.251159668 168.5321502686 0.0499999523 -0.0500000305 0 0 0
-( -963.9229736328 1024 -90.3970489502 ) ( -968.6946411133 1056 -113.9179229736 ) ( -963.9229736328 1056 -90.3970489502 ) common/caulk 0 46.0184555054 0 0.125 0.6125226617 0 0 0
-( -938.3556518555 1056 -135.3782806396 ) ( -954.0362548828 1024 -132.1972045898 ) ( -938.3556518555 1024 -135.3782806396 ) common/caulk 60.8674316406 0 0 -0.459392935 0.125 0 0 0
-( -957.9563598633 1048 -131.4019317627 ) ( -937.5041503906 1048 -111.0621337891 ) ( -942.2758178711 1048 -134.5830078125 ) common/caulk 7.0248346329 1.2196960449 168.5321502686 0.4687499702 -0.625 0 0 0
-( -937.5041503906 1024 -111.0621337891 ) ( -942.2758178711 1056 -134.5830078125 ) ( -942.2758178711 1024 -134.5830078125 ) common/caulk 0 36.2807998657 0 0.125 0.6125226617 0 0 0
+( -1741.9096679688 1512 -44.2061309814 ) ( -1757.9095458984 1480 -44.1492767334 ) ( -1757.9095458984 1512 -44.1492767334 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1746.0517578125 1512 -84.1916656494 ) ( -1729.9665527344 1512 -60.2486572266 ) ( -1745.9664306641 1512 -60.1918182373 ) analmango/poster_lagranger 87.2906265259 238.322845459 179.7964324951 0.1176478118 -0.1242236719 0 0 0
+( -1759.9130859375 1480 -45.1421661377 ) ( -1759.9984130859 1512 -69.1420135498 ) ( -1759.9130859375 1512 -45.1421661377 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1726.0518798828 1512 -84.2627105713 ) ( -1742.0517578125 1480 -84.2058868408 ) ( -1726.0518798828 1480 -84.2627105713 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1746.0517578125 1504 -84.1916656494 ) ( -1729.9665527344 1504 -60.2486572266 ) ( -1730.0518798828 1504 -84.2485046387 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1729.9665527344 1480 -60.2486572266 ) ( -1730.0518798828 1512 -84.2485046387 ) ( -1730.0518798828 1480 -84.2485046387 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
// brush 680
{
@@ -9640,6 +9640,47 @@ nexus6/e8crete03
( -950.4873046875 2615.6169433594 -162.1298217773 ) ( -904.4332275391 2629.1455078125 -162.1298217773 ) ( -960.1066894531 2648.3630371094 -195.8811950684 ) analmango/rock1 352 352 0 0.5 0.5 0 0 0
( -969.7464599609 2685.1669921875 -99.2316131592 ) ( -1016.1765136719 2672.9914550781 -99.2316131592 ) ( -977.0438232422 2712.9943847656 -137.6553039551 ) analmango/rock1 352 0 0 0.5 0.5 0 0 0
}
+// brush 957
+{
+( -1658.0834960938 1512 -52.9957427979 ) ( -1673.7641601562 1480 -49.8146514893 ) ( -1673.7641601562 1512 -49.8146514893 ) common/caulk 0.3076324463 0 0 -0.459392935 0.125 0 0 0
+( -1669.9562988281 1512 -91.4019317627 ) ( -1649.5041503906 1512 -71.0621337891 ) ( -1665.1848144531 1512 -67.8810577393 ) analmango/poster_gems 351.0546264648 368.112701416 168.5321502686 0.0499999523 -0.0500000268 0 0 0
+( -1675.9229736328 1480 -50.3970489502 ) ( -1680.6945800781 1512 -73.9179229736 ) ( -1675.9229736328 1512 -50.3970489502 ) common/caulk 0 47.3221664429 0 0.125 0.6125226617 0 0 0
+( -1650.3557128906 1512 -95.3782806396 ) ( -1666.0362548828 1480 -92.1972045898 ) ( -1650.3557128906 1480 -95.3782806396 ) common/caulk 46.9959869385 0 0 -0.459392935 0.125 0 0 0
+( -1669.9562988281 1504 -91.4019317627 ) ( -1649.5041503906 1504 -71.0621337891 ) ( -1654.2758789062 1504 -94.5830078125 ) common/caulk 37.4489135742 29.4485206604 168.5321502686 0.4687499702 -0.625 0 0 0
+( -1649.5041503906 1480 -71.0621337891 ) ( -1654.2758789062 1512 -94.5830078125 ) ( -1654.2758789062 1480 -94.5830078125 ) common/caulk 0 37.5845108032 0 0.125 0.6125226617 0 0 0
+}
+// brush 958
+{
+( -1728 1400 232 ) ( -1728 1152 232 ) ( -1800 1400 232 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1744 1160 232 ) ( -1816 1160 232 ) ( -1744 1160 160 ) common/caulk 32 0 0 0.5 0.5 0 0 0
+( -1728 1400 232 ) ( -1728 1400 160 ) ( -1728 1152 232 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1800 1152 160 ) ( -1728 1152 160 ) ( -1800 1400 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1800 1152 160 ) ( -1800 1152 232 ) ( -1728 1152 160 ) analmango/poster_monika 0 113.7778320312 0 0.140625 0.140625 0 0 0
+( -1800 1152 160 ) ( -1800 1400 160 ) ( -1800 1152 232 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 959
+{
+patchDef2
+{
+analmango/gauss
+( 13 7 0 0 0 )
+(
+( ( -204.3356781006 3850.1262207031 754.2915039062 0 0 ) ( -182.282043457 3895.0502929688 778.1140136719 0 0.1666666716 ) ( -149.0873718262 3928.4484863281 748.8792724609 0 0.3333333433 ) ( -115.8925933838 3961.8469238281 719.6447753906 0 0.5 ) ( -104.7517700195 3950.3215332031 666.5875244141 0 0.6666666865 ) ( -93.6104888916 3938.7966308594 613.5307617188 0 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.0833333358 0 ) ( -156.9149475098 3877.7834472656 787.1911621094 0.0833333358 0.1666666716 ) ( -111.0374450684 3902.5485839844 762.4951171875 0.0833333358 0.3333333433 ) ( -65.1591491699 3927.3139648438 737.7990722656 0.0833333358 0.5 ) ( -66.7014770508 3924.4216308594 680.2036132812 0.0833333358 0.6666666865 ) ( -68.2438354492 3921.5297851562 622.6081542969 0.0833333358 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.0833333358 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.1666666716 0 ) ( -155.2586517334 3846.6884765625 779.8187255859 0.1666666716 0.1666666716 ) ( -108.5520019531 3855.90625 751.4362792969 0.1666666716 0.3333333433 ) ( -61.8460388184 3865.1240234375 723.0541992188 0.1666666716 0.5 ) ( -64.2163696289 3877.7790527344 669.14453125 0.1666666716 0.6666666865 ) ( -66.5873413086 3890.4345703125 615.2354736328 0.1666666716 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.1666666716 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.25 0 ) ( -153.6018981934 3815.5932617188 772.4460449219 0.25 0.1666666716 ) ( -106.0675964355 3809.263671875 740.3774414062 0.25 0.3333333433 ) ( -58.5330505371 3802.9338378906 708.3089599609 0.25 0.5 ) ( -61.7317504883 3831.13671875 658.0856933594 0.25 0.6666666865 ) ( -64.9307250977 3859.3393554688 607.8631591797 0.25 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.25 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.3333333433 0 ) ( -177.3123168945 3801.7651367188 755.99609375 0.3333333433 0.1666666716 ) ( -141.6328430176 3788.5202636719 715.7028808594 0.3333333433 0.3333333433 ) ( -105.9534759521 3775.2766113281 675.4094238281 0.3333333433 0.5 ) ( -97.2971191406 3810.3935546875 633.4113769531 0.3333333433 0.6666666865 ) ( -88.6408996582 3845.5114746094 591.4132080078 0.3333333433 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.3333333433 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.4166666865 0 ) ( -201.0226287842 3787.9362792969 739.5463867188 0.4166666865 0.1666666716 ) ( -177.1981811523 3767.7775878906 691.0279541016 0.4166666865 0.3333333433 ) ( -153.3737487793 3747.6196289062 642.5095214844 0.4166666865 0.5 ) ( -132.8623199463 3789.6506347656 608.7360839844 0.4166666865 0.6666666865 ) ( -112.3513031006 3831.6828613281 574.9632568359 0.4166666865 0.8333333731 ) ( -115.6643829346 3893.873046875 589.7082519531 0.4166666865 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.5 0 ) ( -226.3895263672 3805.2026367188 730.4691162109 0.5 0.1666666716 ) ( -215.2483825684 3793.6774902344 677.412109375 0.5 0.3333333433 ) ( -204.1074676514 3782.1528320312 624.3552246094 0.5 0.5 ) ( -170.9129486084 3815.55078125 595.1206054688 0.5 0.6666666865 ) ( -137.717956543 3848.9494628906 565.8858642578 0.5 0.8333333731 ) ( -115.6643829346 3893.873046875 589.7082519531 0.5 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.5833333135 0 ) ( -251.7561187744 3822.4692382812 721.3918457031 0.5833333135 0.1666666716 ) ( -253.298538208 3819.5771484375 663.7962646484 0.5833333135 0.3333333433 ) ( -254.8408050537 3816.6857910156 606.2003173828 0.5833333135 0.5 ) ( -208.9626464844 3841.4501953125 581.5046386719 0.5833333135 0.6666666865 ) ( -163.0848083496 3866.2155761719 556.8087158203 0.5833333135 0.8333333731 ) ( -115.6643829346 3893.873046875 589.7082519531 0.5833333135 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.6666666269 0 ) ( -253.4124145508 3853.564453125 728.7644042969 0.6666666269 0.1666666716 ) ( -255.782989502 3866.2202148438 674.8549804688 0.6666666269 0.3333333433 ) ( -258.1540527344 3878.8759765625 620.9456787109 0.6666666269 0.5 ) ( -211.4475402832 3888.0932617188 592.5634765625 0.6666666269 0.6666666865 ) ( -164.7412109375 3897.3110351562 564.181640625 0.6666666269 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.6666666269 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.7499999404 0 ) ( -255.0691986084 3884.6594238281 736.1369628906 0.7499999404 0.1666666716 ) ( -258.2683105469 3912.8625488281 685.9140625 0.7499999404 0.3333333433 ) ( -261.4667053223 3941.0654296875 635.6911621094 0.7499999404 0.5 ) ( -213.9325561523 3934.7355957031 603.6220703125 0.7499999404 0.6666666865 ) ( -166.3976287842 3928.4057617188 571.5537109375 0.7499999404 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.7499999404 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.8333332539 0 ) ( -231.3587799072 3898.4877929688 752.5869140625 0.8333332539 0.1666666716 ) ( -222.7027435303 3933.6052246094 710.5888671875 0.8333332539 0.3333333433 ) ( -214.0463409424 3968.7231445312 668.5905761719 0.8333332539 0.5 ) ( -178.366897583 3955.4787597656 628.2971191406 0.8333332539 0.6666666865 ) ( -142.6874694824 3942.2341308594 588.0036621094 0.8333332539 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.8333332539 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.9166665673 0 ) ( -207.6488952637 3912.3166503906 769.0368652344 0.9166665673 0.1666666716 ) ( -187.1373138428 3954.3479003906 735.2634277344 0.9166665673 0.3333333433 ) ( -166.626159668 3996.3796386719 701.4899902344 0.9166665673 0.5 ) ( -142.8017883301 3976.2211914062 652.9721679688 0.9166665673 0.6666666865 ) ( -118.9771118164 3956.0627441406 604.4536132812 0.9166665673 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.9166665673 1 ) )
+( ( -204.3356781006 3850.1262207031 754.2915039062 0.9999998808 0 ) ( -182.282043457 3895.0502929688 778.1140136719 0.9999998808 0.1666666716 ) ( -149.0873718262 3928.4484863281 748.8792724609 0.9999998808 0.3333333433 ) ( -115.8925933838 3961.8469238281 719.6447753906 0.9999998808 0.5 ) ( -104.7517700195 3950.3215332031 666.5875244141 0.9999998808 0.6666666865 ) ( -93.6104888916 3938.7966308594 613.5307617188 0.9999998808 0.8333333731 ) ( -115.6643371582 3893.8728027344 589.7083740234 0.9999998808 1 ) )
+)
+}
+}
}
// entity 1
{
@@ -11789,3 +11830,10 @@ niveus/base_yellow
"light" "70"
"_color" "1 0.528435 0.477134"
}
+// entity 161
+{
+"classname" "light"
+"origin" "-1764.000000 1136.000000 196.000000"
+"light" "3"
+"_color" "0.843244 0.58088 0.219104"
+}
diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index 3ebc915..2177ffe 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -999,6 +999,21 @@ textures/analmango/poster_radio_math
}
}
+textures/analmango/poster_monika
+{
+ surfaceparm nonsolid
+ surfaceparm trans
+ polygonOffset
+
+ {
+ map textures/analmango/poster_monika.tga
+ }
+ {
+ map $lightmap
+ blendFunc filter
+ }
+}
+
textures/analmango/zittrigmann
{
surfaceparm nonsolid
diff --git a/textures/analmango/poster_monika.tga b/textures/analmango/poster_monika.tga
new file mode 100644
index 0000000..94220d8
--- /dev/null
+++ b/textures/analmango/poster_monika.tga
Binary files differ