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

kitchen counter Interaction #188

Closed
wants to merge 2 commits into from
Closed

Conversation

Tanisha800
Copy link

if you like the interaction please add it to hacktoberfest2024

Copy link

🙏 Thanks for your pull request @Tanisha800, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
188 37 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

Copy link

🙏 Thanks for your pull request @Tanisha800, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
188 37 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

Copy link
Collaborator

@r4pt0s r4pt0s left a comment

Choose a reason for hiding this comment

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

Hi @Tanisha800,
Your PR looks like a duplicate of #186
Even the comment in the pull request.

Can you change the behavior of your implementation here a bit?

Copy link

⚠️ MERGE CONFLICT DETECTED!

@Tanisha800 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

1 similar comment
Copy link

⚠️ MERGE CONFLICT DETECTED!

@Tanisha800 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link
Author

@Tanisha800 Tanisha800 left a comment

Choose a reason for hiding this comment

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

commited the changes

@@ -2,8 +2,8 @@ import { time } from '../../kplayCtx';
import { displayDialogue, displayPermissionBox } from '../../utils';
import { updateEnergyState } from '../../utils/energyUpdate';

export const kitchencounterInteractions = (player, k, map) => {
player.onCollide('kitchen_slab', async () => {
Copy link
Author

@Tanisha800 Tanisha800 Oct 29, 2024

Choose a reason for hiding this comment

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

kitchen_slab must be change to kitchencounter

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 29, 2024

@Tanisha800 there is still a merge conflict. Can you please fix it 🙏🏻?

@r4pt0s
Copy link
Collaborator

r4pt0s commented Nov 2, 2024

Closed due to inactivity

@r4pt0s r4pt0s closed this Nov 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants