Changeset 3789

Timestamp:

2012-07-27 11:37:27 (11 years ago)

Author:

anlakane

Message:

Talletus.

Location:

2012/30/JyriP/X/X

Files:

• X/X.cs (modified) (12 diffs)
• XContent/XContent.contentproj (modified) (1 diff)
• XContent/dj_piisamirotta_-_avaruudesta_pudonnutta_p-P9o_aQOk3Jg_fmt34.mp4 (added)
• XContent/imgs/floor.png (added)
• XContent/maps/map1.png (modified) (previous)
• XContent/maps/map2.png (modified) (previous)
• XContent/maps/map3.png (added)
• XContent/music (added)
• XContent/music/LSL1Track01.ogg (added)
• XContent/music/dj_piisamirotta_-_avaruudesta_pudonnutta_p-P9o_aQOk3Jg_fmt34.mp4 (added)
• XContent/musics (added)
• XContent/musics/music2.mp3 (added)
• XContent/musics/theme.mp3 (added)

2012/30/JyriP/X/X/X/X.cs

@@ -14 +14 @@
     PhysicsObject goal;
     PhysicsObject border;
+    PhysicsObject floatingBridge;
+    PhysicsObject DropHouse;
     GameObject qwe;
 
@@ -26 +28 @@
     {
         // TODO: Kirjoita ohjelmakoodisi tähän
-        NextMap();
+        //Kopioi tämä NextMap();
+        MainMenu();
         IsMouseVisible = true;
         IsFullScreen = true;
     }
 
+    void MainMenu()
+    {
+        mapNum = 1;
+        ClearAll();
+        MediaPlayer.Play("musics/theme");
+        MultiSelectWindow mainMenu = new MultiSelectWindow("X", "Play", "Exit");
+        mainMenu.AddItemHandler(0, MapMenu);
+        mainMenu.AddItemHandler(1, ExitGame);
+        Add(mainMenu);
+    }
+
+    void MapMenu()
+    {
+        MultiSelectWindow MapList = new MultiSelectWindow("X Maps", "Hello World", "Run!", "QWE");
+        MapList.AddItemHandler(0, NextMap);
+        MapList.AddItemHandler(1, map2);
+        MapList.AddItemHandler(2, map3);
+        Add(MapList);
+    }
+
+    void map2()
+    {
+        mapNum = 2;
+        NextMap();
+    }
+
+    void map3()
+    {
+        MediaPlayer.Stop();
+        mapNum = 3;
+        NextMap();
+    }
+
+
     void NextMap()
     {
@@ -37 +74 @@
         Gravity = new Vector(0.0, -800.0);
         if (mapNum == 1) CreateMap("maps/map1");
-        else if (mapNum == 2) CreateMap("map2");
+        else if (mapNum == 2)
+        {
+            CreateMap("maps/map2");
+            MediaPlayer.Play("musics/music2");
+        }
+        else if (mapNum == 3)
+        {
+            MediaPlayer.Play("musics/theme");
+            CreateMap("maps/map3");
+        }
+        else if (mapNum == 4) MainMenu();
 
         Level.Background.FitToLevel();
@@ -46 +93 @@
         taustaAni.Start();
 
+        Camera.ZoomFactor = 0.99;
+
         qwe = new GameObject(Screen.Width, Screen.Height);
         qwe.X = Level.Left;
         qwe.Animation = taustaAni;
-        Add(qwe, -1);
+        Add(qwe, -2);
 
         
@@ -65 +114 @@
         tile.SetTileMethod(Color.Yellow, CreateGoal);
         tile.SetTileMethod(Color.FromHexCode("ff0000"), CreateBorder);
-
+        tile.SetTileMethod(Color.FromHexCode("a4a4a4"), CreateFloor);
+        tile.SetTileMethod(Color.FromHexCode("9f9f9f"), CreateHouseDrop);
+        tile.SetTileMethod(Color.FromHexCode("822b00"), CreateFloatingBridge);
         tile.SetTileMethod(Color.FromHexCode("cccccc"), CreateBgWall);
 
@@ -82 +133 @@
 
         AddCollisionHandler<PlatformCharacter, PhysicsObject>(player, "break", onHitWindow);
+        AddCollisionHandler<PlatformCharacter, PhysicsObject>(player, "drop", onHitFloatingBridge);
+        AddCollisionHandler<PlatformCharacter, PhysicsObject>(player, "dropHouse", onHitDropHouse);
         AddCollisionHandler<PlatformCharacter, PhysicsObject>(player, "die", onHitHouse);
         AddCollisionHandler<PlatformCharacter, PhysicsObject>(player, "border", onHitHouse);
@@ -89 +142 @@
         Keyboard.Listen(Key.LeftControl, ButtonState.Pressed, Jump, "", player, 800.0);
         Keyboard.Listen(Key.R, ButtonState.Pressed, NextMap, "");
-        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ExitGame, "");
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, MainMenu, "");
 
 
@@ -96 +149 @@
         ControllerOne.Listen(Button.X, ButtonState.Pressed, Jump, "", player, 800.0);
         ControllerOne.Listen(Button.RightShoulder, ButtonState.Pressed, NextMap, "");
