Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Cartas........ denovo....! 🃏 (Cards Einstein Engines Patch) #143

Closed
wants to merge 3 commits into from

Conversation

Day-OS
Copy link
Collaborator

@Day-OS Day-OS commented Sep 11, 2024

Mesma coisa que o PR abaixo, porém adaptado para a codebase EE
Same thing as the PR below, but adapted for the EE codebase.

#104

TRUUUCOOOOOOOOOOOOOOOOOOO!!!!!

Day-OS and others added 3 commits September 11, 2024 18:05
* Adds cards sprites from Paradise

* Adds Cards entities

* adds Card Decks

They can be joined, shuffled, and cards can be picked up from them!

* Make cards flippable

* Make Card Decks show what's on their pile

Known bugs:
Decks are not updated at start
Decks sprites are glitched at spawn menu

* Adds Cards ftl files

* Adds Cards SFX, Fixes decks sprites not starting correctly, Refactors the code

Known bugs:
Decks sprites are STILL glitched at spawn menu

* Adds deck organization (flipping all cards to a specific direction) and fixes deck sprites appearing wrongly at spawn menu

* Add CardsHandMenu, makes Cards rotatable, Refactor events

* Fixes Cards not joining correctly and cards being added to stacks in a weird way

Still more bugs to be fixed tho

* Makes the card draw function from CardHand actually work and other things

Re-adds ComponentStartup to carddecksystem, but preventing it to appear as an error
Refactors namespace of Stack

* Makes Card Hand sprite change dynamically

* Fixes Audio and makes card hands to decks interaction better

* Some fixes, FTL texts and refactors

Adds ftl entries
Refactors CardHandSystem importing cardstacksystem twice
Fixes InteractUsing events not being handled at all

* Adds option to get a specific card from hand if picked with empty hand. Prevent Stack joining with itself

* Retexture Card Sprites and adds Card boxes sprites

Co-Authored-By: VictorJob <117521143+VICTorjob@users.noreply.github.com>

* Adds ways to view how many cards are there in stacks

* Fixes card names not appearing properly at card hand menu

* Add Convert from hand to deck cards button

* Muda o nome do conjunto Preto para Conjunto mão do povo

* Add a way to fill storages ONLY when someone interacts with them

* Change convertToDeck verb icon

* Change convertToDeck verb icon

* Rework of how Card Hand/Deck Sprite layers work so it allows multilayered cards

* Adds a way to split decks in half

* Adds CardBox to vending machines

* Fix OpenTriggeredStorageFillSystem not removing itself at the end

* Fixes sound collection

* removes white space from texture names

I guess this fixes the issue...?

---------

Co-authored-by: VictorJob <117521143+VICTorjob@users.noreply.github.com>
Copy link

RSI Diff Bot; head commit c950380 merging into ca23b25
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi

State Old New Status
black_box Added
black_box_open Added
black_hand1 Added
black_hand2 Added
black_hand3 Added
black_hand4 Added
black_hand5 Added
black_joker Added
deck_black_empty Added
deck_black_full Added
deck_black_half Added
deck_black_low Added
deck_nanotrasen_empty Added
deck_nanotrasen_full Added
deck_nanotrasen_half Added
deck_nanotrasen_low Added
deck_syndicate_empty Added
deck_syndicate_full Added
deck_syndicate_half Added
deck_syndicate_low Added
nanotrasen_box Added
nanotrasen_box_open Added
nanotrasen_hand1 Added
nanotrasen_hand2 Added
nanotrasen_hand3 Added
nanotrasen_hand4 Added
nanotrasen_hand5 Added
nanotrasen_joker Added
sc_10_of_Clubs_black Added
sc_10_of_Clubs_nanotrasen Added
sc_10_of_Clubs_syndicate Added
sc_10_of_Diamonds_black Added
sc_10_of_Diamonds_nanotrasen Added
sc_10_of_Diamonds_syndicate Added
sc_10_of_Hearts_black Added
sc_10_of_Hearts_nanotrasen Added
sc_10_of_Hearts_syndicate Added
sc_10_of_Spades_black Added
sc_10_of_Spades_nanotrasen Added
sc_10_of_Spades_syndicate Added
sc_2_of_Clubs_black Added
sc_2_of_Clubs_nanotrasen Added
sc_2_of_Clubs_syndicate Added
sc_2_of_Diamonds_black Added
sc_2_of_Diamonds_nanotrasen Added
sc_2_of_Diamonds_syndicate Added
sc_2_of_Hearts_black Added
sc_2_of_Hearts_nanotrasen Added
sc_2_of_Hearts_syndicate Added
sc_2_of_Spades_black Added
sc_2_of_Spades_nanotrasen Added
sc_2_of_Spades_syndicate Added
sc_3_of_Clubs_black Added
sc_3_of_Clubs_nanotrasen Added
sc_3_of_Clubs_syndicate Added
sc_3_of_Diamonds_black Added
sc_3_of_Diamonds_nanotrasen Added
sc_3_of_Diamonds_syndicate Added
sc_3_of_Hearts_black Added
sc_3_of_Hearts_nanotrasen Added
sc_3_of_Hearts_syndicate Added
sc_3_of_Spades_black Added
sc_3_of_Spades_nanotrasen Added
sc_3_of_Spades_syndicate Added
sc_4_of_Clubs_black Added
sc_4_of_Clubs_nanotrasen Added
sc_4_of_Clubs_syndicate Added
sc_4_of_Diamonds_black Added
sc_4_of_Diamonds_nanotrasen Added
sc_4_of_Diamonds_syndicate Added
sc_4_of_Hearts_black Added
sc_4_of_Hearts_nanotrasen Added
sc_4_of_Hearts_syndicate Added
sc_4_of_Spades_black Added
sc_4_of_Spades_nanotrasen Added
sc_4_of_Spades_syndicate Added
sc_5_of_Clubs_black Added
sc_5_of_Clubs_nanotrasen Added
sc_5_of_Clubs_syndicate Added
sc_5_of_Diamonds_black Added
sc_5_of_Diamonds_nanotrasen Added
sc_5_of_Diamonds_syndicate Added
sc_5_of_Hearts_black Added
sc_5_of_Hearts_nanotrasen Added
sc_5_of_Hearts_syndicate Added
sc_5_of_Spades_black Added
sc_5_of_Spades_nanotrasen Added
sc_5_of_Spades_syndicate Added
sc_6_of_Clubs_black Added
sc_6_of_Clubs_nanotrasen Added
sc_6_of_Clubs_syndicate Added
sc_6_of_Diamonds_black Added
sc_6_of_Diamonds_nanotrasen Added
sc_6_of_Diamonds_syndicate Added
sc_6_of_Hearts_black Added
sc_6_of_Hearts_nanotrasen Added
sc_6_of_Hearts_syndicate Added
sc_6_of_Spades_black Added
sc_6_of_Spades_nanotrasen Added
sc_6_of_Spades_syndicate Added
sc_7_of_Clubs_black Added
sc_7_of_Clubs_nanotrasen Added
sc_7_of_Clubs_syndicate Added
sc_7_of_Diamonds_black Added
sc_7_of_Diamonds_nanotrasen Added
sc_7_of_Diamonds_syndicate Added
sc_7_of_Hearts_black Added
sc_7_of_Hearts_nanotrasen Added
sc_7_of_Hearts_syndicate Added
sc_7_of_Spades_black Added
sc_7_of_Spades_nanotrasen Added
sc_7_of_Spades_syndicate Added
sc_8_of_Clubs_black Added
sc_8_of_Clubs_nanotrasen Added
sc_8_of_Clubs_syndicate Added
sc_8_of_Diamonds_black Added
sc_8_of_Diamonds_nanotrasen Added
sc_8_of_Diamonds_syndicate Added
sc_8_of_Hearts_black Added
sc_8_of_Hearts_nanotrasen Added
sc_8_of_Hearts_syndicate Added
sc_8_of_Spades_black Added
sc_8_of_Spades_nanotrasen Added
sc_8_of_Spades_syndicate Added
sc_9_of_Clubs_black Added
sc_9_of_Clubs_nanotrasen Added
sc_9_of_Clubs_syndicate Added
sc_9_of_Diamonds_black Added
sc_9_of_Diamonds_nanotrasen Added
sc_9_of_Diamonds_syndicate Added
sc_9_of_Hearts_black Added
sc_9_of_Hearts_nanotrasen Added
sc_9_of_Hearts_syndicate Added
sc_9_of_Spades_black Added
sc_9_of_Spades_nanotrasen Added
sc_9_of_Spades_syndicate Added
sc_Ace_of_Clubs_black Added
sc_Ace_of_Clubs_nanotrasen Added
sc_Ace_of_Clubs_syndicate Added
sc_Ace_of_Diamonds_black Added
sc_Ace_of_Diamonds_nanotrasen Added
sc_Ace_of_Diamonds_syndicate Added
sc_Ace_of_Hearts_black Added
sc_Ace_of_Hearts_nanotrasen Added
sc_Ace_of_Hearts_syndicate Added
sc_Ace_of_Spades_black Added
sc_Ace_of_Spades_nanotrasen Added
sc_Ace_of_Spades_syndicate Added
sc_Jack_of_Clubs_black Added
sc_Jack_of_Clubs_nanotrasen Added
sc_Jack_of_Clubs_syndicate Added
sc_Jack_of_Diamonds_black Added
sc_Jack_of_Diamonds_nanotrasen Added
sc_Jack_of_Diamonds_syndicate Added
sc_Jack_of_Hearts_black Added
sc_Jack_of_Hearts_nanotrasen Added
sc_Jack_of_Hearts_syndicate Added
sc_Jack_of_Spades_black Added
sc_Jack_of_Spades_nanotrasen Added
sc_Jack_of_Spades_syndicate Added
sc_King_of_Clubs_black Added
sc_King_of_Clubs_nanotrasen Added
sc_King_of_Clubs_syndicate Added
sc_King_of_Diamonds_black Added
sc_King_of_Diamonds_nanotrasen Added
sc_King_of_Diamonds_syndicate Added
sc_King_of_Hearts_black Added
sc_King_of_Hearts_nanotrasen Added
sc_King_of_Hearts_syndicate Added
sc_King_of_Spades_black Added
sc_King_of_Spades_nanotrasen Added
sc_King_of_Spades_syndicate Added
sc_Queen_of_Clubs_black Added
sc_Queen_of_Clubs_nanotrasen Added
sc_Queen_of_Clubs_syndicate Added
sc_Queen_of_Diamonds_black Added
sc_Queen_of_Diamonds_nanotrasen Added
sc_Queen_of_Diamonds_syndicate Added
sc_Queen_of_Hearts_black Added
sc_Queen_of_Hearts_nanotrasen Added
sc_Queen_of_Hearts_syndicate Added
sc_Queen_of_Spades_black Added
sc_Queen_of_Spades_nanotrasen Added
sc_Queen_of_Spades_syndicate Added
singlecard_down_black Added
singlecard_down_nanotrasen Added
singlecard_down_syndicate Added
syndicate_box Added
syndicate_box_open Added
syndicate_hand1 Added
syndicate_hand2 Added
syndicate_hand3 Added
syndicate_hand4 Added
syndicate_hand5 Added
syndicate_joker Added

Repository owner locked and limited conversation to collaborators Sep 12, 2024
@Day-OS Day-OS closed this Sep 12, 2024
@rbertoche
Copy link
Owner

Oi, desculpa, eu vi ontem mas com o caos que tava rolando no discord acabei esquecendo não respondendo a tempo, quando vc tiver cabeça abre um chat comigo por favor!
Tô 100% do seu lado e não abro Daniela, não sei qual foi o mal entendido nesse sentido mas não tenha dúvida disso!
Abraço e obrigado por tudo

@rbertoche
Copy link
Owner

Mergido!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants