Code

Merging minimal build#3

Code

Open

zaguarman wants to merge 115 commits intomixandjam:mainmixandjam/Balatro-Feel:mainfrom zaguarman:MinimalBuildzaguarman/SlayTheClone2025:MinimalBuildCopy head branch name to clipboard

+22,580-9,285

Commits

Commits on Nov 17, 2024

• initial commit

  zaguarman

  committed
  bb22cd0

• Basic card creation and some logic working

  zaguarman

  committed
  fac03f6

• Added some ui, the creature cards stopped working debug that

  zaguarman

  committed
  0ace662

Commits on Nov 18, 2024

• Resolving actions working more or less, fixed the card button creation again

  zaguarman

  committed
  b1db897

• Creatures summoned in the battlefield

  zaguarman

  committed
  203d941

Commits on Nov 19, 2024

• Trying to implement clean code with strategy, mediator and command pattern

  zaguarman

  committed
  144c032

Commits on Nov 20, 2024

• Revert "Trying to implement clean code with strategy, mediator and command pattern"

  Show description for 8986c5e
  zaguarman

  committed
  8986c5e

• Fixed and started refactoring towards interfaces

  zaguarman

  committed
  57753b2

• tons of refactoring

  zaguarman

  committed
  35ecac6

Commits on Nov 21, 2024

• Added Mediator Pattern

  zaguarman

  committed
  24b5256

• Added GameManager on runtime as a DontDestroyOnLoad game object

  zaguarman

  committed
  fc20e9d

• Implementing reference manager

  zaguarman

  committed
  af345f9

• Improving code little by little

  zaguarman

  committed
  5b2272d

• removed dotween and balatro scripts to avoid confusion

  zaguarman

  committed
  97261d9

• Fixed major bugs

  zaguarman

  committed
  b70f790

• Project changes

  zaguarman

  committed
  ff6ba51

Commits on Nov 22, 2024

• Fixed buttons, they work now :)

  Show description for 5f94e57
  zaguarman

  committed
  5f94e57

• Singleton streamline refactoring

  zaguarman

  committed
  702f005

• Streamlined the game events system

  zaguarman

  committed
  cff9c4d

• Updating the UI system, to be proven a good solution yet

  zaguarman

  committed
  4f39cb2

Commits on Nov 23, 2024

• Order of execution working we are back on track :)

  zaguarman

  committed
  e6a1a38

• Buttons need to be restored but we are on track

  zaguarman

  committed
  a37495e

Commits on Nov 24, 2024

• Cards appearing again, lets goooooo

  zaguarman

  committed
  cb8bc88

• Fixed with some problems, initialization is more robust now

  Show description for f83cc4c
  zaguarman

  committed
  f83cc4c

• idk

  zaguarman

  committed
  a9704f1

• Imported Draggable Cards and Containers from Balatro Feel Project

  zaguarman

  committed
  9a14827

• Managed to work somehow

  zaguarman

  committed
  d1f6718

• Implemented Drag and Drop into the Card Buttons

  zaguarman

  committed
  6b4e183

• minor changes while saving

  zaguarman

  committed
  e515f6d

Commits on Nov 25, 2024

• Checkpoint Monday adding cards container and refactoring this mf

  zaguarman

  committed
  06b2040

Commits on Nov 26, 2024

• Merged GameMeditator with GameEvents class

  zaguarman

  committed
  8ddce28

• Working more or less

  zaguarman

  committed
  e1dc1e4

• Working on the initialization manager

  zaguarman

  committed
  5a5a2d8

Commits on Nov 28, 2024

• Initialization workin IT IS WORKING MOFO!

  zaguarman

  committed
  3fc0c4e

• Added new cards and Improved UI

  zaguarman

  committed
  52a925c

• Renamed CardButton to Card

  zaguarman

  committed
  08b731f

• minor changes

  zaguarman

  committed
  9a99dd8

Commits on Nov 29, 2024

• Refactoring ui events to be in ui component

  zaguarman

  committed
  f39b642

• Refactoring: UIComponent inherit from InitializableComponent

  zaguarman

  committed
  92a8e48

• minor changes, still working

  zaguarman

  committed
  ff6d76c

• Refactoring Singleton pattern

  zaguarman

  committed
  eb55717

• Commented some debug code

  zaguarman

  committed
  ef27985

• Deleted some shit

  zaguarman

  committed
  8ca29a6

• Deleted innecesary code

  zaguarman

  committed
  e018943

• Created the CardTestingDropZone

  zaguarman

  committed
  695c4c7

Commits on Dec 1, 2024

• Refactoring from decorator to composition

  zaguarman

  committed
  de0a512

• Removed gamecontext from the parameters, Targeting system is now a singleton

  zaguarman

  committed
  ca9d811

• refactoring to get a unified size along the card spawning

  zaguarman

  committed
  2f98824

• Unifying IDs across the classes

  zaguarman

  committed
  64bd0f8

Commits on Dec 2, 2024

• Removed soul collector and some debug messages

  zaguarman

  committed
  1d224ac

• Summoning creatures with resolve actions WORKING!

  zaguarman

  committed
  517476f

• bigger battlefield

  zaguarman

  committed
  21f6abe

• minor changes

  zaguarman

  committed
  bdd644c

• Refactoring Dropzones

  zaguarman

  committed
  6f79d2e

