Changeset 5608

Timestamp:

2014-07-23 23:44:29 (9 years ago)

Author:

mijoliim

Message:

 

Location:

2014/30/MikkoL/Gradiant/LM2

Files:

• LM2/Gradiant.cs (modified) (28 diffs)
• LM2Content/GradiantContent.contentproj (modified) (2 diffs)
• LM2Content/earth.png (deleted)
• LM2Content/level_02.txt (modified) (1 diff)
• LM2Content/stage1_bg.png (added)
• LM2Content/stage2_bg.png (modified) (previous)

2014/30/MikkoL/Gradiant/LM2/LM2/Gradiant.cs

@@ -96 +96 @@
 
     string currentlevel = "level_test";
+
+    #region Images
 
     //Player
@@ -138 +140 @@
     Image border_bottom = LoadImage("border_top");
     //Backgrounds
-    Image earth = LoadImage("earth");
+    Image stage1_bg = LoadImage("stage1_bg");
     Image stage2_bg = LoadImage("stage2_bg");
-    //Explosion
+    //Animations
     private Animation explosion_anim;
     private Animation droid_anim;
@@ -163 +165 @@
     Image aj = LoadImage("aj-weed");
 
-    //SFX
+    #endregion
+
+    #region SFX
+
     SoundEffect hurtsfx = LoadSoundEffect("hurt");
     SoundEffect hitsfx = LoadSoundEffect("hit");
@@ -172 +177 @@
     SoundEffect enemy_shootsfx = LoadSoundEffect("enemy_shoot");
 
+    #endregion
+
     //Weapon
     double wpn_shootRate = 0.1;
@@ -182 +189 @@
     IntMeter drd_damageRatio = new IntMeter(1, 1, 20);
 
-    //drd types
-    //1: spreadshot
-    //3: laser
-
     //Collision ignore groups
     //2: player bullets/enemy bullets
@@ -191 +194 @@
     //4: powerups
 
+    ProgressBar healthBar;
     Timer wpn_timer = new Timer();
 
