Merge pull request #1490 from placeAtlas/cleanup

Updated Reddit

data/read-ids.txt

@@ -12731,3 +12731,4 @@ zznclm
 15d6x9i
 15t0vbd
 15t7ta7
+18vzerg

tools/merge_out.py

@@ -57,7 +57,7 @@
 		f = os.path.join(patches_dir, filename)
 
 	print(f"{filename}: Processing...")
-	
+
 	if not os.path.isfile(f) or not f.endswith('json'):
 		continue
 
@@ -75,7 +75,16 @@
 			scale_back.scale_back_entries(entries)
 			scale_back.swap_source_dest('166', '167', os.path.join(base_image_path, '165_159.png'))
 			scale_back.scale_back_entries(entries)
-			
+
+			# Add TFC if the entry is in the final canvas.
+			for entry in entries:
+				for key in ['path', 'center']:
+					for period, value in entry[key].items():
+						if ('164' in period or '165' in period or '166' in period) and 'T' not in period:
+							entry[key][period + ', T:0-1'] = value
+							del(entry[key][period])
+							break
+
 			for entry in entries:
 				if entry is None:
 					continue

tools/scale_back.py

@@ -73,8 +73,15 @@ def remove_white(entry: dict):
 	# print(entry['path'])
 
 	for (period, polygonList) in entry['path'].items():
-
-		if not f"-{ScaleConfig.source}" in period: continue
+		# Check if the entry's period applies to the current scale config.
+		period_split = period.split(', ')
+		period_index = None
+		for i, period_section in enumerate(period_split):
+			if f'-{ScaleConfig.source}' in period_section or period_section == ScaleConfig.source:
+				period_index = i
+				break
+		if period_index is None:
+			continue
 
 		# Get bounding rectangle and have a list of tuples for polygon
 
@@ -136,7 +143,12 @@ def remove_white(entry: dict):
 
 		if (ScaleConfig.type == "shrink" and colorness < ScaleConfig.threshold) or (ScaleConfig.type == "expand" and colorness > ScaleConfig.threshold):
 			print(f"[{entry['id']} {period}] {colored_pixel_count}/{all_pixel_count} ({colorness}%)")
-			new_period = period.replace(f'-{ScaleConfig.source}', f'-{ScaleConfig.destination}')
+			if f'-{ScaleConfig.source}' in period:
+				period_section = period_section.replace(f'-{ScaleConfig.source}', f'-{ScaleConfig.destination}')
+			else:
+				period_section = f'{period_section}-{ScaleConfig.destination}'
+			period_split[period_index] = period_section
+			new_period = ', '.join(period_split)
 			entry['path'][new_period] = entry['path'][period]
 			del entry['path'][period]
 			entry['center'][new_period] = entry['center'][period]

web/all-authors.txt

@@ -5568,3 +5568,4 @@ _squizzle
 DasHeroTill
 PokeJose163
 A_Ok_Name
+CalmAmbassador6555

web/atlas.json

@@ -10869,20 +10869,21 @@
 {"id": "yllf71", "name": "Guts", "description": "Guts is the protagonist of the manga and anime Berserk.\n\nThis drawing of Guts was drawn by Twitch streamer Asmongold above the existing tribute to Berserk, replacing the My Little Pony artwork. The high quality of the drawing was embraced by both the Berserk and MLP communities, so the MLP community moved elsewhere.", "links": {"website": ["https://en.wikipedia.org/wiki/Guts_(Berserk)"], "subreddit": ["Berserk"]}, "path": {"59-166, T:0-1": [[597, 203], [595, 205], [595, 258], [598, 262], [690, 262], [693, 259], [693, 223], [690, 220], [682, 220], [676, 214], [676, 205], [674, 203]]}, "center": {"59-166, T:0-1": [644, 233]}},
 {"id": 621, "name": "ASL", "description": "Group of friends in Discord from Colombia and Venezuela", "links": {"subreddit": ["aslcol"]}, "path": {"132": [[175, 708], [182, 708], [182, 714], [175, 714]]}, "center": {"132": [179, 711]}},
 {"id": 622, "name": "If", "description": "The fourth studio album by the electropunk band Mindless Self Indulgence.", "links": {"subreddit": ["MSI"]}, "path": {"118-141": [[1904, 1227], [1883, 1227], [1883, 1247], [1904, 1247]]}, "center": {"118-141": [1894, 1237]}},
