Changeset 1822 for 2011/23/sijoseha/AdventureGame/AdventureGame

Timestamp:

2011-06-09 15:14:45 (10 years ago)

Author:

tekrjant

Message:

Generates random map on startup.
Saving works and loading added
Minor "optimization" done

Location:

2011/23/sijoseha/AdventureGame/AdventureGame

Files:

• AdventureGame.cs (modified) (7 diffs)
• Button.cs (modified) (2 diffs)
• HUD.cs (modified) (1 diff)
• Map.cs (modified) (2 diffs)
• Tile.cs (modified) (2 diffs)

2011/23/sijoseha/AdventureGame/AdventureGame/AdventureGame.cs

@@ -73 +73 @@
 
             CreateViews();
-            gameMap = new Map(this, tileImage, TILE_SIZE, 20, 20);
+            gameMap = new Map(this, tileImage, TILE_SIZE, 5000, 5000);
             CreateHUD();
 
@@ -137 +137 @@
                             else
                                 button.Pressed();
+                    }
+                }
+            }
+
+            if (previousMouseState.RightButton == ButtonState.Released && mouseState.RightButton == ButtonState.Pressed)
+            {
+                if (mouseState.X < gameHUD.ViewPort.X)
+                {
+                    Vector2 mouseWorldPos = gameCamera.getMouseWorldPos(new Vector2(mouseState.X, mouseState.Y), mapView);
+                    Rectangle mousePos = new Rectangle((int)mouseWorldPos.X, (int)mouseWorldPos.Y, 1, 1);
+                    foreach (Tile tile in gameMap.Tiles)
+                    {
+                        if (mousePos.Intersects(tile.Boundaries))
+                        {
+                            gameMap.ChangeTileTo(tile, gameHUD.SelectedButton.RelatedTileType);
+                        }
                     }
                 }
@@ -187 +203 @@
             DrawMap();
             DrawHUD();
-            DrawMiniMap();
+            //DrawMiniMap();
             base.Draw(gameTime);
         }
@@ -239 +255 @@
             gameHUD = new HUD();
             gameHUD.ViewPort = hudView;
-            gameHUD.AddButton(new Button
+            Button LoadButton = new Button
+                (new Rectangle(10, 150, 150, 40),
+                "Load", Color.YellowGreen, Color.Red, GraphicsDevice);
+            LoadButton.Clicked += LoadMap;
+            gameHUD.AddButton(LoadButton);
+
+            Button SaveButton = new Button
                 (new Rectangle(10, 10, 150, 40),
-                "Save", Color.YellowGreen, Color.Red, GraphicsDevice, SaveMap));
-            
-            gameHUD.AddButton(new Button(
-                new Rectangle(10,60,32,32), gameMap.textureType[TileType.Grass],
-                Color.Red, true, GraphicsDevice));
+                "Save", Color.YellowGreen, Color.Red, GraphicsDevice);
+
+            SaveButton.Clicked += SaveMap;
+            gameHUD.AddButton(SaveButton);
+
+            Button grassButton = new Button(
+                new Rectangle(10, 60, 32, 32), gameMap.textureType[TileType.Grass],
+                Color.Red, true, GraphicsDevice);
+            grassButton.RelatedTileType = TileType.Grass;
+
+            Button sandButton = new Button(
+                new Rectangle(10, 100, 32, 32), gameMap.textureType[TileType.Sand],
+                Color.Red, true, GraphicsDevice);
+            sandButton.RelatedTileType = TileType.Sand;
+
+            gameHUD.AddButton(grassButton);
+            gameHUD.AddButton(sandButton);
             gameHUD.AddMiniMap(new MiniMap(gameMap, miniMapView, miniMapBorders));
 
@@ -253 +287 @@
         {
             return false;
+        }
+
+        private void LoadMap(object sender, EventArgs e)
+        {
+            using (FileStream mapLoad = new FileStream("savedMap", FileMode.Open, FileAccess.Read))
+            {
+                using (BinaryReader r = new BinaryReader(mapLoad))
+                {
+                    int amount = r.ReadInt32();
+                    for (int i = 0; i < amount; i++)
+                    {
+                        int tile = r.ReadInt32();
+                        int x = r.ReadInt32();
+                        int y = r.ReadInt32();
+                        bool passable = r.ReadBoolean();
+                        Tile newTile = new Tile((TileType)tile,
+                            new Rectangle(x,y,TILE_SIZE,TILE_SIZE));
+                        newTile.Passable = passable;
+                        gameMap.Tiles.Add(newTile);
+                    }
+                }
+            }
         }
 