-        ControllerOne.Listen(Button.Back, ButtonState.Pressed, ExitGame, "");
-        Add(player);
+        ControllerOne.Listen(Button.Back, ButtonState.Pressed, MainMenu, "");
+        ControllerOne.Listen(Button.Start, ButtonState.Pressed, MainMenu, "");
+        Add(player, 2);
     }
 
     void onHitWindow(PlatformCharacter player, PhysicsObject window)
     {
-        window.Destroy();        
+        window.IgnoresGravity = false;
+        Timer.SingleShot(1.0, delegate { window.Destroy(); });
+
+    }
+
+    void onHitFloatingBridge(PlatformCharacter player, PhysicsObject floatingBridge)
+    {
+        floatingBridge.IgnoresGravity = false;
+        Timer.SingleShot(1.0, delegate { floatingBridge.Destroy(); });
+
+    }
+
+    void onHitDropHouse(PlatformCharacter player, PhysicsObject floatingBridge)
+    {
+        DropHouse.IgnoresGravity = false;
+        Timer.SingleShot(3.0, delegate { DropHouse.Destroy(); });
+
     }
 
@@ -148 +218 @@
     }
 
+    void CreateHouseDrop(Vector pos, double width, double height)
+    {
+        DropHouse = PhysicsObject.CreateStaticObject(width, height);
+        Image DropHouseImg = Game.LoadImage("imgs/housePart");
+        DropHouse.Position = pos;
+        DropHouse.Image = DropHouseImg;
+        DropHouse.CollisionIgnoreGroup = 1;
+        DropHouse.IgnoresGravity = true;
+        DropHouse.Mass = 50;
+        DropHouse.CanRotate = false;
+        DropHouse.Tag = "dropHouse";
+        Add(DropHouse);
+    }
+
     void CreateRoof(Vector pos, double width, double height)
     {
@@ -160 +244 @@
     void CreateWindow(Vector pos, double width, double height)
     {
-        window = PhysicsObject.CreateStaticObject(16, height);
+        window = new PhysicsObject(24, height);
         Image windowImg = Game.LoadImage("imgs/window");
+        window.IgnoresGravity = true;
         window.Position = pos;
         window.Image = windowImg;
         window.CollisionIgnoreGroup = 1;
+        window.Mass = 5;
         window.Tag = "break";
-        Add(window);
+        Add(window, 1);
+    }
+
+    void CreateFloatingBridge(Vector pos, double width, double height)
+    {
+        floatingBridge = new PhysicsObject(width, height);
+        Image floatingBridgeImg = Game.LoadImage("imgs/floor");
+        floatingBridge.IgnoresGravity = true;
+        floatingBridge.Position = pos;
+        floatingBridge.Image = floatingBridgeImg;
+        floatingBridge.CollisionIgnoreGroup = 1;
+        floatingBridge.Mass = 5;
+        floatingBridge.Tag = "drop";
+        Add(floatingBridge, 1);
+    }
+
+
+
+    void CreateFloor(Vector pos, double width, double height)
+    {
+        PhysicsObject floor = PhysicsObject.CreateStaticObject(width, height);
+        Image floorImg = Game.LoadImage("imgs/floor");
+        floor.Position = pos;
+        floor.Image = floorImg;
+        floor.CollisionIgnoreGroup = 1;
+        Add(floor);
     }
 
@@ -174 +285 @@
         Image borderImg = Game.LoadImage("imgs/border");
         border.Position = pos;
+        border.CollisionIgnoreGroup = 0;
         border.Image = borderImg;
         border.Tag = "border";
@@ -197 +309 @@
         wall.Position = pos;
         wall.Image = wallImg;
-        Add(wall);
+        Add(wall, -1);
     }
 

2012/30/JyriP/X/X/XContent/XContent.contentproj

@@ -189 +189 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="map2.png">
-      <Name>map2</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="imgs\wall\wall.png">
       <Name>wall</Name>
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="maps\map2.png">
+      <Name>map2</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="imgs\floor.png">
+      <Name>floor</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="maps\map3.png">
+      <Name>map3</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="musics\theme.mp3">
+      <Name>theme</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="musics\music2.mp3">
+      <Name>music2</Name>
+      <Importer>Mp3Importer</Importer>
+      <Processor>SongProcessor</Processor>
     </Compile>
   </ItemGroup>