Skip to content

Commit 2c5f734

Browse files
ganickeganicke
authored
Merge branch 'master' into Jaqster-patch-2
2 parents c616012 + 512703e commit 2c5f734

19 files changed

Lines changed: 191 additions & 12 deletions

‎docs/gamejam/heist.html‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
5+
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
6+
<title>MakeCode Arcade Game Jam</title>
7+
<meta name="twitter:card" content="summary_large_image">
8+
<meta name="twitter:url" content="https://arcade.makecode.com/gamejam">
9+
<meta name="twitter:title" content="MakeCode Arcade Game Jam">
10+
<meta name="twitter:site" content="@MsMakeCode">
11+
<meta name="twitter:creator" content="@MsMakeCode">
12+
<meta name="twitter:description" content="The MakeCode Arcade Game Jam starts on October 1st!">
13+
<meta name="twitter:image" content="/static/gamejam/jams/heist/assets/preview.png">
14+
<link rel="stylesheet" href="https://pxt.azureedge.net/blob/2163189fd5e35c0981ed55318415582a7c9aeb12/doccdn/semantic.css" type="text/css">
15+
<link rel="stylesheet" href="/static/gamejam/lib/gamejam.css">
16+
<link rel="stylesheet" href="/static/gamejam/jams/heist/style.css">
17+
<script type="text/javascript">
18+
window.pxtSkipAnalyticsCookie = true;
19+
</script>
20+
</head>
21+
<body style="background-image: url(/static/gamejam/jams/heist/assets/museum-wall2.png)">
22+
<div class="backdrop"></div>
23+
<div class="hero">
24+
<div class="banner"><img class="top" src="/static/gamejam/jams/heist/assets/heist-jam-banner.gif" alt=""/></div>
25+
</div>
26+
<div class="checker"></div>
27+
<div class="content">
28+
<h1>It's game jam time!</h1>
29+
<div class="segment">
30+
<p>
31+
Welcome to the 11th Official Microsoft MakeCode Game Jam! This is a fun
32+
competition where you can pit your game development skills against
33+
others to build a game using <a href="https://arcade.makecode.com">MakeCode Arcade</a>,
34+
a game engine for retro pixel-art games that run in the browser
35+
or on handheld game devices.
36+
</p>
37+
<div id="timer"></div>
38+
</div>
39+
<div class="segment">
40+
<div id="rules"></div>
41+
</div>
42+
<div class="segment submit">
43+
<h2>Submit</h2>
44+
<p>Ready to submit your game? Use the button below!</p>
45+
<div class="actions">
46+
<a class="button" href="https://aka.ms/GameJamForm" target="_blank" rel="noopener noreferrer">Submit a Game</a>
47+
</div>
48+
</div>
49+
<div class="segment gallery">
50+
<h2>Gallery</h2>
51+
<p class="description">Check out the submitted games!</p>
52+
<div id="gallery"></div>
53+
</div>
54+
</div>
55+
56+
<!-- @include tracking.html -->
57+
<!-- @include tickevent.html -->
58+
<!-- @include thin-footer.html -->
59+
60+
<script type="text/javascript"
61+
src="https://pxt.azureedge.net/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"></script>
62+
<script type="text/javascript"
63+
src="https://pxt.azureedge.net/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"></script>
64+
<script src="/static/gamejam/lib/gamejam.js"></script>
65+
<script>
66+
getInfo("/static/gamejam/jams/heist/info.json");
67+
</script>
68+
</body>
69+
</html>

‎docs/index-ref.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"appref": "v2.0.58"
2+
"appref": "v2.0.59"
33
}

‎docs/skillmap/bug-arena.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
### bug-arena-introduction
2020
* name: Introduction
2121
* type: tutorial
22-
* description: Intro to MakeCode Arcade and Bug Arena
22+
* description: Intro to MakeCode Arcade and Bug Arena (no coding)
2323
* url: /skillmap/bug-arena/introduction
2424
* imageUrl: /static/skillmap/bug-arena/game.gif
2525
* tags: beginner, hour of ai, hour of code
@@ -29,7 +29,7 @@
2929
### bug-arena-scribble
3030
* name: Random Algorithm
3131
* type: tutorial
32-
* description:
32+
* description: Create an AI algorithm that will make your bug walk in random patterns
3333
* url: /skillmap/bug-arena/scribble
3434
* imageUrl: /static/skillmap/bug-arena/random.gif
3535
* tags: beginner, hour of ai, hour of code
@@ -39,7 +39,7 @@
3939
### bug-arena-squares
4040
* name: Squares Algorithm
4141
* type: tutorial
42-
* description:
42+
* description: Code your AI bug to draw squares around the screen
4343
* url: /skillmap/bug-arena/squares
4444
* imageUrl: /static/skillmap/bug-arena/squares.gif
4545
* tags: beginner, hour of ai, hour of code
@@ -49,7 +49,7 @@
4949
### bug-arena-backandforth
5050
* name: Back and Forth Algorithm
5151
* type: tutorial
52-
* description:
52+
* description: Code your bug's AI algorithm to move back and forth across the screen
5353
* url: /skillmap/bug-arena/back-and-forth
5454
* imageUrl: /static/skillmap/bug-arena/back-and-forth.gif
5555
* tags: beginner, hour of ai, hour of code
@@ -59,7 +59,7 @@
5959
### bug-arena-tower
6060
* name: Tower Battle
6161
* type: tutorial
62-
* description:
62+
* description: Battle other AI bugs in the Tower and level up with every win!
6363
* url: /skillmap/bug-arena/tower
6464
* imageUrl: /static/skillmap/bug-arena/tower-battle.gif
6565
* allowCodeCarryover: true

