@zamojtel/rpg 116 equipment #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhawryluk
reviewed
May 17, 2022
| @@ -48,6 +51,19 @@ public void openTextImagePopup(String text, Image image, int x, int y){ | |||
| public void openPointsPopup(int pointsCount, int x, int y) { | |||
| openTextImagePopup("You earned " + pointsCount + " points!", coinImage, x, y); | |||
| } | |||
| public void openInventoryPopup(Inventory inventory,int x, int y){ | |||
There was a problem hiding this comment.
Suggested change
| public void openInventoryPopup(Inventory inventory,int x, int y){ | |
| public void openInventoryPopup(Inventory inventory,int x, int y){ |
mhawryluk
reviewed
May 17, 2022
Comment on lines
151
to
154
| if (object instanceof CollectibleGameObject) { | ||
| popupController.openTextImagePopup("Picked up an item!", objectView.getImage(), getWindowCenterX(), getWindowCenterY()); | ||
| objectView.setVisible(false); | ||
| currentModel.getPlayer().getInventory().add((CollectibleGameObject) object); |
There was a problem hiding this comment.
replace that with an Action implementation
Collected collectibles are now displayed if we click on a non-collectible item
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>
kkafar
force-pushed
the
@zamojtel/RPG-116-equipment
branch
from
7bedeb0 to
f4f1a23
Compare
kkafar
approved these changes
May 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Checklist