-{"id": 623, "name": "Lawrence", "description": "Just a little guy.", "links": {}, "path": {"164": [[1844, 1326], [1852, 1326], [1848, 1327]]}, "center": {"164": [1848, 1327]}},
+{"id": 623, "name": "Lawrence", "description": "Just a little guy.", "links": {}, "path": {"164, T:0-1": [[1844, 1326], [1852, 1326], [1848, 1327]]}, "center": {"164, T:0-1": [1848, 1327]}},
 {"id": 624, "name": "The Dodo Fans", "description": "The dodo bird is the symbol of a friend group of 6 named The Dodo Fans, formed in 2017.", "links": {"subreddit": ["thedodofans"]}, "path": {"5-10": [[370, 809], [375, 809], [375, 817], [370, 817]], "11-14": [[368, 809], [373, 809], [373, 817], [368, 817]]}, "center": {"5-10": [373, 813], "11-14": [371, 813]}},
 {"id": 625, "name": "Cross-Hatchers", "description": "A small grid of orange stripes", "links": {"subreddit": ["CrossHatchers"]}, "path": {"1-11": [[249, 277], [225, 277], [225, 280], [222, 280], [222, 282], [225, 282], [225, 284], [223, 284], [222, 284], [222, 286], [225, 286], [225, 288], [220, 288], [219, 288], [218, 293], [221, 298], [229, 302], [233, 298], [237, 299], [241, 300], [245, 300], [254, 297], [254, 288], [254, 281], [250, 277]]}, "center": {"1-11": [242, 289]}},
 {"id": 626, "name": "Hydro-Québec", "description": "Hydro-Québec is a public utility that manages the generation, transmission and distribution of electricity in the Canadian province of Quebec, as well as the export of power to portions of the Northeast United States.\n\nIt was established by the Government of Quebec in 1944 from the expropriation of private firms. This was followed by massive investment in hydro-electric projects like the James Bay Project. Today, with 63 hydroelectric power stations, the combined output capacity is 37,370 megawatts. Extra power is exported from the province and Hydro-Québec supplies 10 per cent of New England's power requirements.\n\nHydro-Québec is a Crown corporation (state-owned enterprise) based in Montreal. In 2018, it paid CAD$2.39 billion in dividends to its sole shareholder, the Government of Québec. Its residential power rates are among the lowest in North America.\n\nMore than 40 percent of Canada's water resources are in Québec and Hydro-Québec is the fourth largest hydropower producer in the world.\n\nThe company logo, a stylized \"Q\" fashioned out of a circle and a lightning bolt, was designed by Montreal-based design agency Gagnon/Valkus in 1960.", "links": {"website": ["https://www.hydroquebec.com/", "https://en.wikipedia.org/wiki/Hydro-Qu%C3%A9bec"], "subreddit": ["Quebec"], "discord": ["PlaceQuebec"]}, "path": {"10": [[346, 400], [346, 401], [345, 401], [344, 402], [343, 402], [343, 403], [342, 403], [342, 406], [341, 406], [342, 407], [342, 411], [342, 412], [343, 412], [343, 413], [344, 413], [344, 414], [345, 414], [345, 415], [346, 415], [346, 416], [351, 416], [351, 414], [353, 414], [353, 407], [356, 406], [355, 405], [355, 403], [354, 403], [354, 402], [353, 402], [353, 401], [352, 401], [351, 400], [349, 400]], "11-37": [[350, 400], [347, 400], [346, 401], [345, 401], [344, 402], [343, 403], [342, 404], [341, 405], [341, 410], [342, 411], [343, 412], [344, 413], [344, 414], [345, 415], [347, 415], [348, 416], [350, 416], [351, 415], [352, 414], [353, 415], [355, 416], [360, 416], [360, 415], [359, 414], [358, 413], [357, 412], [357, 411], [356, 413], [355, 412], [355, 411], [355, 409], [356, 409], [356, 408], [355, 406], [355, 405], [354, 404], [354, 403], [353, 402], [352, 402], [352, 401], [351, 401]]}, "center": {"10": [347, 407], "11-37": [348, 408]}},
 {"id": 627, "name": "KY23 Logo", "description": "A random logo desperately placed by u/KY23thememer and his alt accounts\n(I'm sorry for doing this, -KY)", "links": {}, "path": {"139": [[1390, 355], [1402, 355], [1402, 367], [1390, 367]]}, "center": {"139": [1396, 361]}},
 {"id": 628, "name": "Tim - The Little Music Fox", "description": "A small monument to the musical artist 'Tim - The Little Music Fox'", "links": {"website": ["https://www.timthelittlemusicfox.com/about"]}, "path": {"148-162": [[1110, 1177], [1118, 1189], [1118, 1177], [1110, 1177], [1110, 1189], [1118, 1189]]}, "center": {"148-162": [1113, 1186]}},
