Hausmeisterarbeiten

This commit is contained in:
2014-04-03 11:47:37 +02:00
parent b4a84997fe
commit 06e069c052
10 changed files with 265 additions and 330 deletions

View File

@@ -52,10 +52,11 @@
<Compile Include="src\DefaultGui\test\MapCell.cs" />
<Compile Include="src\Dragon.cs" />
<Compile Include="src\Map.cs" />
<Compile Include="src\Player.cs" />
<Compile Include="src\Program.cs" />
<Compile Include="src\Start.cs" />
<Compile Include="src\Tile.cs" />
<Compile Include="src\Entity.cs" />
<Compile Include="src\Player.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="src\DefaultGui\" />

View File

@@ -11,12 +11,12 @@ namespace Frontend
/// <summary>
/// Der Haupteinstiegspunkt für die Anwendung.
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new DefaultGui(new Backend()));
}
//[STAThread]
//static void Main()
//{
// Application.EnableVisualStyles();
// Application.SetCompatibleTextRenderingDefault(false);
// Application.Run(new DefaultGui(new Backend()));
//}
}
}

View File

@@ -4,86 +4,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
public class Dragon
namespace WorldOfPeacecraft
{
public int id;
public int posX;
public int posY;
public int points;
public string type;
public bool busy;
public Dragon(int id, int posX, int posY, int points, string type, bool busy)
public class Dragon : Entity
{
this.setId(id);
this.setPosX(posX);
this.setPosY(posY);
this.setPoints(points);
this.setType(type);
this.setBusy(busy);
}
public void setId(int id)
public Dragon(int id, int posX, int posY, string desc, bool busy) : base(id, posX, posY, desc, busy)
{
this.id = id;
// Nothing to do
}
public int getId()
{
return id;
}
public void setPosX(int x)
{
this.posX = x;
}
public int getPosX()
{
return posX;
}
public void setPosY(int y)
{
this.posY = y;
}
public int getPosY()
{
return posY;
}
public void setPoints(int points)
{
this.points = points;
}
public int getPoints()
{
return points;
}
public void setType(string type)
{
this.type = type;
}
public string getType()
{
return type;
}
public void setBusy(bool busy)
{
this.busy = busy;
}
public bool getBusy()
{
return busy;
}
}

73
src/Entity.cs Normal file
View File

@@ -0,0 +1,73 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Frontend;
namespace WorldOfPeacecraft
{
public abstract class Entity : IPositionable
{
public int id;
public int posX;
public int posY;
public string desc;
public bool busy;
public Entity (int id, int posX, int posY, string desc, bool busy)
{
this.setId (id);
this.setPosX (posX);
this.setPosY (posY);
this.setDesc (desc);
this.setBusy (busy);
}
public void setId (int id)
{
this.id = id;
}
public int getId ()
{
return id;
}
public void setPosX (int x)
{
this.posX = x;
}
public int getXPosition ()
{
return posX;
}
public void setPosY (int y)
{
this.posY = y;
}
public int getYPosition ()
{
return posY;
}
public void setDesc (string desc)
{
this.desc = desc;
}
public void setBusy (bool busy)
{
this.busy = busy;
}
public bool getBusy ()
{
return busy;
}
}
}

View File

@@ -1,7 +1,7 @@
using System;
namespace WorldOfPeacecraft
{
public class Map
{
public Tile[,] map;
@@ -23,6 +23,6 @@
return map [x, y];
}
}
}

View File

@@ -1,89 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
public class Player
namespace WorldOfPeacecraft
{
public int id;
public int posX;
public int posY;
public int points;
public string type;
public bool busy;
public Player(int id, int posX, int posY, int points, string type, bool busy)
public class Player : Entity
{
this.setId(id);
this.setPosX(posX);
this.setPosY(posY);
this.setPoints(points);
this.setType(type);
this.setBusy(busy);
private int Score;
public Player (int id, int posX, int posY, string desc, bool busy, int score) : base(id, posX, posY, desc, busy)
{
this.SetScore(score);
}
public void setId(int id)
public void SetScore(int score)
{
this.id = id;
this.Score = score;
}
public int getId()
public int GetScore ()
{
return id;
return Score;
}
public void setPosX(int x)
{
this.posX = x;
}
public int getPosX()
{
return posX;
}
public void setPosY(int y)
{
this.posY = y;
}
public int getPosY()
{
return posY;
}
public void setPoints(int points)
{
this.points = points;
}
public int getPoints()
{
return points;
}
public void setType(string type)
{
this.type = type;
}
public string getType()
{
return type;
}
public void setBusy(bool busy)
{
this.busy = busy;
}
public bool getBusy()
{
return busy;
}
}

View File

@@ -1,6 +1,7 @@
using System.Net.Sockets;
using System.Threading;
using System;
using WorldOfPeacecraft;
public class Program
{
@@ -9,11 +10,11 @@ public class Program
private Thread SenderThread;
private Thread ReceiverThread;
//public static void Main ()
//{
// Program program = new Program();
// program.StartThreads();
//}
public static void Main ()
{
Program program = new Program();
program.StartThreads();
}
public Program ()
{

View File

@@ -2,6 +2,8 @@ using System;
using System.IO;
using System.Net.Sockets;
namespace WorldOfPeacecraft
{
class Receiver
{
private TcpClient Client;
@@ -17,5 +19,5 @@ class Receiver
{
return Reader.ReadLine ();
}
}
}

View File

@@ -3,6 +3,8 @@ using System.IO;
using System.Net.Sockets;
using System.Text;
namespace WorldOfPeacecraft
{
public class Sender
{
private TcpClient Client;
@@ -19,3 +21,4 @@ public class Sender
writer.Flush ();
}
}
}

View File

@@ -1,17 +1,17 @@
using System;
using Frontend;
public class Tile
namespace WorldOfPeacecraft
{
public class Tile : ITile
{
public int x;
public int y;
public Dragon drag;
public Player playr;
public bool isWalkable;
public bool isForest;
public bool isHuntable;
public bool isWater;
public Entity entity;
public bool walkable;
public bool forest;
public bool huntable;
public bool water;
public Tile (int posX, int posY, bool walkable, bool forest, bool huntable, bool water)
{
@@ -33,6 +33,11 @@
return x;
}
public int getXPosition ()
{
return x;
}
public void setY (int y)
{
this.y = y;
@@ -43,69 +48,59 @@
return y;
}
public void setDragon(Dragon drag)
public int getYPosition ()
{
this.drag = drag;
return y;
}
public Dragon getDragon()
public void setEntity (Entity entity)
{
return drag;
this.entity = entity;
}
public void setPlayer(Player playr)
public Entity getEntity ()
{
this.playr = playr;
}
public Player getPlayer()
{
return playr;
return entity;
}
public void setWalkable (bool walkable)
{
this.isWalkable = walkable;
this.walkable = walkable;
}
public bool getWalkable()
public bool isWalkable ()
{
return isWalkable;
return walkable;
}
public void setForest (bool forest)
{
this.isForest = forest;
this.forest = forest;
}
public bool getForest()
public bool isForest ()
{
return isForest;
return forest;
}
public void setHuntable (bool huntable)
{
this.isHuntable = huntable;
this.huntable = huntable;
}
public bool getHuntable()
public bool isHuntable ()
{
return isHuntable;
return huntable;
}
public void setWater (bool water)
{
this.isWater = water;
this.water = water;
}
public bool getWater()
public bool isWater ()
{
return isWater;
return water;
}
}
}