Changeset 6334 for 2014/30

Timestamp:

2015-06-25 11:29:24 (8 years ago)

Author:

anlakane

Message:

 

Location:

2014/30/MitjaK/Attack to Agora/Attack to Agora

Files:

• Attack to Agora.sln (modified) (2 diffs)
• Attack to Agora/Attack to Agora/Attack to Agora.csproj (modified) (3 diffs)
• Attack to Agora/Attack to Agora/Attack_to_Agora.cs (modified) (8 diffs)
• Attack to Agora/Attack to Agora/Elava.cs (added)

2014/30/MitjaK/Attack to Agora/Attack to Agora/Attack to Agora.sln

@@ -4 +4 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Attack to Agora", "Attack to Agora\Attack to Agora\Attack to Agora.csproj", "{DDF55303-D454-45BC-81E0-ED7879E29D5C}"
 EndProject
-Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "Attack to AgoraContent", "Attack to Agora\Attack to AgoraContent\Attack to AgoraContent.contentproj", "{2930AD0E-5824-4386-8008-3C0C45D1DA86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Attack to AgoraContent", "Attack to Agora\Attack to AgoraContent\Attack to AgoraContent.contentproj", "{2930AD0E-5824-4386-8008-3C0C45D1DA86}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jypeli", "Muokattu Jypeli\Jypeli.csproj", "{74DD1DDD-283D-45D7-A79D-3DCB120708A6}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|x86 = Debug|x86
+                DebugVisualize|x86 = DebugVisualize|x86
                 Release|x86 = Release|x86
         EndGlobalSection
@@ -14 +17 @@
                 {DDF55303-D454-45BC-81E0-ED7879E29D5C}.Debug|x86.ActiveCfg = Debug|x86
                 {DDF55303-D454-45BC-81E0-ED7879E29D5C}.Debug|x86.Build.0 = Debug|x86
+                {DDF55303-D454-45BC-81E0-ED7879E29D5C}.DebugVisualize|x86.ActiveCfg = Debug|x86
+                {DDF55303-D454-45BC-81E0-ED7879E29D5C}.DebugVisualize|x86.Build.0 = Debug|x86
                 {DDF55303-D454-45BC-81E0-ED7879E29D5C}.Release|x86.ActiveCfg = Release|x86
                 {DDF55303-D454-45BC-81E0-ED7879E29D5C}.Release|x86.Build.0 = Release|x86
                 {2930AD0E-5824-4386-8008-3C0C45D1DA86}.Debug|x86.ActiveCfg = Debug|x86
+                {2930AD0E-5824-4386-8008-3C0C45D1DA86}.DebugVisualize|x86.ActiveCfg = Debug|x86
                 {2930AD0E-5824-4386-8008-3C0C45D1DA86}.Release|x86.ActiveCfg = Release|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.Debug|x86.ActiveCfg = Debug|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.Debug|x86.Build.0 = Debug|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.DebugVisualize|x86.ActiveCfg = DebugVisualize|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.DebugVisualize|x86.Build.0 = DebugVisualize|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.Release|x86.ActiveCfg = Release|x86
+                {74DD1DDD-283D-45D7-A79D-3DCB120708A6}.Release|x86.Build.0 = Release|x86
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

2014/30/MitjaK/Attack to Agora/Attack to Agora/Attack to Agora/Attack to Agora/Attack to Agora.csproj

@@ -62 +62 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Jypeli">
-    </Reference>
     <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
       <Private>False</Private>
@@ -118 +116 @@
     <Compile Include="Attack_to_Agora.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Elava.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -151 +150 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Muokattu Jypeli\Jypeli.csproj">
+      <Project>{74DD1DDD-283D-45D7-A79D-3DCB120708A6}</Project>
+      <Name>Jypeli</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Attack to AgoraContent\Attack to AgoraContent.contentproj">
       <Project>{2930AD0E-5824-4386-8008-3C0C45D1DA86}</Project>

2014/30/MitjaK/Attack to Agora/Attack to Agora/Attack to Agora/Attack to Agora/Attack_to_Agora.cs

@@ -24 +24 @@
     Image cCaseF = LoadImage("caseavausruutu");
 
-    PlatformCharacter taistelija;
+    Elava taistelija;
+    AssaultRifle taistelijanAse;
+    const double ASEEN_DMG = 25.0;
+    const double WEAPON_INACCURACY = 20.0;
+    bool walkBackwards = false;
 
     int kenttaNro = 1;
@@ -40 +44 @@
         taustamusiikki_1.Play();
     }
+
+    protected override void Update(Time time)
+    {
+        if (!walkBackwards)
+        {
+            if (taistelija.Velocity.X < 0)
+                taistelijanAse.Angle = Angle.FromDegrees(180.0);
+            if (taistelija.Velocity.X > 0)
+                taistelijanAse.Angle = Angle.FromDegrees(0.0);
+        }
+        base.Update(time);
+    }
+
+    /// <summary>
+    /// Pimennetään ruutua pikku hiljaa.
+    /// Oletusnopeus 0.01.
+    /// </summary>
+    public void PimennaRuutua(double nopeus)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = 0.1;
+        ajastin.Timeout += delegate
+        {
+            Level.AmbientLight -= nopeus;
+            if (Level.AmbientLight <= 0.0)
+            {
+                ajastin.Stop();
+                ajastin.Reset();
+            }
+        };
+        ajastin.Start();
+    }
+    /// <summary>
+    /// Kirkastetaan ruutua pikku hiljaa.
+    /// </summary>
+    public void KirkastaRuutua(double nopeus, double tavoite)
+    {
+        Timer ajastin = new Timer();
+        ajastin.Interval = 0.1;
+        ajastin.Timeout += delegate
+        {
+            //if (Level.AmbientLight > 0.1) return;
+            Level.AmbientLight += nopeus;
+            if (Level.AmbientLight > tavoite)
+            {
+                ajastin.Stop();
+                ajastin.Reset();
+            }
+        };
+        ajastin.Start();
+    }
+
+    /// <summary>
+    /// Piirretään valojuovia.
+    /// </summary>
+    /// <param name="position">Valojuovan tämänhetkinen sijainti.</param>
+    /// <param name="color">Valojuovan väri.</param>
+    /// <param name="lifetimeInSeconds">Kauanko valojuova pysyy kentällä.</param>
+    void DrawTracers(Vector position, Color color, double lifetimeInSeconds, double brightnessFactor)
+    {
+        color.AlphaComponent = (byte)(32 * brightnessFactor); // 64 toimii
+        GameObject tracer = new GameObject(2, 2);
+        tracer.Shape = Shape.Circle;
+        tracer.Color = color;
+        tracer.Position = position;
+        tracer.MaximumLifetime = TimeSpan.FromSeconds(lifetimeInSeconds);
+        Add(tracer);
+    }
+    /// <summary>
+    /// Piirretään valojuovia.
+    /// </summary>
+    /// <param name="tracingObject">Olio, josta valojuovat tulevat.</param>
+    /// <param name="color">Valojuovan väri.</param>
+    /// <param name="lifetimeInSeconds">Kauanko valojuova pysyy kentällä.</param>
+    /// <param name="brightnessFactor">Valojuovan kirkkaus.</param>
+    void DrawTracers(PhysicsObject tracingObject, Color color, double lifetimeInSeconds, double brightnessFactor)
+    {
+        color.AlphaComponent = (byte)(32 * brightnessFactor); // 64 toimii
+        GameObject tracer = new GameObject(90, 2);
+        tracer.Shape = Shape.Circle;
+        tracer.Color = color;
+        tracer.Position = tracingObject.Position;
+        tracer.Angle = tracingObject.Angle;
+        tracer.MaximumLifetime = TimeSpan.FromSeconds(lifetimeInSeconds);
+        Add(tracer);
+    }
+
 
     void Liikuta(PlatformCharacter pelaaja, double suunta)
@@ -67 +158 @@
     {
         SmoothTextures = false;
-        IsFullScreen = true;
+        // IsFullScreen = true;
         Gravity = new Vector(0, -2500);
         // Synkataan taustakuvan ja colortilemapin pikselit
@@ -96 +187 @@
         vasenreuna.X -= 75;
         vasenreuna.Tag = "vasenreuna";
-        //PhysicsObject oikeareuna = Level.CreateRightBorder();
-        //oikeareuna.X += 75;
-        //oikeareuna.Tag = "oikeareuna";
+        PhysicsObject oikeareuna = Level.CreateRightBorder();
+        oikeareuna.Tag = "oikeareuna";
 
         Varjo();
@@ -106 +196 @@
     {
 
-        taistelija = new PlatformCharacter(75, 75);
+        taistelija = new Elava(75, 75, 100.0);
         taistelija.Shape = Shape.Rectangle;
         taistelija.Animation = new Animation(chuckinkavely);
@@ -118 +208 @@
         Camera.Follow(taistelija);
         Camera.StayInLevel = true;
+
+        taistelijanAse = new AssaultRifle(20, 10);
+        taistelijanAse.FireRate = 20;
+        taistelijanAse.InfiniteAmmo = true;
+        taistelijanAse.Power.Value = 750;
+        taistelijanAse.Power.DefaultValue = 750;
+        taistelija.Add(taistelijanAse);
     }
 
@@ -263 +360 @@
         Keyboard.Listen(Key.Space, ButtonState.Pressed, LiikutaYlos, null, taistelija);
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+        Keyboard.Listen(Key.Enter, ButtonState.Down, Ammu, null);
+        Keyboard.Listen(Key.LeftShift, ButtonState.Pressed, delegate { walkBackwards = true; }, null);
+        Keyboard.Listen(Key.LeftShift, ButtonState.Released, delegate { walkBackwards = false; }, null);
 
 #if DEBUG
@@ -269 +369 @@
     }
 
+    void Ammu()
+    {
+        if (taistelijanAse == null) 
+            return;
+
+        PhysicsObject ammus = taistelijanAse.Shoot();
+
+        if (ammus == null) 
+            return;
+        ammus.Size *= 0.2;
+
+        ammus.Hit(new Vector(0.0, RandomGen.NextDouble(-WEAPON_INACCURACY, WEAPON_INACCURACY)));
+        ammus.IsUpdated = true;
+        ammus.NeedsUpdateCall = true;
+        ammus.CanRotate = false;
+        ammus.Updated += delegate(PhysicsObject a) 
+        { 
+             DrawTracers(a, Color.Yellow, 0.2, 2.0); 
+        };
+
+        AddCollisionHandler(ammus, "vihollinen", AmmusOsuuViholliseen);
+        ammus.Collided += delegate { ammus.Destroy(); };
+    }
+
+    void AmmusOsuuViholliseen(PhysicsObject ammus, PhysicsObject kohde)
+    {
+        Elava vihu = kohde as Elava;
+
+        if (vihu == null) return;
+
+        vihu.Damagea(ASEEN_DMG);
+    }
+
     void VoititPelin()
     {