mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-20 22:54:46 +00:00
This PR is reverting the wallening by reverting everything up to
8868a5d1fe and replaying the PRs skipping
#85491.
The following 239 (39 + Wallening Main PR excluded) PRs need to be
replayed (DO NOT EDIT THIS LIST MANUALLY, IT IS USED BY THE BOT TO TRACK
PROGRESS):
- [x] #85777 - Reverted in 3
- [x] #85767 - Reverted in 2
- [x] #85763 - Reverted in c
- [x] #85762 - Reverted in 2
- [x] #85760 - Reverted in dbc19df13b033ac8bb5a83fa38c5cf140cf31836
- [x] #85733 - Reverted in 22f17d057eac71661b86c3f2186489568c130043
- [x] #85721 - Reverted in 6d90643dbbc90f3d21f2d25dc85dc4d4f706d6a3
- [x] #85719 - Reverted in c52954648309ad4786238f409cd33142d486190f
- [x] #85705 - Reverted in 3b5ddabfd5ab2cfec226a643be6e8a8fd656c831
- [x] #85684 - Reverted in cbc1839625f44ba67bcd5489c3629ef98e31b2d4
- [x] #85662 - Reverted in 69cac24e236604c262093abea7b9566ecbd092c4
- [x] #85663 - Reverted in f394c3b1430d346b0598abf19fe511b30c3f4676
- [x] #85673 - Reverted in 8a9ae0411488c9c779a54c5c41076238c230a304
- [x] #85718 - Reverted in f8f18d8b626e963b06555f76850702740d5de0c3
- [x] #85667 - Reverted in a1365766d178b727b6c6b503ad410e9d88d57ddd
- [x] #85683 - Reverted in 3bdb0207d883de8db6f726d976025517cc6d3cba
- [x] #85676 - Reverted in 0a5d667b2c8a9a2519af2a4fda8cd39f568e5049
- [x] #85661 - Reverted in 49fc6bc1815133644d7173aa7914ede6c900218a
- [x] #85682 - Reverted in b41efe96fd72228b079319ac07c660f4cd974af6
- [x] #85695 - Reverted in 89a173b136cb0297070cef39c5bc9783b6323f02
- [x] #85654 - Reverted in 1e4836b5173a40fbeb8755e0fb76ebc8d39fe1e0
- [x] #85655 - Reverted in b4dde41eebd0422e1ec440b4d8d54229fc9617f4
- [x] #85634 - Reverted in 0c352fc785762da025a68873438593b508f757d9
- [x] #85700 - Reverted in 1327cf7fe48d7f4fd227120508f77c831aefa4ca
- [x] #85633 - Reverted in c71c8c9d43112a1f4c6331bbba546881dcffd59d
- [x] #85649 - Reverted in 73484337077f616878e63208d9bf2309f0d2e579
- [x] #85475 - Reverted in 839f700001a57646109e75332d5311fe27bbc957
- [x] #85467 - Reverted in 6f08421f64d01b13775d146cf7a451f9f38e195a
- [x] #85472 - Reverted in 63c6a9b04e72e8130df5eeb2861c75f80a97e3de
- [x] #85300 - Reverted in 7c776034f34ee6a76810c1a3779f169f2430c418
- [x] #85249 - Reverted in 257d02273751fc1f939f76756f70b614a6e06789
- [x] #85236 - Reverted in f9f4c444c8fc027dea87d4dbe0ebb8dd6bc67154
- [x] #85299 - Reverted in f24ddff51dc3fec7145a2e97f057f1b286921db3
- [x] #85228 - Reverted in cb8c318f7e2183d9f941c582f79e4c8b2503d95c
- [x] #84910 - Reverted in 2a562ca26d9d13f335c276487f66edaa0d21b3bd
- [x] #84889 - Reverted in 679da6885b034bcd8843f7f4c855388bce263733
- [x] #84766 - Reverted in 4035dd7adee74af0fed82c14a8749585b2ab1c96
- [x] #85607 - Reverted in dc9a0462b4c287cee2d541925f8a9988d18d9d85
- [x] #85618 - Reverted in 2a06f57c89939dc31e9273ef250bd050cff17ff1
- [x] #85619 - Reverted in b98661affc90e44c68a58c05e57cdf1dfd094c93
- [x] #85608 - Reverted in 57a935126233f90255aef0a55dab16524be1faac
- [x] #85648 - Reverted in ab82c66a95d4fbff86040b421a86cc82dca73009
- [x] #85692 - Reverted in f04fac92bd3594f12f244bae9ea0c5c300c737fb
- [x] #85544 - Reverted in 7b1198eb5c700e85ec163e60828c01fac55a9909
- [x] #85631 - Reverted in 81c04ceb553f9887d59f8edf8b2526ff3807264b
- [x] #85529 - Reverted in 2a7e2c8e3856d67cdefda0d25803393070a6e996
- [x] #85525 - Reverted in 6ed2d9f28a9333c705eafd21acf54771b8e4db36
- [x] #85514 - Reverted in a4fa2aa79d93b69d15e0fb9cb1fb7a5bc288bb34
- [x] #85520 - Reverted in 6e1bd4b11cd55e36cab332c5a0c90c76a2e43703
- [x] #85521 - Reverted in 79afdac194da5f42b38fb0fdfc394f2b8d485266
- [x] #85519 - Reverted in a967cae1fb3feea23fdf196595e496431740f52d
- [x] #85513 - Reverted in e3934edf8794f93a37dc7f63c60aa64ed7b60736
- [x] #85498 - Reverted in cf1fadbc54a1365362aaeb142cbbd4e2c3be6f15
- [x] #85485 - Reverted in 2a650ef9c0454bd650d6a13d10c0cb71bb134b2b
- [x] #85494 - Reverted in bbb97958010dc0f74cee279fd304a7fcaccb625e
- [x] #85552 - Reverted in f1780715bd054300e50e9102ad150c76690d4ca1
- [x] #85724 - Reverted in 6933699cef8b01f9aef989f36ca079680a2777ff
- [x] #85735 - Reverted in a6564f19226ef3969bec0573b49fa772d6e6df31
- [x] #85729 - Reverted in f728d121a2f27a3cc7973fc2041df9b7193b796d
- [x] #85704 - Reverted in 38f5b034a3370eda4657a2a5a6adcf3df6ec280c
- [x] #85660 - Reverted in 7db39869d37ff5b39574d88ffc872449ab5b457c
- [x] #85752 - Reverted in 1f2988028b7cccad121fc658d6547d89453703b7
- [x] #85592 - Reverted in 263cbcfcb54746a9361369d86b44cc3e2d375199
- [x] #85580 - Reverted in a92d53624198dce844c108b5dbea09cf2a16cd10
- [x] #85573 - Reverted in a7d51042355798038ced44f64e987261b85e93bc
- [x] #85534 - Reverted in 31787e7d1ce4fec2ce20776672099bf35486a296
- [x] #85511 - Reverted in 2567a2eb56cdb7058f89ea298e53197147198d82
- [x] #85508 - Reverted in 69de2ac16c20d968adcd19f0732fd2f84a4ae90e
- [x] #85680 - Reverted in 44437ac406c708b9a3ab3b47f4e3c10e77a0b91b
- [x] #85551 - Reverted in 7f17d428fd2787a6982534bfc9ac9188fd4b8675
- [x] #85478 - Reverted in bd9e575dafc62dc7e1259e8c19199ba15d82be4f
- [x] #85476 - Reverted in 4ce8052076de0bb52f1ed87663920e98482ade62
- [x] #85593 - Reverted in 9ff5924d3d56fcba3f180fc4b539568fb2013323
- [x] #85441 - Reverted in db96015adaec01f3fbcb978796a0d7abd5668932
- [x] #85567 - Reverted in 62696ad04fb34fd946708309bd3e439db9b3f488
- [x] #85337 - Reverted in 1267e9f002d03c33187afd2e734e95a78a5ca6ac
- [x] #85348 - Reverted in 4fcc3c659ee2a38d978e137252309644d5adde8f
- [x] #85350 - Reverted in e691c833dd5aca2e7808591516e8443e8ccf1b27
- [x] #85744 - Reverted in 251578d2868a691981b824a268c540b9c15a424e
- [x] #85772 - Reverted in bc6804a04aa9368074bcc853e689c8fe6de2cb3a
- [x] #85797 - Reverted in a05e36ec4a0129ff6901ea07488120b54a8ee124
- [x] #85787 - Reverted in a5393f94b9e71d9ea0625e5fcfb5baaf16af38d3
- [x] #85742 - Reverted in cd99a2aeaa1347b790c9bfdae35e41900e2ada9a
- [x] #85440 - Reverted in 8b5ead7c7f0d8087b41256a296e730443752f17d
- [x] #85739 - Reverted in 3511aae5a4798104220b79ad0e5b2b357dc1e83b
- [x] #85293 - Reverted in fc687ca36ef476ab9080f0c62b427ab0af533d68
- [x] #85716 - Reverted in 130b32a222a7585cfdde71aa561fb8b2c7d8083b
- ~~[ ] #85848 - Reverted in f6c46ca2f5cb2d039e4b26731570ca801741cc5d~~
(SKIPPED)
- [x] #85795 - Reverted in 4684c3325a9135b6bf10eb43026f373993bf605d
- [x] #85859 - Reverted in 0e0838fe11b7d9af4f62af4f7388ed8fb57bf49c
- [x] #84873 - Reverted in 34407b79a45718a305f3bfe3fac7f129b4f1c51f
- [x] #85864 - Reverted in 4b25a209c5019bb65922cd793aff339f20c3d026
- ~~[ ] #85845 - Reverted in a326246e81b7b9242bbf45e7ab3b31caf9ce8147~~
(SKIPPED)
- [x] #85844 - Reverted in bdf1e6c1e3469884550d3211e51ec9303a022482
- ~~[ ] #85843 - Reverted in 41a8acb196af0988372b06ade7131d07d03daab3~~
(NOT BEING INCLUDED)
- ~~[ ] #85840 - Reverted in 4807bacea8418000f84d62ca0fb122846cab4929~~
(NOT BEING INCLUDED)
- ~~[ ] #85837 - Reverted in bc9edfa8666de14ca4e57e466146d753182a3a71~~
(NOT BEING INCLUDED)
- [x] #85865 - Reverted in 14c958b465af40f0ff28b100047c4c572919ae19
- ~~[ ] #85818 - Reverted in a77256f74e2d330f5f76141eb9c994a8e5e45810~~
(NOT BEING INCLUDED)
- [x] #85822 - Reverted in caba685be95fd336f0b09e88bccfb8856d5ad9b4
- [x] #85794 - Reverted in 0d4de984eb8513d065e8ac724e8cde11f01d4ef7
- [x] #85756 - Reverted in 9c5a7e1a5f895851493e149ccb5cd50e35cd6101
- [x] #85852 - Reverted in 74303e5bbae8426a073d068ef4342d8acc420a09
- ~~[ ] #85841 - Reverted in e5831ce3cc87765cb13e6d342417bc1730780392~~
(NOT BEING INCLUDED)
- ~~[ ] #85834 - Reverted in 1be665204da791ec7520d0799c015157fc625953~~
(NOT BEING INCLUDED)
- [x] #85792 - Reverted in 33b4e48175040f9f76ef83d3154f10c69589b6ad
- [x] #85646 - Reverted in fd23a0d6c4c96470b688dc0a35370c61c7e32f61
- ~~[ ] #85799 - Reverted in 4a7a6d812f2f301c1e749c92f324223f9bde8a39~~
(NOT BEING INCLUDED)
- [x] #85819 - Reverted in 8bf001b7889d3a4282947cd332833c473b98eac1
- [x] #85479 - Reverted in 6aeb5ef4582c03febe0c914185d29f75df4d5d94
- ~~[ ] #85824 - Reverted in 9ca3edfaa17d97306ac73207ef32fd1272061f6b~~
(SKIPPED)
- [x] #85406 - Reverted in 702280ff48c8aef44f4da9a85eb33a7bc5faa013
- [x] #85778 - Reverted in ce0ec5c685aadb02ae049d6714f1d2fd6dae1f26
- ~~[ ] #85851 - Reverted in 610c68b275cf3c54181d36ce48bd97b0cce0665c~~
(NOT BEING INCLUDED)
- [x] #85754 - Reverted in 5cbdda00c5335db79ea50aedba097de1d06bf91b
- [x] #85266 - Reverted in abdfec798e5223dfa9d67e1967d7618454dbec28
- ~~[ ] #85823 - Reverted in 86b766abd3d77af8ad835a3464fc5ff95cc11079~~
(NOT BEING INCLUDED)
- ~~[ ] #85842 - Reverted in 7ddd47e26ef1bc336e92a6675a33ec3191039c16~~
(NOT BEING INCLUDED)
- [x] #85857 - Reverted in e32312ee20e9fdccb6dd7c4dc2d185540bd2276b
- [x] #85856 - Reverted in 7d5d74c2b55a08ef5553568e996053157359dbe2
- [x] #85276 - Reverted in 1d6fa881e4aef1e6b368d5b6809bccb021fbbd2a
- [x] #85886 - Reverted in f27d6cabdf8f06f29926616345fa82c4e1e48708
- ~~[ ] #85771 - Reverted in 019d898b601c9ef4d45b7ee0f2144518ee127ca9~~
(SKIPPED)
- [x] #85464 - Reverted in adc00417795deb85f8aa6170b0f0a07c40c8798c
- ~~[ ] #85870 - Reverted in d69b998420bfb39693bb59b9b9a20611880fdafa~~
(NOT BEING INCLUDED)
- ~~[ ] #85869 - Reverted in 0063c69f111bb67144f9b379476250ce86c99eee~~
(NOT BEING INCLUDED)
- [x] #85530 - Reverted in b40c93399411d277b3899e149196f3eb974f841f
- ~~[ ] #85871 - Reverted in 63908bbd0a71d0a2bd0a4691816c17cc9eb5310c~~
(NOT BEING INCLUDED)
- ~~[ ] #85832 - Reverted in b29dab083f091198d65a9b0754536f13a935dc2c~~
(SKIPPED)
- ~~[ ] #85825 - Reverted in d072b294ca3bc526df5128df45653db97ba38fe1~~
(NOT BEING INCLUDED)
- [x] #85632 - Reverted in 290092c7d826aa5b100a38cd4bacc5330b39a934
- [x] #85902 - Reverted in 76118d620e71f1819a9385863b689d9a8d4ea810
- [x] #85906 - Reverted in 82623c2cc0fd9aee3e79c95fe5558146c59bc941
- [x] #85907 - Reverted in 68b7305f21240ca28c33afc904ee532966b7c4bd
- [x] #85449 - Reverted in ab86a79339ef7b01ceb08dc7279c698927ebcbfa
- ~~[ ] #85875 - Reverted in 0a1fcda90e638e66d574c247e93f0669d0c27b0e~~
(NOT BEING INCLUDED)
- ~~[ ] #85861 - Reverted in 6dad5111aa144860371c93a2d78094fe3d39a7e1~~
(NOT BEING INCLUDED)
- [x] #85264 - Reverted in dc1d2dcc995f33fc5773e037f5171e9516897281
- [x] #85726 - Reverted in dbd9ec81586c87c1ab2afc43d43c4f020907dc1b
- [x] #85730 - Reverted in 7de2c2a1d012ccb03f82c6beabd71a66aa0f910a
- [x] #85880 - Reverted in 02169d2f28611765997fa332dda69c8031436fd1
- [x] #85176 - Reverted in e3c85aae1cf665c9892bf7280b7b48ea42323198
- ~~[ ] #85887 - Reverted in 56b35f294b303fd30fbd7685011d37b456d584c7~~
(NOT BEING INCLUDED)
- [x] #85883 - Reverted in 53be06a505ebd8581114bba8590e378d387b6c1a
- ~~[ ] #85882 - Reverted in a8877ff0083ca5753e3d3b1b9c9edc3613fa6570~~
(NOT BEING INCLUDED)
- [x] #85895 - Reverted in 741235d41b3a19a40434653f1c14fc0999fac9c3
- ~~[ ] #85746 - Reverted in b7aebb6e5788f6c484173f0a5e29f042ea0c8560~~
(NOT BEING INCLUDED)
- ~~[ ] #85889 - Reverted in d677231d8c55efcd2cf427d510d961cd00f186c7~~
(NOT BEING INCLUDED)
- ~~[ ] #85888 - Reverted in 693f79abae54980ee098d602ed79926d51d5094b~~
(NOT BEING INCLUDED)
- [x] #85898 - Reverted in 4f41fda23e6b9711aef5d00836591c1ac230612e
- ~~[ ] #85821 - Reverted in 738c9a75f65c4a376da36ad208e1fd8fdeac1ff0~~
(NOT BEING INCLUDED)
- [x] #85694 - Reverted in f7ea4d19cdaa2067c87c43362b514c684b56b1f3
- [x] #85308 - Reverted in 4a89b62774da5e9ec9ea241c60ec2a99f51f9bed
- [x] #85904 - Reverted in 999dbe1773cc7488c629bb8d0d21be5454dbef60
- ~~[ ] #85901 - Reverted in bbf832da9e0c61ad25221530df3b1e93cace25dd~~
(NOT BEING INCLUDED)
- ~~[ ] #85896 - Reverted in 542fe408728faaef8a16869e13c4661018a8a07c~~
(NOT BEING INCLUDED)
- [x] #85927 - Reverted in 7dc87df28e79ef3e9f3fad83cc0907d2dc867c47
- [x] #85908 - Reverted in bcca80f073a486ca7908e9636d0e8b275c2085bf
- [x] #85929 - Reverted in 094bf3610a73961f6433a52ada1a52f25d853738
- [x] #85877 - Reverted in 5874cafd0dab8d3bd61cf1f662793c2708f42dcc
- [x] #85903 - Reverted in b3ba8fffc5548e0f2ae6bada3baf10bad3c75e54
- ~~[ ] #85913 - Reverted in 67f7ec48d20f9a64ce4664fa2c452a25b60db59e~~
(SKIPPED)
- [x] #85914 - Reverted in 7efcd3a5f7fef33c2a1625386bfead80a6ed5309
- [x] #85917 - Reverted in fc50a5ff998d0e7269131a029e533e90e9dc3c54
- ~~[ ] #85949 - Reverted in 10a8e0f5c69e3ca1eb6e26f00945bfe226598bc2~~
(NOT BEING INCLUDED)
- ~~[ ] #85338 - Reverted in 847549ab938f77464829b1392a1b6f2b2f4b9e8f~~
(SKIPPED)
- ~~[ ] #85922 - Reverted in 3d9388249b8c322aac5dd4980d4ab4673ca01006~~
(SKIPPED)
- [x] #85923 - Reverted in 2c6ffa4decf40eb52a92353aeb98aee8cbc7b4a2
- ~~[ ] #85920 - Reverted in 1de5b03981d9fcf9c2e6823bffa515fb939aa541~~
(NOT BEING INCLUDED)
- [x] #85919 - Reverted in 1773e9baccdc941285f56ccb416f5c7125b031ef
- [x] #85271 - Reverted in aecf8002cf2807a76b6b295867e50392b4bc4534
- [x] #85918 - Reverted in 023ec3a4d1b1b2fc8f596fea65a77ddc9a06689f
- [x] #85924 - Reverted in e4886079ad90f33628ac59e0793dfbbc8b8b9420
- [x] #85928 - Reverted in 7470b7d5ac40be21c345e8825f4c4efc4738e29f
- [x] #85926 - Reverted in 7761c9e3a1f442f37d4db4b27e5d78fae95edf00
- [x] #85900 - Reverted in 633736cb0655dc464e9794666c63ae6ec7689826
- [x] #85909 - Reverted in a47c7ec8a77bd02f8b7bb1ce3c621efbe57077c3
- ~~[ ] #85931 - Reverted in 9bc7a412982da6fbdb9cd24570d98877b76a45c3~~
(NOT BEING INCLUDED)
- ~~[ ] #85894 - Reverted in c15e1711656929aeb59f482145ecf029b40d58b8~~
(SKIPPED)
- ~~[ ] #85759 - Reverted in f45d70be0ffb9bf007bfa18a1bd1b5ce23d6dcfc~~
(SKIPPED)
- ~~[ ] #85892 - Reverted in fc08dc1a7160f584c94e368962eb56c18dccc86a~~
(SKIPPED)
- ~~[ ] #85915 - Reverted in 428f475c26f383998a689560a16de86da3f17557~~
(NOT BEING INCLUDED)
- [x] #85222 - Reverted in 66e7ac2f00735c90acdb69a50c9e485a0f4e1552
- [x] #85150 - Reverted in 3079387f926e41febb576105ec0b3acec2f7beba
- [x] #85935 - Reverted in ce6114f644593ead295763362a61d19077f22acf
- ~~[ ] #85936 - Reverted in f601fa796bce7e70645a84fff91391cbb6ed8e37~~
(NOT BEING INCLUDED)
- [x] #85937 - Reverted in 64242f589df3d9118fd5c09d19574758260c76a1
- ~~[ ] #85940 - Reverted in a979c6c24705a8729efab5eca40840f1c8070f1d~~
(NOT BEING INCLUDED)
- ~~[ ] #85942 - Reverted in 9562c14083212fc962b8687663ba5fac2ebfdd1a~~
(NOT BEING INCLUDED)
- [x] #85944 - Reverted in adf8e1927e4b9886c9042d6a0eaaef74e4e0e102
- [x] #85605 - Reverted in 88dbfb4f859f12549e8cf8ed5204ee8d7183d40f
- [x] #85945 - Reverted in dea9e79a9c298eae05b8d173d8df4a37218e2d9c
- [x] #84964 - Reverted in 234481fb1d92a266768fcbca49245151236803ed
- [x] #85952 - Reverted in c62d87ab54d687db64b1551b319195527ca92924
- [x] #85953 - Reverted in bd0e46245ccb597081b8baa4f81ff85949f672be
- ~~[ ] #85943 - Reverted in 697b6841391354885ef2d314d9185b8eee7a5cb0~~
(NOT BEING INCLUDED)
- [x] #85946 - Reverted in f4afd4d330b6fc28397f7707bca8773d44cb15ed
- [x] #85950 - Reverted in 394fffcb836f32f4e1b1fd91a621249e0e5d7d67
- [x] #85955 - Reverted in 2230a5bc141cd11fc79ccf6b4b653257508a7e65
- [x] #85319 - Reverted in fdaddd9cd6ed0bdd1cd78ba3c9729035936abcbd
- ~~[ ] #85934 - Reverted in 41bb6122b6d6e3c38c500d5ddf63808836ab090e~~
(NOT BEING INCLUDED)
- ~~[ ] #85255 - Reverted in 3e213b8554b40e53f6429969d6e9dbaa357fb09e~~
(SKIPPED)
- ~~[ ] #85961 - Reverted in 6f3d000b3601dc7f75f7edd221fab3edc3bbbd8c~~
(NOT BEING INCLUDED)
- [x] #85956 - Reverted in a5bf22a93ca1a149ca839e6c874d088b32c7c25f
- [x] #85958 - Reverted in c964a46741bd26a600bb75bc6463c629c11c914f
- ~~[ ] #85969 - Reverted in b599cd4bd3ae223210eb0d3b47c3bd814e1cb08c~~
(NOT BEING INCLUDED)
- [x] #85252 - Reverted in 5a0e2f31a6e1093ab47970056f5bb3af54172e12
- [x] #85984 - Reverted in b000da82f62bb48b059a881d596f3a2e7d985d21
- [x] #85137 - Reverted in 1f31b558e41fc66d5da9db30a83d89cbb9949eae
- [x] #85881 - Reverted in f3913f94c4557c4fc9d5605cd8e875accabebda6
- [x] #85972 - Reverted in d3afed87a3a8eed7e0016512d2186b6aded0fca9
- [x] #85998 - Reverted in 3d286b763cf2f7fe11b6f0ccb2456130570726c2
- [x] #85358 - Reverted in 75f84bda1b3c80d54ae94a567bf96016aaae45b2
- ~~[ ] #85964 - Reverted in be1aeb010afa20c1b6949218d8911ee9e900b3d7~~
(SKIPPED)
- [x] #85960 - Reverted in 69cbfce1529377ce7cd998ab474add0d61650d7f
- [x] #85992 - Reverted in 89e4a7bb0b793461338ba1b0a3d332bf78ef140c
- [x] #85967 - Reverted in d398e418eb340f309be523514ae0befdf1869560
- [x] #84888 - Reverted in bb98eb09f06a1fdc0bbb733d6a42d711e6d477bc
- ~~[ ] #85983 - Reverted in 81152a9cd347eb7b4073758e2e96490e6e729ca9~~
(NOT BEING INCLUDED)
- [x] #85976 - Reverted in 93c091347ca8f04763b91fd4c39ccdff848a0d50
- ~~[ ] #85962 - Reverted in de32ea25b534c725e3d55418ef0363145f0ed2b0~~
(NOT BEING INCLUDED)
- [x] #85977 - Reverted in 393652a1ef065014748ae6977a9f36b32c99dc7c
- [x] #85959 - Reverted in 52e6e07eb98bcb74a423934b14d5850dbf2c6647
- ~~[ ] #85988 - Reverted in a5853ccde46b5fee2d9eb31755384de15e7a5a87~~
(SKIPPED)
- ~~[ ] #85974 - Reverted in eab20ba04e6b06f862a0fb35cedb6374af7b93c0~~
(SKIPPED)
- [x] #85939 - Reverted in ca85b05692f55f6b3e4bd0b3f30c63f89531c33f
- [x] #85878 - Reverted in 3b3d3dbff9148e46b01f3af28f17f66bef4dfd16
- [x] #85858 - Reverted in 08d6082e62d07117170ff5ffd065daad1278e853
- [x] #85651 - Reverted in b76ab4a2114dd0eb78336878b2825d9919c210cc
- [x] #85505 - Reverted in 0958eaa7b6f4d48400bea4e215e11edaa933ba8a
- ~~[ ] #85352 - Reverted in 620cec18618e514bbe4d3eb0a0d0db1528b9d312~~
(SKIPPED)
- [x] #85279 - Reverted in ba0fd529ef94ba793fe2eee40975533fe8f475e3
- [x] #85954 - Reverted in d7fe0336f2a968b93fd02361814930236e3b8ddf
- ~~[ ] #85996 - Reverted in 5fbd62139e0c1b668aaaf35d249d527cdc276b93~~
(SKIPPED)
- [x] #85994 - Reverted in c99a03c6833ac58e0288111953573f697488234f
- [x] #85470 - Reverted in fbd5ac46d84d27455cbcf5f998741124ed6de625
- ~~[ ] #85981 - Reverted in dc74c75011ddfb1b16d644fd2ca5607599532d6f~~
(NOT BEING INCLUDED)
- [x] #86011 - Reverted in b14b42e70e2bd21f19d443065b2342e4591c5e05
- [x] #85820 - Reverted in 26248546b9f7d0fedec52e7b2f7def40d457e29f
- [x] #86013 - Reverted in e17ac14f53d08be988f0516e7c39d31496a35184
- [x] #85986 - Reverted in 4021ffea0b1bbb1f6c5b26a296abd5a8bda1d5b3
- [x] #86019 - Reverted in c0801b3aa5dbdd33ca7c6c81e80c9fa573ada9e1
- [x] #86010 - Reverted in 10dff005729305b75deaf1c5755a94125fa5141d
- [x] #86029 - Reverted in 664619213db52930fa22007561dad01fe8bb3de4
- [x] #86024 - Reverted in e74ea4368cbd2cd085aa6e8bbe83db07800b0bd4
- [x] #86022 - Reverted in 0b2fc6a1f478c48546b161fd3ddd571f7ed6000f
- [x] #86015 - Reverted in b99d93592dbf8840a035f22f26b64bcf27c817cb
- [x] #85415 - Reverted in d6102c7339838675c03eb771d7a3b5a9bea4035d
- ~~[ ] #85703 - Reverted in 339b7edf3c0318f9f02922018d6918211660234f~~
(SKIPPED)
- [x] #85890 - Reverted in 4e54f376e07071f84ed283e7468e334aaf6e4e02
- [x] #86046 - Reverted in 0bbe2c9a048c229d151682e08aca1fa176c3ad91
- [x] #86008 - Reverted in a0a0635cd6618618c49fda7cf150231d62a14236
- [x] #86042 - Reverted in fa376315a064b945ed9846225c7f48e38e9b55ed
- [x] #85891 - Reverted in 603dcd691e9eaad0a610c60c94fee522391bd2b3
- [x] #86040 - Reverted in e42fc7618194b4b01cb68ca0c61385e465d0cb05
- [x] #86025 - Reverted in 536bb25fe91845fe05bb7d512d8e73cc193b67ff
- [x] #86012 - Reverted in 5cb4ec5bdf87653a5bb651c536f21423db30887e
- [x] #86004 - Reverted in e9536143e78e3b0614d3ce6ee2c9a40005ba9b91
- [x] #85989 - Reverted in 88a92322c2f028d2e3a2be18951d35d1135a6268
- [x] #86044 - Reverted in d0a5fb5956be23144e325d3d51f53cb103dd5bbe
- [x] #86001 - Reverted in 195c3597044315c9b10d002e6196911ac0622c45
- [x] #86030 - Reverted in 5265796286b481d34fc91a1f8c58b6373d23415e
- [x] #86055 - Reverted in e82138798cda028b673fe7ac83890e5a6b9e16d2
- [x] #86057 - Reverted in c921900e6151552aa0768b4c9d7cc58c58dfbcc0
- [x] #86014 - Reverted in c004d4e989a2faa672793f58fd98bd6fded8194e
- [x] #85304 - Reverted in 611510bd7f65ee06738b7344326d72f57a131f8a
- [x] #86061 - Reverted in f14b0a245dcf164bb99f7696e180847bb5be9b11
- [x] #86075 - Reverted in 5339fe6c098d48769eda3f9935aa3488faa73097
- [x] #86089 - Reverted in 10b5398e6b55f4799ca7d6740ac50c031e157c43
- [x] #86081 - Reverted in ba86f43383cd2e8417c0a465c23fe3227fcd5520
- [x] #85609 - Reverted in 9e5208feaca3163b7f4237c316d880161933777f
- [x] #86114 - Reverted in cf410a97b8348381f96cc784a6489d7c1dea49ba
- [x] #86023 - Reverted in a7a2e95c0c1b0598f15019934c80ccc80a9f89af
- [x] #86027 - Reverted in 9cf71611befac64d26d326c060ef082262aeca70
- [x] #86016 - Reverted in b67fa06e1559c8de87899bd06d09891b4c7ae947
- [x] #86095 - Reverted in dc5abd827bb56e1609afe5a9d2bdd957d40cc75c
- [x] #86105 - Reverted in f5b8e7ecbe99cb38e829a98a4f6eb2c200af8b91
- [x] #86070 - Reverted in 6c460bbc22827bdbc566b524b8e6a959cbb61c37
After that some startup commits on this branch need to be reverted then
it can be merged.
---------
Co-authored-by: tgstation-ci <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: MrMelbert <kmelbert4@gmail.com>
665 lines
22 KiB
Plaintext
665 lines
22 KiB
Plaintext
|
|
//generic (by snowflake) tile smoothing code; smooth your icons with this!
|
|
/*
|
|
Each tile is divided in 4 corners, each corner has an appearance associated to it; the tile is then overlayed by these 4 appearances
|
|
To use this, just set your atom's 'smoothing_flags' var to 1. If your atom can be moved/unanchored, set its 'can_be_unanchored' var to 1.
|
|
If you don't want your atom's icon to smooth with anything but atoms of the same type, set the list 'canSmoothWith' to null;
|
|
Otherwise, put all the smoothing groups you want the atom icon to smooth with in 'canSmoothWith', including the group of the atom itself.
|
|
Smoothing groups are just shared flags between objects. If one of the 'canSmoothWith' of A matches one of the `smoothing_groups` of B, then A will smooth with B.
|
|
|
|
Each atom has its own icon file with all the possible corner states. See 'smooth_wall.dmi' for a template.
|
|
|
|
DIAGONAL SMOOTHING INSTRUCTIONS
|
|
To make your atom smooth diagonally you need all the proper icon states (see 'smooth_wall.dmi' for a template) and
|
|
to add the 'SMOOTH_DIAGONAL_CORNERS' flag to the atom's smoothing_flags var (in addition to either SMOOTH_TRUE or SMOOTH_MORE).
|
|
|
|
For turfs, what appears under the diagonal corners depends on the turf that was in the same position previously: if you make a wall on
|
|
a plating floor, you will see plating under the diagonal wall corner, if it was space, you will see space.
|
|
|
|
If you wish to map a diagonal wall corner with a fixed underlay, you must configure the turf's 'fixed_underlay' list var, like so:
|
|
fixed_underlay = list("icon"='icon_file.dmi', "icon_state"="iconstatename")
|
|
A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is
|
|
not set properly, the underlay will default to regular floor plating.
|
|
|
|
To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes.
|
|
*/
|
|
|
|
#define NO_ADJ_FOUND 0
|
|
#define ADJ_FOUND 1
|
|
#define NULLTURF_BORDER 2
|
|
|
|
GLOBAL_LIST_INIT(adjacent_direction_lookup, generate_adjacent_directions())
|
|
|
|
/* Attempting to mirror the below
|
|
* Each 3x3 grid is a tile, with each X representing a direction a border object could be in IN said grid
|
|
* Directions marked with A are acceptable smoothing targets, M is the example direction
|
|
* The example given here is of a northfacing border object
|
|
xxx AxA xxx
|
|
xxx AxA xxx
|
|
xxx AxA xxx
|
|
|
|
AAA MMM AAA
|
|
xxx AxA xxx
|
|
xxx AxA xxx
|
|
|
|
xxx xxx xxx
|
|
xxx xxx xxx
|
|
xxx xxx xxx
|
|
*/
|
|
/// Encodes connectivity between border objects
|
|
/// Returns a list accessable by a border object's dir, the direction between it and a target, and a target
|
|
/// Said list will return the direction the two objects connect, if any exists (if the target isn't a border object and the direction is fine, return the inverse of the direction in use)
|
|
/proc/generate_adjacent_directions()
|
|
// Have to hold all conventional dir pairs, so we size to the largest
|
|
// We don't HAVE diagonal border objects, so I'm gonna pretend they'll never exist
|
|
|
|
// You might be like, lemon, can't we use GLOB.cardinals/GLOB.alldirs here
|
|
// No, they aren't loaded yet. life is pain
|
|
var/list/cardinals = list(NORTH, SOUTH, EAST, WEST)
|
|
var/list/alldirs = cardinals + list(NORTH|EAST, SOUTH|EAST, NORTH|WEST, SOUTH|WEST)
|
|
var/largest_cardinal = max(cardinals)
|
|
var/largest_dir = max(alldirs)
|
|
|
|
var/list/direction_map = new /list(largest_cardinal)
|
|
for(var/dir in cardinals)
|
|
var/left = turn(dir, 90)
|
|
var/right = turn(dir, -90)
|
|
var/opposite = REVERSE_DIR(dir)
|
|
// Need to encode diagonals here because it's possible, even if it is always false
|
|
var/list/acceptable_adjacents = new /list(largest_dir)
|
|
// Alright, what directions are acceptable to us
|
|
for(var/connectable_dir in (cardinals + NONE))
|
|
// And what border objects INSIDE those directions are alright
|
|
var/list/smoothable_dirs = new /list(largest_cardinal + 1) // + 1 because we need to provide space for NONE to be a valid index
|
|
// None is fine, we want to smooth with things on our own turf
|
|
// We'll do the two dirs to our left and right
|
|
// They connect.. "below" us and on their side
|
|
if(connectable_dir == NONE)
|
|
smoothable_dirs[left] = dir_to_junction(opposite | left)
|
|
smoothable_dirs[right] = dir_to_junction(opposite | right)
|
|
// If it's to our right or left we'll include just the dir matching ours
|
|
// Left edge touches only our left side, and so on
|
|
else if (connectable_dir == left)
|
|
smoothable_dirs[dir] = left
|
|
else if (connectable_dir == right)
|
|
smoothable_dirs[dir] = right
|
|
// If it's straight on we'll include our direction as a link
|
|
// Then include the two edges on the other side as diagonals
|
|
else if(connectable_dir == dir)
|
|
smoothable_dirs[opposite] = dir
|
|
smoothable_dirs[left] = dir_to_junction(dir | left)
|
|
smoothable_dirs[right] = dir_to_junction(dir | right)
|
|
// otherwise, go HOME, I don't want to encode anything for you
|
|
else
|
|
continue
|
|
acceptable_adjacents[connectable_dir + 1] = smoothable_dirs
|
|
direction_map[dir] = acceptable_adjacents
|
|
return direction_map
|
|
|
|
/// Are two atoms border adjacent, takes a border object, something to compare against, and the direction between A and B
|
|
/// Returns the way in which the first thing is adjacent to the second
|
|
#define CAN_DIAGONAL_SMOOTH(border_obj, target, direction) (\
|
|
(target.smoothing_flags & SMOOTH_BORDER_OBJECT) ? \
|
|
GLOB.adjacent_direction_lookup[border_obj.dir][direction + 1]?[target.dir] : \
|
|
(GLOB.adjacent_direction_lookup[border_obj.dir][direction + 1]) ? REVERSE_DIR(direction) : NONE \
|
|
)
|
|
|
|
#define DEFAULT_UNDERLAY_ICON 'icons/turf/floors.dmi'
|
|
#define DEFAULT_UNDERLAY_ICON_STATE "plating"
|
|
|
|
|
|
///Scans all adjacent turfs to find targets to smooth with.
|
|
/atom/proc/calculate_adjacencies()
|
|
. = NONE
|
|
|
|
if(!loc)
|
|
return
|
|
|
|
for(var/direction in GLOB.cardinals)
|
|
switch(find_type_in_direction(direction))
|
|
if(NULLTURF_BORDER)
|
|
if((smoothing_flags & SMOOTH_BORDER))
|
|
. |= direction //BYOND and smooth dirs are the same for cardinals
|
|
if(ADJ_FOUND)
|
|
. |= direction //BYOND and smooth dirs are the same for cardinals
|
|
|
|
if(. & NORTH_JUNCTION)
|
|
if(. & WEST_JUNCTION)
|
|
switch(find_type_in_direction(NORTHWEST))
|
|
if(NULLTURF_BORDER)
|
|
if((smoothing_flags & SMOOTH_BORDER))
|
|
. |= NORTHWEST_JUNCTION
|
|
if(ADJ_FOUND)
|
|
. |= NORTHWEST_JUNCTION
|
|
|
|
if(. & EAST_JUNCTION)
|
|
switch(find_type_in_direction(NORTHEAST))
|
|
if(NULLTURF_BORDER)
|
|
if((smoothing_flags & SMOOTH_BORDER))
|
|
. |= NORTHEAST_JUNCTION
|
|
if(ADJ_FOUND)
|
|
. |= NORTHEAST_JUNCTION
|
|
|
|
if(. & SOUTH_JUNCTION)
|
|
if(. & WEST_JUNCTION)
|
|
switch(find_type_in_direction(SOUTHWEST))
|
|
if(NULLTURF_BORDER)
|
|
if((smoothing_flags & SMOOTH_BORDER))
|
|
. |= SOUTHWEST_JUNCTION
|
|
if(ADJ_FOUND)
|
|
. |= SOUTHWEST_JUNCTION
|
|
|
|
if(. & EAST_JUNCTION)
|
|
switch(find_type_in_direction(SOUTHEAST))
|
|
if(NULLTURF_BORDER)
|
|
if((smoothing_flags & SMOOTH_BORDER))
|
|
. |= SOUTHEAST_JUNCTION
|
|
if(ADJ_FOUND)
|
|
. |= SOUTHEAST_JUNCTION
|
|
|
|
|
|
/atom/movable/calculate_adjacencies()
|
|
if(can_be_unanchored && !anchored)
|
|
return NONE
|
|
return ..()
|
|
|
|
|
|
///do not use, use QUEUE_SMOOTH(atom)
|
|
/atom/proc/smooth_icon()
|
|
if(QDELETED(src))
|
|
return
|
|
smoothing_flags &= ~SMOOTH_QUEUED
|
|
flags_1 |= HTML_USE_INITAL_ICON_1
|
|
if (!z)
|
|
CRASH("[type] called smooth_icon() without being on a z-level")
|
|
if(smoothing_flags & SMOOTH_CORNERS)
|
|
if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS)
|
|
corners_diagonal_smooth(calculate_adjacencies())
|
|
else
|
|
corners_cardinal_smooth(calculate_adjacencies())
|
|
else if(smoothing_flags & (SMOOTH_BITMASK|SMOOTH_BITMASK_CARDINALS))
|
|
bitmask_smooth()
|
|
else
|
|
CRASH("smooth_icon called for [src] with smoothing_flags == [smoothing_flags]")
|
|
SEND_SIGNAL(src, COMSIG_ATOM_SMOOTHED_ICON)
|
|
|
|
// As a rule, movables will most always care about smoothing changes
|
|
// Turfs on the other hand, don't, so we don't do the update for THEM unless they explicitly request it
|
|
/atom/movable/smooth_icon()
|
|
. = ..()
|
|
update_appearance(~UPDATE_SMOOTHING)
|
|
|
|
/atom/proc/corners_diagonal_smooth(adjacencies)
|
|
switch(adjacencies)
|
|
if(NORTH_JUNCTION|WEST_JUNCTION)
|
|
replace_smooth_overlays("d-se","d-se-0")
|
|
if(NORTH_JUNCTION|EAST_JUNCTION)
|
|
replace_smooth_overlays("d-sw","d-sw-0")
|
|
if(SOUTH_JUNCTION|WEST_JUNCTION)
|
|
replace_smooth_overlays("d-ne","d-ne-0")
|
|
if(SOUTH_JUNCTION|EAST_JUNCTION)
|
|
replace_smooth_overlays("d-nw","d-nw-0")
|
|
|
|
if(NORTH_JUNCTION|WEST_JUNCTION|NORTHWEST_JUNCTION)
|
|
replace_smooth_overlays("d-se","d-se-1")
|
|
if(NORTH_JUNCTION|EAST_JUNCTION|NORTHEAST_JUNCTION)
|
|
replace_smooth_overlays("d-sw","d-sw-1")
|
|
if(SOUTH_JUNCTION|WEST_JUNCTION|SOUTHWEST_JUNCTION)
|
|
replace_smooth_overlays("d-ne","d-ne-1")
|
|
if(SOUTH_JUNCTION|EAST_JUNCTION|SOUTHEAST_JUNCTION)
|
|
replace_smooth_overlays("d-nw","d-nw-1")
|
|
|
|
else
|
|
corners_cardinal_smooth(adjacencies)
|
|
return FALSE
|
|
|
|
icon_state = ""
|
|
return TRUE
|
|
|
|
|
|
/atom/proc/corners_cardinal_smooth(adjacencies)
|
|
var/mutable_appearance/temp_ma
|
|
|
|
//NW CORNER
|
|
var/nw = "1-i"
|
|
if((adjacencies & NORTH_JUNCTION) && (adjacencies & WEST_JUNCTION))
|
|
if(adjacencies & NORTHWEST_JUNCTION)
|
|
nw = "1-f"
|
|
else
|
|
nw = "1-nw"
|
|
else
|
|
if(adjacencies & NORTH_JUNCTION)
|
|
nw = "1-n"
|
|
else if(adjacencies & WEST_JUNCTION)
|
|
nw = "1-w"
|
|
temp_ma = mutable_appearance(icon, nw)
|
|
nw = temp_ma.appearance
|
|
|
|
//NE CORNER
|
|
var/ne = "2-i"
|
|
if((adjacencies & NORTH_JUNCTION) && (adjacencies & EAST_JUNCTION))
|
|
if(adjacencies & NORTHEAST_JUNCTION)
|
|
ne = "2-f"
|
|
else
|
|
ne = "2-ne"
|
|
else
|
|
if(adjacencies & NORTH_JUNCTION)
|
|
ne = "2-n"
|
|
else if(adjacencies & EAST_JUNCTION)
|
|
ne = "2-e"
|
|
temp_ma = mutable_appearance(icon, ne)
|
|
ne = temp_ma.appearance
|
|
|
|
//SW CORNER
|
|
var/sw = "3-i"
|
|
if((adjacencies & SOUTH_JUNCTION) && (adjacencies & WEST_JUNCTION))
|
|
if(adjacencies & SOUTHWEST_JUNCTION)
|
|
sw = "3-f"
|
|
else
|
|
sw = "3-sw"
|
|
else
|
|
if(adjacencies & SOUTH_JUNCTION)
|
|
sw = "3-s"
|
|
else if(adjacencies & WEST_JUNCTION)
|
|
sw = "3-w"
|
|
temp_ma = mutable_appearance(icon, sw)
|
|
sw = temp_ma.appearance
|
|
|
|
//SE CORNER
|
|
var/se = "4-i"
|
|
if((adjacencies & SOUTH_JUNCTION) && (adjacencies & EAST_JUNCTION))
|
|
if(adjacencies & SOUTHEAST_JUNCTION)
|
|
se = "4-f"
|
|
else
|
|
se = "4-se"
|
|
else
|
|
if(adjacencies & SOUTH_JUNCTION)
|
|
se = "4-s"
|
|
else if(adjacencies & EAST_JUNCTION)
|
|
se = "4-e"
|
|
temp_ma = mutable_appearance(icon, se)
|
|
se = temp_ma.appearance
|
|
|
|
var/list/new_overlays
|
|
|
|
if(top_left_corner != nw)
|
|
cut_overlay(top_left_corner)
|
|
top_left_corner = nw
|
|
LAZYADD(new_overlays, nw)
|
|
|
|
if(top_right_corner != ne)
|
|
cut_overlay(top_right_corner)
|
|
top_right_corner = ne
|
|
LAZYADD(new_overlays, ne)
|
|
|
|
if(bottom_right_corner != sw)
|
|
cut_overlay(bottom_right_corner)
|
|
bottom_right_corner = sw
|
|
LAZYADD(new_overlays, sw)
|
|
|
|
if(bottom_left_corner != se)
|
|
cut_overlay(bottom_left_corner)
|
|
bottom_left_corner = se
|
|
LAZYADD(new_overlays, se)
|
|
|
|
if(new_overlays)
|
|
add_overlay(new_overlays)
|
|
|
|
|
|
///Scans direction to find targets to smooth with.
|
|
/atom/proc/find_type_in_direction(direction)
|
|
var/turf/target_turf = get_step(src, direction)
|
|
if(!target_turf)
|
|
return NULLTURF_BORDER
|
|
|
|
var/area/target_area = get_area(target_turf)
|
|
var/area/source_area = get_area(src)
|
|
if((source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) || (target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)))
|
|
return NO_ADJ_FOUND
|
|
|
|
if(isnull(canSmoothWith)) //special case in which it will only smooth with itself
|
|
if(isturf(src))
|
|
return (type == target_turf.type) ? ADJ_FOUND : NO_ADJ_FOUND
|
|
var/atom/matching_obj = locate(type) in target_turf
|
|
return (matching_obj && matching_obj.type == type) ? ADJ_FOUND : NO_ADJ_FOUND
|
|
|
|
if(!isnull(target_turf.smoothing_groups))
|
|
for(var/target in canSmoothWith)
|
|
if(!(canSmoothWith[target] & target_turf.smoothing_groups[target]))
|
|
continue
|
|
return ADJ_FOUND
|
|
|
|
if(smoothing_flags & SMOOTH_OBJ)
|
|
for(var/atom/movable/thing as anything in target_turf)
|
|
if(!thing.anchored || isnull(thing.smoothing_groups))
|
|
continue
|
|
for(var/target in canSmoothWith)
|
|
if(!(canSmoothWith[target] & thing.smoothing_groups[target]))
|
|
continue
|
|
return ADJ_FOUND
|
|
|
|
return NO_ADJ_FOUND
|
|
|
|
/**
|
|
* Basic smoothing proc. The atom checks for adjacent directions to smooth with and changes the icon_state based on that.
|
|
*
|
|
* Returns the previous smoothing_junction state so the previous state can be compared with the new one after the proc ends, and see the changes, if any.
|
|
*
|
|
*/
|
|
/atom/proc/bitmask_smooth()
|
|
var/new_junction = NONE
|
|
|
|
// cache for sanic speed
|
|
var/canSmoothWith = src.canSmoothWith
|
|
|
|
var/smooth_border = (smoothing_flags & SMOOTH_BORDER)
|
|
var/smooth_obj = (smoothing_flags & SMOOTH_OBJ)
|
|
var/border_object_smoothing = (smoothing_flags & SMOOTH_BORDER_OBJECT)
|
|
|
|
// Did you know you can pass defines into other defines? very handy, lets take advantage of it here to allow 0 cost variation
|
|
#define SEARCH_ADJ_IN_DIR(direction, direction_flag, ADJ_FOUND, WORLD_BORDER, BORDER_CHECK) \
|
|
do { \
|
|
var/turf/neighbor = get_step(src, direction); \
|
|
if(neighbor && ##BORDER_CHECK(neighbor, direction)) { \
|
|
var/neighbor_smoothing_groups = neighbor.smoothing_groups; \
|
|
if(neighbor_smoothing_groups) { \
|
|
for(var/target in canSmoothWith) { \
|
|
if(canSmoothWith[target] & neighbor_smoothing_groups[target]) { \
|
|
##ADJ_FOUND(neighbor, direction, direction_flag); \
|
|
} \
|
|
} \
|
|
} \
|
|
if(smooth_obj) { \
|
|
for(var/atom/movable/thing as anything in neighbor) { \
|
|
var/thing_smoothing_groups = thing.smoothing_groups; \
|
|
if(!thing.anchored || isnull(thing_smoothing_groups) || !##BORDER_CHECK(thing, direction)) { \
|
|
continue; \
|
|
}; \
|
|
for(var/target in canSmoothWith) { \
|
|
if(canSmoothWith[target] & thing_smoothing_groups[target]) { \
|
|
##ADJ_FOUND(thing, direction, direction_flag); \
|
|
} \
|
|
} \
|
|
} \
|
|
} \
|
|
} else if (smooth_border) { \
|
|
##WORLD_BORDER(null, direction, direction_flag); \
|
|
} \
|
|
} while(FALSE) \
|
|
|
|
#define BITMASK_FOUND(target, direction, direction_flag) \
|
|
new_junction |= direction_flag; \
|
|
break set_adj_in_dir; \
|
|
/// Check that non border objects use to smooth against border objects
|
|
/// Returns true if the smooth is acceptable, FALSE otherwise
|
|
#define BITMASK_ON_BORDER_CHECK(target, direction) (!(target.smoothing_flags & SMOOTH_BORDER_OBJECT) || CAN_DIAGONAL_SMOOTH(target, src, REVERSE_DIR(direction)))
|
|
|
|
#define BORDER_FOUND(target, direction, direction_flag) new_junction |= CAN_DIAGONAL_SMOOTH(src, target, direction)
|
|
// Border objects require an object as context, so we need a dummy. I'm sorry
|
|
#define WORLD_BORDER_FOUND(target, direction, direction_flag) \
|
|
var/static/atom/dummy; \
|
|
if(!dummy) { \
|
|
dummy = new(); \
|
|
dummy.smoothing_flags &= ~SMOOTH_BORDER_OBJECT; \
|
|
} \
|
|
BORDER_FOUND(dummy, direction, direction_flag);
|
|
// Handle handle border on border checks. no-op, we handle this check inside CAN_DIAGONAL_SMOOTH
|
|
#define BORDER_ON_BORDER_CHECK(target, direction) (TRUE)
|
|
|
|
// We're building 2 different types of smoothing searches here
|
|
// One for standard bitmask smoothing (We provide a label so our macro can eary exit, as it wants to do)
|
|
#define SET_ADJ_IN_DIR(direction, direction_flag) do { set_adj_in_dir: { SEARCH_ADJ_IN_DIR(direction, direction_flag, BITMASK_FOUND, BITMASK_FOUND, BITMASK_ON_BORDER_CHECK) }} while(FALSE)
|
|
// and another for border object work (Doesn't early exit because we can hit more then one direction by checking the same turf)
|
|
#define SET_BORDER_ADJ_IN_DIR(direction) SEARCH_ADJ_IN_DIR(direction, direction, BORDER_FOUND, WORLD_BORDER_FOUND, BORDER_ON_BORDER_CHECK)
|
|
|
|
// Let's go over all our cardinals
|
|
if(border_object_smoothing)
|
|
SET_BORDER_ADJ_IN_DIR(NORTH)
|
|
SET_BORDER_ADJ_IN_DIR(SOUTH)
|
|
SET_BORDER_ADJ_IN_DIR(EAST)
|
|
SET_BORDER_ADJ_IN_DIR(WEST)
|
|
// We want to check against stuff in our own turf
|
|
SET_BORDER_ADJ_IN_DIR(NONE)
|
|
// Border objects don't do diagonals, so GO HOME
|
|
set_smoothed_icon_state(new_junction)
|
|
return
|
|
|
|
SET_ADJ_IN_DIR(NORTH, NORTH)
|
|
SET_ADJ_IN_DIR(SOUTH, SOUTH)
|
|
SET_ADJ_IN_DIR(EAST, EAST)
|
|
SET_ADJ_IN_DIR(WEST, WEST)
|
|
|
|
// If there's nothing going on already
|
|
if(smoothing_flags & SMOOTH_BITMASK_CARDINALS || !(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST)))
|
|
set_smoothed_icon_state(new_junction)
|
|
return
|
|
|
|
if(new_junction & NORTH_JUNCTION)
|
|
if(new_junction & WEST_JUNCTION)
|
|
SET_ADJ_IN_DIR(NORTHWEST, NORTHWEST_JUNCTION)
|
|
|
|
if(new_junction & EAST_JUNCTION)
|
|
SET_ADJ_IN_DIR(NORTHEAST, NORTHEAST_JUNCTION)
|
|
|
|
if(new_junction & SOUTH_JUNCTION)
|
|
if(new_junction & WEST_JUNCTION)
|
|
SET_ADJ_IN_DIR(SOUTHWEST, SOUTHWEST_JUNCTION)
|
|
|
|
if(new_junction & EAST_JUNCTION)
|
|
SET_ADJ_IN_DIR(SOUTHEAST, SOUTHEAST_JUNCTION)
|
|
|
|
set_smoothed_icon_state(new_junction)
|
|
|
|
#undef SET_BORDER_ADJ_IN_DIR
|
|
#undef SET_ADJ_IN_DIR
|
|
#undef BORDER_ON_BORDER_CHECK
|
|
#undef WORLD_BORDER_FOUND
|
|
#undef BORDER_FOUND
|
|
#undef BITMASK_ON_BORDER_CHECK
|
|
#undef BITMASK_FOUND
|
|
#undef SEARCH_ADJ_IN_DIR
|
|
|
|
///Changes the icon state based on the new junction bitmask
|
|
/atom/proc/set_smoothed_icon_state(new_junction)
|
|
. = smoothing_junction
|
|
smoothing_junction = new_junction
|
|
icon_state = "[base_icon_state]-[smoothing_junction]"
|
|
|
|
|
|
/turf/closed/set_smoothed_icon_state(new_junction)
|
|
// Avoid calling ..() here to avoid setting icon_state twice, which is expensive given how hot this proc is
|
|
var/old_junction = smoothing_junction
|
|
smoothing_junction = new_junction
|
|
|
|
if (!(smoothing_flags & SMOOTH_DIAGONAL_CORNERS))
|
|
icon_state = "[base_icon_state]-[smoothing_junction]"
|
|
return
|
|
|
|
switch(new_junction)
|
|
if(
|
|
NORTH_JUNCTION|WEST_JUNCTION,
|
|
NORTH_JUNCTION|EAST_JUNCTION,
|
|
SOUTH_JUNCTION|WEST_JUNCTION,
|
|
SOUTH_JUNCTION|EAST_JUNCTION,
|
|
NORTH_JUNCTION|WEST_JUNCTION|NORTHWEST_JUNCTION,
|
|
NORTH_JUNCTION|EAST_JUNCTION|NORTHEAST_JUNCTION,
|
|
SOUTH_JUNCTION|WEST_JUNCTION|SOUTHWEST_JUNCTION,
|
|
SOUTH_JUNCTION|EAST_JUNCTION|SOUTHEAST_JUNCTION,
|
|
)
|
|
icon_state = "[base_icon_state]-[smoothing_junction]-d"
|
|
if(new_junction == old_junction || fixed_underlay) // Mutable underlays?
|
|
return
|
|
|
|
var/junction_dir = reverse_ndir(smoothing_junction)
|
|
var/turned_adjacency = REVERSE_DIR(junction_dir)
|
|
var/turf/neighbor_turf = get_step(src, turned_adjacency & (NORTH|SOUTH))
|
|
var/mutable_appearance/underlay_appearance = mutable_appearance(layer = LOW_FLOOR_LAYER, offset_spokesman = src, plane = FLOOR_PLANE)
|
|
if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
|
|
neighbor_turf = get_step(src, turned_adjacency & (EAST|WEST))
|
|
|
|
if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
|
|
neighbor_turf = get_step(src, turned_adjacency)
|
|
|
|
if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
|
|
if(!get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) //if all else fails, ask our own turf
|
|
underlay_appearance.icon = DEFAULT_UNDERLAY_ICON
|
|
underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
|
|
underlays += underlay_appearance
|
|
else
|
|
icon_state = "[base_icon_state]-[smoothing_junction]"
|
|
|
|
/turf/open/floor/set_smoothed_icon_state(new_junction)
|
|
if(broken || burnt)
|
|
return
|
|
return ..()
|
|
|
|
|
|
//Icon smoothing helpers
|
|
/proc/smooth_zlevel(zlevel, now = FALSE)
|
|
var/list/away_turfs = Z_TURFS(zlevel)
|
|
for(var/turf/turf_to_smooth as anything in away_turfs)
|
|
if(turf_to_smooth.smoothing_flags & USES_SMOOTHING)
|
|
if(now)
|
|
turf_to_smooth.smooth_icon()
|
|
else
|
|
QUEUE_SMOOTH(turf_to_smooth)
|
|
for(var/atom/movable/movable_to_smooth as anything in turf_to_smooth)
|
|
if(movable_to_smooth.smoothing_flags & USES_SMOOTHING)
|
|
if(now)
|
|
movable_to_smooth.smooth_icon()
|
|
else
|
|
QUEUE_SMOOTH(movable_to_smooth)
|
|
|
|
|
|
/atom/proc/clear_smooth_overlays()
|
|
cut_overlay(top_left_corner)
|
|
top_left_corner = null
|
|
cut_overlay(top_right_corner)
|
|
top_right_corner = null
|
|
cut_overlay(bottom_right_corner)
|
|
bottom_right_corner = null
|
|
cut_overlay(bottom_left_corner)
|
|
bottom_left_corner = null
|
|
|
|
/// Internal: Takes icon states as text to replace smoothing corner overlays
|
|
/atom/proc/replace_smooth_overlays(nw, ne, sw, se)
|
|
clear_smooth_overlays()
|
|
var/mutable_appearance/temp_ma
|
|
|
|
temp_ma = mutable_appearance(icon, nw)
|
|
nw = temp_ma.appearance
|
|
|
|
temp_ma = mutable_appearance(icon, ne)
|
|
ne = temp_ma.appearance
|
|
|
|
temp_ma = mutable_appearance(icon, sw)
|
|
sw = temp_ma.appearance
|
|
|
|
temp_ma = mutable_appearance(icon, se)
|
|
se = temp_ma.appearance
|
|
|
|
var/list/new_overlays = list()
|
|
|
|
top_left_corner = nw
|
|
new_overlays += nw
|
|
|
|
top_right_corner = ne
|
|
new_overlays += ne
|
|
|
|
bottom_left_corner = sw
|
|
new_overlays += sw
|
|
|
|
bottom_right_corner = se
|
|
new_overlays += se
|
|
|
|
add_overlay(new_overlays)
|
|
|
|
/// Takes a direction, turns it into all the junctions that contain it
|
|
/proc/dir_to_all_junctions(dir)
|
|
var/handback = NONE
|
|
if(dir & NORTH)
|
|
handback |= NORTH_JUNCTION | NORTHEAST_JUNCTION | NORTHWEST_JUNCTION
|
|
if(dir & SOUTH)
|
|
handback |= SOUTH_JUNCTION | SOUTHEAST_JUNCTION | SOUTHWEST_JUNCTION
|
|
if(dir & EAST)
|
|
handback |= EAST_JUNCTION | SOUTHEAST_JUNCTION | NORTHEAST_JUNCTION
|
|
if(dir & WEST)
|
|
handback |= WEST_JUNCTION | NORTHWEST_JUNCTION | SOUTHWEST_JUNCTION
|
|
return handback
|
|
|
|
/proc/dir_to_junction(dir)
|
|
switch(dir)
|
|
if(NORTH)
|
|
return NORTH_JUNCTION
|
|
if(SOUTH)
|
|
return SOUTH_JUNCTION
|
|
if(WEST)
|
|
return WEST_JUNCTION
|
|
if(EAST)
|
|
return EAST_JUNCTION
|
|
if(NORTHWEST)
|
|
return NORTHWEST_JUNCTION
|
|
if(NORTHEAST)
|
|
return NORTHEAST_JUNCTION
|
|
if(SOUTHEAST)
|
|
return SOUTHEAST_JUNCTION
|
|
if(SOUTHWEST)
|
|
return SOUTHWEST_JUNCTION
|
|
else
|
|
return NONE
|
|
|
|
/proc/reverse_ndir(ndir)
|
|
switch(ndir)
|
|
if(NORTH_JUNCTION)
|
|
return NORTH
|
|
if(SOUTH_JUNCTION)
|
|
return SOUTH
|
|
if(WEST_JUNCTION)
|
|
return WEST
|
|
if(EAST_JUNCTION)
|
|
return EAST
|
|
if(NORTHWEST_JUNCTION)
|
|
return NORTHWEST
|
|
if(NORTHEAST_JUNCTION)
|
|
return NORTHEAST
|
|
if(SOUTHEAST_JUNCTION)
|
|
return SOUTHEAST
|
|
if(SOUTHWEST_JUNCTION)
|
|
return SOUTHWEST
|
|
if(NORTH_JUNCTION | WEST_JUNCTION)
|
|
return NORTHWEST
|
|
if(NORTH_JUNCTION | EAST_JUNCTION)
|
|
return NORTHEAST
|
|
if(SOUTH_JUNCTION | WEST_JUNCTION)
|
|
return SOUTHWEST
|
|
if(SOUTH_JUNCTION | EAST_JUNCTION)
|
|
return SOUTHEAST
|
|
if(NORTH_JUNCTION | WEST_JUNCTION | NORTHWEST_JUNCTION)
|
|
return NORTHWEST
|
|
if(NORTH_JUNCTION | EAST_JUNCTION | NORTHEAST_JUNCTION)
|
|
return NORTHEAST
|
|
if(SOUTH_JUNCTION | WEST_JUNCTION | SOUTHWEST_JUNCTION)
|
|
return SOUTHWEST
|
|
if(SOUTH_JUNCTION | EAST_JUNCTION | SOUTHEAST_JUNCTION)
|
|
return SOUTHEAST
|
|
else
|
|
return NONE
|
|
|
|
|
|
//Example smooth wall
|
|
/turf/closed/wall/smooth
|
|
name = "smooth wall"
|
|
icon = 'icons/turf/smooth_wall.dmi'
|
|
icon_state = "smooth"
|
|
smoothing_flags = SMOOTH_CORNERS|SMOOTH_DIAGONAL_CORNERS|SMOOTH_BORDER
|
|
smoothing_groups = null
|
|
canSmoothWith = null
|
|
|
|
#undef NO_ADJ_FOUND
|
|
#undef ADJ_FOUND
|
|
#undef NULLTURF_BORDER
|
|
|
|
#undef DEFAULT_UNDERLAY_ICON
|
|
#undef DEFAULT_UNDERLAY_ICON_STATE
|
|
#undef CAN_DIAGONAL_SMOOTH
|