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.

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

Block #114

Merged
merged 24 commits into from
Aug 7, 2024
Merged

Block #114

merged 24 commits into from
Aug 7, 2024

Conversation

JonaLam
Copy link
Collaborator

@JonaLam JonaLam commented Jul 19, 2024

Description

added block to the game

Related issue(s)

#111

List of changes

Changed Health component to have block
Added a block display to all entities
Added block debug cards

Tests

added some block tests to test_health

@Turtyo Turtyo linked an issue Jul 19, 2024 that may be closed by this pull request
Copy link
Collaborator

@Turtyo Turtyo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why but you seem to like multi-line value assignment, when it's not really necessary.
It follows what we discussed in the issue well, so that works nicely i think. i'll try to think of possible interactions with debuff that could make negative healing for example, as I remember a problem with this, but we might have added a test for it 🤔

Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Show resolved Hide resolved
Entity/Components/HealthComponent.gd Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Show resolved Hide resolved
Managers/PhaseManager.gd Outdated Show resolved Hide resolved
Tests/test_health.gd Show resolved Hide resolved
JonaLam added 3 commits July 20, 2024 17:40
changed to assign value at the same line as the var
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Tests/test_health.gd Outdated Show resolved Hide resolved
JonaLam added 3 commits July 21, 2024 21:56
made floats to ints and also removed bad function
Turtyo
Turtyo previously approved these changes Jul 21, 2024
@Turtyo
Copy link
Collaborator

Turtyo commented Jul 21, 2024

Great job on the block 👍 I don't have anything more to ask, actually that end was more me being picky about the types so we don't get conversions everywhere 😆

Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Entity/Components/HealthComponent.gd Outdated Show resolved Hide resolved
Managers/PhaseManager.gd Outdated Show resolved Hide resolved
Turtyo
Turtyo previously approved these changes Aug 6, 2024
Copy link
Collaborator

@Turtyo Turtyo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say we merge as is and we fix the problem with order of block removal as quickly as possible with #118 and #120

@Turtyo Turtyo merged commit facd0a4 into Saplings-Projects:main Aug 7, 2024
1 check passed
@JonaLam JonaLam deleted the Block branch October 17, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Block mechanic
3 participants