-{"id": 629, "name": "Goated ass dog", "description": "R.I.P Boswell Youth made this. A few pals. history forever", "links": {}, "path": {"164": [[1171, 1769], [1173, 1769], [1182, 1769], [1184, 1772], [1184, 1774], [1181, 1775], [1181, 1777], [1180, 1778], [1174, 1778], [1173, 1777], [1172, 1775], [1171, 1770]]}, "center": {"164": [1177, 1773]}},
+{"id": 629, "name": "Goated ass dog", "description": "R.I.P Boswell Youth made this. A few pals. history forever", "links": {}, "path": {"164-166, T:0-1": [[1171, 1769], [1173, 1769], [1182, 1769], [1184, 1772], [1184, 1774], [1181, 1775], [1181, 1777], [1180, 1778], [1174, 1778], [1173, 1777], [1172, 1775], [1171, 1770]]}, "center": {"164-166, T:0-1": [1177, 1773]}},
 {"id": 630, "name": "OkBrawlerRetard", "description": "OkBrawlerRetard mascot featuring Doge as Mortis from the mobile game Brawl Stars. OkBrawlerRetard is a circejerk server of Brawl Stars.", "links": {"subreddit": ["OkBrawlerRetard2"], "wiki": ["OkBrawlerRetard"]}, "path": {"80-98": [[1983, 556], [1993, 556], [1992, 551], [1994, 550], [1995, 549], [1995, 547], [1994, 540], [1987, 540], [1985, 541], [1984, 544], [1981, 544], [1979, 549], [1981, 550], [1980, 555], [1996, 556], [1996, 561], [1998, 561], [1998, 557], [1998, 551], [1998, 548], [1998, 545], [1997, 539], [1994, 539]]}, "center": {"80-98": [1984, 548]}},
 {"id": 631, "name": "SSundee", "description": "Famous Youtuber SSundee, formerly known for Minecraft content and being a member of Team Crafted, now known for modded Among Us content. He still returns to Minecraft from time to time.", "links": {"website": ["https://www.youtube.com/@SSundee"], "subreddit": ["SSundee"]}, "path": {"119-126": [[1585, 1301], [1585, 1310], [1594, 1310], [1594, 1301], [1591, 1301], [1588, 1301]]}, "center": {"119-126": [1590, 1306]}},
 {"id": 632, "name": "Bernie sanders sitting down meme", "description": "The Bernie Sanders sitting down meme became an internet sensation during the 2021 Presidential Inauguration when a photograph of Senator Bernie Sanders wearing mittens and sitting alone on a folding chair went viral. The image was humorously inserted into various pop culture scenes and settings, making it a humorous and widely recognized symbol of relatable moments and internet creativity.", "links": {"website": ["https://berniesanders.com/"], "subreddit": ["BernieSanders", "politics"]}, "path": {"69-90": [[1726, 434], [1735, 434], [1735, 435], [1737, 435], [1737, 436], [1738, 436], [1738, 437], [1738, 438], [1739, 438], [1739, 439], [1739, 440], [1741, 440], [1741, 448], [1741, 451], [1743, 452], [1743, 462], [1744, 462], [1744, 464], [1743, 464], [1743, 466], [1740, 466], [1740, 470], [1739, 470], [1739, 483], [1738, 483], [1738, 492], [1739, 494], [1737, 494], [1737, 495], [1734, 495], [1734, 494], [1733, 494], [1732, 485], [1731, 484], [1730, 489], [1729, 497], [1727, 497], [1727, 498], [1725, 498], [1725, 497], [1724, 497], [1724, 494], [1725, 494], [1725, 491], [1724, 491], [1724, 466], [1721, 466], [1721, 465], [1720, 465], [1720, 463], [1719, 463], [1719, 460], [1718, 460], [1718, 457], [1719, 457], [1719, 449], [1722, 449], [1722, 446], [1722, 445], [1720, 444], [1720, 443], [1721, 441], [1725, 434], [1733, 434]]}, "center": {"69-90": [1731, 457]}},
