-
Notifications
You must be signed in to change notification settings - Fork 83
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
fix: Deliver at non-destination does not show popup #1694
Conversation
Hi, this is including all of my old commits for another issue. I tried to merge commits with origin master but it does nothing in my terminal. Git status says that it is up to date but on github, it says that I am 8 commits behind. |
Hi @Ridwanah, I reckon what happened is that you kept working on the same branch, or maybe you didn't pull the changes from your latest work into your local repo before starting this task. |
Hi @faucomte97, thanks for your answer. I made a branch, so I don't lose my work, and pulled the changes from upstream. I did this in rapid router, but I am having a problem now that when I run the code, it gives me an error, related to aimmo, which makes me think that I pulled the changes only for rapid router and it is affecting other submodules. I am not sure, here is the error: `Traceback (most recent call last): During handling of the above exception, another exception occurred: Traceback (most recent call last): |
Hi @Ridwanah, ah yes, we made a significant change last week which would be causing this. |
Hi @faucomte97, it works now. Thanks. |
When I run the python tests, I get an error related which say 'no fixture named aimmo_characters found'. I know I haven't merged this branch properly yet, I will do so. The branch i am working on that i called backup-branch is exactly the same with only one commit ahead, which is updating pipfile.lock, has the same error when I run the python tests. |
Hmm, I'm not 100% sure why this is happening. I'm looking into this now and will let you know if I find anything. |
Hey @Ridwanah, just a quick update to let you know that I'm actually getting this error on my side too so it seems we still need to clean up a few things. I'll let you know as soon as we sort it out. Apologies for the blocker |
Hi @Ridwanah, we've managed to fix the issue which involved upgrading the version of our |
Hi, the tests work now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Ridwanah)
game/static/game/js/model.js
line 390 at r2 (raw file):
this.makeDelivery(destination, 'DELIVER'); } else { ocargo.animation.appendAnimation({
Please add the following line before this line and after the else
:
ocargo.game.sendAttempt(0);
This is just so the level marks this an attempt with 0 points.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed and just left 1 comment 🙂
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Ridwanah)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @Ridwanah)
Well done @Ridwanah! 2nd PR merged in! 🥳 |
Thank you for your support :). I am looking forward to doing more contributions. |
Description
I added a popup for when a delivery is made at a location which is not a valid destination. This popup informs the user that
they tried to deliver at a destination that doesn’t exist. The failure sound now plays when this popup appears and this event is logged as a reason for termination when it occurs.
How Has This Been Tested?
I tested this using pytest. It passed all 58 tests. The selenium tests did not run.
Checklist:
This change is