From db9c3cceea33fda80f31ff55d65bd1b95d115317 Mon Sep 17 00:00:00 2001 From: Talon Date: Fri, 23 Apr 2021 21:08:37 +0200 Subject: [PATCH] Initial options screen --- .vs/EvilSatellites/v16/.suo | Bin 178176 -> 185344 bytes EvilSatellites/Game1.cs | 2 - EvilSatellites/GameSettings.cs | 14 +++++ EvilSatellites/MusicManager.cs | 7 ++- EvilSatellites/Program.cs | 8 ++- EvilSatellites/Screens/GameScreen.cs | 12 ++++ EvilSatellites/Screens/MainMenuScreen.cs | 15 ++++- EvilSatellites/Screens/MenuScreen.cs | 1 + EvilSatellites/Screens/OptionsScreen.cs | 77 +++++++++++++++++++++++ EvilSatellites/Screens/StatsScreen.cs | 2 + 10 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 EvilSatellites/GameSettings.cs create mode 100644 EvilSatellites/Screens/OptionsScreen.cs diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo index 1691341934bc08e3851f1c050b4c6b2068a0bc57..8100790cf559da8d949bc1e842d1dea25d25400b 100644 GIT binary patch delta 6851 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 LrPF;rUI+XG20-`v delta 5760 zcmeI0eOQ!L7Qo+gW`>VJkWW#-1cXF!bOwfD5Q729($w%H#LZL?NYgbeG)09$t=uv} zuFdIVOPytr$P^jnZFS8t&BwBBv!|_gpVrl$Cu^T_qf*n1*mGwF(^mVi+GqdRJJ0XE zpYNS>&pG$J_kHaxLH164gE0XWUkX)}2rg=vue-auWveXb?3fsfA#EFSCM~eO4W-;- zpDe1e8pen-xC%c8QLU*C9tVnYEKc5|DE!aJYU`H%hNa?rYN;aEEfWOjaFa&8Rvt1k|2Z(v3-A&j?G{H-W)edSOH7h%?jzP)_y zLw)&d&dV6lkep;X#f7_>N@gK*4|6Y5#VleLGxsq|898~4oKoxHn)nJTLmHyq`7YCB zU1}PyY~9`dd~=WDW!txnCEKP61DjEnX7T7BVw&DOPLA(MS24|xvCLSHX@Yp-A7UCU zkGraA#L=SEU(zB0(js!{jrurk06US0*H6((cNa@~3a{(?3Tsd=5t^hG=k&&4Ib7Oj zJoEMXk|T}1uKCvX(9@tB!SiUv`KV~+=vu$8SiBaE>&q}dZF|Tl z2n6}(S=>k^^%x-*rX9w#ImKTu*r5dzIop%YCCLd*7-1Y|e#V z(?r80Be~b1o80x7LM`>!mv6a4x`x~YG64&Tj7AE}=oml7pOJbCWb{lB6U<0CLpblv zgfd}FI1|apz8GOjjINF4S{&1#xsDmYBrSQt59Cg)NSS)8-l^-4Au5_x$yioAgXA&%WGHcQ%d0&^=<$V_A=F_W1o z%xz2&GnFZ3rZK-_*cUcZz&f;Eo4Nxps@v6-tU*zg9O;TodJH_4`!&lb1^;%)5r>nl zjg~6Ev)tb>PgGmJgau+zX02{MHx#+f55E9`9{=L1;_5PJuyM^fh;*H|`@_Wl+w}Ww zDvl-&Twht$7!vLZHlqUx|00?5zU;9a8Ute5e2ub0rX5^w zXIzTwl_Co`r=W8>Qraf8xGcr5fO9Oi&-xg`<@{YdOm1S&xdB{X-+|~X#rCQy@GIo5 zJw>8=(F25ToZ^~NwiTR(NMZXR#uYQ?WKjD92T>ffn|;pYT;iEF;y9%?d zb%jkD`_k}5a>A~ zL~!3lJ-beq_Ja1+EcgO$_6pv<)&^0L$gzu?N&YD z`T1u0WDE57h^9?d3f7B-FHN9R(a@W==Az|)M8D-(rmVCI%WOkwmL=U_PBU5!rRGeN zA;VZc+f-U%wV29HKeK)V=+k0oq5B6w6@79SWYWH545g71U{y>E`d}120by#5Wm{JX+ui^guo<%0vPMvQ7rZHE~K zp-5;=6%XxS{Eb7>o@JOro4|Db2b!-5^JO*2a2dI8-|cQ2W+(9b_l1}%fLu0b0No($4zCq5J%H* zha__6fSuf>U{~F_U<1nMD}_7JrrQ4rZg7-y)qXqJuexa*rQjx;XV{%!Q*E=s4&=TQ zhDONOh8sL@W{Q%{qASWWDmjc(>FF9A0uGU9t^L03RzTgw@WhpTuFs`Dm%?+)7o&n! zapK*jWSGXxkP*g?VVE_-;5%ubq{~-2&BH2K9wVf}5~_ zezVDYQyw+1g;S#LU_7;@W2Rcu2+sh)A7H-P4Y(ng68t!f-kpz8>NF#~rlZ2UU?aJo z2E97638rc;as2nPAx5hh6$72fhUicun^IBcD|7k9vYcNqr9Y#uGtArR?U>G;voCk@ zVPskh+2me^M$!9hh)0nc4&xMdKRijD#T*zqbMX}_KftT#31c6GUFuDq2&S&M0bd51 zl7J3x)S8`&Pf=SchEd^e7?jXHvkk5oXH@$~G6G#|EVs4w6UA1;FY31CXmiw}O&;v6>bdzC0JQ!|DC>z@-@6Nn zbdDOHA`kp%bS+kst(K*0YsY*#RD%`Nuo|_hyA}~>=_Ef)$&OfF-i zz4e$HeG3=IG2@vD%&klzpYn6>$Ngk~3!-V`n|v}Fx3rC|5r3Jn!zz#JMr9s{nfw&i#;{CE|ptODM+-bFXBVimo&0rSQ4*>UQOCfwjp zFYd#|RQMEzsxLf;Yy4@)E{vj0k75#Kt;U;vDGjNk_u_7C^Fj1;yn)FSz6oQfbr)L6 rRFAh__GKsd;->~yuvc@sju!k(bGhUNdf^^#RY$ythx|L 0.9) + { + Manager.Music.Volume = 0f; + return; + } + if (Manager.Music.Volume < 0) + { + Manager.Music.Volume = 1; + } + if (Inputs.IsPressed(Microsoft.Xna.Framework.Input.Keys.LeftShift)) + { + Manager.Music.Volume = Manager.Music.Volume - 0.1f; + } else + { + Manager.Music.Volume = Manager.Music.Volume + 0.1f; + } + + } + } +} diff --git a/EvilSatellites/Screens/StatsScreen.cs b/EvilSatellites/Screens/StatsScreen.cs index 519a596..8b11d74 100644 --- a/EvilSatellites/Screens/StatsScreen.cs +++ b/EvilSatellites/Screens/StatsScreen.cs @@ -19,10 +19,12 @@ namespace EvilSatellites.Screens .Add(new MenuEntry("Satellite collisions: " + GameStats.SatelliteCollisions.ToString(), "How many satellites you crashed into")) .Add(new MenuEntry("Total play time: " + GameStats.TotalPlayTime.ToString(), "How much time you spent on this run")) .Add(new MenuEntry("OK", "Go back to main menu")); + base.Activate(); } public override void SelectItem() { + base.SelectItem(); if (CursorPosition == MenuOptions.Entries.Count-1) { Manager.RemoveScreen(this);