From 6b5406badef02db80495f5fdbdda69bdfddc1d0f Mon Sep 17 00:00:00 2001
From: Tim Repke <timmothey@gmx.de>
Date: Sat, 26 Sep 2015 16:52:52 +0200
Subject: [PATCH] achieved 33 achievements so far
---
.../view/signups/game1/js/achievements.js | 49 +++++++++++++++++-
.../view/signups/game1/js/events.js | 2 +-
.../signups/game1/maps/castle_entrance.svg | Bin 590215 -> 590025 bytes
.../view/signups/game1/maps/castle_fs.svg | Bin 1083864 -> 1087156 bytes
.../view/signups/game1/maps/dorf.svg | Bin 1807707 -> 1808110 bytes
5 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/registration-system/view/signups/game1/js/achievements.js b/registration-system/view/signups/game1/js/achievements.js
index e2a6e3e..38e6b61 100644
--- a/registration-system/view/signups/game1/js/achievements.js
+++ b/registration-system/view/signups/game1/js/achievements.js
@@ -10,7 +10,14 @@ function Achievements() {
}
},
'saw_devs1': 'Wilde Informatiker auf Wiese gesehen',
- 'spotted_gorilla': 'Ein bekannter Gorilla im Wald',
+ 'spotted_gorilla': {
+ messgae: 'Alten Bekannten im Wald gesehen',
+ action: function() {
+ Story.dialogueHelper([{
+ message: 'Gorilla sagt: HU HU HU!'
+ }])
+ }
+ },
'hydrant': {
message: 'Wasser aufgedreht',
condition: function (context) {
@@ -21,6 +28,41 @@ function Achievements() {
// CASTLE ENTRANCE
'moneyboy': 'Money Boy: Swag ist aufgedreht',
+ 'batteries': 'Batterien in den Computer eingelegt',
+ 'bierball': 'BIIIEEEERBAAAAALLLLL!!',
+
+ // FACHSCHAFT
+ 'wrong_board': {
+ message: 'Falsche Tafel!',
+ condition: function () {
+ return Environment.progress.fs_georgeScreamed;
+ }
+ },
+ 'hugo_water': 'Toten Hugo gegossen',
+ 'laptop2': 'Laptop zugeklappt',
+ 'laptop1': {
+ message: 'Laptop ausgemacht',
+ condition: function() {
+ return self.achievedAchievements.indexOf('laptop2') >= 0
+ }
+ },
+ 'marathon': 'Runtimeerror! dev TIM low on energy',
+ 'ffa': {
+ message: 'FFA Essen gegessen. Mit Tisch.',
+ action: function () {
+ Game.char.svg.select('#ffa_food').style('display', 'none');
+ }
+ },
+ 'stolper': 'Ãœber Teppichkante gestolpert',
+ 'fs_chair': {
+ message: 'Stuhl aus Fachschaft geklaut',
+ action: function () {
+ Game.char.svg.select('#stuhl').style('display', 'none');
+ },
+ condition: function (context) {
+ return euclidianDistance(Game.char.translation[0], Game.char.translation[1], context.x, context.y) < 80;
+ }
+ },
// DORF
'speedrun': 'Haalt stop! Denkt doch mal an die Kinder!!1!',
@@ -28,6 +70,7 @@ function Achievements() {
'plumber': 'Berufung: Gas, Wasser, Scheiße',
'princess': 'Prinzessin verärgert',
'stroh': 'Warum liegt hier Stroh rum?',
+ 'blumen': 'Blumen zertrampelt',
'maske': {
message: 'Warum hast du eine Maske auf?',
condition: function () {
@@ -158,8 +201,10 @@ Achievements.prototype.triggerAchievement = function (achievementId, context) {
if (typeof this.achievements[achievementId] === 'object' && 'action' in this.achievements[achievementId]) {
this.achievements[achievementId].action();
}
+ return true;
}
// else console.warn("Achievement already achieved: " + achievementId);
- if (this.numCompletedAchievements() === 42) this.triggerAchievement('achievement42')
+ if (this.numCompletedAchievements() === 42) this.triggerAchievement('achievement42');
+ return false;
};
diff --git a/registration-system/view/signups/game1/js/events.js b/registration-system/view/signups/game1/js/events.js
index 5cfa8e2..9d3bcdb 100644
--- a/registration-system/view/signups/game1/js/events.js
+++ b/registration-system/view/signups/game1/js/events.js
@@ -89,7 +89,7 @@ EventHandler.prototype.handleEvent = function (event, context) {
var eventWasActive = true;
switch (event.type) {
case 'achievement':
- Game.achievements.triggerAchievement(event.id, context);
+ eventWasActive = Game.achievements.triggerAchievement(event.id, context);
break;
case 'mapchange':
Game.instance.nextMap(event.destination, event.target);
diff --git a/registration-system/view/signups/game1/maps/castle_entrance.svg b/registration-system/view/signups/game1/maps/castle_entrance.svg
index 8bb30204e1ddd7f5399227167519e2bc99372d80..ffb0726b656fe91b5b02ad5457c4ca5deeed5792 100644
GIT binary patch
delta 803
zcmbV~J!n)x5XZUA#ar_wf<ZYD9xo|G?$+IXZ})aDIk8X+i=?r&czM2Do;fe^@(4zR
z5K<i2XyTE<G=Y>>c2}vDg<bk!VNhZ~I7q}0E9Z_VK^t-454*Fov-6wT`ttDmrQugV
z(pEUN<xNuGB&p^mA@`o%;7sw33Ae{-TU?!<3xnCH7(OhyLK(q4Wz1iP3ne%2`K+Lf
zH44U8$<35*uC0>mskG3BuQkZ|zNsiKPbHXzOO1|fT3FdR>BigAZ^yt`gY>2Z1kcG}
zeWpQBU8ppw8+8hmY0fn0?J;=wnwsY5XS&@7AHH-A435mq24S2m6cIrQi-uLg(mKh)
z)*9)7XK!dPyxpOLu(3}wu-HonU~89NgljLz1=!oC)#l4@w4V%xSdH>MCOlvL0(G1Y
zzEzSHxc1<|HqFAo0X+-ZL+W&rrADB5NQ=<gCa2-n0qqA&x6)icq8~GG_=BE-@x9}B
zos+fdg5^T0k;%AHDGqTyImtPQBN_)<7{;x!Du**+()wIDd1Y__(uiE1Gr!$zhchmX
zm&;>qnk#fD%Q*M6&E*9%l568UI-VDf^KQwV2$CeK#nBwBw5Yh0EX+nFHwdTVXg<0h
zRg>SrNi8myqgu%gD{(jt)m`es{8wyQyLtZxaYsraSiu^d)3~tO6Uxa8pBb%8PB7g2
z1xGO7mx$nbObO4TLt=oB1PIBsum2>7quNAJsr(PX#&_yLYll9D%ljw3z&UvGi7sYF
LuguMtulD=|SV8ip
delta 1137
zcmbW0&ubGw6vxT5nn_zhM2fYoOhZA`?R0+a?o3JRLGd7^;17BdM7BkuHkKAkJ(XH8
zM`@ez4ms%2qqm&=1A5b=sECRu5mKs`Qizky?k2X{gA0#c-n{pnH=p_L*6MI^ZTJ<S
zZl$S97C2*ytyNI5f>PBALie6s;#6@Zxb(7Jr19hn_ZNdZ^Rr{Y@_5$xhH}?)-2;n{
z$Fm|_6h^?+4Rj@?tLq!+a;n3)9=zK`Lr8Jh+eD|KuY~#$*Wi^<7Cx0wZ?RB9Hacu{
z+Bjn4sEu^BP{KE-;8q>KgzGhY7M_1Zr&eahvvb6kKJ|UZJja!iN~wHJ0>T`RdeT#h
zjJQ<##yDJ1#yx2h@mE_aDt1`1DxIjYJrj3Y`4Nv!H#Z3NwQ&+%5|vqrq@lGzoN}6T
z#l<R_2DSm6EKg>ZVCyxO)!i@neGmNjj=N#6j(cGx=t#rV2YenfDLiy+BD|YikY5NM
z%tC4#_d#U`4>kY|z|$HotTZo=kdT&Oj8P`EbX?C+%SDRAXvyUC@pv{9p2cmkQV}X`
z;%b|T8Ib9aRU4{<q*~>QG(lPMNMIkPcnlR%I@53>H(J}P6_F7MS$sH?pSLjvZ)>=>
zyqd{XcWXF}V6Kk)2Q}49x-zMbBwWgc_F=t-FTk5R?t~jVcmQ5}ZDPm!UB`{_DOavF
zT_kuI#+K=l`TvdaFBDbNa3RD=5*a#1tRhtZP0{%SK>{Yh7}!5LIc9k|a}l2W!sLYV
psS!dt!cZ+a^Yl5m_RTu)_%?o2z5Nq^PWR+S?@n~(Mi-at>o>s19xea?
diff --git a/registration-system/view/signups/game1/maps/castle_fs.svg b/registration-system/view/signups/game1/maps/castle_fs.svg
index 8be76739d29a4e322bcdb78cc91892e2d5dd81b1..6a1a66935160ba9348c64c70e3608600bf96e3a2 100644
GIT binary patch
delta 1752
zcmcgtO^6&t6lSCOF>$kfk!&ueoPZa*%c@uP>Q!x6Ln1k<5O0bM?d;6Xkjc(4GjU@e
zaW^4OLUIe(Ab9ZNP4FPhMTl3ALJl4Uy#+lbXZ?D!AiD`U#VvTy_4-ZozMuEzw|i%Q
z{Qm3@k2c<A9XLexzHwO9r?+-t+$x9drPk%;MkK4*Itfp`{Cv4#lhsbVbvI;lCYy7=
zoUh)TW+(66`g*?l{lob;ru<+Iu@CVQ;$_5s!~w)X#395hGk$RR^@r8wPYa9FyZ4VE
zUY*^&Ki@yUe>}O=?N?_W&Yhe6wRrTc1Jm*1(b;%$q5uA&PN!^k27{IA*MH{DO^elq
zS+Sa3J5e3Hp1u7J2T8^fpX&7b{iTz}bUMbI8c#-p3+?(^pY3b0-dmY;myAvvk|m<y
z<?7CQM%8R1JJt#|XmZ4oQ}8;aXo4!D(axYU$B)SSsBn+oQC@hfEpu>6k`C5In-^R3
zL{V3^*#o&N%Z>HXU~RSe>7X2~R2yGpa-?i^d+pEK7u#!-%HPOT_1*34_*d7n@WQZ^
z$s28=_>hy3770YEa8Yxlgx-y|E?7}Xvjjos5l_I!%EBIG0t2s0ly*VsURoVA*UL$J
zv{y))F&T87Qp%l;+BjRQLQumn)m=VO1&D$K=b?dUnAobigj_-fNUSHj3rfEnP6k7}
zM>vjuY#jPQ$2AI&ZX8fV?I=MHAQY1vyk(q;c|o;gCbA;Y!CR<kwP(lSnHXq~FdS>T
z5VR$Ua25O&Fe*_MK4^H!q?+h@G7?~jlPG!NSVt!3R9z!UwrWCv9d`k_SdPj`xBB*K
zmj3_gc&+uGase|NtfibW;VEIMDG$esWh*%gco$BBoDuJWm)r}~0T`>CXrX{j@g$e<
z9re+UiO0Trz9xTu!U3AYmiVxVn(&mA^Pme!4|+9YUJ0GmCx=t&7w`;n+cmX)co&c3
z$)G>PaQ=NW`(Ou=-`vg`FLuL3Y|F?tcmQB9=h?#1R;R!T3*|pAkP*fd!V8XUN{U!B
k8M`%@_@@D=o$InQZnnB*?|B=h`uR$BdiKYc+2eix0%tMlLI3~&
delta 222
zcmdn8*6GG%rwv~koDKC%3{8v-jm?y}6hI&|FS|H7u^`ndxx!Y-!opb3($vDp6hpGo
zR>{!FNYC8B*wCWcym7mEBjd@S>G~`JBJBoO7=f4xh?#+y1&CRJm<@>8ftUk`Iky{J
z;j(`{{l7aC+w^s10!q_QN-^=aH}B^LVxH~I`*{n3rteqfV`nim)HR;`u-#?*JZ?T6
tw)PAOzU>(j{5gKp`JK7gn1Rlo{!xV2wOuitf4gG3K%M;d_Q?Xe%mCJ%NudA$
diff --git a/registration-system/view/signups/game1/maps/dorf.svg b/registration-system/view/signups/game1/maps/dorf.svg
index ce37243fa92244dfb5ef429e3c328a3fb9cbed32..1f93948de78be03db5f43921a1cb3a424cbc7dbe 100644
GIT binary patch
delta 509
zcmZY6Pis>_5CCwJ+NA$%wTaa_6rL%SBJZvH|Ls;D2!4RxJa|fsDU|3-gB2PNq9)LK
z5KU_t>ZvzDC{z&MwVy(e9{LSb`~c!SkX{`4U1r$bnVr+m>5rrI<=4W(@Sb7TSZB1Z
zO$2$Yr|qZB#zt$Uxs}wcj+xcci2sVcq!wGrtg=FG*M|jCBqQVk86_oBCSzorOpr-3
zMJ|$QGD9wr%Vd^RNR?b6bL1+yM&`5n@cQpF?7oHy{wfs9*x7<<y!#gJWZ$}QSiET*
z(@MrBjHG5NR^0g@R?PWW>QGx|yw%!g2b=J51bG+cOIj-LJ+5|P8@~^riZA-$@j(Zc
zKSezl%P&vxbO5vGg<IL#D`*$a-&W(DjYe~Qv$rC!(TDr_;iYV50Lf^H^R+e3G3`T=
zy?X;EllXH7=J5DEEMt2YI(17OD{j0Cg|tj~5ywHKIFs5a5pu>gH$fyQA$2~M%72@4
zrvoFHQeL|-;>>ZcT=4wgerSD<lG?+^&z`i>y&L5!9)77T;GYk$h$lO68&~&X>MuN0
BpSJ)2
delta 439
zcmZ|H%Sr-q6vuHi%e-_kyV)r)C9sfj{(r~0c!{DXs70$FWs;b((Nbch7DiDNxNvo#
zRqG;(DCP-TN)OPYHf>w<0MV&kL|^!D7C$)e*XHx3*|>L1v=+Faa#i9Ak9fo18RlkH
zFI0+Y-O5E+QWga<nbiJ_^;|@eB|&72ODFl3gE&bCagk2aMckyDc!-zyh@bS3UeZVU
zNq`KHAQ>b>WSESQQ4+HAt+9_6yfcF_T(w}ue%OW!XOyV|Q@N6gGcL$n)>xP^Nnnz~
zrMM=fG+9d7do?)km@HQcx>2jAMM2_8jZ!mfMzvBZ)YFDpGRz__Zo@Rr9m6<2S)ifb
zgdjF72%~ccW^7)EPxpUw%ziz9EeBpLfu}d4mrLcHbX5Ea@er1OKbykS286Ju9du*6
m0;;`n1aB_fZ-O5mEl}{b2{-oq83cU(Y+`-Zn@v=A>3ji+DwAjc
--
GitLab