From 15bfc8685fefc531a73431dccaccaf0a41497804 Mon Sep 17 00:00:00 2001 From: Talon Date: Sun, 11 Apr 2021 20:43:29 +0200 Subject: [PATCH] More weapon and movement updates --- .../DesignTimeBuild/.dtbcache.v2 | Bin 62845 -> 63073 bytes .vs/EvilSatellites/v16/.suo | Bin 91136 -> 91136 bytes EvilSatellites/Objects/Player.cs | 7 ++++--- EvilSatellites/Objects/Projectile.cs | 11 +++++++---- EvilSatellites/Program.cs | 1 + EvilSatellites/ScreenManager.cs | 2 ++ EvilSatellites/Screens/GameScreen.cs | 8 ++++---- EvilSatellites/Weapons/LaserMG.cs | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 b/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 index ec4de394538891c229ca4858ce0808f01ace1b9f..5cf0ec0ad0f017401f44a0efe43f0703bb904839 100644 GIT binary patch delta 5556 zcmZ{od3;pW6~}W95O%^Q5ZM)3WJ^LeWJ#hx2#|!uN+}3T!VCsN0!aXoC7{R_0wh62 z!CJew)+$YRYOUQ{Ypt!cww6lR2}yW|37Zh`ymRld7%?CIsVRa*|^c zLW#*qW0I2Nmjq%HbK`P?aXGPv_r0DuG%9WNlDxvS;^JV*m`S5@izC{k2UY}Q{asW> z!OGPonSp}9(qK{5?5u(TGm8qB1#?UC@`L{U?%6s1yW$0N0wuxx{JfH2RdrTjWSiN6 zC4r)t_!(6^`+1(>3B~Z`S)S*34)ADu|LX+)kmv3C0yxGB-)%N=j1!oN?Ikj_I@;9pDk13d%uEYNd62RMnf=Yd`T zItX+K=tY?7wf7o$r7!yLi2W}CeF^Agpf9tZrLO>e73gc?|GFIH8*=?7Un{)GjIb9; z-(u^x!D~;i$gS`2_2wZjJgt{>N$Q|U?*erYuH#AD?=L_dU5*9AbyDs=fR*I$96B)#;c?e{mJ z&MwD-;kqdIK2R6o-acvj9R=zt3Te{cfx5X#ESRM3n)DB#?!rwtW&3>qbeGGqV7MO2 z{S&B%>teyUdaCPRKs_b>wNtj=hd{ktjs?R-EB9}pXyI<0vi*($-7U(%(>CcpK)u~0 z7EDqfP5KC^k8mqa+kVG^`nntohU=$X4NyPV#e#A5SJw%k{*wNYp6Vpf0GDIIa08V) z1vF5&;b&~W(?Iu#GV6@(cLwNQH;Dz4G)R-q0u2)G#WS|wIiUMojs?RFR_;8|VAsWh zaSc&dEzl52k2-5lbpdFo%dud%VanA34HItuS=+B3=zdYQXi@{va5sqslQcq;E&`1Z z?wzx?p9eJ3DCG!flzu-6m=m|ilo0(Yx}i8N_9CF440-{OQba6F4Wq7t&koRrOO4I6p8eZo5X@i znxsjsktPZE=mp!a4bo(nW5IA!lxvGL#dWb@Tu&PbUq$AaOqlQNHblI1;fo!t~=5!;ilKyes>|w7G+hv?bicoj+?}SNqSh5dLlh6+#B__ zUoWK3xf~0IdqlZtq(@vA3&u59U3VkRmGsdK_Ef!*KJRiY7;c_&eURn}x4yyl>x=XS zQC`-hen|7(Bo<840!`|Vv_QD}2HS4{(xWcNg5ee_HxOx|>teyU7OCqVq(zdx=%Vd+ zFVbR{W5I9%zu-rRusLX{n^|^=!Z4NRPQ33x>;6ZUj=Ea36ZM-$x3H@w*4j`Jt0aUZ2L__TJI*YV3IayQVP-r;a&~f zeyK!MIA*^&nEIr1x*Mr+Nr!v&*qyxGl;}LfRtS@Fa*MVI^Zqxm?U X7VvL8FAMqSnU}@}Qn}`(@# z69sSNY~nn~+05xc_95A4|8^KqBq*f zd4v<)tzDeYa~|b9#(A6*W$flW!P&!ElFiGLoV}cV9M?X&ox(RMwY!WvdJHMAf44;5 zJh=3|q*_`g`+}p<MwhBGx%f;_JuwWb!=Q$%CJbu1YQvz8 zt1b-cx$46p;0nS3TnK{(u7>bnv-f*6Z_a!?T3-B7uhe5wCS`bBCUdY`qU#faJ%T3% zdjjHFUQnV?+ol;8_8CCCgax$(v5S>*qcV87tYg0Ij|>1n|;f@ih=t9*xjcurrx z#%pPiF*OV_@I0+wPf3u8Z|K*)$!pYWS{R1-mf+ib{X4=ZeEMCz*;hY;nrZkR6?|XV z9WNM@eaTvCt>p*8`_j}>Yb|xOq@tJ?g*UCKr_OrnZOjjaH?*mx-dX}{c}aM)-HG`l zALhyp>v>uDNn9C|iar|s2pX*Cfbe6w(i44b#uDm#^CQ8*EAGvYb$$JQbOnvt^Ao{O zukifLcp7caDf?DGmsD`dd#_X0bJ}`-A;D?Sa@tzXSj#UZIOAE)Sj$;!c}0S=p5<(0 z>BJMCvz}i`aE_j`LtRt)(|uKf^B!~F#$K?R^ch~4;1j-7e&A5oJGJmz2`)GBhJ3CcNE4g)JK@hwO_5++;#|KMNaQN- zRgo3f*?$lypQB*7bjSTskgmC+imbMp`;(xVR!Uvcp9RhRBnl=e!zKMikfFH`E3y{q zq`wMU_#6epwRGGYf|kCEf^oHSt~Uj(bo#8rw%=QV);>qUaG8$#n;=tjPan4Z-WIgc z%Ihxa?}D~|5(Sgg&LzDgXs5ZhM{K`;2-^D`1;cf4+&={!d=~}d>gZhm5_Ht*sUx=E zyMj(WN5OEN9rvD~v*zA7V*CADaFtfzlKvyO+E1cjlDfF0_XS-vH|nVE_g_I*pQB*7 zZjSpv(9L&IFs>};`kx?6r@wU6_WMw9jn7dqTzAKPB&bV$&{ zPoiLwdb*?vK~K%CK4$wJ7WDEt3Wn?LxFdqzzKeo!^>MDFf<8L^V|S`!g6n*ag5ml) zu2Rrfa|0`FzvF`IwKAvD_B$cC!B3)KlKQ!%lY)Mld$!W{s}kJka}*5M-*MG~{=SQX zaSd>;8o>aa-u}2fRjuGApQB*7fsU&a4Ak7B;v6tYDa*M8PBtcS+|2!!>v5gza};Fv9037%taw7X-P!i-K|GIoCx&o=z`0Y5QFg z+~RW-3^&qop9n^3?v<0a-(|tATB&eJX$qtKBnl>Jv`Z3&(V81nW&0_GF+NAZaAO^p zt}xbjQ82D?&ecp|oKAnP%JyrnaGTFjFx+^@Whji-Ty>T0*Fs@}RytPOq?QU3{Uiz| zX_8B7r7%fzi>qzF)(Vq-j)LK)I4)CRitnOeTvMH^jlxu&{^DtT5YmQ82DK z&UKZ-9G!mIo$6|ZJA96U;pRH7i^5#ZO|P~6x+=`m%Gz4nubaZ>{3Hq{X}(L!Qkbu~ zS8Hv*YZUJEISPhb;JEGz3w##^<67uk*D5U3=|k%5sd^~f<#QAax5#ll6&7i3bDizi zOW|&?g#w?WV7NlZ^;0O++za)#-;D~(wepTj>aURSlPH*^q)Qs0kknj{!1lXI;U1r( zV7L{I8>q0tcTq5|mCkju!b+XKH?aK%DctLG6bx77xWNiVn)@KI{e~#4(hC0~GJmOO zE3EdDD43*TmlRVd*4zx(emM#yK1acDYaAC>SmV1W7}r|o8mh2Xr@!V-HB4ch&rvYk zddCe{Sg*Ov2HS6h!hKqaHQ0W+3ita-6im_vmz1ZlL33LgY`_IzPoiLwwz{No z3R^YzVrcu_rjYVE3WnR}xbX_xd=~}d+U{Hv6t?U1UXAut6BQozISPi`;kZc(J2Y3+ zX!}i8*r}D$#w_z+=P3%0_(>E@(k_=YRbiL!qF`LpRGI9@bTu8f^Op_RO#bfRn$53$ dt~>ZG&NYu;)LirVz00*gq2)sEyVSOAp8}Hu@v#5^ diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo index 4b9a815110295757a77aab6e5219ac49654997a8..e36a48c1080c763efb693834e82c875e9d057f42 100644 GIT binary patch delta 6935 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 delta 5826 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 diff --git a/EvilSatellites/Objects/Player.cs b/EvilSatellites/Objects/Player.cs index daa2533..80dc3f7 100644 --- a/EvilSatellites/Objects/Player.cs +++ b/EvilSatellites/Objects/Player.cs @@ -11,8 +11,9 @@ namespace EvilSatellites.Objects public class Player : AbstractGameObject { private Vector3 _PrevPos; - private Vector3 MaxSpeed = new Vector3(1, 1, 1); - private Vector3 Deceleration = new Vector3(0.005f, 0.005f, 0.005f); + private Vector3 MaxSpeed = new Vector3(0.2f, 0.2f, 0.2f); + public Vector3 Acceleration = new Vector3(0.008f, 0.008f, 0.008f); + private Vector3 Deceleration = new Vector3(0.0025f, 0.0025f, 0.0025f); private ISoundEffect sfxEngine; private ISoundEffect sfxWhine; public IWeapon CurrentWeapon; @@ -21,7 +22,7 @@ namespace EvilSatellites.Objects ShouldDestroy = false; Active = true; Type = ObjectType.Player; - Position = new Vector3(10, 0, 0); + Position = new Vector3(0, 0, 0); Dimensions = new Vector3(5, 5, 5); Movement = new Vector3(0, 0, 0); Rotation = Matrix.Identity; diff --git a/EvilSatellites/Objects/Projectile.cs b/EvilSatellites/Objects/Projectile.cs index 5dbaac8..7b389d6 100644 --- a/EvilSatellites/Objects/Projectile.cs +++ b/EvilSatellites/Objects/Projectile.cs @@ -12,15 +12,17 @@ namespace EvilSatellites.Objects public class Projectile : AbstractGameObject { private ISoundEffect3D Sound; + private Random rnd = new Random(); private Vector3 Direction; private Vector3 StartPos; private float Range; - public Projectile(IScreen screen, Vector3 pos, Vector3 direction) : base(screen) + public Projectile(IScreen screen, Vector3 pos, Matrix rotation) : base(screen) { StartPos = pos; Position = pos; Dimensions = new Vector3(5, 5, 5); - Direction = direction; + Direction = new Vector3(0, 0, -1); + Rotation = rotation; Range = 500; Type = ObjectType.Projectile; Activate(); @@ -39,7 +41,7 @@ namespace EvilSatellites.Objects override public void Update(GameTime gameTime) { - Position += Direction; + Move(Direction); if (Vector3.Distance(StartPos, Position) > Range) { Destroy(); @@ -48,8 +50,9 @@ namespace EvilSatellites.Objects public override void OnCollision(IGameObject obj) { + if (obj.Type == ObjectType.Projectile) return; if (obj.Type == ObjectType.Player) return; - Screen.Manager.Sound.PlayOneshot(@"sfx/physics/impacts/bullet/1.wav", new System.Numerics.Vector3(Position.X, Position.Y, Position.Z), Screen.Manager.EnvironmentEffect); + Screen.Manager.Sound.PlayOneshot(@"sfx/physics/impacts/bullet/"+(rnd.Next(5)+1)+".wav", new System.Numerics.Vector3(Position.X, Position.Y, Position.Z), Screen.Manager.EnvironmentEffect); Destroy(); } } diff --git a/EvilSatellites/Program.cs b/EvilSatellites/Program.cs index 83eaca6..a22adeb 100644 --- a/EvilSatellites/Program.cs +++ b/EvilSatellites/Program.cs @@ -7,6 +7,7 @@ namespace EvilSatellites [STAThread] static void Main() { + DavyKager.Tolk.Load(); using (var game = new Game1()) game.Run(); diff --git a/EvilSatellites/ScreenManager.cs b/EvilSatellites/ScreenManager.cs index fdfd54f..d1bd1e8 100644 --- a/EvilSatellites/ScreenManager.cs +++ b/EvilSatellites/ScreenManager.cs @@ -4,6 +4,7 @@ using System.Text; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Input; using SynthySound; +using Synthizer; using Microsoft.Xna.Framework.Audio; using EvilSatellites.Screens; @@ -17,6 +18,7 @@ namespace EvilSatellites private Game _Game; private bool _Running = false; public Synthy Sound = new Synthy(); + public FDNReverb EnvironmentEffect; public AudioListener Listener = new AudioListener(); public ScreenManager(Game instance): base(instance) diff --git a/EvilSatellites/Screens/GameScreen.cs b/EvilSatellites/Screens/GameScreen.cs index 657334f..82c9b9f 100644 --- a/EvilSatellites/Screens/GameScreen.cs +++ b/EvilSatellites/Screens/GameScreen.cs @@ -94,19 +94,19 @@ namespace EvilSatellites.Screens Vector3 move = new Vector3(0, 0, 0); if (Input.IsPressed(Keys.W)) { - move.Z = -0.035f; + move.Z = -_player.Acceleration.Z; } if (Input.IsPressed(Keys.S)) { - move.Z = 0.035f; + move.Z = _player.Acceleration.Z; } if (Input.IsPressed(Keys.A)) { - move.X = -0.035f; + move.X = -_player.Acceleration.X; } if (Input.IsPressed(Keys.D)) { - move.X = 0.035f; + move.X = _player.Acceleration.X; } if (Input.IsPressed(Keys.Left)) { diff --git a/EvilSatellites/Weapons/LaserMG.cs b/EvilSatellites/Weapons/LaserMG.cs index 4095c51..e1acebb 100644 --- a/EvilSatellites/Weapons/LaserMG.cs +++ b/EvilSatellites/Weapons/LaserMG.cs @@ -76,7 +76,7 @@ namespace EvilSatellites.Weapons { sfxShoot.Play(); TimerStart = TimerEnd; - Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation.Forward); + Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation); Screen.AddObject(proj); } }