‎docs/skillmap/bug-arena/back-and-forth.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Bug Arena Back and Forth
2+
### @hideReplaceMyCode true
23

34
## Bug Arena: Back-and-Forth Algorithm @showdialog
45

‎docs/skillmap/bug-arena/introduction.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
# Bug Arena Introduction
2+
### @hideReplaceMyCode true
23

34
## ✨ AI Challenge Accepted! @showdialog
45

56
Welcome to the 👾 **Bug Arena** 👾 where the smartest bugs battle for glory!
67

78
![Bug Arena Gameplay](/static/skillmap/bug-arena/game.gif "animation of game")
89

9-
Get ready to code your own super-smart bug using **Artificial Intelligence (AI)** and challenge other AI bugs to see who rules the arena!
10+
This first tutorial will introduce you to the mechanics of the Bug Arena game. You won't be doing any coding, but you'll get ready to create your own super-smart bug using **Artificial Intelligence (AI)** and challenge other AI bugs to see who rules the arena!
1011

1112
Your mission: splash your bug's paint 🎨 all over the screen and out-color 🖌️ your rivals. The more you cover, the closer you are to victory!
1213

1314
## Practice mode
1415

1516
Go to the Game Window 🖼️ (bottom right corner) and click on the **Practice** button.
1617

17-
You can pick **No Opponent** or select from various different challengers 💪 to train your bug's AI.
18+
![Practice Button](/static/skillmap/bug-arena/practice-button.png "practice button")
1819

19-
Then click to select a **Timed Match** or **Infinite** to play without a clock. 🕓
20+
You can pick No Opponent or select from various different challengers 💪 to train your bug's AI. To unlock more opponents, battle them in the Tower.
21+
22+
Click on **Stinky** as your practice opponent.
23+
24+
Then click to select a **Timed Match** 🕓. Infinite mode allows you to play without a clock.
2025

2126
Click **Next** below for more information about the game screen.
2227

@@ -30,7 +35,7 @@ At the top of the screen you'll see graphs showing you the percentage of the scr
3035

3136
If you selected a Timed Match, you will also see a clock timer 🕓 at the top. In Practice mode, there is no time limit.
3237

33-
Speed things up or slow them down using the ⚡ Speed slider at the bottom of the screen.
38+
Speed things up or slow them down using the **SPEED** slider at the bottom of the screen.
3439

3540
Watch them zoom around! The bugs move on their own, thanks to their smart ✨ AI brains.
3641

@@ -82,7 +87,7 @@ hint~
8287

8388
![Example Algorithms](/static/skillmap/bug-arena/algorithms.gif "animation of 3 types of algorithms")
8489

85-
- Scribble
90+
- Random
8691
- Squares
8792
- Back and forth
8893

@@ -96,4 +101,4 @@ hourOfAi.onStart(function () {
96101

97102
```package
98103
hourOfAi=github:riknoll/bug-arena
99-
```
104+
```

‎docs/skillmap/bug-arena/scribble.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Bug Arena Scribble
2+
### @hideReplaceMyCode true
23

34
## Bug Arena: Random Algorithm @showdialog
45

‎docs/skillmap/bug-arena/squares.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Bug Arena Squares
2+
### @hideReplaceMyCode true
23

34
## Bug Arena: Squares Algorithm @showdialog
45

‎docs/static/badges/badge-bug-locked.png‎

81.8 KB
Loading

‎docs/static/badges/badge-bug.png‎

93.7 KB
Loading

‎docs/static/gamejam/jams/heist/assets/full-banner.gif‎

139 KB
Loading

0 commit comments

Comments
 (0)