diff --git a/Hiko/Hiko/Content/Testitaustakuva.png b/Hiko/Hiko/Content/Testitaustakuva.png new file mode 100644 index 0000000000000000000000000000000000000000..5389922a59c455c25a3546625815039108cfb491 Binary files /dev/null and b/Hiko/Hiko/Content/Testitaustakuva.png differ diff --git a/Hiko/Hiko/Content/luoti.png b/Hiko/Hiko/Content/luoti.png new file mode 100644 index 0000000000000000000000000000000000000000..c9adddf2c97b2b529ee506e58dbdece42274f967 Binary files /dev/null and b/Hiko/Hiko/Content/luoti.png differ diff --git "a/Hiko/Hiko/Content/p\303\244\303\244jehu.png" "b/Hiko/Hiko/Content/p\303\244\303\244jehu.png" deleted file mode 100644 index fb57723c38ce57ab7f54e5d07e4ebb15ae9bca92..0000000000000000000000000000000000000000 Binary files "a/Hiko/Hiko/Content/p\303\244\303\244jehu.png" and /dev/null differ diff --git "a/Hiko/Hiko/Content/p\303\244\303\244jehu2.png" "b/Hiko/Hiko/Content/p\303\244\303\244jehu2.png" new file mode 100644 index 0000000000000000000000000000000000000000..ec541ba19d0b97c590e4e173e57b3d26473e53bb Binary files /dev/null and "b/Hiko/Hiko/Content/p\303\244\303\244jehu2.png" differ diff --git "a/Hiko/Hiko/Content/\303\266rkki.png" "b/Hiko/Hiko/Content/\303\266rkki.png" new file mode 100644 index 0000000000000000000000000000000000000000..19c8494279fe77c990f03e0a31fec192dd6436e3 Binary files /dev/null and "b/Hiko/Hiko/Content/\303\266rkki.png" differ diff --git a/Hiko/Hiko/Hiko.cs b/Hiko/Hiko/Hiko.cs index 1ab16145bdefd21f7b358ce1eb27ff5739daa87c..2b450ec7df5208008910e9e072494a9d4c619e6d 100644 --- a/Hiko/Hiko/Hiko.cs +++ b/Hiko/Hiko/Hiko.cs @@ -13,12 +13,14 @@ namespace Hiko { PhysicsObject pelaaja; GameObject tahtain; + Image taustakuva = LoadImage("Testitaustakuva"); public override void Begin() { // Kirjoita ohjelmakoodisi tähän Level.CreateBorders(); Camera.ZoomToLevel(); + Level.Background.Image = taustakuva; LuoPelaaja(); Gravity = new Vector(0.0, -981.0); LuoOhjaimet(); @@ -32,7 +34,7 @@ namespace Hiko pelaaja = new PhysicsObject(20, 40); pelaaja.Shape = Shape.Circle; pelaaja.Color = Color.Blue; - pelaaja.Image = LoadImage("pääjehu"); + pelaaja.Image = LoadImage("pääjehu2"); pelaaja.CanRotate = false; pelaaja.AddCollisionIgnoreGroup(1); Add(pelaaja); @@ -43,6 +45,7 @@ namespace Hiko PhysicsObject maavihu = new PhysicsObject(50, 50); maavihu.Shape = Shape.Circle; maavihu.Color = Color.Blue; + maavihu.Image = LoadImage("örkki"); Add(maavihu); return maavihu; } @@ -86,6 +89,8 @@ namespace Hiko luoti.IgnoresGravity = true; luoti.IgnoresCollisionWith(pelaaja); luoti.AddCollisionIgnoreGroup(1); + luoti.LifetimeLeft = TimeSpan.FromSeconds(0.3); + luoti.Image = LoadImage("luoti"); Add(luoti); //luoti.Hit(new Vector(pelaaja.RelativePosition.X - Mouse.PositionOnScreen.X, pelaaja.RelativePosition.Y - Mouse.PositionOnScreen.Y)); diff --git a/Hiko/Hiko/Hiko.csproj b/Hiko/Hiko/Hiko.csproj index c63becbdfd15a52f9552a55c9ac38aa6fda1011b..4247a2487b7b3ae4751921b8c37a2282d85aa002 100644 --- a/Hiko/Hiko/Hiko.csproj +++ b/Hiko/Hiko/Hiko.csproj @@ -13,12 +13,21 @@ </ItemGroup> <ItemGroup> - <None Update="Content\pääjehu.png"> + <None Update="Content\luoti.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Update="Content\pääjehu2.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Update="Content\Testitaustakuva.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> <None Update="Content\tähtäinristikko.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Update="Content\örkki.png"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> </ItemGroup> </Project>