Create-upgrade-object #50
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
Mitchell-Borders
requested review from
HagenSR,
amanda-f-ndsu,
Anomalous-Creator,
Checkers300,
erickbickler and
ryan-liebsch
amanda-f-ndsu
requested changes
Jun 4, 2021
|
For the future, make sure you are on the dev branch when you create your new branch. This will ensure that all the commits from the dev branch are seen as 'old code' when you create your merge request. Here, your create-wall commits are treated like 'changes' when they've already been merged into dev. |
erickbickler
requested changes
Jun 4, 2021
Closed
…lemented json methods. Also, put upgrade stats in stats.py. Changed the Wall class so collidable can be modified in the parameter.
HagenSR
requested changes
Jun 5, 2021
game/common/items/upgrade.py
Outdated
|
|
||
| def to_json(self): | ||
| data = super().to_json() | ||
| data[upgrade_enum] = self.upgrade_enum |
There was a problem hiding this comment.
keys in a dictionary should be strings. You can use a variable but I don't think this is will result in the desired output you want
HagenSR
approved these changes
Jun 5, 2021
erickbickler
approved these changes
Jun 5, 2021
amanda-f-ndsu
approved these changes
Jun 5, 2021
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.
Made a new enum, and assigned some values in the upgrade class.