diff --git a/Resources/Fonts/04B_03B_.TTF b/Resources/Fonts/04B_03B_.TTF deleted file mode 100644 index c7a4861f4a..0000000000 Binary files a/Resources/Fonts/04B_03B_.TTF and /dev/null differ diff --git a/Resources/Fonts/04B_08__.TTF b/Resources/Fonts/04B_08__.TTF deleted file mode 100644 index aadf20e3b9..0000000000 Binary files a/Resources/Fonts/04B_08__.TTF and /dev/null differ diff --git a/Resources/Fonts/Animal Silence.otf b/Resources/Fonts/Animal Silence.otf deleted file mode 100644 index a923bd099d..0000000000 Binary files a/Resources/Fonts/Animal Silence.otf and /dev/null differ diff --git a/Resources/Fonts/CALIBRI.TTF b/Resources/Fonts/CALIBRI.TTF deleted file mode 100644 index 2fede68225..0000000000 Binary files a/Resources/Fonts/CALIBRI.TTF and /dev/null differ diff --git a/Resources/Fonts/MICROGBE.TTF b/Resources/Fonts/MICROGBE.TTF deleted file mode 100644 index f9f4131992..0000000000 Binary files a/Resources/Fonts/MICROGBE.TTF and /dev/null differ diff --git a/Resources/Fonts/MICROGME.TTF b/Resources/Fonts/MICROGME.TTF deleted file mode 100644 index 33f8cc6343..0000000000 Binary files a/Resources/Fonts/MICROGME.TTF and /dev/null differ diff --git a/Resources/Fonts/SpacedockStencil.ttf b/Resources/Fonts/SpacedockStencil.ttf deleted file mode 100644 index 8f5be45d63..0000000000 Binary files a/Resources/Fonts/SpacedockStencil.ttf and /dev/null differ diff --git a/Resources/Fonts/bluehigh.png b/Resources/Fonts/bluehigh.png deleted file mode 100644 index 12a141d40c..0000000000 Binary files a/Resources/Fonts/bluehigh.png and /dev/null differ diff --git a/Resources/Fonts/bluehigh.ttf b/Resources/Fonts/bluehigh.ttf deleted file mode 100644 index 14d45c5a1e..0000000000 Binary files a/Resources/Fonts/bluehigh.ttf and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_10.png b/Resources/Textures/Effects/Light/lighting_falloff_10.png deleted file mode 100644 index 02425d83a3..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_10.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_2.png b/Resources/Textures/Effects/Light/lighting_falloff_2.png deleted file mode 100644 index 3f69b47c2e..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_2.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_3.png b/Resources/Textures/Effects/Light/lighting_falloff_3.png deleted file mode 100644 index 2a638eed6d..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_3.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_4.png b/Resources/Textures/Effects/Light/lighting_falloff_4.png deleted file mode 100644 index 2aa99ad0c2..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_4.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_5.png b/Resources/Textures/Effects/Light/lighting_falloff_5.png deleted file mode 100644 index a64a9cceb9..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_5.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_6.png b/Resources/Textures/Effects/Light/lighting_falloff_6.png deleted file mode 100644 index 36d929987a..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_6.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_7.png b/Resources/Textures/Effects/Light/lighting_falloff_7.png deleted file mode 100644 index c2c20e49bd..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_7.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_8.png b/Resources/Textures/Effects/Light/lighting_falloff_8.png deleted file mode 100644 index 012aa988c3..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_8.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/lighting_falloff_9.png b/Resources/Textures/Effects/Light/lighting_falloff_9.png deleted file mode 100644 index 7316fb79c1..0000000000 Binary files a/Resources/Textures/Effects/Light/lighting_falloff_9.png and /dev/null differ diff --git a/Resources/Textures/Effects/Light/white.png b/Resources/Textures/Effects/Light/white.png deleted file mode 100644 index 4b1bad2b7c..0000000000 Binary files a/Resources/Textures/Effects/Light/white.png and /dev/null differ diff --git a/Resources/Textures/Logo/background.png b/Resources/Textures/Logo/background.png deleted file mode 100644 index cab3aa7e28..0000000000 Binary files a/Resources/Textures/Logo/background.png and /dev/null differ diff --git a/Resources/Textures/Logo/copyright.md b/Resources/Textures/Logo/copyright.md deleted file mode 100644 index 14b1bbcc78..0000000000 --- a/Resources/Textures/Logo/copyright.md +++ /dev/null @@ -1,3 +0,0 @@ -* `background.png` a modified version from http://imgarcade.com/16-bit-space-background.html -* `logo.png` is a modified version of the logo on http://spacestation13.com -* `nt.png` is an exported PNG from https://github.com/Baystation12/Baystation12/blob/0eb51892d0cd84a04aeebd6b8c8dcfbd92d2b35a/tgui/src/images/nanotrasen.svg diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index f8a7ae898c..ed7a738c3e 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ diff --git a/Resources/Textures/Logo/nanotrasen.png b/Resources/Textures/Logo/nanotrasen.png deleted file mode 100644 index 96bd926b12..0000000000 Binary files a/Resources/Textures/Logo/nanotrasen.png and /dev/null differ diff --git a/Resources/Textures/Unatlased/flashlight_mask.png b/Resources/Textures/Unatlased/flashlight_mask.png deleted file mode 100644 index 49fbd95d65..0000000000 Binary files a/Resources/Textures/Unatlased/flashlight_mask.png and /dev/null differ diff --git a/Resources/Textures/Unatlased/flashlight_mask_diag.png b/Resources/Textures/Unatlased/flashlight_mask_diag.png deleted file mode 100644 index c8b830f9e9..0000000000 Binary files a/Resources/Textures/Unatlased/flashlight_mask_diag.png and /dev/null differ diff --git a/Resources/Textures/Unatlased/outofview.png b/Resources/Textures/Unatlased/outofview.png deleted file mode 100644 index 6ccadac761..0000000000 Binary files a/Resources/Textures/Unatlased/outofview.png and /dev/null differ diff --git a/Resources/Textures/Unatlased/whitemask.png b/Resources/Textures/Unatlased/whitemask.png deleted file mode 100644 index 974d8032de..0000000000 Binary files a/Resources/Textures/Unatlased/whitemask.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/1pxwhite.png b/Resources/Textures/UserInterface/1pxwhite.png deleted file mode 100644 index 3e7dc9cc2f..0000000000 Binary files a/Resources/Textures/UserInterface/1pxwhite.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/action_button.psd b/Resources/Textures/UserInterface/action_button.psd deleted file mode 100644 index 7ed584fe69..0000000000 Binary files a/Resources/Textures/UserInterface/action_button.psd and /dev/null differ diff --git a/Resources/Textures/UserInterface/action_empty.png b/Resources/Textures/UserInterface/action_empty.png deleted file mode 100644 index 4d6dd942fd..0000000000 Binary files a/Resources/Textures/UserInterface/action_empty.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/barTabLeft.png b/Resources/Textures/UserInterface/barTabLeft.png deleted file mode 100644 index abe6dc5de5..0000000000 Binary files a/Resources/Textures/UserInterface/barTabLeft.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/barTabMid.png b/Resources/Textures/UserInterface/barTabMid.png deleted file mode 100644 index b706cd11c5..0000000000 Binary files a/Resources/Textures/UserInterface/barTabMid.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/barTabRight.png b/Resources/Textures/UserInterface/barTabRight.png deleted file mode 100644 index ef2853b87e..0000000000 Binary files a/Resources/Textures/UserInterface/barTabRight.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/blip.png b/Resources/Textures/UserInterface/blip.png deleted file mode 100644 index de6f979d41..0000000000 Binary files a/Resources/Textures/UserInterface/blip.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/blipfull.png b/Resources/Textures/UserInterface/blipfull.png deleted file mode 100644 index 89339118b6..0000000000 Binary files a/Resources/Textures/UserInterface/blipfull.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_bottom.png b/Resources/Textures/UserInterface/border_bottom.png deleted file mode 100644 index 73c504fe45..0000000000 Binary files a/Resources/Textures/UserInterface/border_bottom.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_left.png b/Resources/Textures/UserInterface/border_left.png deleted file mode 100644 index 93155b9729..0000000000 Binary files a/Resources/Textures/UserInterface/border_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_middle_h.png b/Resources/Textures/UserInterface/border_middle_h.png deleted file mode 100644 index b6525e2457..0000000000 Binary files a/Resources/Textures/UserInterface/border_middle_h.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_middle_v.png b/Resources/Textures/UserInterface/border_middle_v.png deleted file mode 100644 index 452f9eaf0f..0000000000 Binary files a/Resources/Textures/UserInterface/border_middle_v.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_right.png b/Resources/Textures/UserInterface/border_right.png deleted file mode 100644 index a51c041233..0000000000 Binary files a/Resources/Textures/UserInterface/border_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/border_top.png b/Resources/Textures/UserInterface/border_top.png deleted file mode 100644 index 2490ce2815..0000000000 Binary files a/Resources/Textures/UserInterface/border_top.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/button_closecombo.png b/Resources/Textures/UserInterface/button_closecombo.png deleted file mode 100644 index 663a196a9f..0000000000 Binary files a/Resources/Textures/UserInterface/button_closecombo.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/button_left.png b/Resources/Textures/UserInterface/button_left.png deleted file mode 100644 index ff607a3f4e..0000000000 Binary files a/Resources/Textures/UserInterface/button_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/button_middle.png b/Resources/Textures/UserInterface/button_middle.png deleted file mode 100644 index caa5c8139f..0000000000 Binary files a/Resources/Textures/UserInterface/button_middle.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/button_right.png b/Resources/Textures/UserInterface/button_right.png deleted file mode 100644 index 6175971665..0000000000 Binary files a/Resources/Textures/UserInterface/button_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/checkbox0.png b/Resources/Textures/UserInterface/checkbox0.png deleted file mode 100644 index 236e3544df..0000000000 Binary files a/Resources/Textures/UserInterface/checkbox0.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/checkbox1.png b/Resources/Textures/UserInterface/checkbox1.png deleted file mode 100644 index 8bca1e389a..0000000000 Binary files a/Resources/Textures/UserInterface/checkbox1.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/closewindow.png b/Resources/Textures/UserInterface/closewindow.png deleted file mode 100644 index 178c3ed5ce..0000000000 Binary files a/Resources/Textures/UserInterface/closewindow.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/context_bluepoint.png b/Resources/Textures/UserInterface/context_bluepoint.png deleted file mode 100644 index b46ead0d03..0000000000 Binary files a/Resources/Textures/UserInterface/context_bluepoint.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/context_eye.png b/Resources/Textures/UserInterface/context_eye.png deleted file mode 100644 index eef43aedee..0000000000 Binary files a/Resources/Textures/UserInterface/context_eye.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_bottom_left.png b/Resources/Textures/UserInterface/corner_bottom_left.png deleted file mode 100644 index dded075725..0000000000 Binary files a/Resources/Textures/UserInterface/corner_bottom_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_bottom_right.png b/Resources/Textures/UserInterface/corner_bottom_right.png deleted file mode 100644 index 3fc7d0fb9a..0000000000 Binary files a/Resources/Textures/UserInterface/corner_bottom_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_middle_left.png b/Resources/Textures/UserInterface/corner_middle_left.png deleted file mode 100644 index f68e1a6b92..0000000000 Binary files a/Resources/Textures/UserInterface/corner_middle_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_middle_right.png b/Resources/Textures/UserInterface/corner_middle_right.png deleted file mode 100644 index 6ec743afb6..0000000000 Binary files a/Resources/Textures/UserInterface/corner_middle_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_top_left.png b/Resources/Textures/UserInterface/corner_top_left.png deleted file mode 100644 index 3d6f5f805e..0000000000 Binary files a/Resources/Textures/UserInterface/corner_top_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corner_top_right.png b/Resources/Textures/UserInterface/corner_top_right.png deleted file mode 100644 index 908a900799..0000000000 Binary files a/Resources/Textures/UserInterface/corner_top_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/corners.png b/Resources/Textures/UserInterface/corners.png deleted file mode 100644 index 2f4287a2d8..0000000000 Binary files a/Resources/Textures/UserInterface/corners.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/cursor.png b/Resources/Textures/UserInterface/cursor.png deleted file mode 100644 index 74c62a0b3f..0000000000 Binary files a/Resources/Textures/UserInterface/cursor.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/cursor_target.png b/Resources/Textures/UserInterface/cursor_target.png deleted file mode 100644 index e7af8b0d13..0000000000 Binary files a/Resources/Textures/UserInterface/cursor_target.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/erasericon.png b/Resources/Textures/UserInterface/erasericon.png deleted file mode 100644 index 91654b08ce..0000000000 Binary files a/Resources/Textures/UserInterface/erasericon.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/main_hotbar.png b/Resources/Textures/UserInterface/main_hotbar.png deleted file mode 100644 index 43b8ee24dc..0000000000 Binary files a/Resources/Textures/UserInterface/main_hotbar.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/mainbg.png b/Resources/Textures/UserInterface/mainbg.png deleted file mode 100644 index 38b57b3d0f..0000000000 Binary files a/Resources/Textures/UserInterface/mainbg.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/mainbg_filler.png b/Resources/Textures/UserInterface/mainbg_filler.png deleted file mode 100644 index cc669c7a07..0000000000 Binary files a/Resources/Textures/UserInterface/mainbg_filler.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/scrollbutton_h.png b/Resources/Textures/UserInterface/scrollbutton_h.png deleted file mode 100644 index b52a432322..0000000000 Binary files a/Resources/Textures/UserInterface/scrollbutton_h.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/scrollbutton_v.png b/Resources/Textures/UserInterface/scrollbutton_v.png deleted file mode 100644 index 6caf558094..0000000000 Binary files a/Resources/Textures/UserInterface/scrollbutton_v.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/slot.png b/Resources/Textures/UserInterface/slot.png deleted file mode 100644 index c05e130d40..0000000000 Binary files a/Resources/Textures/UserInterface/slot.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/text_left.png b/Resources/Textures/UserInterface/text_left.png deleted file mode 100644 index 51a9b2da7c..0000000000 Binary files a/Resources/Textures/UserInterface/text_left.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/text_middle.png b/Resources/Textures/UserInterface/text_middle.png deleted file mode 100644 index 61aae2907e..0000000000 Binary files a/Resources/Textures/UserInterface/text_middle.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/text_right.png b/Resources/Textures/UserInterface/text_right.png deleted file mode 100644 index 02724abdf3..0000000000 Binary files a/Resources/Textures/UserInterface/text_right.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/tilebuildoverlay.png b/Resources/Textures/UserInterface/tilebuildoverlay.png deleted file mode 100644 index 6b175e9f9d..0000000000 Binary files a/Resources/Textures/UserInterface/tilebuildoverlay.png and /dev/null differ diff --git a/Resources/Textures/UserInterface/white.png b/Resources/Textures/UserInterface/white.png deleted file mode 100644 index 63e6054014..0000000000 Binary files a/Resources/Textures/UserInterface/white.png and /dev/null differ diff --git a/Resources/Textures/noSprite.png b/Resources/Textures/noSprite.png index bb6c8a9933..49cde225b7 100644 Binary files a/Resources/Textures/noSprite.png and b/Resources/Textures/noSprite.png differ diff --git a/Resources/buildResourcePack.py b/Resources/buildResourcePack.py deleted file mode 100755 index d81689363e..0000000000 --- a/Resources/buildResourcePack.py +++ /dev/null @@ -1,280 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - -# Potential improvements: -# * Asynchronous file I/O. -# * Stream files in from MSpriteRenderer instead of waiting for it to complete. -# * Don't wait on all atlasses to finish before starting non-texture files. - -# TODO: -# * Better handling of errors. -# * Better logging. - -import argparse -import asyncio -import os -from pathlib import Path -import shutil -import subprocess -import sys -import tempfile -import typing # autism. -import zipfile - -try: - from colorama import init, Fore, Back, Style - init() - -except ImportError: - # Just give an empty string for everything, no colored logging. - class ColorDummy(object): - def __getattr__(self, name): - return "" - - Fore = ColorDummy() - Style = ColorDummy() - Back = ColorDummy() - -IS_WINDOWS = sys.platform in ("win32", "cygwin") - - -async def main(): - parser = argparse.ArgumentParser(description="Builds the SS14 resource pack zip file.") - parser.add_argument("--no-atlas", - dest="atlas", - help=("Disable texture atlas generation. " - "This severely ruins rendering performance in game. Beware."), - action="store_false") - - parser.add_argument("--no-animations", - dest="animations", - help="Skip generating animations", - action="store_false") - - parser.add_argument("--sprite-renderer", - dest="renderer", - type=Path, - default=Path("SpriteRenderer/MSpriteRenderer.exe"), - help="Provide a custom path to the animations sprite renderer's directory.") - - parser.add_argument("--atlas-tool", - dest="atlas_tool", - type=str, - default="../Tools/AtlasTool.exe", - help="Provide a custom path to the atlas tool used.") - - parser.add_argument("--out", - dest="out", - type=Path, - default=Path("ResourcePack.zip"), - help="Output file.") - - parser.add_argument("--no-temp-out-file", - dest="temp_out", - action="store_false", - help=("Do not write to a temporarily file during operation, " - "instead write to the output file directly. " - "Note that this will cause a current zip to be corrupted " - "if the script gets killed midway through.")) - - parser.add_argument("--resources-dir", - dest="source", - type=Path, - default=Path("."), - help="Set the directory to pull resources from.") - - # For debugging on non-Windows systems. - # You're probably gonna want to pass --sprite-renderer SpriteDummy/DummySpriteRenderer.py too. - parser.add_argument("--force-animations-build", - dest="force_animations", - action="store_true", - help=argparse.SUPPRESS) - - parser.add_argument("--to-stderr", - dest="stderr", - action="store_true", - help="Redirect all output to stderr.") - - args = parser.parse_args() - - if args.stderr: - sys.stdout = sys.stderr - - animations = args.animations - atlas = args.atlas - atlas_command = [args.atlas_tool] - atlas_dir = None - textures_path = args.source.joinpath("Textures") - - if not IS_WINDOWS: - if animations and not args.force_animations: - print(Fore.YELLOW + "WARNING: animations generation will be disabled because you are not on Windows.") - print(" Pass --no-animations to surpress this warning." + Style.RESET_ALL) - animations = False - - # Maybe softcode this to allow using .NET core? - atlas_command.insert(0, "mono") - - outfile = args.out - if args.temp_out: - outfile = outfile.with_suffix(".tmp") - - zip_target = zipfile.ZipFile(str(outfile), "w", zipfile.ZIP_DEFLATED, allowZip64=False) - - if atlas: - atlas_dir = tempfile.TemporaryDirectory() - atlas_dir.path = Path(atlas_dir.name) - - # Separare so we can easily hand them to build_animations() - # Which can then easily hand them to handle_texture_directory. - # Also bit of a misnomer, sorry about that. - atlas_args = { - "zip_target": zip_target, - "atlas": atlas, - "atlas_command": atlas_command, - "atlas_out_dir": atlas_dir.name if atlas_dir else Path("") - } - - # Animations atlas building gets done after build_animations. - # If animations are done. - tasks = [ - handle_texture_directory( - input_dir=textures_path.joinpath(name), - atlas_name=name, - **atlas_args - ) for name in [ - "Decals", - "Effects", - "Items", - "Objects", - "Tiles", - "UserInterface" - ] - ] - - tasks.append(handle_texture_directory(textures_path.joinpath("Unatlased"), zip_target, False)) - - if animations: - tasks.append(build_animations(args.renderer, atlas_args)) - - await asyncio.gather(*tasks) - - if atlas: - # Gotta copy over the files from the atlas output dir. - for filepath in atlas_dir.path.iterdir(): - zip_path = Path("TAI" if filepath.suffix == ".TAI" else "Textures") - zip_target.write(str(filepath), str(zip_path.joinpath(filepath.name))) - - write_zip_dir_node(zip_target, "TAI/") - - write_zip_dir_node(zip_target, "Textures/") - - # Copy over non-image files. - for otherassets in ["Fonts", "ParticleSystems", "Shaders"]: - for (dirpath, dirnames, filenames) in os.walk(str(args.source.joinpath(otherassets))): - dirpath = Path(dirpath) - write_zip_dir_node(zip_target, str(dirpath.relative_to(args.source))) - for filename in filenames: - filepath = dirpath.joinpath(filename) - targetpath = filepath.relative_to(args.source) - - print(Fore.CYAN + "Wrote {0} -> {1}".format(filepath, targetpath) + Style.RESET_ALL) - zip_target.write(str(filepath), str(targetpath)) - - - # Clean up. - zip_target.close() - if args.temp_out: - outfile.replace(args.out) - - if atlas_dir is not None: - atlas_dir.cleanup() - - -async def build_animations(path: Path, atlas_args: typing.Dict[str, typing.Any]): - dirpath = path.parent - outdir = dirpath.joinpath("output") - if outdir.exists(): - print(Fore.CYAN + "Deleting previous output from the animation renderer..." + Style.RESET_ALL) - def handle_errors(function, path, excinfo): - print(Fore.RED + " ERROR: failed to remove {0}: {1}".format(path, excinfo[1].strerror) + Style.RESET_ALL) - - shutil.rmtree(str(outdir), onerror=handle_errors) - - outdir.mkdir() - - print(Fore.GREEN + "Running the animation renderer, this will take a while..." + Style.RESET_ALL) - exec_path = path.resolve() - process = await asyncio.create_subprocess_exec(str(exec_path), cwd=str(dirpath)) - await process.wait() - - await handle_texture_directory(input_dir=outdir, atlas_name="Animations", **atlas_args) - - zip_target = atlas_args["zip_target"] - write_zip_dir_node(zip_target, "Animations/") - # Write animation XML files to ZIP/Animations/ - for xmlfile in outdir.glob("*.xml"): - targetpath = Path("Animations").joinpath(xmlfile.name) - print(Fore.CYAN + "Wrote {0} -> {1}".format(xmlfile, targetpath) + Style.RESET_ALL) - zip_target.write(str(xmlfile), str(targetpath)) - - -async def handle_texture_directory(input_dir: Path, - zip_target: zipfile.ZipFile, - atlas: bool, - atlas_name: str = None, - atlas_command: typing.List[str] = None, - atlas_out_dir: Path = None): - - if not atlas: - # NOTE: Hardcoding for .png is probably bad. - # But it prevents the animation XML files from being copied so... - for pngfile in input_dir.glob("**/*.png"): - texturepath = Path("Textures").joinpath(pngfile.name) - zip_target.write(str(pngfile), str(texturepath)) - print(Fore.CYAN + "Wrote {0} -> {1}".format(pngfile, texturepath) + Style.RESET_ALL) - - return - - print(Fore.GREEN + "Generating atlas for {0}...".format(atlas_name) + Style.RESET_ALL) - process = await asyncio.create_subprocess_exec( - *atlas_command, - "-n", atlas_name, - "-o", str(atlas_out_dir), - "-i", str(input_dir) - ) - - print(Fore.GREEN + "Done generating atlas for {0}.".format(atlas_name) + Style.RESET_ALL) - - await process.wait() - - -# If it's stupid and it works, is it still stupid? -def write_zip_dir_node(file: zipfile.ZipFile, path: str): - """ - Attempt to write a dummy directory node into the zip file. - Does nothing if the node already exists. - """ - - if not path.endswith("/"): - path += "/" - - try: - info = file.getinfo(path) - - except: - info = zipfile.ZipInfo() - info.date_time = (2001, 9, 11, 8, 46, 0) - info.filename = path - - file.writestr(info, "") - print(Fore.CYAN + Style.DIM + "Wrote " + path + " zip directory." + Style.RESET_ALL) - - -if __name__ == "__main__": - loop = asyncio.get_event_loop() - if IS_WINDOWS: - loop = asyncio.ProactorEventLoop() - asyncio.set_event_loop(loop) - - loop.run_until_complete(main()) diff --git a/Resources/emotes.xml b/Resources/emotes.xml deleted file mode 100644 index 73b56fce44..0000000000 --- a/Resources/emotes.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - default - You do something! - {0} does something! - - - sigh - You sigh. - {0} sighs. - - - scream - You scream as loudly as you can! - {0} lets out a blood-curdling scream! - - - fart - You strain, but produce nary a toot. - {0} lifts {1} leg a little and gets a funny look on {1} face. - - - laugh - You laugh. - {0} laughs heartily. - - - chuckle - You chuckle. - {0} chuckles wryly. - - \ No newline at end of file diff --git a/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs b/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs index dc2e7222b7..70c0c93a6d 100644 --- a/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs +++ b/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs @@ -112,11 +112,11 @@ namespace Robust.Client.GameObjects set { radius = FloatMath.Clamp(value, 2, 10); - var tex = _resourceCache.GetResource(new ResourcePath("/Textures/Effects/Light/") / - $"lighting_falloff_{(int) radius}.png"); + //var tex = _resourceCache.GetResource(new ResourcePath("/Textures/Effects/Light/") / + // $"lighting_falloff_{(int) radius}.png"); - Light.Texture = tex.Texture; + //Light.Texture = tex.Texture; } } diff --git a/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs index f74f2df6ee..1194211dc2 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs @@ -63,8 +63,6 @@ namespace Robust.Client.UserInterface.CustomControls contents = new Label { - FontOverride = - new VectorFont(resourceCache.GetResource(new ResourcePath("/Fonts/CALIBRI.TTF")), 12), FontColorShadowOverride = Color.Black, MarginTop = 5, MarginLeft = 5 diff --git a/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs index cedc5f10c0..1f5ae6223f 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs @@ -51,8 +51,6 @@ namespace Robust.Client.UserInterface.CustomControls contents = new Label { - FontOverride = resourceCache.GetResource(new ResourcePath("/Fonts/CALIBRI.TTF")) - .MakeDefault(), FontColorShadowOverride = Color.Black, MarginTop = 5, MarginLeft = 5 diff --git a/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs b/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs index 1078b3b78f..23b6c6eb9a 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs @@ -34,8 +34,6 @@ namespace Robust.Client.UserInterface.CustomControls { _contents = new Label { - FontOverride = _resourceCache.GetResource(new ResourcePath("/Fonts/CALIBRI.TTF")) - .MakeDefault(), FontColorShadowOverride = Color.Black, MarginTop = 5, MarginLeft = 5 diff --git a/Robust.Client/UserInterface/UITheme.cs b/Robust.Client/UserInterface/UITheme.cs index 494386b6a5..369c6eb4da 100644 --- a/Robust.Client/UserInterface/UITheme.cs +++ b/Robust.Client/UserInterface/UITheme.cs @@ -1,12 +1,11 @@ using Robust.Client.Graphics; using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; -using Robust.Shared.IoC; -using Robust.Shared.Maths; namespace Robust.Client.UserInterface { + // DON'T USE THESE + // THEY'RE A BAD IDEA THAT NEEDS TO BE BURIED. + /// /// Fallback theme system for GUI. /// @@ -19,29 +18,6 @@ namespace Robust.Client.UserInterface public abstract StyleBox LineEditBox { get; } } - public sealed class UIThemeDefault : UITheme - { - public override Font DefaultFont { get; } - public override Font LabelFont { get; } - public override StyleBox PanelPanel { get; } - public override StyleBox ButtonStyle { get; } - public override StyleBox LineEditBox { get; } - - public UIThemeDefault() - { - var res = IoCManager.Resolve(); - var calibri = res.GetResource("/Fonts/CALIBRI.TTF"); - DefaultFont = LabelFont = new VectorFont(calibri, 16); - - PanelPanel = new StyleBoxFlat {BackgroundColor = new Color(37, 37, 45)}; - - ButtonStyle = new StyleBoxFlat {BackgroundColor = Color.Gray}; - ButtonStyle.SetContentMarginOverride(StyleBox.Margin.All, 5); - LineEditBox = new StyleBoxFlat {BackgroundColor = Color.Blue}; - LineEditBox.SetContentMarginOverride(StyleBox.Margin.All, 5); - } - } - public sealed class UIThemeDummy : UITheme { public override Font DefaultFont { get; } = new DummyFont(); diff --git a/Robust.Client/UserInterface/UserInterfaceManager.cs b/Robust.Client/UserInterface/UserInterfaceManager.cs index d000405cfa..042f25d715 100644 --- a/Robust.Client/UserInterface/UserInterfaceManager.cs +++ b/Robust.Client/UserInterface/UserInterfaceManager.cs @@ -72,7 +72,7 @@ namespace Robust.Client.UserInterface public void Initialize() { UIScale = _configurationManager.GetCVar("display.uiScale"); - ThemeDefaults = new UIThemeDefault(); + ThemeDefaults = new UIThemeDummy(); _initializeCommon(); diff --git a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs index 0bd781e8ea..753acc8e9d 100644 --- a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs +++ b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs @@ -70,14 +70,14 @@ namespace Robust.Client.ViewVariables.Instances var stringified = obj.ToString(); if (type.FullName != stringified) { - var smallFont = new VectorFont(_resourceCache.GetResource("/Fonts/CALIBRI.TTF"), 10); + //var smallFont = new VectorFont(_resourceCache.GetResource("/Fonts/CALIBRI.TTF"), 10); // Custom ToString() implementation. var headBox = new VBoxContainer {SeparationOverride = 0}; headBox.AddChild(new Label {Text = stringified, ClipText = true}); headBox.AddChild(new Label { Text = type.FullName, - FontOverride = smallFont, + // FontOverride = smallFont, FontColorOverride = Color.DarkGray, ClipText = true }); diff --git a/Robust.Client/ViewVariables/ViewVariablesInstance.cs b/Robust.Client/ViewVariables/ViewVariablesInstance.cs index c1497e2c4a..47bdf60e7e 100644 --- a/Robust.Client/ViewVariables/ViewVariablesInstance.cs +++ b/Robust.Client/ViewVariables/ViewVariablesInstance.cs @@ -121,9 +121,9 @@ namespace Robust.Client.ViewVariables return new Label {Text = top, ClipText = true}; } - var smallFont = - new VectorFont(IoCManager.Resolve().GetResource("/Fonts/CALIBRI.TTF"), - 10); + //var smallFont = + // new VectorFont(IoCManager.Resolve().GetResource("/Fonts/CALIBRI.TTF"), + // 10); // Custom ToString() implementation. var headBox = new VBoxContainer {SeparationOverride = 0}; @@ -131,7 +131,7 @@ namespace Robust.Client.ViewVariables headBox.AddChild(new Label { Text = bottom, - FontOverride = smallFont, + // FontOverride = smallFont, FontColorOverride = Color.DarkGray, ClipText = true }); diff --git a/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs b/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs index 2a63a88bdc..883a838ce6 100644 --- a/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs +++ b/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs @@ -50,11 +50,11 @@ namespace Robust.Client.ViewVariables }; VBox.AddChild(BottomContainer); - var smallFont = new VectorFont(_resourceCache.GetResource("/Fonts/CALIBRI.TTF"), 10); + //var smallFont = new VectorFont(_resourceCache.GetResource("/Fonts/CALIBRI.TTF"), 10); _bottomLabel = new Label { - FontOverride = smallFont, + // FontOverride = smallFont, FontColorOverride = Color.DarkGray }; BottomContainer.AddChild(_bottomLabel); diff --git a/Robust.Shared/Noise/ss14-noise/Cargo.lock b/Robust.Shared/Noise/ss14-noise/Cargo.lock index b671761983..35dd18aa57 100644 --- a/Robust.Shared/Noise/ss14-noise/Cargo.lock +++ b/Robust.Shared/Noise/ss14-noise/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "bitflags" version = "1.0.3"