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

Update craft #25089

Merged
merged 5 commits into from
Sep 28, 2018
Merged

Update craft #25089

merged 5 commits into from
Sep 28, 2018

Conversation

joshlory
Copy link
Contributor

@joshlory joshlory commented Sep 27, 2018

Includes new player aquatic movement (rowing and swimming) and treasure chests.

image

@joshlory joshlory requested a review from Hamms September 27, 2018 23:47
@joshlory
Copy link
Contributor Author

+cc @ryansloan

@@ -533,6 +534,10 @@ Craft.executeUserCode = function () {
},
};

const isWalkable = block => {
return block && block.isWalkable;
};
Copy link
Contributor

Choose a reason for hiding this comment

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

should this change be replicated in the other craft.jss?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the first year we've used isWalkable.

@@ -374,7 +375,7 @@ Craft.initializeAppLevel = function (levelConfig) {
entities: levelConfig.entities,
playerStartPosition: levelConfig.playerStartPosition,
playerStartDirection: levelConfig.playerStartDirection,
playerName: Craft.getCurrentCharacter(),
playerName: Craft.getCurrentCharacter() + 'Aquatic',
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a specific reason this is added here an not in getCurrentCharacter itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think because we still key the skin avatars off the base name:

var character = characters[Craft.getCurrentCharacter()];
config.skin.staticAvatar = character.staticAvatar;
config.skin.smallStaticAvatar = character.smallStaticAvatar;
config.skin.failureAvatar = character.failureAvatar;
config.skin.winAvatar = character.winAvatar;

This is following the pattern in the Designer & Hero levels:

playerName: Craft.getCurrentCharacter() + 'Events',

@joshlory joshlory merged commit a415cbc into staging Sep 28, 2018
@joshlory joshlory deleted the update-craft branch September 28, 2018 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants