blairjordan/codachi
1
0
Fork 0
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity Actions

adds the ability to put your pet to sleep and wake them up again #11

Open
danieldelcore wants to merge 1 commit from danieldelcore/sleep-wake into main
pull from: danieldelcore/sleep-wake
merge into: blairjordan:main
Conversation 2 Commits 1 Files changed 7 +217 -3
danieldelcore commented 2023-06-26 01:45:55 -04:00 (Migrated from github.com)
Copy link

Super basic implementation for sleep/wake interactions.
Adds two quick commands to control their sleep and placeholder animation config.

Right now, the sleep state is equivalent to idle in that the pet will just remain idle until you manually wake it up again.

Ultimately would be interesting if we could tie this into the progression system somehow.
I.e. You have to keep your pet well-rested in order to progress with their experience and have them evolve.

ps really love the art you've created for this project, really excellent work!
pps No pressure to accept this PR if it doesn't align with your long-term vision 😄.

Super basic implementation for sleep/wake interactions. Adds two quick commands to control their sleep and placeholder animation config. Right now, the sleep state is equivalent to `idle` in that the pet will just remain idle until you manually wake it up again. Ultimately would be interesting if we could tie this into the progression system somehow. I.e. You have to keep your pet well-rested in order to progress with their experience and have them evolve. ps really love the art you've created for this project, really excellent work! pps No pressure to accept this PR if it doesn't align with your long-term vision 😄.
blairjordan commented 2023-07-01 13:04:32 -04:00 (Migrated from github.com)
Copy link

This is awesome! I haven't tested, but the code looks good to me.

I would like to wait to merge this one with some sleep animations for each character 💤

I can't take any credit for the art - I was working with an awesome pixel artist who has gone AWOL unfortunately 😔 BUT I'm working to find more skilled pixel artists for animations and backgrounds.

This is awesome! I haven't tested, but the code looks good to me. I would like to wait to merge this one with some sleep animations for each character 💤 I can't take any credit for the art - I was working with an awesome pixel artist who has gone AWOL unfortunately 😔 BUT I'm working to find more skilled pixel artists for animations and backgrounds.
danieldelcore commented 2023-07-02 21:03:54 -04:00 (Migrated from github.com)
Copy link

No worries at all! I assumed it would be best to hold off until there were some proper sleep animations! That sounds good :)

That's a real shame about the artist! Hopefully you can find someone to take over soon!

No worries at all! I assumed it would be best to hold off until there were some proper sleep animations! That sounds good :) That's a real shame about the artist! Hopefully you can find someone to take over soon!
This pull request has changes conflicting with the target branch.
  • media/main-bundle.js
  • package.json
  • src/panel/main.ts
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin danieldelcore/sleep-wake:danieldelcore/sleep-wake
git switch danieldelcore/sleep-wake

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff danieldelcore/sleep-wake
git switch danieldelcore/sleep-wake
git rebase main
git switch main
git merge --ff-only danieldelcore/sleep-wake
git switch danieldelcore/sleep-wake
git rebase main
git switch main
git merge --no-ff danieldelcore/sleep-wake
git switch main
git merge --squash danieldelcore/sleep-wake
git switch main
git merge --ff-only danieldelcore/sleep-wake
git switch main
git merge danieldelcore/sleep-wake
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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
blairjordan/codachi!11
No description provided.