abgit/UGJ128
2
0
Fork 0
generated from abgit/UGJ
Code Issues 1 Pull requests Projects Releases 10 Packages Wiki Activity Actions

Merge card work into main #3

Closed
fbouju wants to merge 0 commits from cards into main
pull from: cards
merge into: abgit:main
Conversation 1 Commits - Files changed -
fbouju commented 2026-06-04 15:47:02 +02:00
Owner
Copy link

⚠️This might break stuff, merge conflicts ahead

changelog

assets

  • Added card design, might need a rework or more detailing => Dimensions (180*252) can be adjusted

scenes

  • card.tscn
    • min-height (180*252) must match asset size i guess ?
    • The root node is a TexturedButton
    • Had some issues with mouse_filter interactions
  • CardSelection.tscn
    • just a controlNode and HorizontalVbox to hold 3 cards.
    • for now it is called by click "Tribute" in nav but it should be loaded after the tribute scene
  • Modifications of other scene was to try to fix an interaction bug with the mouse, it might break stuff ...

scripts

  • cards.gd holds the logic for setting up a card before displaying it.
    • Signal cardSelected fired when card is clicked
  • cardSelection.gd holds the logic to draw 3 cards and displays them. when a card is selected apply it's effects
  • globals/cardDatabase.gd
    • Holds all the card definitions, see #2
    • is in charge of actually drawing the cards and returning cards data
  • globals/gameGlobals added the playerDeck: Dictionnary and the applyCard and recomputeStats
    • in charge of keeping track of the player's current cards and assiciated level.
    • in charge of applying the effects of the cards to the player's stats

other minor changes to be albe to test and debug the card system.

TODO

  • Card animations ?
  • Card sounds
  • Card costs
  • Display of card level and cost
  • Handle the case of no cards available (All fully upgraded)
  • Scene transition back to pond and reset of time
# ⚠️This might break stuff, merge conflicts ahead ## changelog ### assets * Added card design, might need a rework or more detailing => Dimensions (180*252) can be adjusted ### scenes - `card.tscn` - min-height (180*252) must match asset size i guess ? - The root node is a `TexturedButton` - Had some issues with `mouse_filter` interactions - `CardSelection.tscn` - just a controlNode and HorizontalVbox to hold 3 cards. - for now it is called by click "Tribute" in nav but it should be loaded after the tribute scene - Modifications of other scene was to try to fix an interaction bug with the mouse, it might break stuff ... ### scripts - `cards.gd` holds the logic for setting up a card before displaying it. - Signal cardSelected fired when card is clicked - `cardSelection.gd` holds the logic to draw 3 cards and displays them. when a card is selected apply it's effects - `globals/cardDatabase.gd` - Holds all the card definitions, see [#2](https://git.pipicaca.online/abgit/UGJ128/issues/2) - is in charge of actually drawing the cards and returning cards data - `globals/gameGlobals` added the `playerDeck: Dictionnary` and the `applyCard` and `recomputeStats` - in charge of keeping track of the player's current cards and assiciated level. - in charge of applying the effects of the cards to the player's stats other minor changes to be albe to test and debug the card system. ## TODO - [ ] Card animations ? - [ ] Card sounds - [ ] Card costs - [ ] Display of card level and cost - [ ] Handle the case of no cards available (All fully upgraded) - [ ] Scene transition back to pond and reset of time
Todo :

Card scene
- Redo the card layout in full size
- Change from AtlasMap to Texture2D

Calculate the effect and add them to playerStats
fbouju stopped working 2026-06-04 15:49:25 +02:00
11 seconds
fbouju commented 2026-06-04 15:57:25 +02:00
Author
Owner
Copy link

This has been manually merged

This has been manually merged
fbouju closed this pull request 2026-06-04 15:57:25 +02:00
fbouju deleted spent time 2026-06-04 16:04:59 +02:00
- 11 seconds

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
abgit/UGJ128!3
No description provided.