From c49db61494f8cec0f5f64c175986d4449d883209 Mon Sep 17 00:00:00 2001
From: Talon <talon@iamtalon.me>
Date: Mon, 19 Apr 2021 20:23:23 +0200
Subject: [PATCH] IOnitial attempt to shoot player

---
 .vs/EvilSatellites/v16/.suo          | Bin 106496 -> 106496 bytes
 EvilSatellites/Objects/Projectile.cs |   9 ++++++---
 EvilSatellites/Objects/Satellite.cs  |  18 ++++++++++++++++++
 EvilSatellites/SatelliteSpawner.cs   |   2 +-
 EvilSatellites/Screens/GameScreen.cs |   5 +++++
 EvilSatellites/Weapons/LaserMG.cs    |   2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo
index 76ca56741248957da8ca403dba87fc56a69fc2d3..7e839a08aeb53fef2cb3ec73fb13cc9f0ae1dee3 100644
GIT binary patch
delta 2241
zcmb`JdrTBp6vpSw4lXQ8dH5jU#s%c16b5BM(dfFxVhtJ>tWs+QtXNT^AgHK~V6}h-
zSKzceDW!-50g6&_uegX-XBB+Z*Q$`(SW}FzVyt4UG;LIRcR_^KKWywwZtl1Do|(J%
ze7|!uIntmUX;2}Lov{w?&J5$jFpP}0=iS}iv}1s_G5d9%tX;df;ld1(&dLFbalLF0
zgrhI_j<1#m&{*5$L3IOdA-!Wf?Pt+8p-AV+J)<GGmkSy)sdtv6y%KM8<H5T~=T@A?
z5#DYxI3(ItWXw?i2>xUZn+;Gyp2+<<GE#91j82(=nZpW1ch=~d<%U`F^NanyaHyj1
zsiy5be&e?Sekjt7vOm|m1Zor(V?e4SrbZZ$4O<HuvOY5p#Nn(sffGGgfsF$X;xXlp
zTvV|b<?BqG=XHW{W{f=B|J~fmvgens8Jl?R;orshuZ5=7^QcykM|_32#d4bJw8KT=
z(_&Ma>kshSaZ3Wv=GBbI%ecjBH{MT=-*<4S|6V#i$`YEJ6L6%{O!aS(+AX|iZoo;Z
z%fG)qv3SUwm=>yc|9ZDE$FzB!HKuDvK=fYaAO73&e&V%cN>uul3*m9ibmG`&Ef?mG
z%$RGU3oC_ZPnv3{yRT@##kz6W{FS?RY-6eF{1DaE6ErkAW&MGte-@m%Nnf#HRaUDa
zAl&>(6Gk?9kgV8znYfY_<A;mEteD0c!&w&D%%03d%Tc<hF@EZ3kB*kLj;ol(%yK4~
z`IyNh1(x?<Y`*~}gIUO=F{_zXFG83UCY1&U)9?)DeKA)dc5#jx9mBX$GgQoJAt@BT
zMAg+WOsGALJF5+tP_D+h=jY%Qnj3eZ=l)6D5r~R3&WV8m*>}Caa@paU^NXyR>Yx4o
zuKdqVsQX*-nojUqOsd;16b1p0rQe>QJKQ3cvcgOUm|@#(ZHJondJHnyWBFfdAwdSG
zgb+Dg!IhPIyjaF#Ly1IlqbEUzRzOSRCfrmKVGT3j(QBbJQ+i=1fV~hXgK+Xd%mM5a
zoUL&}p*=*91vOfrj~j$tAHq2Da8DTrFLTbRm?*O~&DK~2hSiQ0X3vGLm#N3cq}$F~
zzy8Fz!wU!;>;~lTH3-Q*bp7n>4Y)+d2RlZ4H!I|=!>m@kE^tlxcBXVc;J})ir?@y-
zLo~;yIrXOt3oJe`8|y9mpcE4?tqJ@mXc<frlS$!9rFV)=^<svzZYz7YNmN(8!6lGx
zq380ICR3p^6?%aL7}>6n50$3U5ntg_GCjehGACSks1oZBX;CZ1V@sQ!SRT_iMD;$;
zFzv@apn5Dica#VpIe^;qT?7mQQ_4uF1LAWxn|<LWjy67WIo0=^uXK%S2Q=R-w)wj3
zm&-0*eX}abx`G!mx19kvZuNv1T0;PD-_u(S$H7;gLbI(Rwl%E7M57xnYE+=IvBE^H
zFoV#R4E;gyyiv=7&03sTsm8bObYb*my{TRe<H2-b0>l8;|2&%9eJFx(aw<e(xnV9^
z9@|?nNrGft@Od1G>#CEzvQ%Hv_o7~{wL73@DZNK~c|ZFGoWD8VeW%C(l-s~YFv-4t
z2uu{f5ikIkus&P-r0G<L^x)#+(l^d9u2jGEU!gH2`9KTw7&EZuaA=3&O>r9WFP!Lq
zj5-O`un1U$T?LfPNI|cKXRl2dQ8tD`zXQheMlf3qiNN9RJ4#%7GhqN^=4x01tZ+jK
zV`M7H7pGn}^dP4wqenPT?~T(;uoN^hK@$y9)p8hIvH1a8H3vAdxzqlYC|1n_)<id;
qaWrXCKys~$2exWED5~<o>EKo<U`+)jK)(P&x2gnHE~MIi+Wif55qzuw

delta 2447
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

diff --git a/EvilSatellites/Objects/Projectile.cs b/EvilSatellites/Objects/Projectile.cs
index 7ee95e8..709799c 100644
--- a/EvilSatellites/Objects/Projectile.cs
+++ b/EvilSatellites/Objects/Projectile.cs
@@ -13,11 +13,13 @@ namespace EvilSatellites.Objects
     {
         private ISoundEffect3D Sound;
         private Random rnd = new Random();
-        private Vector3 Direction;
+        public Vector3 Direction;
         private Vector3 StartPos;
         private float Range;
-        public Projectile(IScreen screen, Vector3 pos, Matrix rotation) : base(screen)
+        public IGameObject Owner;
+        public Projectile(IScreen screen, Vector3 pos, Matrix rotation, IGameObject owner) : base(screen)
         {
+            Owner = owner;
             StartPos = pos;
             Position = pos;
             Dimensions = new Vector3(5, 5, 5);
@@ -58,7 +60,8 @@ namespace EvilSatellites.Objects
 
         public override void OnCollision(IGameObject obj)
         {
-            if (obj.Type == ObjectType.Projectile || obj.Type == ObjectType.Player || obj.Type == ObjectType.Debris) return;
+            if (obj.Type == ObjectType.Projectile || obj.Type == ObjectType.Debris) return;
+            if (obj == Owner) return;
             Screen.Manager.Sound.PlayOneshot(@"sfx/physics/impacts/bullet/"+(rnd.Next(5)+1)+".wav", new System.Numerics.Vector3(Position.X+Dimensions.X/2, Position.Y+Dimensions.Y/2, Position.Z+Dimensions.Z/2), Screen.Manager.EnvironmentEffect);
             Destroy();
         }
diff --git a/EvilSatellites/Objects/Satellite.cs b/EvilSatellites/Objects/Satellite.cs
index 5e390ae..c28b578 100644
--- a/EvilSatellites/Objects/Satellite.cs
+++ b/EvilSatellites/Objects/Satellite.cs
@@ -50,10 +50,28 @@ namespace EvilSatellites.Objects
         {
             Move(new Vector3(0, 0, -0.05f));
             Sound.Position = new System.Numerics.Vector3(Position.X+Dimensions.X/2, Position.Y+Dimensions.Y/2, Position.Z+Dimensions.Z/2);
+            if (rnd.Next(500) == 250)
+            {
+                var scr = (GameScreen)Screen;
+                var player = scr.GetPlayer();
+                var view = player.Position - Position;
+                var rotationAxis = Vector3.Cross(Rotation.Forward, view);
+                var rotationAngle = (float)Math.Acos(Vector3.Dot(Rotation.Forward, view) / Rotation.Forward.Length() / view.Length());
+                var rotationMatrix = Matrix.CreateFromAxisAngle(rotationAxis, rotationAngle);
+                var proj = new Projectile(Screen, Position, rotationMatrix, this);
+                proj.Direction = new Vector3(0, 0, 1);
+                scr.AddObject(proj);
+                DavyKager.Tolk.Output("Shoot!");
+            }
         }
 
         public override void OnCollision(IGameObject obj)
         {
+            if (obj.Type == ObjectType.Projectile)
+            {
+                var proj = (Projectile)obj;
+                if (proj.Owner == this) return;
+            }
             Health -= 10;
             if (obj.Type == ObjectType.Player)
             {
diff --git a/EvilSatellites/SatelliteSpawner.cs b/EvilSatellites/SatelliteSpawner.cs
index d8fd901..584e9fd 100644
--- a/EvilSatellites/SatelliteSpawner.cs
+++ b/EvilSatellites/SatelliteSpawner.cs
@@ -22,7 +22,7 @@ namespace EvilSatellites
 
         public void Spawn()
         {
-            for (var i = 0; i < Level*20; i++)
+            for (var i = 0; i < Level*1; i++)
             {
                 var player = Screen.Objects.Where((x) => x.Type == ObjectType.Player).FirstOrDefault();
                 var x = player.Position.X-250f + (float)rnd.NextDouble() * 500;
diff --git a/EvilSatellites/Screens/GameScreen.cs b/EvilSatellites/Screens/GameScreen.cs
index f62db19..54cec5a 100644
--- a/EvilSatellites/Screens/GameScreen.cs
+++ b/EvilSatellites/Screens/GameScreen.cs
@@ -213,5 +213,10 @@ namespace EvilSatellites.Screens
         {
             Addable.Add(obj);
         }
+
+        public Player GetPlayer()
+        {
+            return _player;
+        }
     }
 }
diff --git a/EvilSatellites/Weapons/LaserMG.cs b/EvilSatellites/Weapons/LaserMG.cs
index 6096f64..48a63ee 100644
--- a/EvilSatellites/Weapons/LaserMG.cs
+++ b/EvilSatellites/Weapons/LaserMG.cs
@@ -86,7 +86,7 @@ namespace EvilSatellites.Weapons
                 {
                     sfxShoot.Play();
                     TimerStart = TimerEnd;
-                    Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation);
+                    Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation, _wielder);
                     Screen.AddObject(proj);
                 }
             }