Skip to content

Commit

Permalink
Switch to pandoc_reader
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Schütz committed Sep 24, 2017
1 parent 003fb14 commit 2abb4e4
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "website/Flex"]
path = website/Flex
url = https://github.com/alexandrevicenzi/Flex.git
[submodule "website/pandoc_reader"]
path = website/pandoc_reader
url = https://github.com/liob/pandoc_reader.git
3 changes: 2 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ in pkgs.stdenv.mkDerivation {
avrdude avrgcclibc
(python3.withPackages (ps: with ps; [
numpy scikitimage # for sprites
pelican markdown # for website
pelican # for website
]))
haskellPackages.pandoc
(python2.withPackages (ps: with ps; [mido])) # for sound
];
}
Expand Down
Binary file added website/content/downloads/gameover.ogg
Binary file not shown.
Binary file added website/content/downloads/ingame1.ogg
Binary file not shown.
Binary file added website/content/downloads/ingame2.ogg
Binary file not shown.
Binary file added website/content/downloads/slides.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion website/content/pages/about-us.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Title: About Us
Order: 0

![]({filename}/images/wir.jpg){width=100%}
![](images/wir.jpg){width=100%}

* Daniela Kilian
- BSc Applied Computer Science
Expand Down
28 changes: 28 additions & 0 deletions website/content/pages/download.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Title: Download
Order: 9

You can download the source code of this project from [here]({filename}/downloads/code.zip).
It is also available on [GitHub](https://github.com/dotlambda/metro-hd).
Also have a look at the [slides]({filename}/downloads/slides.pdf)
of the presentation we gave at the end of the practical.

## Statistics
Our git repository has about 450 commits.

Regarding the lines of code,
excluding those generated by scripts,
we have the `master` folder:

```sh
$ find master/ -type f -not -name "sprites.*" | xargs sloccount
ansic: 3279 (98.44%)
python: 52 (1.56%)
```

and the `slave` folder:

```sh
$ find slave/ -type f -not -name "music.*" -not -name "fx.*" | xargs sloccount
ansic: 327 (75.00%)
python: 109 (25.00%)
```
20 changes: 6 additions & 14 deletions website/content/pages/the-game.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,31 @@
Title: The Game
Order: 2

![]({filename}/images/splash.png){width=100%}
![](images/splash.png){width=100%}

We based our game on the Metroid Series, especially on Metroid Fusion which is an action-adventure jump'n'run game.


So what is there to do in our game?



![Fight against various Monster.]({filename}/images/world2.png){width=50%}

![Fight against various Monster.](images/world2.png){width=50%}

There are no less than 8 monster types in our game. The protagonist faces at least one of them in each room and can kill them with his rockets or one of his bombs.


![Explore different Level layouts.]({filename}/images/world3.png){width=50%}
![Explore different Level layouts.](images/world3.png){width=50%}

Additionally there are different obstacles like water or spikes in the different levels.

![Rest in the Recharge Room.]({filename}/images/world4.png){width=50%}
![Rest in the Recharge Room.](images/world4.png){width=50%}

Before every fifth level, there is a so called recharge room, where the protagonist can refill his energy and ammunition.

![Fight bosses.]({filename}/images/world6.png){width=50%}

![Fight bosses.](images/world6.png){width=50%}

After the recharge room there will be a boss encounter in which one of the four bosses appear.
All the bosses have different moves and abilities, so none is like the other.

![Achieve Power-Ups.]({filename}/images/world5.png){width=50%}

![Achieve Power-Ups.](images/world5.png){width=50%}

After successfully defeating a boss the protagonist obstains a Power-Up.


The amount of monsters which can appear in one room will increase by one after each successful boss fight.
2 changes: 1 addition & 1 deletion website/content/pages/the-task.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Our task was to design and implement a game for a console resembling the Nintend
The console should also have a sound output for music and sound effects.

# Hardware
![The hardware]({filename}/images/console.jpg){width=50%}
![The hardware](images/console.jpg){width=50%}

The console features two microcontrollers:

Expand Down
1 change: 1 addition & 0 deletions website/pandoc_reader
Submodule pandoc_reader added at 9ef019
14 changes: 12 additions & 2 deletions website/pelicanconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@

PATH = 'content'

PAGES_SORT_ATTRIBUTE = 'order'
PAGE_URL = '{slug}.html'
PAGE_SAVE_AS = '{slug}.html'

STATIC_PATHS = ['images', 'downloads']

TIMEZONE = 'Europe/Berlin'

DEFAULT_LANG = 'en'
Expand All @@ -29,7 +32,14 @@
# Uncomment following line if you want document-relative URLs when developing
RELATIVE_URLS = True

PAGE_ORDER_BY = 'order'

THEME = './Flex'
JINJA_ENVIRONMENT = { }
COPYRIGHT_NAME = 'Daniela Kilian, Stefan Müller, Robert Schütz'
COPYRIGHT_YEAR = 2017

PLUGINS = ['pandoc_reader']
PANDOC_ARGS = [
'--mathjax',
'--smart',
]

0 comments on commit 2abb4e4

Please sign in to comment.