Skip to content

custom type for play lab ninja cat#3252

Merged
Bjvanminnen merged 1 commit into
stagingfrom
hackedLevels
Aug 12, 2015
Merged

custom type for play lab ninja cat#3252
Bjvanminnen merged 1 commit into
stagingfrom
hackedLevels

Conversation

@Bjvanminnen

Copy link
Copy Markdown
Contributor

I noticed we still had a bunch of levels that have __hacked code in their success condition. I've been going through and removing these or fixing them up. One class I haven't fixed yet is Ninja Cat. As far as I can tell, we were hacking handleUpdatePlayer to be different in that the direction was always 0. This moves that logic to code and adds Ninja Cat as a new game type. Once this makes it to LB, I will fix those levels (remove the success condition and set the custom game logic).

These are the levels I will change on LB:
https://levelbuilder-studio.code.org/levels/1869/edit
https://levelbuilder-studio.code.org/levels/1364/edit
https://levelbuilder-studio.code.org/levels/2459/edit

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not strictly necessary. Right now this is something we do with hidden non-functional blocks (i.e. when run -> setBackground). Seems cleaner to have that logic here, so that if we create a new big game level we don't have to worry about remembering to create those hidden blocks.

@bcjordan

Copy link
Copy Markdown
Contributor

LGTM

Bjvanminnen added a commit that referenced this pull request Aug 12, 2015
custom type for play lab ninja cat
@Bjvanminnen Bjvanminnen merged commit 836a717 into staging Aug 12, 2015
@Bjvanminnen Bjvanminnen deleted the hackedLevels branch August 12, 2015 22:06
deploy-code-org added a commit that referenced this pull request Aug 12, 2015
commit 836a717
Merge: 1788d65 0cde9b9
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Aug 12 15:06:04 2015 -0700

    Merge pull request #3252 from code-dot-org/hackedLevels

    custom type for play lab ninja cat

commit 1788d65
Merge: 65b860e 7f669b3
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Wed Aug 12 15:04:13 2015 -0700

    Merge pull request #3512 from code-dot-org/fix_example_buttons_ie11

    [Finishes #101164984] Fix pressing example add/run buttons on IE11.

commit 0cde9b9
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Tue Jul 28 10:07:44 2015 -0700

    custom type for play lab ninja cat

commit 7f669b3
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Wed Aug 12 15:03:42 2015 -0700

    [Finishes #101164984] Fix example add/run buttons on IE11.

commit 65b860e
Merge: fef04cd 99c5650
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Aug 12 15:00:49 2015 -0700

    Merge pull request #3501 from code-dot-org/examplesOnClose

    [Finishes #99188090] Examples on close

commit fef04cd
Merge: 5fce434 550c909
Author: philbogle <phil@code.org>
Date:   Wed Aug 12 14:59:45 2015 -0700

    Merge pull request #3511 from code-dot-org/revert-3492-netsim-viz-performance-cleanup

    Revert "NetSim: Viz performance cleanup"

commit 550c909
Author: philbogle <phil@code.org>
Date:   Wed Aug 12 14:59:01 2015 -0700

    Revert "NetSim: Viz performance cleanup"

commit 5fce434
Merge: 6677a1d e6d07ba
Author: philbogle <phil@code.org>
Date:   Wed Aug 12 14:57:14 2015 -0700

    Merge pull request #3492 from code-dot-org/netsim-viz-performance-cleanup

    NetSim: Viz performance cleanup

commit 6677a1d
Author: Continuous Integration <dev@code.org>
Date:   Wed Aug 12 21:47:41 2015 +0000

    Automatically built.

    commit a4aefe4
    Merge: 3848999 89a2f53
    Author: Brian Jordan <bcjordan@gmail.com>
    Date:   Wed Aug 12 14:33:20 2015 -0700

        Merge pull request #3508 from code-dot-org/ignore_clicks_drawn_ui

        Ignore clicks on SVG-drawn UI elements to allow panning through them.

    commit 89a2f53
    Author: Brian Jordan <bcjordan@gmail.com>
    Date:   Wed Aug 12 14:31:06 2015 -0700

        Rename svgIgnoreMouse [ci skip]

    commit 96647d1
    Author: Brian Jordan <bcjordan@gmail.com>
    Date:   Wed Aug 12 14:20:51 2015 -0700

        Ignore clicks on SVG-drawn UI elements to allow panning through them.
        - Rename callText to callResult text to be more accurate (result also uses it)
        - Add helper for adding pointer events for SVG elements

commit 99c5650
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 12 14:37:17 2015 -0700

    finish bad rebase

commit 3bf61c6
Merge: a4aefe4 0300263
Author: Tanya Parker <tanya@code.org>
Date:   Wed Aug 12 14:36:46 2015 -0700

    Merge pull request #3509 from code-dot-org/strayunderscore

    no text decoration on buttons

commit 9d6c0bc
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 12 14:34:21 2015 -0700

    fix UI test

commit 56c2f28
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 12 13:33:17 2015 -0700

    code review feedback

commit bc16af5
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 12 12:49:14 2015 -0700

    consolidate some common code
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