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

71 collection #76

Merged
merged 9 commits into from
Dec 10, 2019
Merged

71 collection #76

merged 9 commits into from
Dec 10, 2019

Conversation

knoffi
Copy link
Collaborator

@knoffi knoffi commented Dec 9, 2019

No description provided.

@mkraenz mkraenz temporarily deployed to fursorger-game December 9, 2019 10:43 Inactive
@codecov
Copy link

codecov bot commented Dec 9, 2019

Codecov Report

Merging #76 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #76   +/-   ##
=======================================
  Coverage   33.33%   33.33%           
=======================================
  Files           1        1           
  Lines          18       18           
  Branches        6        5    -1     
=======================================
  Hits            6        6           
  Misses         12       12
Impacted Files Coverage Δ
src/scenes/Player.ts 33.33% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae18208...2589120. Read the comment docs.

Copy link
Owner

@mkraenz mkraenz left a comment

Choose a reason for hiding this comment

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

1 Major issue: json levels don't work anymore. See review comments for details. After that's fixed, we can merge. :) Great job ! 🏆

src/scenes/ILevel.ts Show resolved Hide resolved
@@ -6,7 +6,8 @@ export class Player implements IPlayer {
constructor(
private graph: Graph,
private location: ILocation,
public stock = 3,
// tslint:disable-next-line:variable-name
Copy link
Owner

Choose a reason for hiding this comment

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

what's the reason for having to disabling the linter?

src/scenes/logicBuilder.ts Show resolved Hide resolved
@@ -86,6 +89,54 @@ export class MainScene extends Scene {
this.playerTurnInfo.setText(this.player.turn.toString());
this.updateBuildFactoryButton();
this.updateCityInfos();
this.updateVisibility();
Copy link
Owner

Choose a reason for hiding this comment

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

who's visibility is updated? The + - buttons?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Name has been changed. New pull request will follow immediately. I was planning to extend the method to handle more GameObjects but it does not seem necessary at the moment.

src/scenes/mainScene.ts Show resolved Hide resolved
@@ -314,6 +375,9 @@ export class MainScene extends Scene {
}

private drawEdges(cities: ICity[]) {
this.travelPathLines = this.add.graphics({
Copy link
Owner

Choose a reason for hiding this comment

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

this line occurs 3 times, consider extract method

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It's done. New pull request will follow immediately.

@mkraenz mkraenz temporarily deployed to fursorger-game December 10, 2019 17:54 Inactive
@knoffi knoffi merged commit 35b1485 into master Dec 10, 2019
@knoffi knoffi deleted the 71-Collection branch December 10, 2019 22:31
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.

2 participants