diff --git a/Eskape/.vs/Eskape/DesignTimeBuild/.dtbcache.v2 b/Eskape/.vs/Eskape/DesignTimeBuild/.dtbcache.v2
index da7449c6d3333820b827b609d61421e6c07e18b8..7213d370349d2e4b43d4a30e32c551ebf4c62646 100644
Binary files a/Eskape/.vs/Eskape/DesignTimeBuild/.dtbcache.v2 and b/Eskape/.vs/Eskape/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/Eskape/.vs/Eskape/v16/.suo b/Eskape/.vs/Eskape/v16/.suo
index 4fb0ffc77bdee8e003543f3a7d6289abcfb7162a..5cb6c2a6189af5680e08586d492dd2e9db12d52a 100644
Binary files a/Eskape/.vs/Eskape/v16/.suo and b/Eskape/.vs/Eskape/v16/.suo differ
diff --git a/Eskape/Eskape/Content/Enemy1.png b/Eskape/Eskape/Content/Enemy1.png
index b3ff4aeb5a4d5c4112a6246a36e5823cb35f2ac0..35b4e102a85ac4bb9bda9de9025764ec12a3a45e 100644
Binary files a/Eskape/Eskape/Content/Enemy1.png and b/Eskape/Eskape/Content/Enemy1.png differ
diff --git a/Eskape/Eskape/Content/Enemy2.png b/Eskape/Eskape/Content/Enemy2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ff5aa86d2a138fe1b48543dc93a0ae04534f9dd
Binary files /dev/null and b/Eskape/Eskape/Content/Enemy2.png differ
diff --git a/Eskape/Eskape/Content/PlayerHero.png b/Eskape/Eskape/Content/PlayerHero.png
index f12436f4c21db46d83b98fe27ea9cb9323a30a5e..8f869a765abb0e3d8a0108ef427e64acde7e098f 100644
Binary files a/Eskape/Eskape/Content/PlayerHero.png and b/Eskape/Eskape/Content/PlayerHero.png differ
diff --git a/Eskape/Eskape/Content/PlayerHero1.png b/Eskape/Eskape/Content/PlayerHero1.png
index 1e35f2f1e0d0e48f63c5085882756eac30862abb..35d21893ede38245db590aa87e02a96536639bd2 100644
Binary files a/Eskape/Eskape/Content/PlayerHero1.png and b/Eskape/Eskape/Content/PlayerHero1.png differ
diff --git a/Eskape/Eskape/Content/background2.jpg b/Eskape/Eskape/Content/background2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a3adff0a8f16cf53d3a438a98f9f1b8dcbd197fd
Binary files /dev/null and b/Eskape/Eskape/Content/background2.jpg differ
diff --git a/Eskape/Eskape/Content/bullet.png b/Eskape/Eskape/Content/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1b497a3a3ed097437e0d1d5350923cb0dfad98c
Binary files /dev/null and b/Eskape/Eskape/Content/bullet.png differ
diff --git a/Eskape/Eskape/Content/explosion.wav b/Eskape/Eskape/Content/explosion.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2ac1977dad02c31fd4cca8cc3779d83be92babf7
Binary files /dev/null and b/Eskape/Eskape/Content/explosion.wav differ
diff --git a/Eskape/Eskape/Content/healthpotion.png b/Eskape/Eskape/Content/healthpotion.png
new file mode 100644
index 0000000000000000000000000000000000000000..1463f275390cf221f2f94e6106a3602590389f15
Binary files /dev/null and b/Eskape/Eskape/Content/healthpotion.png differ
diff --git a/Eskape/Eskape/Content/kentta1.txt b/Eskape/Eskape/Content/kentta1.txt
index 383a616a8f818980cbc73bf9654a45206de09ae2..aad8b5401bd9673224e0fb0ab26273f9d4a5d246 100644
--- a/Eskape/Eskape/Content/kentta1.txt
+++ b/Eskape/Eskape/Content/kentta1.txt
@@ -1,17 +1,36 @@
- *
- ##
- * B*
- ## ##
- * B B *
- ## ## ##
- * B* *B *
- ## ## ## ##
- * * B* *
- ## ## ## ## ##
- N E
-######################
+ F
+ # # # ###
+ S
+
+ #
+ S
+ S
+ ** #
+ XFEX *
+ XXXX ##
+ H ## #
+ ##
+ FH E F F F #
+ ############################ ##
+ N *^ F**#
+ ## ## #### ##
+ # ###
+ * *^ #
+ ## ## X*# ###########
+ S X*#
+ * *S X^# ## ##
+ ## ## ## ### ## ##
+ #
+ * * * * # E
+ ## ## ## ## # #####
+ #
+ * * F * *E#
+ ## ## ## ## ### ##
+ #
+T S #
+###############################################################################
diff --git a/Eskape/Eskape/Content/nakymatonTaso.png b/Eskape/Eskape/Content/nakymatonTaso.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08b9a8272e50b2d3d01c7487e48599173272454
Binary files /dev/null and b/Eskape/Eskape/Content/nakymatonTaso.png differ
diff --git a/Eskape/Eskape/Content/norsu.png b/Eskape/Eskape/Content/norsu.png
deleted file mode 100644
index cd22e5b3ad58e4a2a3825b313054cbec58e3c788..0000000000000000000000000000000000000000
Binary files a/Eskape/Eskape/Content/norsu.png and /dev/null differ
diff --git a/Eskape/Eskape/Content/pickCoin.wav b/Eskape/Eskape/Content/pickCoin.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f3f7c1133967366b617f0051ac99cae4ca52a304
Binary files /dev/null and b/Eskape/Eskape/Content/pickCoin.wav differ
diff --git a/Eskape/Eskape/Content/points 2.png b/Eskape/Eskape/Content/points 2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d10ba3a2cb826c64eca6a6e407906db0ad03a20
Binary files /dev/null and b/Eskape/Eskape/Content/points 2.png differ
diff --git a/Eskape/Eskape/Content/points.png b/Eskape/Eskape/Content/points.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f35f3a73aed7321c4a525d3cff9c895cd7d146
Binary files /dev/null and b/Eskape/Eskape/Content/points.png differ
diff --git a/Eskape/Eskape/Content/powerUp.wav b/Eskape/Eskape/Content/powerUp.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c2cf0ad868d5b7dd12f52a97ca80e37e62324631
Binary files /dev/null and b/Eskape/Eskape/Content/powerUp.wav differ
diff --git a/Eskape/Eskape/Content/skull.png b/Eskape/Eskape/Content/skull.png
new file mode 100644
index 0000000000000000000000000000000000000000..e61c4af3483f4ad3038b8f6fade5e9f2dc89878c
Binary files /dev/null and b/Eskape/Eskape/Content/skull.png differ
diff --git a/Eskape/Eskape/Content/spikes.png b/Eskape/Eskape/Content/spikes.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1668ec344d122de8da474b74f76624b481323b0
Binary files /dev/null and b/Eskape/Eskape/Content/spikes.png differ
diff --git a/Eskape/Eskape/Eskape.cs b/Eskape/Eskape/Eskape.cs
index 44adf6f01401d13db3107db016cf6f329601eb76..b1149ff6b96c5698f726a5f996dea6d16c02079d 100644
--- a/Eskape/Eskape/Eskape.cs
+++ b/Eskape/Eskape/Eskape.cs
@@ -5,54 +5,103 @@ using Jypeli.Widgets;
using System;
using System.Collections.Generic;
+/* class Vihu : PhysicsObject
+{
+ private IntMeter elamalaskuri = new IntMeter(3, 0, 3);
+ public IntMeter Elamalaskuri { get { return elamalaskuri; } }
+
+ public Vihu(double leveys, double korkeus)
+ : base(leveys, korkeus)
+ {
+ elamalaskuri.LowerLimit += delegate { this.Destroy(); };
+ }
+} */
+
public class Eskape : PhysicsGame
{
private const double NOPEUS = 150;
private const double HYPPYNOPEUS = 900;
private const int RUUDUN_KOKO = 40;
- private PlatformCharacter pelaaja1;
+ private PlatformCharacter pelaaja;
+ int healthPoints = 5;
+ IntMeter pistelaskuri = new IntMeter(0);
+
+ // kuvat
private Image pelaajanKuva = LoadImage("PlayerHero1.png");
private Image enemyPic = LoadImage("Enemy1.png");
- private Image tahtiKuva = LoadImage("tahti.png");
+ private Image enemyPic2 = LoadImage("Enemy2.png");
+ private Image point1 = LoadImage("points.png");
+ private Image point2 = LoadImage("points 2.png");
private Image boxPic = LoadImage("Box3.png");
private Image floorPic = LoadImage("floor.png");
- private Image taustakuva = LoadImage("background1.png");
+ private Image invisibleFloorPic = LoadImage("nakymatonTaso.png");
+ private Image spikesPic = LoadImage("spikes.png");
+ private Image healthPotionPic = LoadImage("healthpotion.png");
+ private Image taustakuva = LoadImage("background2.jpg");
+ private Image bullet = LoadImage("bullet.png");
+ private Image skull = LoadImage("skull.png");
+ // äänet
private SoundEffect hyppyAani = LoadSoundEffect("Jump3.wav");
private SoundEffect ampuminenAani = LoadSoundEffect("Laser_Shoot.wav");
+ private SoundEffect rajahdysAani = LoadSoundEffect("explosion.wav");
private SoundEffect osumaAani = LoadSoundEffect("Hit_Hurt3.wav");
- private SoundEffect maaliAani = LoadSoundEffect("maali.wav");
+ private SoundEffect coinAani = LoadSoundEffect("pickCoin.wav");
+ private SoundEffect hpAani = LoadSoundEffect("powerUp.wav");
+
+
public override void Begin()
{
- Gravity = new Vector(0, -1500);
+ Gravity = new Vector(300, -2000);
LuoKentta();
LisaaNappaimet();
+ LuoPistelaskuri();
- Camera.Follow(pelaaja1);
- Camera.ZoomFactor = 1.8;
+ Camera.Follow(pelaaja);
+ Camera.ZoomFactor = 2;
Camera.StayInLevel = true;
MasterVolume = 0.5;
}
+ /// <summary>
+ /// Tähän alapuolelle tulee kaikki luo ja lisää -tapahtumat.
+ /// </summary>
+
private void LuoKentta()
{
TileMap kentta = TileMap.FromLevelAsset("kentta1.txt");
kentta.SetTileMethod('#', LisaaTaso);
- kentta.SetTileMethod('*', LisaaTahti);
+ kentta.SetTileMethod('X', LisaaNakymatonTaso);
+ kentta.SetTileMethod('T', LisaaTappavaTaso);
+ kentta.SetTileMethod('*', LisaaPiste);
+ kentta.SetTileMethod('^', LisaaPiste2);
kentta.SetTileMethod('N', LisaaPelaaja);
kentta.SetTileMethod('E', LisaaVihollinen);
+ kentta.SetTileMethod('F', LisaaVihollinen2);
kentta.SetTileMethod('B', LisaaLaatikko);
+ kentta.SetTileMethod('S', LisaaPommi);
+ kentta.SetTileMethod('H', LisaaHealthPotion);
kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO);
Level.CreateBorders();
Level.Background.Image = taustakuva;
Level.Background.TileToLevel();
}
+ void LisaaHealthPotion(Vector paikka, double leveys, double korkeus)
+ {
+ PhysicsObject healthPotion = new PhysicsObject(leveys, korkeus);
+ healthPotion.IgnoresCollisionResponse = true;
+ healthPotion.Position = paikka;
+ healthPotion.Tag = "health";
+ healthPotion.Image = healthPotionPic;
+ Add(healthPotion);
+ }
+
private void LisaaTaso(Vector paikka, double leveys, double korkeus)
{
PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus);
@@ -62,42 +111,176 @@ public class Eskape : PhysicsGame
Add(taso);
}
- private void LisaaTahti(Vector paikka, double leveys, double korkeus)
+ private void LisaaNakymatonTaso(Vector paikka, double leveys, double korkeus)
+ {
+ PhysicsObject taso = PhysicsObject.CreateStaticObject(leveys, korkeus);
+ taso.Position = paikka;
+ taso.Image = invisibleFloorPic;
+ taso.Tag = "floor";
+ Add(taso);
+ }
+
+ private void LisaaTappavaTaso(Vector paikka, double leveys, double korkeus)
+ {
+ PhysicsObject spikes = PhysicsObject.CreateStaticObject(leveys, korkeus);
+ spikes.Position = paikka;
+ spikes.Image = spikesPic;
+ spikes.Tag = "spikes";
+ Add(spikes);
+ }
+
+ private void LisaaPiste(Vector paikka, double leveys, double korkeus)
+ {
+ PhysicsObject piste = PhysicsObject.CreateStaticObject(leveys, korkeus);
+ piste.IgnoresCollisionResponse = true;
+ piste.Position = paikka;
+ piste.Image = point1;
+ piste.Tag = "piste";
+ Add(piste);
+ }
+
+ private void LisaaPiste2(Vector paikka, double leveys, double korkeus)
+ {
+ PhysicsObject piste2 = PhysicsObject.CreateStaticObject(leveys, korkeus);
+ piste2.IgnoresCollisionResponse = true;
+ piste2.Position = paikka;
+ piste2.Image = point2;
+ piste2.Tag = "piste2";
+ Add(piste2);
+ }
+
+ public void LisaaPelaaja(Vector paikka, double leveys, double korkeus)
{
- PhysicsObject tahti = PhysicsObject.CreateStaticObject(leveys, korkeus);
- tahti.IgnoresCollisionResponse = true;
- tahti.Position = paikka;
- tahti.Image = tahtiKuva;
- tahti.Tag = "tahti";
- Add(tahti);
+ pelaaja = new PlatformCharacter(35, 39);
+ pelaaja.Position = paikka;
+ pelaaja.Mass = 1.8;
+ pelaaja.Image = pelaajanKuva;
+ pelaaja.Weapon = new AssaultRifle(0, 0);
+ pelaaja.Weapon.Ammo.Value = 999;
+ pelaaja.Weapon.ProjectileCollision = AmmusOsui;
+ pelaaja.Tag = "pelaaja";
+ AddCollisionHandler(pelaaja, "piste", TormaaPisteeseen);
+ AddCollisionHandler(pelaaja, "piste2", TormaaPisteeseen2);
+ AddCollisionHandler(pelaaja, "tappavat", TormaaPommiin);
+ AddCollisionHandler(pelaaja, "health", TormaaHealthPotion);
+ AddCollisionHandler(pelaaja, "spikes", TormaaTappavaanTasoon);
+ // AddCollisionHandler(pelaaja, "tappavat", CollisionHandler.ExplodeObject(100, true));
+
+ Add(pelaaja);
}
- private void LisaaPelaaja(Vector paikka, double leveys, double korkeus)
+ private void LisaaPommi(Vector paikka, double leveys, double korkeus)
{
- pelaaja1 = new PlatformCharacter(leveys, korkeus);
- pelaaja1.Position = paikka;
- pelaaja1.Mass = 4.0;
- pelaaja1.Image = pelaajanKuva;
- pelaaja1.Weapon = new AssaultRifle(0, 0);
- pelaaja1.Weapon.Ammo.Value = 999;
- pelaaja1.Weapon.ProjectileCollision = AmmusOsui;
- AddCollisionHandler(pelaaja1, "tahti", TormaaTahteen);
- Add(pelaaja1);
+ /// Pommi toimii satunnaisesti. Tuhoamalla sen saa pisteitä.
+ /// Pommi satuttaa osuessaan.
+ ///
+
+ PhysicsObject paakallo = new PhysicsObject(40, 40);
+
+
+ RandomMoverBrain satunnaisaivot = new RandomMoverBrain(150); // tekoäly
+ satunnaisaivot.ChangeMovementSeconds = 5;
+ paakallo.Brain = satunnaisaivot;
+ satunnaisaivot.WanderRadius = 400;
+ paakallo.Position = paikka;
+
+
+ paakallo.Image = skull;
+ paakallo.Tag = "tappavat";
+ Add(paakallo);
}
private void LisaaVihollinen(Vector paikka, double leveys, double korkeus)
{
// tähän tulee vihollinen
- PhysicsObject enemy1 = new PhysicsObject(leveys, korkeus);
+ PlatformCharacter enemy1 = new PlatformCharacter(40, 40);
+
+ enemy1.Mass = 8.0;
enemy1.Position = paikka;
enemy1.Image = enemyPic;
+ enemy1.Tag = "vihu";
+ enemy1.CanRotate = false;
Add(enemy1);
+
+ RandomMoverBrain satunnaisaivot = new RandomMoverBrain(50);
+ satunnaisaivot.ChangeMovementSeconds = 5;
+ enemy1.Brain = satunnaisaivot;
+
+ FollowerBrain seuraajanAivot = new FollowerBrain("pelaaja"); // tekoäly
+
+ // vihollisen tekoäly
+
+ seuraajanAivot.Active = true;
+ seuraajanAivot.Speed = 50;
+ seuraajanAivot.DistanceFar = 400;
+ seuraajanAivot.DistanceClose = 200;
+ seuraajanAivot.TurnWhileMoving = true;
+ seuraajanAivot.StopWhenTargetClose = true;
+ // seuraajanAivot.TargetClose += MitaTapahtuuKunOllaanLahella;
+ seuraajanAivot.FarBrain = satunnaisaivot;
+
+ enemy1.Brain = seuraajanAivot;
+
+ // seuraajanAivot.TargetClose += MitaTapahtuuKunOllaanLahella;
+
+ }
+
+ private void LisaaVihollinen2(Vector paikka, double leveys, double korkeus)
+ {
+ // Täysin identtinen aikaisemman vihollisen kanssa. On vain erivärinen.
+
+ ShootingPlatformCharacter enemy2 = new ShootingPlatformCharacter(40, 40);
+
+ enemy2.Mass = 8.0;
+ enemy2.Position = paikka;
+ enemy2.Image = enemyPic2;
+ enemy2.Tag = "vihu";
+ enemy2.CanRotate = false;
+ Add(enemy2);
+
+ RandomMoverBrain satunnaisaivot = new RandomMoverBrain(50);
+ satunnaisaivot.ChangeMovementSeconds = 5;
+ enemy2.Brain = satunnaisaivot;
+
+ FollowerBrain seuraajanAivot = new FollowerBrain("pelaaja"); // tekoäly
+
+ // vihollisen tekoäly
+
+ seuraajanAivot.Active = true;
+ seuraajanAivot.Speed = 50;
+ seuraajanAivot.DistanceFar = 400;
+ seuraajanAivot.DistanceClose = 200;
+ seuraajanAivot.TurnWhileMoving = true;
+ seuraajanAivot.StopWhenTargetClose = true;
+ // seuraajanAivot.TargetClose += MitaTapahtuuKunOllaanLahella;
+ seuraajanAivot.FarBrain = satunnaisaivot;
+
+ enemy2.Brain = seuraajanAivot;
+ }
+
+ /* private void MitaTapahtuuKunOllaanLahella;
+ {
+ AmmuAseella.Play;
+ } */
+
+ void LuoPistelaskuri()
+ {
+ pistelaskuri = new IntMeter(0);
+
+ Label pistenaytto = new Label();
+ pistenaytto.X = Screen.Left + 100;
+ pistenaytto.Y = Screen.Top - 100;
+ pistenaytto.TextColor = Color.DarkYellow;
+ pistenaytto.Color = Color.White;
+
+ pistenaytto.BindTo(pistelaskuri);
+ Add(pistenaytto);
}
private void LisaaLaatikko(Vector paikka, double leveys, double korkeus)
{
- // tähän tulee vihollinen
PhysicsObject box = new PhysicsObject(leveys, korkeus);
+ box.Mass = 5.0;
box.Position = paikka;
box.Image = boxPic;
Add(box);
@@ -108,30 +291,37 @@ public class Eskape : PhysicsGame
Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
- Keyboard.Listen(Key.Left, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, -NOPEUS);
- Keyboard.Listen(Key.Right, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja1, NOPEUS);
- Keyboard.Listen(Key.Up, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, HYPPYNOPEUS);
- Keyboard.Listen(Key.RightControl, ButtonState.Down, AmmuAseella, "Ammu", pelaaja1);
+ Keyboard.Listen(Key.Left, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja, -NOPEUS);
+ Keyboard.Listen(Key.Right, ButtonState.Down, Liikuta, "Liikkuu vasemmalle", pelaaja, NOPEUS);
+ Keyboard.Listen(Key.Up, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja, HYPPYNOPEUS);
+ Keyboard.Listen(Key.RightControl, ButtonState.Down, AmmuAseella, "Ammu", pelaaja);
PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
}
- void AmmuAseella(PlatformCharacter pelaaja)
+ private void AmmuAseella(PlatformCharacter pelaaja)
{
- ampuminenAani.Play();
PhysicsObject ammus = pelaaja.Weapon.Shoot();
+
+ pelaaja.Weapon.FireRate = 2;
+ pelaaja.Weapon.ProjectileCollision = AmmusOsui;
+
+ ampuminenAani.Play();
+
if (ammus != null)
{
ammus.Size *= 3;
- // ammus.Image = ...
- ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
+ ammus.Image = bullet;
+ ammus.MaximumLifetime = TimeSpan.FromSeconds(7.0);
}
}
void AmmusOsui(PhysicsObject ammus, PhysicsObject kohde)
{
+ osumaAani.Play();
ammus.Destroy();
}
+
private void Liikuta(PlatformCharacter hahmo, double nopeus)
{
hahmo.Walk(nopeus);
@@ -143,11 +333,50 @@ public class Eskape : PhysicsGame
hahmo.Jump(nopeus);
}
- private void TormaaTahteen(PhysicsObject hahmo, PhysicsObject tahti)
+ private void TormaaHealthPotion(PhysicsObject hahmo, PhysicsObject healthPotion)
+ {
+ healthPoints++;
+ hpAani.Play();
+ MessageDisplay.Add("HP +1");
+ healthPotion.Destroy();
+ }
+
+ private void TormaaPisteeseen(PhysicsObject hahmo, PhysicsObject piste)
+ {
+ pistelaskuri.Value += 1;
+ coinAani.Play();
+ MessageDisplay.Add("+1");
+ piste.Destroy();
+ // pistelaskuri.Value += 1;
+ }
+
+ private void TormaaPisteeseen2(PhysicsObject hahmo, PhysicsObject piste2)
+ {
+ coinAani.Play();
+ MessageDisplay.Add("+5");
+ piste2.Destroy();
+ pistelaskuri.Value += 5;
+ }
+
+ private void TormaaPommiin(PhysicsObject hahmo, PhysicsObject skull)
+ {
+ healthPoints--;
+
+ if (healthPoints <= 0)
+ pelaaja.Destroy();
+
+ rajahdysAani.Play();
+ MessageDisplay.Add("HP -1");
+ skull.Destroy();
+ }
+
+ private void TormaaTappavaanTasoon(PhysicsObject hahmo, PhysicsObject spikes)
{
- maaliAani.Play();
- MessageDisplay.Add("Keräsit tähden!");
- tahti.Destroy();
+ healthPoints--;
+ if (healthPoints <= 0)
+ pelaaja.Destroy();
+ MessageDisplay.Add("Kuolit");
+ // lisää tuskanhuuto
}
}
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy1.png b/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy1.png
index b3ff4aeb5a4d5c4112a6246a36e5823cb35f2ac0..35b4e102a85ac4bb9bda9de9025764ec12a3a45e 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy1.png and b/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy1.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy2.png b/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ff5aa86d2a138fe1b48543dc93a0ae04534f9dd
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/Enemy2.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero.png b/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero.png
index f12436f4c21db46d83b98fe27ea9cb9323a30a5e..8f869a765abb0e3d8a0108ef427e64acde7e098f 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero.png and b/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero1.png b/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero1.png
index 1e35f2f1e0d0e48f63c5085882756eac30862abb..35d21893ede38245db590aa87e02a96536639bd2 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero1.png and b/Eskape/Eskape/bin/Debug/net5.0/Content/PlayerHero1.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/background2.jpg b/Eskape/Eskape/bin/Debug/net5.0/Content/background2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a3adff0a8f16cf53d3a438a98f9f1b8dcbd197fd
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/background2.jpg differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/bullet.png b/Eskape/Eskape/bin/Debug/net5.0/Content/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1b497a3a3ed097437e0d1d5350923cb0dfad98c
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/bullet.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/explosion.wav b/Eskape/Eskape/bin/Debug/net5.0/Content/explosion.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2ac1977dad02c31fd4cca8cc3779d83be92babf7
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/explosion.wav differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/healthpotion.png b/Eskape/Eskape/bin/Debug/net5.0/Content/healthpotion.png
new file mode 100644
index 0000000000000000000000000000000000000000..1463f275390cf221f2f94e6106a3602590389f15
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/healthpotion.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/kentta1.txt b/Eskape/Eskape/bin/Debug/net5.0/Content/kentta1.txt
index 383a616a8f818980cbc73bf9654a45206de09ae2..aad8b5401bd9673224e0fb0ab26273f9d4a5d246 100644
--- a/Eskape/Eskape/bin/Debug/net5.0/Content/kentta1.txt
+++ b/Eskape/Eskape/bin/Debug/net5.0/Content/kentta1.txt
@@ -1,17 +1,36 @@
- *
- ##
- * B*
- ## ##
- * B B *
- ## ## ##
- * B* *B *
- ## ## ## ##
- * * B* *
- ## ## ## ## ##
- N E
-######################
+ F
+ # # # ###
+ S
+
+ #
+ S
+ S
+ ** #
+ XFEX *
+ XXXX ##
+ H ## #
+ ##
+ FH E F F F #
+ ############################ ##
+ N *^ F**#
+ ## ## #### ##
+ # ###
+ * *^ #
+ ## ## X*# ###########
+ S X*#
+ * *S X^# ## ##
+ ## ## ## ### ## ##
+ #
+ * * * * # E
+ ## ## ## ## # #####
+ #
+ * * F * *E#
+ ## ## ## ## ### ##
+ #
+T S #
+###############################################################################
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/nakymatonTaso.png b/Eskape/Eskape/bin/Debug/net5.0/Content/nakymatonTaso.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08b9a8272e50b2d3d01c7487e48599173272454
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/nakymatonTaso.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/norsu.png b/Eskape/Eskape/bin/Debug/net5.0/Content/norsu.png
deleted file mode 100644
index cd22e5b3ad58e4a2a3825b313054cbec58e3c788..0000000000000000000000000000000000000000
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Content/norsu.png and /dev/null differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/pickCoin.wav b/Eskape/Eskape/bin/Debug/net5.0/Content/pickCoin.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f3f7c1133967366b617f0051ac99cae4ca52a304
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/pickCoin.wav differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/points 2.png b/Eskape/Eskape/bin/Debug/net5.0/Content/points 2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d10ba3a2cb826c64eca6a6e407906db0ad03a20
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/points 2.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/points.png b/Eskape/Eskape/bin/Debug/net5.0/Content/points.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f35f3a73aed7321c4a525d3cff9c895cd7d146
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/points.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/powerUp.wav b/Eskape/Eskape/bin/Debug/net5.0/Content/powerUp.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c2cf0ad868d5b7dd12f52a97ca80e37e62324631
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/powerUp.wav differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/skull.png b/Eskape/Eskape/bin/Debug/net5.0/Content/skull.png
new file mode 100644
index 0000000000000000000000000000000000000000..e61c4af3483f4ad3038b8f6fade5e9f2dc89878c
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/skull.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Content/spikes.png b/Eskape/Eskape/bin/Debug/net5.0/Content/spikes.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1668ec344d122de8da474b74f76624b481323b0
Binary files /dev/null and b/Eskape/Eskape/bin/Debug/net5.0/Content/spikes.png differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Eskape.dll b/Eskape/Eskape/bin/Debug/net5.0/Eskape.dll
index d8b438fcb2df515044bf66a798f0f5de6abc3f27..264f85ed222fd6a7fc8e12309cc56eb0ae24672d 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Eskape.dll and b/Eskape/Eskape/bin/Debug/net5.0/Eskape.dll differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/Eskape.pdb b/Eskape/Eskape/bin/Debug/net5.0/Eskape.pdb
index cf8431c17cb37265be5ad9b01e40797489a156ee..8120405485af0000ef86a580adc40146adcb8819 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/Eskape.pdb and b/Eskape/Eskape/bin/Debug/net5.0/Eskape.pdb differ
diff --git a/Eskape/Eskape/bin/Debug/net5.0/ref/Eskape.dll b/Eskape/Eskape/bin/Debug/net5.0/ref/Eskape.dll
index 68b88644d7e9e8af0d4f1c442a5fda620a01e292..d3aa7dbd2156ac4488382fc2acf684d0ae46dee4 100644
Binary files a/Eskape/Eskape/bin/Debug/net5.0/ref/Eskape.dll and b/Eskape/Eskape/bin/Debug/net5.0/ref/Eskape.dll differ
diff --git a/Eskape/Eskape/obj/Debug/net5.0/Eskape.csproj.FileListAbsolute.txt b/Eskape/Eskape/obj/Debug/net5.0/Eskape.csproj.FileListAbsolute.txt
index 34c38bfb1ca69d41e878c648cda43563f2d79706..1177e62f88b60922e82f6c49d328820a86a307c4 100644
--- a/Eskape/Eskape/obj/Debug/net5.0/Eskape.csproj.FileListAbsolute.txt
+++ b/Eskape/Eskape/obj/Debug/net5.0/Eskape.csproj.FileListAbsolute.txt
@@ -1,7 +1,6 @@
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Eskape.exe
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Content\kentta1.txt
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Content\maali.wav
-C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Content\norsu.png
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Content\tahti.png
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Eskape.deps.json
C:\Users\royes\ohj1\Peli\Eskape\Eskape\bin\Debug\net5.0\Eskape.runtimeconfig.json
diff --git a/Eskape/Eskape/obj/Debug/net5.0/Eskape.dll b/Eskape/Eskape/obj/Debug/net5.0/Eskape.dll
index d8b438fcb2df515044bf66a798f0f5de6abc3f27..264f85ed222fd6a7fc8e12309cc56eb0ae24672d 100644
Binary files a/Eskape/Eskape/obj/Debug/net5.0/Eskape.dll and b/Eskape/Eskape/obj/Debug/net5.0/Eskape.dll differ
diff --git a/Eskape/Eskape/obj/Debug/net5.0/Eskape.pdb b/Eskape/Eskape/obj/Debug/net5.0/Eskape.pdb
index cf8431c17cb37265be5ad9b01e40797489a156ee..8120405485af0000ef86a580adc40146adcb8819 100644
Binary files a/Eskape/Eskape/obj/Debug/net5.0/Eskape.pdb and b/Eskape/Eskape/obj/Debug/net5.0/Eskape.pdb differ
diff --git a/Eskape/Eskape/obj/Debug/net5.0/ref/Eskape.dll b/Eskape/Eskape/obj/Debug/net5.0/ref/Eskape.dll
index 68b88644d7e9e8af0d4f1c442a5fda620a01e292..d3aa7dbd2156ac4488382fc2acf684d0ae46dee4 100644
Binary files a/Eskape/Eskape/obj/Debug/net5.0/ref/Eskape.dll and b/Eskape/Eskape/obj/Debug/net5.0/ref/Eskape.dll differ
diff --git a/Eskape/Eskape/pickCoin.wav b/Eskape/Eskape/pickCoin.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f3f7c1133967366b617f0051ac99cae4ca52a304
Binary files /dev/null and b/Eskape/Eskape/pickCoin.wav differ