Skip to content
This repository was archived by the owner on Dec 21, 2022. It is now read-only.

Clean up Suggestions #2

Open
drusellers wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Clean up Suggestions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5269e59
It is standard practice to not commit generated files
drusellers Jul 24, 2016
6ae9025
splitting each class into its own file
drusellers Jul 24, 2016
abac38d
Debug flags and clean up of Map.cs
drusellers Jul 24, 2016
9b09fe4
adding level.txt back in and set the correct VS project options
drusellers Jul 24, 2016
f8be13f
Unneeded
drusellers Jul 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified game/.vs/game/v14/.suo
View file
Open in desktop
Binary file not shown.
189 changes: 189 additions & 0 deletions game/game/Game.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
using System;
using System.Threading;

namespace game
{
internal class Game
{
public Map map;
public Joueur player;

public Game()
{
this.map = new Map();
this.player = new Joueur(this.map);

Thread threadRefresh = new Thread(() =>
{
while (player.vivant)
{
Thread.Sleep(3);
RefreshMap();
}
});

Thread threadLaser = new Thread(() =>
{
while (player.vivant)
{
Thread.Sleep(10);
for (int i = 0; i != 24; i++)
{
for (int j = 0; j != 79; j++)
{
if (map.getElement(i, j) == 3) //laser
{
map.ajoutLaser(i, j + 1);
map.tejElement(i, j);
if (j < 78)
{
if (checkLaserCollision(i, j + 2))
{
map.tejElement(i, j + 1);
map.tejElement(i, j + 2);
}
j++;
}
else
{
map.tejElement(i, j + 1);
}
}
}
}
}
});

Thread threadBlocs = new Thread(() =>
{
while (player.vivant)
{
Thread.Sleep(300);
for (int i = 0; i != 24; i++)
{
for (int j = 0; j != 79; j++)
{
if (map.getElement(i, j) == 2 || map.getElement(i, j) == 4)
{
if (checkBlocCollision(i, j - 1) == true)
{
player.meurt();
}
else
{
if (map.getElement(i, j) == 2)
{
map.ajoutBlocGris(i, j - 1);
}
else
{
map.ajoutBlocVert(i, j - 1);
}

map.tejElement(i, j);

if (j < 2)
{
map.tejElement(i, j - 1);
}
}
}
}
}
}
});

threadRefresh.Start();
threadBlocs.Start();
threadLaser.Start();
}

public bool checkBlocCollision(int blocX, int blocY)
{
if (map.getElement(blocX, blocY) == 1)
{
System.Diagnostics.Debug.WriteLine("bloc collision: avec joueur");
return true;
}
else
{
return false;
}
}

public bool checkLaserCollision(int laserX, int laserY)
{
if (map.getElement(laserX, laserY) == 2)
{
System.Diagnostics.Debug.WriteLine("laser collision (bloc gris)");
return true;
}
else if (map.getElement(laserX, laserY) == 4)
{
System.Diagnostics.Debug.WriteLine("laser collision (bloc vert)");
map.plateau[laserX, laserY - 1] = 4;
return false;
}
else
{
return false;
}
}

public void RefreshMap()
{
int cursorPos = 0;
int[,] plateau = new int[25, 80];

for (int i = 0; i != 24; i++)
{
for (int j = 1; j != 80; j++)
{
plateau = map.getMap();

if (plateau[i, j] == 0) //vide
{
Console.Write(" ");
}
else if (plateau[i, j] == 1) //joueur
{
Console.ForegroundColor = ConsoleColor.Cyan;
Console.Write(player.sprite);
}
else if (plateau[i, j] == 3) //laser
{
Console.ForegroundColor = ConsoleColor.Red;
Console.Write("■");
}
else if (plateau[i, j] == 2) //bloc gris
{
if (j > 5)
{
Console.ForegroundColor = ConsoleColor.Gray;
}
else
{
Console.ForegroundColor = ConsoleColor.DarkGray;
}
Console.Write("█");
}
else if (plateau[i, j] == 4) //bloc vert
{
if (j > 5)
{
Console.ForegroundColor = ConsoleColor.Green;
}
else
{
Console.ForegroundColor = ConsoleColor.DarkGreen;
}
Console.Write("█");
}
}
cursorPos++;
Console.ResetColor();
Console.SetCursorPosition(0, cursorPos);
}
}
}
}
42 changes: 42 additions & 0 deletions game/game/Joueur.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
using System.Threading;

namespace game
{
internal class Joueur
{
public Map map;
public string sprite { get; set; }
public int posX;
public int posY;
public bool vivant;

public Joueur(Map mapGame)
{
this.map = mapGame;
this.posX = 10;
this.posY = 10;
this.sprite = ">";
this.vivant = true;
}

public void deplacer(int x, int y)
{
map.refreshPosPlayer(x, y, this.posX, this.posY);
this.posX = x;
this.posY = y;
}

public void tirer(int x, int y)
{
map.ajoutLaser(x, y);
}

public void meurt()
{
this.sprite = "x";
Thread.Sleep(100);
this.sprite = "";
this.vivant = false;
}
}
}
131 changes: 131 additions & 0 deletions game/game/Map.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
using System;
using System.Threading;

namespace game
{
internal class Map
{
public int[,] plateau = new int[25, 80];
public int[,] plateauFile = new int[25, 1000];

public Map()
{
this.plateau[10, 10] = 1; // emplacement initial du joueur
readShowMapFile();

Thread threadLevelMap = new Thread(() =>
{
int i = 0;
while (true)
{
Thread.Sleep(300);
for (int j = 1; j != 24; j++)
{
if (plateauFile[j, i] != 0)
{
this.plateau[j, 78] = plateauFile[j, i];
}
}
i++;
}
});

threadLevelMap.Start();
}

public void readShowMapFile()
{
string content;
int lineLenght = 0;
int i = 0;

using (System.IO.StreamReader file = new System.IO.StreamReader(@"level.txt"))
{

content = file.ReadToEnd();
string[] lines = content.Split(new string[] {"\r\n", "\n"}, StringSplitOptions.None);

foreach (string line in lines)
{
lineLenght = line.Length;
for (int j = 0; j != line.Length - 1; j++)
{

#if DEBUG
if (int.Parse(line[j].ToString()) == 2)
{
System.Diagnostics.Debug.WriteLine("j=" + j + ": i=" + i + ";");
Thread.Sleep(2550);
}
#endif

plateauFile[i, j] = int.Parse(line[j].ToString());
}
i++;

#if DEBUG

System.Diagnostics.Debug.WriteLine(line);

#endif
}

#if DEBUG

System.Diagnostics.Debug.WriteLine("---------------------------------");
Thread.Sleep(5000);
System.Diagnostics.Debug.WriteLine("START");
for (int k = 0; k != 24; k++)
{
for (int j = 1; j != 120; j++)
{
System.Diagnostics.Debug.Write(plateauFile[k, j]);
}
System.Diagnostics.Debug.WriteLine("");
}
System.Diagnostics.Debug.WriteLine("END");

#endif

file.Close();

}
}

public int[,] getMap()
{
return plateau;
}

public void refreshPosPlayer(int x, int y, int lx, int ly)
{
this.plateau[x, y] = 1;
this.plateau[lx, ly] = 0;
}

public void ajoutBlocGris(int x, int y)
{
this.plateau[x, y] = 2;
}

public void ajoutBlocVert(int x, int y)
{
this.plateau[x, y] = 4;
}

public void ajoutLaser(int x, int y)
{
this.plateau[x, y] = 3;
}

public void tejElement(int x, int y)
{
this.plateau[x, y] = 0;
}

public int getElement(int x, int y)
{
return this.plateau[x, y];
}
}
}
Loading