@@ -268 +324 @@
                         w.Write((int)tile.Position.X);
                         w.Write((int)tile.Position.Y);
+                        w.Write(tile.Passable);
                     }
                 }
@@ -284 +341 @@
                             int x = r.ReadInt32();
                             int y = r.ReadInt32();
-                            random.WriteLine(tile.ToString() + ' ' + x.ToString() + ' ' + y.ToString());
+                            bool passable = r.ReadBoolean();
+                            random.WriteLine(tile.ToString() + ' ' + x.ToString() + ' ' + y.ToString() + ' ' + passable.ToString());
                         }
                     }

2011/23/sijoseha/AdventureGame/AdventureGame/Button.cs

@@ -26 +26 @@
         public bool Selectable { get; set; }
         public bool Selected { get; set; }
+        public TileType RelatedTileType { get; set; }
+
 
         public Button(Rectangle boundaries, Texture2D texture, Color borderColor, bool selectable, GraphicsDevice device)
@@ -31 +33 @@
             this.Boundaries = boundaries;
             this.BorderColor = borderColor;
+            this.Selectable = selectable;
             this.Image = CreateTexture(borderColor, texture, device);
             this.SelectedImage = CreateTexture(Color.White, texture, device);
         }
 
-        public Button(Rectangle boundaries, string text, Color bgColor, Color borderColor, GraphicsDevice device, ButtonClickedHandler clickAction)
+        public Button(Rectangle boundaries, string text, Color bgColor, Color borderColor, GraphicsDevice device)//, ButtonClickedHandler clickAction)
         {
             this.Boundaries = boundaries;

2011/23/sijoseha/AdventureGame/AdventureGame/HUD.cs

@@ -15 +15 @@
 
         public Button SelectedButton;
+        public TileType SelectedTileButtonType;
 
         public HUD()

2011/23/sijoseha/AdventureGame/AdventureGame/Map.cs

@@ -31 +31 @@
             for (int x = 0; x < mapWidth; x++)
                 for (int y = 0; y < mapHeight; y++)
-                    this.Tiles.Add(new Tile(TileType.Grass, new Rectangle(x * 32, y * 32, tileSize, tileSize))); 
+                {
+                    int tileT = r.Next(1, 5);
+                    Tile newTile = new Tile(
+                        (TileType)tileT, new Rectangle(x * 32, y * 32, tileSize, tileSize));
+                    if (tileT != 2)
+                        newTile.Passable = true;
+                    else
+                        newTile.Passable = false;
+                    this.Tiles.Add(newTile);
+                }
         }
 
@@ -53 +62 @@
             tile.Selected = true;
             SelectedTile = tile;
+        }
+
+        public void ChangeTileTo(Tile tile, TileType tileType)
+        {
+            tile.TileType = tileType;
         }
 

2011/23/sijoseha/AdventureGame/AdventureGame/Tile.cs

@@ -19 +19 @@
         public Vector2 Position { get { return new Vector2(Boundaries.X, Boundaries.Y); } set{} }
         public Rectangle Boundaries { get; set; }
-        public int Width { get { return Boundaries.Width; } private set {} }
-        public int Height { get { return Boundaries.Height; } private set { } }
-        public Texture2D Image { get; set; }
+        //public int Width { get { return Boundaries.Width; } private set {} }
+        //public int Height { get { return Boundaries.Height; } private set { } }
         public bool Selected { get; set; }
         public TileType TileType { get; set; }
+
+        public bool Passable { get; set; }
 
         public Tile(TileType tileType, Rectangle boundaries)
@@ -33 +34 @@
         public Tile(Texture2D image, Vector2 position, int width, int height)
         {
-            this.Image = image;
             this.Boundaries = new Rectangle((int)position.X, (int)position.Y, width, height);
         }