From 9c392c0ea410a02e0ebc7965faab42246da2ccc1 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Tue, 7 Feb 2023 23:28:14 +0100 Subject: [PATCH] Use Home room --- game/rooms/room01/room01.tscn | 2 +- game/translations/game.de.translation | Bin 732 -> 479 bytes game/translations/game.en.translation | Bin 681 -> 472 bytes game/translations/game.fr.translation | Bin 724 -> 497 bytes game/translations/main_menu.de.translation | Bin 1084 -> 680 bytes game/translations/main_menu.en.translation | Bin 1013 -> 620 bytes game/translations/main_menu.fr.translation | Bin 1052 -> 651 bytes gymkhana/rooms/home/esc/wall_item.esc | 8 ++++---- .../rooms/home/esc/wall_item_popupdialog.esc | 8 ++++---- gymkhana/rooms/home/room01.tscn | 5 +---- 10 files changed, 10 insertions(+), 13 deletions(-) diff --git a/game/rooms/room01/room01.tscn b/game/rooms/room01/room01.tscn index 7fc13804..69dcf184 100644 --- a/game/rooms/room01/room01.tscn +++ b/game/rooms/room01/room01.tscn @@ -16,7 +16,7 @@ vertices = PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ) ] outlines = [ PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) ] -[node name="room1" type="Node2D"] +[node name="room2" type="Node2D"] script = ExtResource( 6 ) __meta__ = { "_edit_vertical_guides_": [ ] diff --git a/game/translations/game.de.translation b/game/translations/game.de.translation index 2638acfd37f3229836932f45f17bd4868a40bf09..c8a9a4a5ddfe80149dc6431fef28b0ca6f6c279d 100644 GIT binary patch literal 479 zcmV<50U-WTQ$s@n000005C8!B0ssKV0RR9fwJ-f(`T^|?0Or+FLNJY+HDV0vYQ`ERRxdT^--G0=?C`b{}pcA2G!=Bp7AlFCbbueP}@Nn^sOA8$AAwA2gDs3&?N%Ax5$cpsXZ&5fCls#f4{iTx!@hnxc(6Ud)gO~S)`ocS<6WBds_9+0(9 z5DPQr4YQFbd9cOC03!{k1@k>h-7Nf#Y-+<$K%aD+F|e405s@l!&)tV*wD7lROtl3t VHHS(o^2m{e<=x~rfHqQ7LqmdP(B=RD literal 732 zcmbu7J1+!L6vxkauU*7O;gNVGYmi`rL_r~5iH%2O5FwJy?6|RO)~w8(tyJhXN{tVo zR1(pN58wl6P*AEhcl^&-$rMyh^2@pBf9^Tw-aBKg8M9QjO89EPz8S18m@>QWnvTqy zUasIk`k&RIycM`Y7K*MV()ogA=F?swEiK^)Y7FNb^FUAp%7Kv5+!K;&5d;;2qF82e zy0m9z@`4%=W{Q?Ayt2TPr03?Gz3(zT!lpVVRi+v z)D3v54}%MQ4ScM;j+Z^>`O56sI<1$hQZJN7wG4R zbubjt-=Xsd?E!rueY^kjwurb3aIc>}ThMnA^W9qj-+}ks0bffklV3e=tgNl~kV@TW zc1YP3O;I%+k33H%Mla8LD}C+Hl%q(^B%^U(d$@_IzBYX@F?3pLZT~1e>DiOdNKm?Y zc6G5#YEIv%>+rQH9`mm3Dt$0|Jbry~s_aL#G}EE>Ka@Sj4TDqowVNqpaVa&s@cV&? H4E)z$-Gs07 diff --git a/game/translations/game.en.translation b/game/translations/game.en.translation index ff161e2fbb4de5e1d760261d5d78485cb5e1b921..3f69f768a19472826f7b3a232a0d269b9e119156 100644 GIT binary patch literal 472 zcmV;}0Vn=aQ$s@n000005C8zj0ssKO0RR9fwJ-f(#{sns0A?0cLlBQRYs6Q3FHlJU z0H^?il1u;w_OcAXa)BXLIB*)nf?K;G&O6bt6#u$HNOJWk8V{1Ma`QV=xKBdO~6XSzrnBh16AVm z>Ni6VT%8(3egv5R@&TifEL(hj2LERy%NHOB2?qR`d++@SKY$98K1!-$iLPd}jmLOu9NR$4?K9Q+D?j*%>3h)zbbbP*Y_3`3brA0Qa!er+xq zot+WFP9k*T7~nK(E0My(Lg=#Y7_5t8BqXCkl8xxFoLEkbA)VcHE-X+%I*HirH=$!h z;o`A@lJc>lvl2o9Dj-mTF~`gfHa|6N;rw}PB;U=BTViiNAA;n( zfj0Cu54M;L64n4(c)n+;%L0rMM%#3Dg^U2eE{sR2ihJ%p?4yOgML*RlfN42YTakZ` OEFQKr}L`WlTY&6K0H07|?W}?-0mz|XeA3)*@aFB56 z7mx_2-hB%kxDaQTS?{b$_Tc81JbCB$%+AivWR3HUW`cV0~F*g$+wHSXr}+ zrUCW83SfCZuqZQ+ES;)lQ`gF>ZK_PC1|{v@IYX;Z(gIVVjA?t6k!CdR3Q9s47Vved zt?ia6X+yhvq?f2&7h)%7TSa5m~B z3gM<7*;*fW*Hg@kGl~>7gt55P2#5l)m*C~~{B#7_2Son*CwR23i+lVt{4x3nnDF>F z_*wKlV8G+ICcYlF(GLRe^Lh9cxK0oT;ta#!67W@j)Cpu$ioCX&&E%t8el*{AK8~-? zre}kWG(xys9p2Trs^&hKtA!7<+f{#h^Tv@D ri6hCe$%WesT~Z4jplk7q zn|$0UIRHQaN&x@s@Bhj1O<9cZ_@DAST9Uvoc|#1A85C_;ir@`RR*A3qAHo0ZWVy;# z#H2MzDr_%o_+J3Pf5{&wnu;v=U-|Dj(bNWpfdTD*fW7zr8<;2z!aF9agL8LBo9em< zoc~uAu`)xPB3EX{`GyEtr~drq|1bVu4*WlbjA%Y=SRo^tl7b8;n%>}4oM>7@LKeQ! z_m>EPJ`aw!nL27*i54gPls_T$AQGhMF)sjL1=g^ zTG!SzkiI4*|41<*V-!$S4Eg~wAV30RpgKG0A|___jX)A>hFS1zB2hh#U*V=77U=Hh zPKj*Ey+ss@oG!s%wj+yJ#tXn=hTl*t64Q^`m=-X00bYQ+XRgzR|00{quw3XP9cKhA neqlUPUEDMKupKSLE&8dp0H)?p(~5j>WGQ*4{D#{GQd2`ifR*7N literal 724 zcmWFv4svFI0%jo13dA5<5Qqaj5{olJiW2jRa}rB3^Yeg0lmQN)b_pOZN-fSWElN&} z&&f|t%!x0_k1tM6%}ZtALzc@+%uQwB1d8OQ78fU`rxr7?136$FsSMmeW(Lr8@g<2# zIjIc1KyFfLa&~G7Q~+dCaY<2TUOGfuadJ^+K?zWhfq@Z-xqujKl9j%`Ap;Lc2newH znFT0;9587`3?Lx|AO_j`9|(XHm}UdgJW#d}lm^LzybPj2Kn}`Y7l<( ztgG4#NQ(inEL036{s1Trq!>VQ)<6tX{}3oX3CLFfVl^c3=Rk2EARlCo6q0z9#?Kw4 zKt9N9O(gM1pm-9HFAT&WJs>~G1Mwyx{^uvJ@}DR8aA%OGYiO{mud82(%D*gb&VTAG z9Fl4>54hj{XFR-;JIj;%U!mIXf9ht+{}~k-{&{hC+p(0`^mH&lg_-mIG5mAn;Q^{% z<$8N5cg|9#wYD{2wSj8fIxPBTXL6&(n>iT%Gui`f_2SOA74Hz|QoFztBOWCdz4^du fO&K)~9*`*zv;VV)1vz?x+*6Bc3j;$CFg*hRQ}3!3 diff --git a/game/translations/main_menu.de.translation b/game/translations/main_menu.de.translation index 1adfd67ff04cbc16b97416fd2652f0e4fe2948a1..f05e505be32a833bf5c00dd67f864b5414eb7d83 100644 GIT binary patch literal 680 zcmV;Z0$2S~Q$s@n000005C8yQ1ONb#0ssIgwJ-f(UjsE104CscNZ`__H6okQ=mp6# z&9hD2Q~gXNJFlR{RB=^{Ln@|1u)*x@0^#m97jl_R(m9B6K6nZouExle&+|_;0yhjE z=)%P5cMWi@rBeV|0BrzZjDsI#?!+>*Hc~82YgSx%_WS{^V-GcJH%o6n>-q!ORvWdp z=Kj?+N6C{bSwmaXnYEFIy0KQn^3>T{{wn`BsS`~)T9THso25A#eiV{_U^X*x_2;Mhkf$y-DOT9@!V^%v z)rS^u0WDP$@t`d+p?aGz8Y+1yeKRI2V2Z>2u7HAYNVqhWOpz*0sNpa~lr}RGNRS|f zORErR1HNmWle?ke;50Z7 zE`iG+2MU1BA_^2hB@&rT(Dwo}^@2Xq56B;$I#;7Ts21Yx?7JtlUl>qZ-FW5Ur)xW) zDVDn6`h9b$-;hpYz3cZ?l5eQCjd@-@t$n)>pT4mNxOpD`@;iN|+6mV``aq4{fTmUw zu0PKD7Z#wY9y)B-pZpwrwi}viq`h5#b?|omH8ia!T>trx>B=2w%0V%1U%G$#wJvCP z-`TOd5VShygeLrQF+g6Pj)q(Q~!^;9Ja8leez5@}Wm`mgLc0pfjLc zAAvm(8CvZ4x*oEbP}W7M$eDd+W?hNcY`Da1;Y4up{r6s*4Oxcl=v&o5Eg8t!jdv$M zOid!xzT%H}wPGz++Ct0B>^&!v)qTrLxi3}SpF2Q&PKNRNZpsf(om((S-D12*3y@kq!Myk+=vQg KnJX-f|Hfa+fZMD9 diff --git a/game/translations/main_menu.en.translation b/game/translations/main_menu.en.translation index 74bdaed25247ff289c811e7c35f146e4d85840c5..cdead0e34925b7331a4a962c61ddf771374ddcb6 100644 GIT binary patch literal 620 zcmV-y0+anxQ$s@n000005C8xe1ONb30ssIgwJ-f(7z0%j0A`+QN8pq=Yrr&Tlstw} zIOhn)R@TNR@KIp^xY)xeD}1dCA=G50f7XqB7Y^%+njSv=)A2RxK_593LLzo%geA{%;|C2F z3~(^4aBVFB(`1G~xL z5do1vODW=ZgtX0SH$-&2=wUI#WAY==2?ar+0>|o)i+_{@XMzsfq|vzDN*WnQi0YY)68hgU{Wk@W`GXDmXf zF{u$CZzP}~K|w*2v>H%?A%+NV65y01S_%wr**5F{2F0HMwyS8k-&20LnayRu3;?!F z@R189bXx!XL~)q=IS-Ho*_-uU$4Y*To3bKsD3#O7rTfS|Y^m$1zIcbE_tZ?vhtZ$o z8^3RYsN;HCrxx(%+3N=LB>zY39*p})x?awxu`wnb6}@cpI^9#1i_e?zmnkO3i9!cb GQ$s@>GbH2y literal 1013 zcmbu8O=uHA6vtoEsAcNYbD)y#G@!&x(9z1#M!BasH{5pEv_ik!(etsc#WznEYB3aVOy~Nuf-9*9k|l716PxE)7FGp_wBl;NlVhk-fxzem(&ku zUV5I;rAHee)*>V&Fl->Zx-aHTNkfoxf!36M*Wf>SzH3-|C(P4a!|`DfMZf@9TPZs_ zI!1$Rq5X5uT#OhdaxO61-n4I+jjSi_hEdXNAr|J&{=RCoB{=K9$W%f0T(|7 zOu#uY)oMI)4?TZlqJaIG7Zcj5?e@*NIW{4?eQeHE6CKqkNt6FKq4suU+q`bCHW(2^Es(}(&F$(p2IhZQSqxw3)N|8 zK6Jj5D*lZzo~T2s{g2d!_qU+`jQ{3jo{hm*`SN~};4uhGM;^WlsUR#pz|Ey_dVFUs zq|zBG*y2h`=bL>t@C=PAj+9!1D&m^#*kL|-x<8%B#mo@Pe3^8ohL&SCWIHlJ7w`y* zHieao6VXg&rEeglys$KBQaCkxD{?Gmf9Hu=nsglV2AvBGpH2v^Nkw_Rvpi855B@hP C2DV}V diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation index 47f1a0382f80f33a05aa3afafc2d4aea0e121c95..c42d0f871845f021f5de10c9cb247b98cf5ba857 100644 GIT binary patch literal 651 zcmV;60(AXSQ$s@n000005C8x_1ONbY0ssIgwJ-f(KLbq@0G8l!M&R_MHDoy^7|?G$ zglL9$7Og~)IY4$jqQ!Fl4oT4!voiLtJpYsJgh^|s z>`!^hByD-p`LeE1bb;~}g0A_hV`yjn5&S6A@Dn9ysjRJ-l{-Jbi^*T|0Zu#${Ed&B zBL~|_d}tRomA|D#5GBxL=Ee`E7!8&-yzsbB+E7|8kmx7z3;jJmhhM{Q^H-?(A26u> zF#mynzz^Vm`4?0oRd-D#su}5&x#%ZlofW$&lL6NWt1`yA$QzWE7DZ`M9iAhM%ARiz z893hkbNn$Mp^0WzgynCVaS;LG7qCL%+mYZm@Ox+>(WXv-SdgobI}*d$BP1eFCrULK zJ5vgtP^47Mz`+`3Vnu6AQ2o%1Lt=x#zhcNzETABu$5}}VNBG?97>X0z2RI6-NWGzLHdLrz(F5@6&g z-U$plY2r2O{|4Fl*ZkC`)QzNFP<=dxWw8O|o{~`@k4*VGoZXDS)k!}5^cgDyB|oOQ zPZHX+X`#*@i0;cvfyEWC8_SLJ9xw;Eo%8?afuGG!B?qjpNRVw0**xSk0viX_R2%xM lhhd#bIz&I8*m4!duL&(@Q!`a_`FTtJQpAS13cONNLqlM?FgXAK literal 1052 zcmbu9OK1~O6oyaITGJ*zijOK5(keu;!TQ`Z^+l}KS~E2bMeq?O;WimNor&`R@v%`C zW}#4|(p@)gF*~)C7F;L<7p`2o=*EI8UrU!0|C8iOknTM2aqs!hJ@;|$ok@-+<5agM zv>O1o?OtkBa3ffc zRU_vLx==0|<&vf9q)bpeuUa`_(Ph`xZX-BmYIn#RZH|~R- zRea@Q=fm`+;;GsI2&YMLHA>*)^ai3)e^bZea(A0YXAQ&EF|Ri;(!EMwemtLFs-+-Q gDCoQvf>$EFD;_0 [eq dialog_advance 0] - say player ROOM1_look_wall_item_1:"I don't know what that stuff is." + say player ROOM1_look_wall_item_1:"111 I don't know what that stuff is." set_global dialog_advance 1 stop > [eq dialog_advance 1] - say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." + say player ROOM1_look_wall_item_2:"111 I REALLY don't know what that stuff is." set_global dialog_advance 2 stop > [eq dialog_advance 2] - say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" - say player ROOM1_look_wall_item_4:"Please stop asking me that!" + say player ROOM1_look_wall_item_3:"111 No, SERIOUSLY, I have no idea what that is!" + say player ROOM1_look_wall_item_4:"111 Please stop asking me that!" stop diff --git a/gymkhana/rooms/home/esc/wall_item_popupdialog.esc b/gymkhana/rooms/home/esc/wall_item_popupdialog.esc index 04ddc8c6..fbc39f5a 100755 --- a/gymkhana/rooms/home/esc/wall_item_popupdialog.esc +++ b/gymkhana/rooms/home/esc/wall_item_popupdialog.esc @@ -1,13 +1,13 @@ :look > [eq dialog_popup_advance 0] - say player ROOM1_look_wall_item_1:"I don't know what that stuff is." avatar + say player ROOM1_look_wall_item_1:"222 I don't know what that stuff is." avatar set_global dialog_popup_advance 1 stop > [eq dialog_popup_advance 1] - say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." avatar + say player ROOM1_look_wall_item_2:"222 I REALLY don't know what that stuff is." avatar set_global dialog_popup_advance 2 stop > [eq dialog_popup_advance 2] - say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" avatar - say player ROOM1_look_wall_item_4:"Please stop asking me that!" avatar + say player ROOM1_look_wall_item_3:"222 No, SERIOUSLY, I have no idea what that is!" avatar + say player ROOM1_look_wall_item_4:"222 Please stop asking me that!" avatar stop diff --git a/gymkhana/rooms/home/room01.tscn b/gymkhana/rooms/home/room01.tscn index edb5d5f5..01589b6a 100644 --- a/gymkhana/rooms/home/room01.tscn +++ b/gymkhana/rooms/home/room01.tscn @@ -57,10 +57,7 @@ margin_top = 3.0 margin_right = 89.0 margin_bottom = 24.0 custom_fonts/font = ExtResource( 3 ) -text = "ROOM 1" -__meta__ = { -"_edit_use_anchors_": false -} +text = "HOME" [node name="advice" type="Label" parent="ESCBackground"] anchor_right = 0.023274