Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic Maptext #2108

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Conversation

amylizzle
Copy link
Contributor

@amylizzle amylizzle commented Nov 23, 2024

Rudimentary implementation. No tag processing but it shouldn't be too hard to add (just copying richtext formatting stuff)

Maptext inherits filters and transforms from parent atom.
image

Resolves #176

@boring-cyborg boring-cyborg bot added Client Involves the OpenDream client Compiler Involves the OpenDream compiler Runtime Involves the OpenDream server/runtime labels Nov 23, 2024
@amylizzle amylizzle marked this pull request as ready for review December 23, 2024 23:54
OpenDreamClient/Rendering/DreamIcon.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamClient/Rendering/DreamViewOverlay.cs Fixed Show fixed Hide fixed
OpenDreamShared/Dream/IconAppearance.cs Fixed Show resolved Hide resolved
OpenDreamShared/Dream/IconAppearance.cs Fixed Show resolved Hide resolved
Copy link

github-actions bot commented Jan 5, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@@ -323,11 +325,9 @@
_animatedAppearance.IconState = endAppearance.IconState;
if (endAppearance.Invisibility != _appearance.Invisibility)
_animatedAppearance.Invisibility = endAppearance.Invisibility;
if (endAppearance.Maptext != _appearance.Maptext)

Check warning

Code scanning / InspectCode

Redundant condition check before assignments Warning

Redundant check before assignment
@@ -227,6 +237,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
@@ -227,6 +237,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);
hashCode.Add(MaptextOffset);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
@@ -227,6 +237,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);
hashCode.Add(MaptextOffset);
hashCode.Add(MaptextSize);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
}


if (MaptextSize != MutableAppearance.Default.MaptextSize) {

Check warning

Code scanning / InspectCode

Incorrect blank lines: Blank lines are redundant elsewhere Warning

Blank lines are redundant, expected maximum 1 instead of 2
@@ -252,6 +261,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
@@ -252,6 +261,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);
hashCode.Add(MaptextOffset);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
@@ -252,6 +261,9 @@
hashCode.Add(RenderTarget);
hashCode.Add(BlendMode);
hashCode.Add(AppearanceFlags);
hashCode.Add(Maptext);
hashCode.Add(MaptextOffset);
hashCode.Add(MaptextSize);

Check warning

Code scanning / InspectCode

Non-readonly type member referenced in 'GetHashCode()' Warning

Non-readonly field referenced in 'GetHashCode()'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Client Involves the OpenDream client Compiler Involves the OpenDream compiler Runtime Involves the OpenDream server/runtime size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

atom/maptext not implemented
1 participant