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.

Sign up for GitHub

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

Merging minimal build #3

Open
wants to merge 115 commits into
base: main
Choose a base branch
from
Open

Merging minimal build #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
bb22cd0
initial commit
zaguarman Nov 17, 2024
fac03f6
Basic card creation and some logic working
zaguarman Nov 17, 2024
0ace662
Added some ui, the creature cards stopped working debug that
zaguarman Nov 17, 2024
b1db897
Resolving actions working more or less, fixed the card button creatio…
zaguarman Nov 18, 2024
203d941
Creatures summoned in the battlefield
zaguarman Nov 18, 2024
144c032
Trying to implement clean code with strategy, mediator and command pa…
zaguarman Nov 19, 2024
8986c5e
Revert "Trying to implement clean code with strategy, mediator and co…
zaguarman Nov 20, 2024
57753b2
Fixed and started refactoring towards interfaces
zaguarman Nov 20, 2024
35ecac6
tons of refactoring
zaguarman Nov 20, 2024
24b5256
Added Mediator Pattern
zaguarman Nov 21, 2024
fc20e9d
Added GameManager on runtime as a DontDestroyOnLoad game object
zaguarman Nov 21, 2024
af345f9
Implementing reference manager
zaguarman Nov 21, 2024
5b2272d
Improving code little by little
zaguarman Nov 21, 2024
97261d9
removed dotween and balatro scripts to avoid confusion
zaguarman Nov 21, 2024
b70f790
Fixed major bugs
zaguarman Nov 21, 2024
ff6ba51
Project changes
zaguarman Nov 21, 2024
5f94e57
Fixed buttons, they work now :)
zaguarman Nov 22, 2024
702f005
Singleton streamline refactoring
zaguarman Nov 22, 2024
cff9c4d
Streamlined the game events system
zaguarman Nov 22, 2024
4f39cb2
Updating the UI system, to be proven a good solution yet
zaguarman Nov 22, 2024
e6a1a38
Order of execution working we are back on track :)
zaguarman Nov 23, 2024
a37495e
Buttons need to be restored but we are on track
zaguarman Nov 23, 2024
cb8bc88
Cards appearing again, lets goooooo
zaguarman Nov 24, 2024
f83cc4c
Fixed with some problems, initialization is more robust now
zaguarman Nov 24, 2024
a9704f1
idk
zaguarman Nov 24, 2024
9a14827
Imported Draggable Cards and Containers from Balatro Feel Project
zaguarman Nov 24, 2024
d1f6718
Managed to work somehow
zaguarman Nov 24, 2024
6b4e183
Implemented Drag and Drop into the Card Buttons
zaguarman Nov 24, 2024
e515f6d
minor changes while saving
zaguarman Nov 24, 2024
06b2040
Checkpoint Monday adding cards container and refactoring this mf
zaguarman Nov 25, 2024
8ddce28
Merged GameMeditator with GameEvents class
zaguarman Nov 26, 2024
e1dc1e4
Working more or less
zaguarman Nov 26, 2024
5a5a2d8
Working on the initialization manager
zaguarman Nov 26, 2024
3fc0c4e
Initialization workin IT IS WORKING MOFO!
zaguarman Nov 28, 2024
52a925c
Added new cards and Improved UI
zaguarman Nov 28, 2024
08b731f
Renamed CardButton to Card
zaguarman Nov 28, 2024
9a99dd8
minor changes
zaguarman Nov 28, 2024
f39b642
Refactoring ui events to be in ui component
zaguarman Nov 29, 2024
92a8e48
Refactoring: UIComponent inherit from InitializableComponent
zaguarman Nov 29, 2024
ff6d76c
minor changes, still working
zaguarman Nov 29, 2024
eb55717
Refactoring Singleton pattern
zaguarman Nov 29, 2024
ef27985
Commented some debug code
zaguarman Nov 29, 2024
8ca29a6
Deleted some shit
zaguarman Nov 29, 2024
e018943
Deleted innecesary code
zaguarman Nov 29, 2024
695c4c7
Created the CardTestingDropZone
zaguarman Nov 29, 2024
de0a512
Refactoring from decorator to composition
zaguarman Dec 1, 2024
ca9d811
Removed gamecontext from the parameters, Targeting system is now a si…
zaguarman Dec 1, 2024
2f98824
refactoring to get a unified size along the card spawning
zaguarman Dec 1, 2024
64bd0f8
Unifying IDs across the classes
zaguarman Dec 1, 2024
1d224ac
Removed soul collector and some debug messages
zaguarman Dec 2, 2024
517476f
Summoning creatures with resolve actions WORKING!
zaguarman Dec 2, 2024
21f6abe
bigger battlefield
zaguarman Dec 2, 2024
bdd644c
minor changes
zaguarman Dec 2, 2024
6f79d2e
Refactoring Dropzones
zaguarman Dec 2, 2024
b26e704
Fixing battlefield size
zaguarman Dec 2, 2024
035192f
Fixed some minor errors
zaguarman Dec 2, 2024
beca40e
minor bug fixed again
zaguarman Dec 2, 2024
9fe0f09
Battlefield working properly
zaguarman Dec 2, 2024
32d74d5
Refactored the card containers
zaguarman Dec 2, 2024
689b6cb
Refactoring card factory and drop zones
zaguarman Dec 7, 2024
58ba644
refactoring minor changes
zaguarman Dec 8, 2024
246c036
Removed a lot of bullshit, positioning of the cards is not right for now
zaguarman Dec 8, 2024
623bc07
trying a different kind of refactoring
zaguarman Dec 8, 2024
7eaa5d5
refactoring minor improvements, flag for dismiss changes
zaguarman Dec 8, 2024
93f2b78
Removed HealtUI and VerticalCardContainer
zaguarman Dec 8, 2024
02e5c04
Refactoring, got rid of bullshit code
zaguarman Dec 8, 2024
14dfd29
Spacing and alignment problem fixed
zaguarman Dec 8, 2024
4f57485
First implementation of battlefield combat working, more or less
zaguarman Dec 8, 2024
4b186d2
minor changes
zaguarman Dec 8, 2024
98e474f
minor changes
zaguarman Dec 8, 2024
38d216b
Fixed Creature IDs
zaguarman Dec 9, 2024
474946e
Implementing arrows to visualize upcoming attacks (Not working)
zaguarman Dec 9, 2024
9d4795c
Arrows working with bugs targeting enemy
zaguarman Dec 9, 2024
0ef40e1
combat kind of working, startup with creatures in the battlefield
zaguarman Dec 10, 2024
7b87acd
arrow indicator goes mor pointy
zaguarman Dec 11, 2024
2f71585
Added a proper debug message system
zaguarman Dec 12, 2024
61ded72
Refactoring debugging and BattlefieldUI
zaguarman Dec 12, 2024
a75bfff
Only one creature attack at a time, refactored debugger as well
zaguarman Dec 12, 2024
c8d6b03
limiting one attack per creature in the battlefield
zaguarman Dec 12, 2024
85a1aa2
Combat working as intended
zaguarman Dec 12, 2024
7f91abd
minor changes
zaguarman Dec 12, 2024
50dfb92
fixed tags for debugger, whitelist mode doesnt work anymore
zaguarman Dec 12, 2024
88b9b2c
fixing problems
zaguarman Dec 12, 2024
722bdd3
fixing problems
zaguarman Dec 12, 2024
2f7dbc0
whatever
zaguarman Dec 12, 2024
efe6b71
nothing changed
zaguarman Dec 14, 2024
53dbb26
fock offf
zaguarman Dec 14, 2024
ad86098
whitelist mode activated
zaguarman Dec 14, 2024
b8f15aa
select deselect all options
zaguarman Dec 14, 2024
a55e8c5
debugger working, missing serialization on play
zaguarman Dec 14, 2024
a3c44df
whatever
zaguarman Dec 14, 2024
ee5f269
playmode saves values now YAYYYY
zaguarman Dec 15, 2024
ec08b5c
RELATED TO LAST ONE
zaguarman Dec 15, 2024
08a3bf6
Fixed ALL BUGS
zaguarman Dec 15, 2024
9dda30f
ITS THE FINAL VERSION FINALLY
zaguarman Dec 15, 2024
33e1ee3
Whitelist and blacklist working properly, also fixed arrows problem
zaguarman Dec 15, 2024
2dee6cd
fixed effects
zaguarman Dec 15, 2024
7764360
Damage Actions and Summon Actions working properly
zaguarman Dec 15, 2024
9d62fb7
whatever
zaguarman Dec 15, 2024
7e4e98d
Moved debug logger into its own folder
zaguarman Dec 15, 2024
b77b499
Started implementing the creature slots, its a mess for now
zaguarman Dec 15, 2024
1e323c9
summoning over queue restored
zaguarman Dec 16, 2024
ce21519
Summoning, swapping and combat working perfectly, YAYYYYYY
zaguarman Dec 17, 2024
e2de269
editor shit
zaguarman Dec 18, 2024
7520317
arrow colors changed
zaguarman Dec 18, 2024
2b03285
Attacking player when slot is empty
zaguarman Dec 18, 2024
2fd3646
swapping priority works, arrows stopped working
zaguarman Dec 18, 2024
46c28fd
trying to fix arrows
zaguarman Dec 18, 2024
de5c053
trying to fix arrows
zaguarman Dec 18, 2024
66ff8b7
Arrows working again yayyy
zaguarman Dec 18, 2024
c42841d
yellow arrow to indicate swap
zaguarman Dec 18, 2024
f819f1d
solving combat issues
zaguarman Dec 18, 2024
616c38b
multiple arrows showing at the same time working!
zaguarman Dec 18, 2024
95dcbbf
Refactoring for Observer Pattern
zaguarman Dec 18, 2024
b5a7a03
TONS of CHANGES, moving towards observer pattern away from mediator
zaguarman Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
2 changes: 1 addition & 1 deletion Assets/Prefabs/[OLD].meta → Assets/Card_Shirts_Lite.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Card_Shirts_Lite/PNG.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Card_Shirts_Lite/Scene.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Plugins/Demigiant.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 4 additions & 17 deletions Assets/Plugins/Demigiant/DOTween.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,089 changes: 0 additions & 3,089 deletions Assets/Plugins/Demigiant/DOTween/DOTween.XML
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Assets/Plugins/Demigiant/DOTween/DOTween.XML.meta
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion Assets/Plugins/Demigiant/DOTween/Editor.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

144 changes: 0 additions & 144 deletions Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.XML
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.XML.meta
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Assets/Plugins/Demigiant/DOTween/Editor/Imgs.meta
View file
Open in desktop

This file was deleted.

Binary file removed Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png
View file
Open in desktop
Binary file not shown.
47 changes: 0 additions & 47 deletions Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png.meta
View file
Open in desktop

This file was deleted.

Binary file removed Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png
View file
Open in desktop
Binary file not shown.
68 changes: 0 additions & 68 deletions Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png.meta
View file
Open in desktop

This file was deleted.

Binary file removed Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png
View file
Open in desktop
Binary file not shown.
Loading