-
Notifications
You must be signed in to change notification settings - Fork 523
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into RCD-change
- Loading branch information
Showing
917 changed files
with
42,191 additions
and
4,490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
Content.Client/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| using Content.Shared.Nyanotrasen.Item.PseudoItem; | ||
|
|
||
| namespace Content.Client.Nyanotrasen.Item.PseudoItem; | ||
|
|
||
| public sealed class PseudoItemSystem : SharedPseudoItemSystem | ||
| { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| using System.Linq; | ||
| using Content.Shared._EstacaoPirata.Cards.Card; | ||
| using Robust.Client.GameObjects; | ||
| using Robust.Shared.Utility; | ||
|
|
||
| namespace Content.Client._EstacaoPirata.Cards.Card; | ||
|
|
||
| /// <summary> | ||
| /// This handles... | ||
| /// </summary> | ||
| public sealed class CardSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly SpriteSystem _spriteSystem = default!; | ||
| /// <inheritdoc/> | ||
| public override void Initialize() | ||
| { | ||
| SubscribeLocalEvent<CardComponent, ComponentStartup>(OnComponentStartupEvent); | ||
| SubscribeNetworkEvent<CardFlipUpdatedEvent>(OnFlip); | ||
| } | ||
|
|
||
| private void OnComponentStartupEvent(EntityUid uid, CardComponent comp, ComponentStartup args) | ||
| { | ||
| if (!TryComp(uid, out SpriteComponent? spriteComponent)) | ||
| return; | ||
|
|
||
| for (var i = 0; i < spriteComponent.AllLayers.Count(); i++) | ||
| { | ||
| //Log.Debug($"Layer {i}"); | ||
| if (!spriteComponent.TryGetLayer(i, out var layer) || layer.State.Name == null) | ||
| continue; | ||
|
|
||
| var rsi = layer.RSI ?? spriteComponent.BaseRSI; | ||
| if (rsi == null) | ||
| continue; | ||
|
|
||
| //Log.Debug("FOI"); | ||
| comp.FrontSprite.Add(new SpriteSpecifier.Rsi(rsi.Path, layer.State.Name)); | ||
| } | ||
|
|
||
| comp.BackSprite ??= comp.FrontSprite; | ||
| Dirty(uid, comp); | ||
| UpdateSprite(uid, comp); | ||
| } | ||
|
|
||
| private void OnFlip(CardFlipUpdatedEvent args) | ||
| { | ||
| if (!TryComp(GetEntity(args.Card), out CardComponent? comp)) | ||
| return; | ||
| UpdateSprite(GetEntity(args.Card), comp); | ||
| } | ||
|
|
||
| private void UpdateSprite(EntityUid uid, CardComponent comp) | ||
| { | ||
| var newSprite = comp.Flipped ? comp.BackSprite : comp.FrontSprite; | ||
| if (newSprite == null) | ||
| return; | ||
|
|
||
| if (!TryComp(uid, out SpriteComponent? spriteComponent)) | ||
| return; | ||
|
|
||
| var layerCount = newSprite.Count(); | ||
|
|
||
| //inserts Missing Layers | ||
| if (spriteComponent.AllLayers.Count() < layerCount) | ||
| { | ||
| for (var i = spriteComponent.AllLayers.Count(); i < layerCount; i++) | ||
| { | ||
| spriteComponent.AddBlankLayer(i); | ||
| } | ||
| } | ||
| //Removes extra layers | ||
| else if (spriteComponent.AllLayers.Count() > layerCount) | ||
| { | ||
| for (var i = spriteComponent.AllLayers.Count() - 1; i >= layerCount; i--) | ||
| { | ||
| spriteComponent.RemoveLayer(i); | ||
| } | ||
| } | ||
|
|
||
| for (var i = 0; i < newSprite.Count(); i++) | ||
| { | ||
| var layer = newSprite[i]; | ||
| spriteComponent.LayerSetSprite(i, layer); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| using System.Linq; | ||
| using Content.Shared._EstacaoPirata.Cards.Stack; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client._EstacaoPirata.Cards; | ||
|
|
||
| /// <summary> | ||
| /// This handles... | ||
| /// </summary> | ||
| public sealed class CardSpriteSystem : EntitySystem | ||
| { | ||
| /// <inheritdoc/> | ||
| public override void Initialize() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| public bool TryAdjustLayerQuantity(Entity<SpriteComponent, CardStackComponent> uid, int? cardLimit = null) | ||
| { | ||
| var sprite = uid.Comp1; | ||
| var stack = uid.Comp2; | ||
| var cardCount = cardLimit == null ? stack.Cards.Count : Math.Min(stack.Cards.Count, cardLimit.Value); | ||
|
|
||
| var layerCount = 0; | ||
| //Gets the quantity of layers | ||
| foreach (var card in stack.Cards.TakeLast(cardCount)) | ||
| { | ||
| if (!TryComp(card, out SpriteComponent? cardSprite)) | ||
| return false; | ||
|
|
||
| layerCount += cardSprite.AllLayers.Count(); | ||
| } | ||
| //inserts Missing Layers | ||
| if (sprite.AllLayers.Count() < layerCount) | ||
| { | ||
| for (var i = sprite.AllLayers.Count(); i < layerCount; i++) | ||
| { | ||
| sprite.AddBlankLayer(i); | ||
| } | ||
| } | ||
| //Removes extra layers | ||
| else if (sprite.AllLayers.Count() > layerCount) | ||
| { | ||
| for (var i = sprite.AllLayers.Count() - 1; i >= layerCount; i--) | ||
| { | ||
| sprite.RemoveLayer(i); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| return true; | ||
| } | ||
|
|
||
| public bool TryHandleLayerConfiguration(Entity<SpriteComponent, CardStackComponent> uid, int cardCount, Func<Entity<SpriteComponent>, int, int, bool> layerFunc) | ||
| { | ||
| var sprite = uid.Comp1; | ||
| var stack = uid.Comp2; | ||
|
|
||
| // int = index of what card it is from | ||
| List<(int, ISpriteLayer)> layers = []; | ||
|
|
||
| var i = 0; | ||
| foreach (var card in stack.Cards.TakeLast(cardCount)) | ||
| { | ||
| if (!TryComp(card, out SpriteComponent? cardSprite)) | ||
| return false; | ||
| layers.AddRange(cardSprite.AllLayers.Select(layer => (i, layer))); | ||
| i++; | ||
| } | ||
|
|
||
| var j = 0; | ||
| foreach (var obj in layers) | ||
| { | ||
| var (cardIndex, layer) = obj; | ||
| sprite.LayerSetVisible(j, true); | ||
| sprite.LayerSetTexture(j, layer.Texture); | ||
| sprite.LayerSetState(j, layer.RsiState.Name); | ||
| layerFunc.Invoke((uid, sprite), cardIndex, j); | ||
| j++; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } |
Oops, something went wrong.