@@ -316 +320 @@
     void Start()
     {
+        ClearControls();
+
         selectsfx.Play();
         MediaPlayer.Stop();
@@ -321 +327 @@
         black.Position = cntr;
         black.Color = Color.Transparent;
-        black.FadeColorTo(Color.Black, 1);
+        black.FadeColorTo(Color.Black, 0.5);
         Add(black, 2);
 
         Timer wait = new Timer();
-        wait.Interval = 1.5;
+        wait.Interval = 1;
         wait.Timeout += delegate
         {
@@ -364 +370 @@
         if (!s001)
         {
-            black.FadeColorTo(Color.Transparent, 1);
-
+            black.FadeColorTo(Color.Transparent, 0.5);
+            Timer.SingleShot(0.5, AddHealthbar);
 
             s001 = true;
@@ -377 +383 @@
         if (!s002)
         {
-            black.FadeColorTo(Color.Transparent, 1);
+            black.FadeColorTo(Color.Transparent, 0.5);
+            Timer.SingleShot(0.5, AddHealthbar);
 
             s002 = true;
@@ -386 +393 @@
     }
 
-    //Stage creation
+    #region Stage Creation
+
     void CreateLevel(string level)
     {
@@ -417 +425 @@
         bg = new GameObject(1280, 800);
         bg.Position = cntr;
-        bg.Image = earth;
+        bg.Image = stage1_bg;
         bg.MoveTo(cntr - new Vector(1280, 0), 900);
 
         bg2 = new GameObject(1280, 800);
         bg2.Position = cntr+new Vector(1280,0);
-        bg2.Image = earth;
+        bg2.Image = stage1_bg;
         bg2.MoveTo(cntr, 900);
 
@@ -445 +453 @@
 
         AddControls();
-        AddHealthbar();
 
         Camera.Position = player.Position;
@@ -482 +489 @@
         //edgeBorders();
     }
-    //Tiles for level
+
     void border(Vector position, double width, double height)
     {
@@ -500 +507 @@
         border2.Color = Color.Transparent;
         border2.Tag = "filler";
+        border2.MaximumLifetime = TimeSpan.FromSeconds(1);
         Add(border2, 1);
     }
@@ -590 +598 @@
     }
 
-    //Player related                
+    #endregion
+
+    #region Player
+              
     void AddPlayer(Vector pos, double width, double height)
     {
@@ -638 +649 @@
     void AddHealthbar()
     {
-        ProgressBar healthBar = new ProgressBar(135, 10);
+        healthBar = new ProgressBar(135, 10);
         healthBar.BorderColor = Color.Black;
         healthBar.Color = Color.Black;
@@ -739 +750 @@
     }
 
-
-    //Weapon system
+    #endregion
+
+    #region Weapons
+
     void shoot()
     {
@@ -1018 +1031 @@
 
     }
-    
-    //Enemies
+
+    #endregion
+
+    #region Enemies
+
     void enemy_ship_1(Vector pos, double width, double height)
     {
@@ -1452 +1468 @@
         enemyship.IgnoresCollisionResponse = true;
         enemyship.CollisionIgnoreGroup = 3;
-        enemyship.health.MaxValue = 100;
+        enemyship.health.MaxValue = 70;
         enemyship.Image = enemy_ship_06;
         enemyship.explosion_scale = 70;
@@ -1618 +1634 @@
     }
 
-    //Bosses
+    #endregion
+
+    #region Bosses
+
     void boss_ship_1(Vector pos, double width, double height)
     {
@@ -1631 +1650 @@
         boss_ship.Hit(stagespeed);
         AddCollisionHandler<boss, frontborder>(boss_ship, boss_01_start);
-        AddCollisionHandler<boss, bullet>(boss_ship, damageBoss);
         AddCollisionHandler<boss, player>(boss_ship, damagePlayerBossShip);
     }
@@ -1646 +1664 @@
             {
                 MediaPlayer.Play("Andross");
+                AddCollisionHandler<boss, bullet>(boss, damageBoss);
                 MediaPlayer.Volume = 1;
                 boss.Velocity = new Vector(0, 0);
@@ -1810 +1829 @@
     }
 
-
-    //Power-ups
+    #endregion
+
+    #region Power-ups
+
     void powerup(Vector pos)
     {
@@ -1981 +2002 @@
     }
 
-    //Misc
+    #endregion
+
+    #region Misc/Colliders
+
     void destroy(PhysicsObject p, PhysicsObject target)
     {
@@ -2102 +2126 @@
     void nextlevel()
     {
+        ClearControls();
+
         if (currentlevel == "level_test")
         {
             SoundEffect.MasterVolume = 1;
+            healthBar.Destroy();
 
             selectsfx.Play();
             stage_clear.Destroy();
-            MediaPlayer.Stop();
+
+            Timer fade = new Timer();
+            fade.Interval = 0.03;
+            fade.Timeout += delegate
+            {
+                MediaPlayer.Volume = MediaPlayer.Volume - 0.1;
+                if (MediaPlayer.Volume == 0)
+                {
+                    fade.Stop();
+                    MediaPlayer.Stop();
+                    MediaPlayer.Volume = 1;
+                }
+            };
+            fade.Start();
 
             black = new GameObject(Screen.Width,Screen.Height);
@@ -2115 +2155 @@
 
             Add(black, 2);
-            black.FadeColorTo(Color.Black, 1);
+            black.FadeColorTo(Color.Black, 0.5);
 
 
             Timer wait = new Timer();
-            wait.Interval = 1.5;
+            wait.Interval = 1;
             wait.Timeout += delegate
             {
+                drd_level.Value = 0;
+                wpn_damageRatio.Value = 1;
+                wpn_spread.Value = 1;
+
                 bg.Image = stage2_bg;
                 bg2.Image = stage2_bg;
@@ -2202 +2246 @@
         }
     }
+
+    #endregion
 }

2014/30/MikkoL/Gradiant/LM2/LM2Content/GradiantContent.contentproj

@@ -202 +202 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="space_bg.png">
-      <Name>space_bg</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="bullet_enemy_02.png">
       <Name>bullet_enemy_02</Name>
@@ -223 +216 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="earth.png">
-      <Name>earth</Name>
+    <Compile Include="stage1_bg.png">
+      <Name>stage1_bg</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>

2014/30/MikkoL/Gradiant/LM2/LM2Content/level_02.txt

@@ -21 +21 @@
 @@                                     @@
 @@                                     @@
-@@                  @                  @@                    6        6        6
+@@                  @                  @@                                                                                                              6
 @@                                     @@
 @@                                     @@