-{"id": 633, "name": "Jimmy Blake", "description": "2 friends wrote their initials which stands for Jimmy Blake (JB)", "links": {}, "path": {"164": [[1973, 675], [1979, 675], [1979, 681], [1973, 681]]}, "center": {"164": [1976, 678]}},
-{"id": 634, "name": "Melk", "description": "Melk has one eye and eats babies, he loves his blue haired gf in which he resides next to and he hates Poland as they eradicated him and all his loved ones literal minutes before r/place ended.", "links": {"website": ["https://roing.us/"]}, "path": {"160-164": [[1703, 554], [1703, 560], [1709, 560], [1709, 553], [1703, 553]]}, "center": {"160-164": [1706, 557]}},
+{"id": 633, "name": "Jimmy Blake", "description": "2 friends wrote their initials which stands for Jimmy Blake (JB)", "links": {}, "path": {"164, T:0-1": [[1973, 675], [1979, 675], [1979, 681], [1973, 681]]}, "center": {"164, T:0-1": [1976, 678]}},
+{"id": 634, "name": "Melk", "description": "Melk has one eye and eats babies, he loves his blue haired gf in which he resides next to and he hates Poland as they eradicated him and all his loved ones literal minutes before r/place ended.", "links": {"website": ["https://roing.us/"]}, "path": {"160-164, T:0-1": [[1703, 554], [1703, 560], [1709, 560], [1709, 553], [1703, 553]]}, "center": {"160-164, T:0-1": [1706, 557]}},
 {"id": 635, "name": "ZezoHD", "description": "The Head of the Minecraft Skin of the Player ZezoHD. He is a very small german YouTuber and he and his friends from the KloFlo SMP built his skin. It was used by the Account \"theLEGOV\", which belonged to ZezoHD and his Brother, so they built this as their shared Account Logo.", "links": {}, "path": {"111-123": [[1347, 1840], [1348, 1841], [1348, 1842], [1350, 1841], [1351, 1842], [1354, 1847], [1347, 1847], [1354, 1840], [1346, 1840], [1347, 1840], [1348, 1839], [1347, 1839], [1348, 1840], [1348, 1841], [1347, 1841], [1346, 1841], [1346, 1838], [1349, 1843], [1350, 1842], [1350, 1843], [1354, 1843], [1354, 1845], [1354, 1843], [1354, 1842], [1354, 1841], [1354, 1843], [1353, 1841], [1353, 1842], [1353, 1843], [1353, 1844], [1355, 1847], [1355, 1845], [1355, 1844], [1355, 1843], [1355, 1842], [1355, 1841], [1355, 1840], [1355, 1839], [1346, 1839], [1346, 1848], [1355, 1848], [1355, 1839], [1346, 1839], [1346, 1848], [1355, 1848], [1355, 1839], [1346, 1839], [1346, 1848], [1355, 1848], [1355, 1839]]}, "center": {"111-123": [1347, 1843]}},
 {"id": 636, "name": "Super Bear Adventure", "description": "Super Bear Adventure is a 3D platformer game inspired by late 90s games.", "links": {"website": ["https://superbearadventure.com/"], "subreddit": ["superbear"], "discord": ["super-bear-adventure-398832325728796672"]}, "path": {"145-157": [[1862, 1540], [1867, 1540], [1867, 1542], [1870, 1542], [1870, 1540], [1875, 1540], [1875, 1545], [1873, 1545], [1873, 1551], [1864, 1551], [1864, 1545], [1862, 1545]]}, "center": {"145-157": [1869, 1547]}},
 {"id": 638, "name": "Make a Cake", "description": "A small drawing of the vanilla cake from popular roblox game Make a Cake", "links": {"website": ["https://www.roblox.com/games/39972972/Make-a-Cake"]}, "path": {"29-41": [[909, 212], [913, 212], [913, 215], [914, 215], [914, 218], [915, 218], [915, 221], [916, 221], [916, 224], [906, 224], [906, 221], [907, 221], [907, 218], [908, 218], [908, 215], [909, 215]]}, "center": {"29-41": [911, 220]}},
-{"id": 639, "name": "Melvin's cat", "description": "This is u/Melvinbro 's cat, Ginge", "links": {}, "path": {"162-166": [[1782, 784], [1788, 784], [1788, 790], [1782, 790]]}, "center": {"162-166": [1785, 787]}}
+{"id": 639, "name": "Melvin's cat", "description": "This is u/Melvinbro 's cat, Ginge", "links": {}, "path": {"162-166, T:0-1": [[1782, 784], [1788, 784], [1788, 790], [1782, 790]]}, "center": {"162-166, T:0-1": [1785, 787]}},
+{"id": 640, "name": "Fireteam", "description": "Fireteam is a Roblox teamwork oriented realistic tactical shooter created by DEVTEAM6 that requires cooperation and communication with your teammates in order to win.", "links": {"discord": ["devteam6-fireteam-351446733173030923"]}, "path": {"164-166, T:0-1": [[1728, 934], [1728, 941], [1740, 941], [1740, 934]]}, "center": {"164-166, T:0-1": [1734, 938]}}
 ]