• Fixing battlefield size

  zaguarman

  committed
  b26e704

• Fixed some minor errors

  zaguarman

  committed
  035192f

• minor bug fixed again

  zaguarman

  committed
  beca40e

• Battlefield working properly

  zaguarman

  committed
  9fe0f09

• Refactored the card containers

  zaguarman

  committed
  32d74d5

Commits on Dec 7, 2024

• Refactoring card factory and drop zones

  zaguarman

  committed
  689b6cb

Commits on Dec 8, 2024

• refactoring minor changes

  zaguarman

  committed
  58ba644

• Removed a lot of bullshit, positioning of the cards is not right for now

  zaguarman

  committed
  246c036

• trying a different kind of refactoring

  zaguarman

  committed
  623bc07

• refactoring minor improvements, flag for dismiss changes

  zaguarman

  committed
  7eaa5d5

• Removed HealtUI and VerticalCardContainer

  zaguarman

  committed
  93f2b78

• Refactoring, got rid of bullshit code

  zaguarman

  committed
  02e5c04

• Spacing and alignment problem fixed

  zaguarman

  committed
  14dfd29

• First implementation of battlefield combat working, more or less

  zaguarman

  committed
  4f57485

• minor changes

  zaguarman

  committed
  4b186d2

• minor changes

  zaguarman

  committed
  98e474f

Commits on Dec 9, 2024

• Fixed Creature IDs

  zaguarman

  committed
  38d216b

• Implementing arrows to visualize upcoming attacks (Not working)

  zaguarman

  committed
  474946e

• Arrows working with bugs targeting enemy

  zaguarman

  committed
  9d4795c

Commits on Dec 10, 2024

• combat kind of working, startup with creatures in the battlefield

  zaguarman

  committed
  0ef40e1

Commits on Dec 11, 2024

• arrow indicator goes mor pointy

  zaguarman

  committed
  7b87acd

Commits on Dec 12, 2024

• Added a proper debug message system

  Show description for 2f71585
  zaguarman

  committed
  2f71585

• Refactoring debugging and BattlefieldUI

  zaguarman

  committed
  61ded72

• Only one creature attack at a time, refactored debugger as well

  zaguarman

  committed
  a75bfff

• limiting one attack per creature in the battlefield

  zaguarman

  committed
  c8d6b03

• Combat working as intended

  zaguarman

  committed
  85a1aa2

• minor changes

  zaguarman

  committed
  7f91abd

• fixed tags for debugger, whitelist mode doesnt work anymore

  zaguarman

  committed
  50dfb92

• fixing problems

  zaguarman

  committed
  88b9b2c

• fixing problems

  zaguarman

  committed
  722bdd3

• whatever

  zaguarman

  committed
  2f7dbc0

Commits on Dec 14, 2024

• nothing changed

  zaguarman

  committed
  efe6b71

• fock offf

  zaguarman

  committed
  53dbb26

• whitelist mode activated

  zaguarman

  committed
  ad86098

• select deselect all options

  zaguarman

  committed
  b8f15aa

• debugger working, missing serialization on play

  zaguarman

  committed
  a55e8c5

• whatever

  zaguarman

  committed
  a3c44df

Commits on Dec 15, 2024

• playmode saves values now YAYYYY

  zaguarman

  committed
  ee5f269

• RELATED TO LAST ONE

  zaguarman

  committed
  ec08b5c

• Fixed ALL BUGS

  zaguarman

  committed
  08a3bf6

• ITS THE FINAL VERSION FINALLY

  zaguarman

  committed
  9dda30f

• Whitelist and blacklist working properly, also fixed arrows problem

  zaguarman

  committed
  33e1ee3

• fixed effects

  zaguarman

  committed
  2dee6cd

• Damage Actions and Summon Actions working properly

  zaguarman

  committed
  7764360

• whatever

  zaguarman

  committed
  9d62fb7

• Moved debug logger into its own folder

  zaguarman

  committed
  7e4e98d

• Started implementing the creature slots, its a mess for now

  zaguarman

  committed
  b77b499

Commits on Dec 16, 2024

• summoning over queue restored

  zaguarman

  committed
  1e323c9

Commits on Dec 17, 2024

• Summoning, swapping and combat working perfectly, YAYYYYYY

  zaguarman

  committed
  ce21519

Commits on Dec 18, 2024

• editor shit

  zaguarman

  committed
  e2de269

• arrow colors changed

  zaguarman

  committed
  7520317

• Attacking player when slot is empty

  zaguarman

  committed
  2b03285

• swapping priority works, arrows stopped working

  zaguarman

  committed
  2fd3646

• trying to fix arrows

  zaguarman

  committed
  46c28fd

• trying to fix arrows

  zaguarman

  committed
  de5c053

• Arrows working again yayyy

  zaguarman

  committed
  66ff8b7

• yellow arrow to indicate swap

  zaguarman

  committed
  c42841d

• solving combat issues

  zaguarman

  committed
  f819f1d

• multiple arrows showing at the same time working!

  zaguarman

  committed
  616c38b

• Refactoring for Observer Pattern

  zaguarman

  committed
  95dcbbf

Commits on Dec 19, 2024

• TONS of CHANGES, moving towards observer pattern away from mediator

  zaguarman

  committed
  b5a7a03