/* CTF-Stuff */ Platz 12 für CSAW

[stratum0-wiki.git] / Anime_Referat.mw

diff --git a/Anime_Referat.mw b/Anime_Referat.mw
index f3eecfc..8ddb3d4 100644 (file)
--- a/Anime_Referat.mw
+++ b/Anime_Referat.mw
@@ -30,29 +30,30 @@ Mögliche Genres können sein:
 ! Titel !! Status !! Kategorie !! Kommentare !! Studio !! Director
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=9541 進撃の巨人 attack on titan]
-| <div align="center>{{Composition bar|04|25|red}}</div>
+| <div align="center">{{Composition bar|08|25|red}}</div>
 | Action, Shonen<br>Gore || Original Work (Manga):<br>by Isayama Hajime || Wit Studio<br>Production IG || Araki Tetsurou
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=247 Ghost in the Shell: Stand Alone Complex]
-| <div align="center">{{Composition bar|18|26|darkblue}}</div>
+| <div align="center">{{Composition bar|22|26|darkblue}}</div>
 | SciFi<br>Transhumanism || || ~Production IG~ || Kamiyama Kenji<br> Original Work: Masamune Shirou
 |-
-| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1265 Paranoia Agent]
-| <div align="center">{{Composition bar|12|13|magenta}}</div>
-| Brainfuck, Thriller || Music<br>[http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=2974 Suzumu Hirasawa] || Madhouse || [http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=54 Satoshi Kon]
+| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=3654 怪~ayakashi~ JAPANESE CLASSIC HORROR]
+| <div align="center">{{Composition bar|02|11|brown}}<div>
+| historical<br>horror || Prequel: Mononoke<br>Original Work:<br>Tsuruya Nanboku<br>Izumi Kyouka || Toei Animation || Imazawa Tetsuo<br>Nakamura Kenji
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=106 Azumanga Daioh]
-| <div align="center">{{Composition bar|16|26|lightpink}}</div>
+| <div align="center">{{Composition bar|20|26|lightpink}}</div>
 | 4koma<br>comedy || || ~JC Staff~ || Nishikiori Hiroshi
 |-
 |}
 
 ==Abstimmungen==
 all new:<br>
-https://dudle.inf.tu-dresden.de/Aniref2014-0/ Ghost in the Shell<br>
-https://dudle.inf.tu-dresden.de/Aniref2014-1/ Alles und der Rest<br>
+https://dudle.inf.tu-dresden.de/Aniref2014-Slot3/
 
 old & busted:<br>
+https://dudle.inf.tu-dresden.de/Aniref2014-0/ Ghost in the Shell<br>
+https://dudle.inf.tu-dresden.de/Aniref2014-1/ Alles und der Rest<br>
 http://doodle.com/63h2isyckhepx2ce
 
 ==Serien-Vorschläge==
@@ -135,6 +136,10 @@ http://doodle.com/63h2isyckhepx2ce
 |- !
 ! Titel !! Status !! Kategorie !! Studio !! Director !! Composition !! Original Work !! noteworthy
 |-
+| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1265 Paranoia Agent]
+| <div align="center">{{Composition bar|13|13|magenta}}</div>
+| Brainfuck, Thriller || Madhouse || [http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=54 Satoshi Kon] || || [http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=54 Satoshi Kon] || Music<br>[http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=2974 Suzumu Hirasawa]
+|-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=8090 Milos no Seinaru Hoshi]
 | <div align="center">{{Composition bar|01|01|#aaaaff}}</div>
 | Action, Fantasy || Bones || Murata Kazuya || || Arakawa Hiromu || sidestory of <br>[http://anidb.net/perl-bin/animedb.pl?show=anime&aid=6107 Fullmetal Alchemist: Brotherhood]