progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into livingEntitiesVlad

Browse source
This commit is contained in:
N4K 2023-08-18 05:23:37 +03:00
commit 8372369a48
40 changed files with 1135 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
DangerousD/Content/animation1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 39 KiB

1
DangerousD/Content/animations/playerReload Normal file
View file

@ -0,0 +1 @@
{"id":"playerReload","textureName":"playerAnimation","startSpriteRectangle":{"X":101,"Y":67,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":2,"isCycle":false,"offset":"0, 0"}

1
DangerousD/Content/animations/playerShootLeft Normal file
View file

@ -0,0 +1 @@
{"id":"playerShootLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":201,"Y":34,"Width":32,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":2,"isCycle":false,"offset":"4, 0"}

1
DangerousD/Content/animations/playerShootRight Normal file
View file

@ -0,0 +1 @@
{"id":"playerShootRight","textureName":"playerAnimation","startSpriteRectangle":{"X":201,"Y":1,"Width":32,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":2,"isCycle":false,"offset":"4, 0"}

162
DangerousD/Content/boss.tmx Normal file
View file

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="16" tileheight="16" infinite="1" nextlayerid="4" nextobjectid="3">
<tileset firstgid="1" source="../../../../../Desktop/DangerousD map/map.tsx"/>
<layer id="1" name="Слой тайлов 1" class="StopTile" width="200" height="200">
<data encoding="csv">
<chunk x="-16" y="-32" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,799,799,799,799,799,799,799,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0
</chunk>
<chunk x="0" y="-32" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="16" y="-32" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="32" y="-32" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0
</chunk>
<chunk x="-16" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,799,799,799,799,799,799,799,799
</chunk>
<chunk x="0" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799
</chunk>
<chunk x="16" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799
</chunk>
<chunk x="32" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,799,0,0,0,0,0,
799,799,799,799,799,799,799,799,799,799,799,0,0,0,0,0
</chunk>
</data>
</layer>
<objectgroup id="2" name="Слой объектов 1" class="LivingEntities">
<object id="1" name="DEBUGUS" type="Player" x="293.333" y="-126.667">
<point/>
</object>
</objectgroup>
<objectgroup id="3" name="Слой объектов 2" class="LivingEntities.Monsters">
<object id="2" type="SilasMaster" x="82.6667" y="-186.667">
<point/>
</object>
</objectgroup>
</map>

373
DangerousD/Content/debug.tmx Normal file
View file

@ -0,0 +1,373 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="200" height="200" tilewidth="16" tileheight="16" infinite="1" nextlayerid="8" nextobjectid="49">
<tileset firstgid="1" source="../Documents/Github_repos/DangerousD/DangerousD/Content/map.tsx"/>
<layer id="3" name="Слой тайлов 3" class="Tile" width="200" height="200">
<data encoding="csv">
<chunk x="0" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570
</chunk>
<chunk x="16" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570
</chunk>
<chunk x="0" y="0" width="16" height="16">
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="16" y="0" width="16" height="16">
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,570,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
</data>
</layer>
<layer id="1" name="Collidable" class="StopTile" width="200" height="200">
<data encoding="csv">
<chunk x="-32" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,50,50,50,50,50,
0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,49,49,49,49,49,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="-16" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="0" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="16" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="32" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="48" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,
49,49,49,49,49,49,49,49,49,49,49,49,49,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
</data>
</layer>
<objectgroup id="7" name="Player" class="LivingEntities">
<object id="42" name="DEBUGUS" type="Player" x="236.506" y="-54.4681">
<point/>
</object>
</objectgroup>
<objectgroup id="6" name="Zombies" class="LivingEntities.Monsters.Zombie">
<object id="17" x="568" y="130">
<point/>
</object>
<object id="18" x="614" y="126">
<point/>
</object>
<object id="19" x="656" y="137">
<point/>
</object>
<object id="20" x="688" y="124">
<point/>
</object>
<object id="21" x="739" y="128">
<point/>
</object>
<object id="22" x="754" y="127">
<point/>
</object>
<object id="23" x="777" y="125">
<point/>
</object>
<object id="24" x="803" y="127">
<point/>
</object>
<object id="25" x="834" y="128">
<point/>
</object>
<object id="26" x="867" y="124">
<point/>
</object>
<object id="27" x="876" y="123">
<point/>
</object>
<object id="28" x="909" y="114">
<point/>
</object>
<object id="29" x="933" y="108">
<point/>
</object>
<object id="30" x="931" y="65">
<point/>
</object>
<object id="31" x="880" y="74">
<point/>
</object>
<object id="32" x="829" y="76">
<point/>
</object>
<object id="33" x="804" y="78">
<point/>
</object>
<object id="34" x="772" y="78">
<point/>
</object>
<object id="35" x="740" y="77">
<point/>
</object>
<object id="36" x="713" y="73">
<point/>
</object>
<object id="37" x="684" y="73">
<point/>
</object>
<object id="38" x="659" y="75">
<point/>
</object>
<object id="39" x="632" y="82">
<point/>
</object>
<object id="40" x="612" y="89">
<point/>
</object>
<object id="41" x="604" y="92">
<point/>
</object>
</objectgroup>
<layer id="2" name="Слой тайлов 2" class="Tile" width="200" height="200">
<data encoding="csv">
<chunk x="0" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0
</chunk>
<chunk x="16" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370
</chunk>
<chunk x="0" y="0" width="16" height="16">
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
369,370,0,0,0,0,0,0,0,0,369,370,0,0,0,0,
382,383,0,0,0,0,0,0,0,0,382,383,0,0,0,0,
395,396,0,0,0,0,0,0,0,0,395,396,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
<chunk x="16" y="0" width="16" height="16">
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,369,370,0,0,0,0,0,0,0,0,369,370,
0,0,0,0,382,383,0,0,0,0,0,0,0,0,382,383,
0,0,0,0,395,396,0,0,0,0,0,0,0,0,395,396,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</chunk>
</data>
</layer>
<objectgroup id="5" name="Various enemies" class="LivingEntities.Monsters">
<object id="7" type="SilasMaster" x="126" y="-25">
<point/>
</object>
<object id="8" type="Frank" x="425" y="60">
<point/>
</object>
<object id="10" type="FrankBalls" x="413" y="50">
<point/>
</object>
<object id="11" type="FrankBalls" x="439" y="52">
<point/>
</object>
<object id="12" type="FlameSkull" x="649" y="-17">
<point/>
</object>
<object id="13" type="Slime" x="-178" y="118">
<point/>
</object>
<object id="15" type="Spider" x="-94" y="109.333">
<point/>
</object>
</objectgroup>
</map>

14
DangerousD/Content/lvl.tmx
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="11" nextobjectid="49">
<tileset firstgid="1" source="map.tsx"/>
<layer id="1" name="Collision" class="StopTile" width="30" height="20" locked="1" offsetx="-352.033" offsety="192.098">
<layer id="1" name="Collision" class="StopTile" width="30" height="20" visible="0" offsetx="-352.033" offsety="192.098">
<data encoding="csv">
<chunk x="0" y="-16" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -130,19 +130,19 @@
0,0,0,0,0,0,0,0,0,0,13,75,0,0,0,0
</chunk>
<chunk x="16" y="0" width="16" height="16">
52,0,0,0,52,0,0,0,52,52,52,52,52,52,52,52,
52,0,0,0,0,0,0,0,52,52,52,52,52,52,52,52,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
52,52,0,0,52,0,0,52,52,52,52,52,52,52,52,52,
52,52,0,0,0,0,0,52,52,52,52,52,52,52,52,52,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
52,52,52,0,52,0,52,52,52,52,52,52,52,52,52,52,
52,52,52,0,0,0,52,52,52,52,52,52,52,52,52,52,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@ -441,7 +441,7 @@
</chunk>
</data>
</layer>
<layer id="6" name="Ladders" class="Platform" width="30" height="20" locked="1">
<layer id="6" name="Ladders" class="Platform" width="30" height="20" visible="0" locked="1">
<data encoding="csv">
<chunk x="-16" y="0" width="16" height="16">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -701,7 +701,7 @@
</chunk>
</data>
</layer>
<objectgroup id="8" name="Zombies" class="LivingEntities.Monsters.Zombie" locked="1">
<objectgroup id="8" name="Zombies" class="LivingEntities.Monsters.Zombie" visible="0">
<object id="26" x="265" y="469.5">
<point/>
</object>
@ -752,7 +752,7 @@
</object>
</objectgroup>
<objectgroup id="10" name="Player" class="LivingEntities.Player">
<object id="47" x="-525" y="461.333">
<object id="47" x="-500" y="461.333">
<point/>
</object>
</objectgroup>

8
DangerousD/Content/map.tmx
View file

@ -66,5 +66,13 @@
<point/>
</object>
</objectgroup>
<<<<<<< HEAD
=======
<objectgroup id="2" name="Слой объектов 1" class="LivingEntities.Monsters.Slime">
<object id="5" x="1" y="100">
<point/>
</object>
</objectgroup>
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
</map>

BIN
DangerousD/Content/tiles.BMP Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 653 KiB

6
DangerousD/GameCore/GUI/AbstractGui.cs
View file

@ -19,7 +19,11 @@ public abstract class AbstractGui : IDrawableObject
private GraphicsDevice graphicsDevice;
public virtual void Initialize()
{
<<<<<<< HEAD
Manager.Initialize(AppManager.Instance.GraphicsDevice);
=======
Manager.Initialize(AppManager.Instance.GraphicsDevice);
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
CreateUI();
}
@ -30,7 +34,7 @@ public abstract class AbstractGui : IDrawableObject
public virtual void Update(GameTime gameTime)
{
Manager.Update();
Manager.Update(gameTime);
}
public virtual void Draw(SpriteBatch spriteBatch)

24
DangerousD/GameCore/GUI/DebugHUD.cs
View file

@ -11,6 +11,7 @@ namespace DangerousD.GameCore.GUI
{
private SpriteFont _spriteFont;
private Dictionary<string, string> _text = new();
private List<string> _log = new();
public void Initialize()
{
@ -27,10 +28,11 @@ namespace DangerousD.GameCore.GUI
public void Draw(SpriteBatch spriteBatch)
{
var keysString = Join("\n", _text.Select(el => el.Key + ": " + el.Value).ToList());
spriteBatch.Begin();
spriteBatch.DrawString(
_spriteFont,
Join("\n", _text.Select(el => el.Key + ": " + el.Value).ToList()),
keysString,
new Vector2(10, 10),
Color.Cyan,
0,
@ -39,6 +41,17 @@ namespace DangerousD.GameCore.GUI
SpriteEffects.None,
0
);
spriteBatch.DrawString(
_spriteFont,
Join("\n", _log),
new Vector2(10, 10 + _spriteFont.MeasureString(keysString).Y),
Color.Green,
0,
Vector2.Zero,
1,
SpriteEffects.None,
0
);
spriteBatch.End();
}
@ -46,5 +59,14 @@ namespace DangerousD.GameCore.GUI
{
_text[key] = value;
}
public void Log(string value)
{
_log.Add(value);
if (_log.Count > 30)
{
_log.RemoveAt(0);
}
}
}
}

4
DangerousD/GameCore/GUI/HUD.cs
View file

@ -11,7 +11,6 @@ namespace DangerousD.GameCore.GUI
{
public class HUD : AbstractGui
{
int ammout = 0;
List<Rect> rects = new List<Rect> { };
int wigth = AppManager.Instance.inGameResolution.X;
int height = AppManager.Instance.inGameResolution.Y;
@ -27,9 +26,8 @@ namespace DangerousD.GameCore.GUI
}
public override void Update(GameTime gameTime)
{
rects.Clear();
for (int i = 0; i < ammout; i++)
for (int i = 0; i < AppManager.Instance.GameManager.GetPlayer1.Bullets; i++)
{
rects.Add(new Rect(Manager) { rectangle = new Rectangle(wigth / 29 + i * 13, height / 17, 5, 20), mainColor = Color.Yellow });
rects[i].LoadTexture(AppManager.Instance.Content);

46
DangerousD/GameCore/GUI/MenuGUI.cs
View file

@ -1,9 +1,12 @@
using DangerousD.GameCore.Managers;
using Microsoft.VisualBasic;
using Microsoft.Xna.Framework;
using MonogameLibrary.UI.Base;
using MonogameLibrary.UI.Elements;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.Serialization;
namespace DangerousD.GameCore.GUI;
@ -11,6 +14,12 @@ namespace DangerousD.GameCore.GUI;
internal class MenuGUI : AbstractGui
{
int selected = 0;
Color[] colors = new Color[] { new Color(64, 53, 51), new Color(84, 58, 52),
new Color(170, 101, 63), new Color(254, 208, 116), new Color(252, 231, 124) };
List<Label> MainLetterLabels = new List<Label>();
List<Label> BigLetterLabels = new List<Label>();
List<Vector2> MainLetterPositions = new List<Vector2>();
List<Vector2> BigLetterPositions = new List<Vector2>();
protected override void CreateUI()
{
int wigth = AppManager.Instance.inGameResolution.X;
@ -20,16 +29,20 @@ internal class MenuGUI : AbstractGui
Elements.Add(menuBackground);
menuBackground.LoadTexture(AppManager.Instance.Content);
Color[] colors = new Color[] { new Color(64, 53, 51), new Color(84, 58, 52),
new Color(170, 101, 63), new Color(254, 208, 116), new Color(252, 231, 124) };
for (int i = 0; i < colors.Length; i++)
Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2 - 60, 200, 50, 50), text = "Dangerous", mainColor = Color.Transparent, scale = 1.35f - 0.05f * i * i / 10, fontName = "Font2", fontColor = colors[i] });
{
Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2 - 60, 220, 50, 50), text = "Dangerous", mainColor = Color.Transparent, scale = 1.35f - 0.05f * i * i / 10, fontName = "Font2", fontColor = colors[i] });
MainLetterLabels.Add(Elements.Last() as Label);
MainLetterPositions.Add(new Vector2(Elements.Last().rectangle.X, Elements.Last().rectangle.Y));
}
int dx = 50;
Color[] colors2 = new Color[] { new Color(64, 53, 51), new Color(84, 58, 52),
new Color(170, 101, 63), new Color(254, 208, 116), new Color(252, 231, 124) };
for (int i = 0; i < colors2.Length; i++)
Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2 + 480 + dx - i * i, 260 - i * i / 5, 50, 50), text = "D", mainColor = Color.Transparent, scale = 2.15f - 0.05f * i * i / 5, fontName = "Font2", fontColor = colors2[i] });
for (int i = 0; i < colors.Length; i++)
{
Elements.Add(new Label(Manager) { rectangle = new Rectangle((wigth - 50) / 2 + 480 + dx - i * i, 260 - i * i / 5, 50, 50), text = "D", mainColor = Color.Transparent, scale = 2.15f - 0.05f * i * i / 5, fontName = "Font2", fontColor = colors[i] });
BigLetterLabels.Add(Elements.Last() as Label);
BigLetterPositions.Add(new Vector2(Elements.Last().rectangle.X, Elements.Last().rectangle.Y));
}
var butSingle = new ButtonText(Manager) { rectangle = new Rectangle((wigth - (int)(300 * 2.4)) / 2, 350, (int)(300 * 2.4), (int)(50 * 2.4)), text = "Singleplayer", scale = 1.2f, fontName = "ButtonFont" };
Elements.Add(butSingle);
@ -61,8 +74,27 @@ internal class MenuGUI : AbstractGui
};
}
public override void Update(GameTime gameTime)
{
for (int i = 0; i < MainLetterLabels.Count; i++)
{
MainLetterLabels[i].fontColor = Color.FromNonPremultiplied(colors[i].ToVector4() *
(float)(((Math.Sin(gameTime.TotalGameTime.TotalSeconds * 4) + 1) / 2f) * 0.3 + 0.8f)
);
BigLetterLabels[i].fontColor = Color.FromNonPremultiplied(colors[i].ToVector4()
* (float)(((Math.Sin(gameTime.TotalGameTime.TotalSeconds * 4 - Math.PI) + 1) / 2f) * 0.3 + 0.8f)
);
MainLetterLabels[i].fontColor.A = 255;
BigLetterLabels[i].fontColor.A = 255;
MainLetterLabels[i].rectangle.Y = (int)(MainLetterPositions[i].Y +
(20 * (Math.Sin(gameTime.TotalGameTime.TotalSeconds * 4) + 1) / 2f * 0.25) * (i - MainLetterLabels.Count / 2)
);
BigLetterLabels[i].rectangle.Y = (int)(BigLetterPositions[i].Y +
(20 * (Math.Sin(gameTime.TotalGameTime.TotalSeconds * 4 - Math.PI) + 1) / 2f * 0.25) * (i - MainLetterLabels.Count / 2)
);
}
base.Update(gameTime);
}
}

24
DangerousD/GameCore/GameObjects/Entities/SilasBall.cs
View file

@ -1,7 +1,9 @@
using DangerousD.GameCore.Graphics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -10,19 +12,22 @@ namespace DangerousD.GameCore.GameObjects.Entities
{
public class SilasBall : LivingEntity
{
private Vector2 v;
public SilasBall(Vector2 position) : base(position)
{
Height = 60;
Width = 60;
Height = 24;
Width = 24;
acceleration = Vector2.Zero;
}
public SilasBall(Vector2 position, Vector2 velosity) : base(position)
{
Height = 60;
Width = 60;
Height = 24;
Width = 24;
acceleration = Vector2.Zero;
velocity = velosity;
v = velosity;
}
@ -30,6 +35,17 @@ namespace DangerousD.GameCore.GameObjects.Entities
public override void Update(GameTime gameTime)
{
base.Update(gameTime);
if (AppManager.Instance.GameManager.physicsManager.CheckRectangle( new Rectangle(Rectangle.X-2,Rectangle.Y-2,Rectangle.Width+8,Rectangle.Height+8)).Count>0)
{
AppManager.Instance.GameManager.Remove(this);
}
velocity = v;
}
public override void Draw(SpriteBatch spriteBatch)
{
base.Draw(spriteBatch);
}
}

1
DangerousD/GameCore/GameObjects/GameObject.cs
View file

@ -15,6 +15,7 @@ namespace DangerousD.GameCore
protected Vector2 _pos;
public Vector2 Pos => _pos;
public int id;
public bool isIdFromHost = false;
public int Width { get; set; }
public int Height { get; set; }
public Rectangle Rectangle => new Rectangle((int)Pos.X, (int)Pos.Y, Width, Height);

7
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
View file

@ -13,11 +13,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
public abstract class CoreEnemy : LivingEntity
{
protected int monster_health;
protected float monster_speed = 2;
protected int monster_speed;
protected string name;
protected bool isAlive = true;
protected bool isAttack = false;
protected bool isGoRight;
protected int leftBoarder = 0;
protected int rightBoarder = 800;
@ -33,7 +31,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
public abstract void Death();
public abstract void Attack();
public abstract void Attack(GameTime gameTime);
public abstract void Move(GameTime gameTime);
@ -46,7 +43,5 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
isAlive = false;
}
}
public abstract void Target();
}
}

11
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs
View file

@ -12,6 +12,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
public class FlameSkull : CoreEnemy
{
private bool isGoRight;
private bool isAttack;
public FlameSkull(Vector2 position) : base(position)
{
Width = 62;
@ -71,14 +74,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
{
}
public override void Target()
{
throw new NotImplementedException();
}
}
}

6
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs
View file

@ -12,6 +12,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
internal class Frank : CoreEnemy
{
private bool isGoRight;
public Frank(Vector2 position) : base(position)
{
isGoRight = false;
@ -69,12 +71,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

4
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
View file

@ -81,12 +81,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

7
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs
View file

@ -10,6 +10,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
public class Ghost : CoreEnemy
{
private bool isGoRight;
private bool isAttack;
public Ghost(Vector2 position) : base(position)
{
isGoRight = true;
@ -76,12 +79,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

4
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs
View file

@ -81,7 +81,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
@ -129,7 +129,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
Debug.WriteLine("Collision");
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

4
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs
View file

@ -27,7 +27,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
@ -42,7 +42,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

10
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs
View file

@ -1,4 +1,4 @@
using DangerousD.GameCore.Graphics;
 using DangerousD.GameCore.Graphics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
@ -15,8 +15,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public SilasHands(Vector2 position) : base(position)
{
name = "SilasHand";
Width = 48;
Height = 48;
Width = 16;
Height = 16;
monster_health = 2;
monster_speed = 2;
acceleration = Vector2.Zero;
@ -30,7 +30,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
@ -61,7 +61,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

27
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs
View file

@ -23,21 +23,17 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public SilasMaster(Vector2 position) : base(position)
{
name = "SilasMaster";
Width = 144;
Height = 160;
Width = 48;
Height = 53;
monster_health = 15;
monster_speed = 4;
monster_speed = 2;
acceleration = Vector2.Zero;
leftBorder = (int)position.X - 60;
rightBorder = (int)position.X + 120;
acceleration = Vector2.Zero;
hands.Add(new SilasHands(new Vector2(Pos.X+60,Pos.Y+120)));
hands.Add(new SilasHands(new Vector2(Pos.X + 90, Pos.Y + 120)));
for (int i = 0; i < 4; i++)
{
SilasBall silasball = new SilasBall(new Vector2(Pos.X + i * 40, Pos.Y + 120), new Vector2((i - 2) * 4, 6));
balls.Add(silasball);
}
hands.Add(new SilasHands(new Vector2(Pos.X+0,Pos.Y+53)));
hands.Add(new SilasHands(new Vector2(Pos.X + 24, Pos.Y + 53)));
}
protected override GraphicsComponent GraphicsComponent { get; } = new GraphicsComponent(new List<string>() { "SilasMove", "SilasAttack" }, "SilasMove");
public override void Attack()
@ -63,15 +59,18 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
private void SpawnAttackBall()
{
for (int i = 0; i < balls.Count; i++)
balls.Clear();
for (int i = 0; i < 4; i++)
{
balls[i].SetPosition(new Vector2(Pos.X + i * 40, Pos.Y + 120));
SilasBall silasball = new SilasBall(new Vector2(Pos.X + i * 12, Pos.Y + 53), new Vector2((i - 2) * 2, 2));
balls.Add(silasball);
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
@ -112,7 +111,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

4
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
View file

@ -232,12 +232,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
base.Update(gameTime);
}
public override void Target()
public void Target()
{
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}

7
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs
View file

@ -14,6 +14,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
public class Spider : CoreEnemy
{
private bool isGoRight;
private bool isAttack;
protected SpiderWeb web;
protected float delay;
protected int webLength;
@ -65,7 +68,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
/// Атака паука РАБОЧАЯ
/// </summary>
/// <param name="gameTime"></param>
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{ //48 72
velocity.X = 0;
delay += (float)gameTime.ElapsedGameTime.TotalSeconds;
@ -167,7 +170,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Target()
public void Target()
{
if (player.Pos.X >= Pos.X && player.Pos.X <= Pos.X+Width)
{

4
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs
View file

@ -28,7 +28,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
@ -43,7 +43,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

7
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs
View file

@ -12,6 +12,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
public class Werewolf : CoreEnemy
{
private bool isGoRight;
private bool isAttack;
public Werewolf(Vector2 position) : base(position)
{
name = "Wolf";
@ -70,11 +73,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
public override void Attack(GameTime gameTime)
public void Attack(GameTime gameTime)
{
}
public override void Target()
public void Target()
{
throw new NotImplementedException();
}

34
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
View file

@ -13,6 +13,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
public class Zombie : CoreEnemy
{
private bool isGoRight;
private bool isAttack;
float leftBorder;
float rightBorder;
bool isAttaking = false;
@ -24,8 +27,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
Height = 40;
monster_speed = 3;
name = "Zombie";
leftBorder = (int)position.X - 50;
rightBorder = (int)position.X + 50;
monster_health = 2;
leftBorder = (int)position.X - 100;
rightBorder = (int)position.X + 100;
physicsManager = new PhysicsManager();
Random random = new Random();
if(random.Next(0, 2) == 0)
@ -74,6 +78,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public override void Death()
{
for (int i = 0; i < 3; i++)
{
Particle particle = new Particle(Pos);
}
AppManager.Instance.GameManager.Remove(this);
}
@ -118,8 +128,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
base.OnCollision(gameObject);
}
<<<<<<< HEAD
public override void Target()
=======
public void Target()
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
{
if (AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 50, (int)Pos.Y, Width + 100, Height), typeof(Player)).Count > 0)
{
@ -150,6 +164,22 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
<<<<<<< HEAD
public override void Attack(GameTime gameTime) { }
=======
public void Attack(GameTime gameTime)
{}
public void TakeDamage()
{
monster_health--;
GraphicsComponent.StartAnimation("ZombieRightAttack");
Particle particle = new Particle(Pos);
if (monster_health <= 0)
{
Death();
}
}
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
}
}

46
DangerousD/GameCore/GameObjects/LivingEntities/Particle.cs Normal file
View file

@ -0,0 +1,46 @@
using DangerousD.GameCore.Graphics;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DangerousD.GameCore.GameObjects.LivingEntities
{
public class Particle : LivingEntity
{
int delay;
public Particle(Vector2 position) : base(position)
{
Width = 14;
Height = 14;
Random random = new Random();
velocity = new Vector2(random.Next(3, 15), random.Next(3,30));
acceleration.Y = 10;
delay = 100;
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "GibsMoveLeftBottom", "GibsMoveLeftTop", "GibsMoveRightBottom", "GibsMoveRightTop" }, "GibsMoveRightTop");
public override void Update(GameTime gameTime)
{
delay--;
if (velocity.X > 0)
{
velocity.X--;
}
if(velocity.Y<=0)
{
GraphicsComponent.StartAnimation("GipsNoMove");
; }
if(delay<=0)
{
AppManager.Instance.GameManager.Remove(this);
}
base.Update(gameTime);
}
}
}

111
DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
View file

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using DangerousD.GameCore.GameObjects.PlayerDeath;
using Microsoft.Xna.Framework.Input;
using Microsoft.Xna.Framework.Graphics;
using DangerousD.GameCore.GameObjects.LivingEntities.Monsters;
using DangerousD.GameCore.Network;
namespace DangerousD.GameCore.GameObjects.LivingEntities
@ -25,28 +26,52 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
public int leftBorder;
public bool isVisible = true;
private bool isAttacked = false;
private bool isShooting = false;
public GameObject objectAttack;
public bool isInvincible;
private int bullets;
public bool FallingThroughPlatform = false;
public int Bullets { get { return bullets; } }
public Player(Vector2 position, bool isNetworkPlayer = false) : base(position)
public Player(Vector2 position) : base(position)
{
Width = 16;
Height = 32;
if (!isNetworkPlayer)
{
AppManager.Instance.InputManager.ShootEvent += Shoot;
AppManager.Instance.InputManager.MovEventJump += Jump;
AppManager.Instance.InputManager.MovEventDown += MoveDown;
}
velocity = new Vector2(0, 0);
rightBorder = (int)position.X + 100;
leftBorder = (int)position.X - 100;
bullets = 5;
this.GraphicsComponent.actionOfAnimationEnd += (a) =>
{
if (a == "playerShootLeft" || a == "playerShootRight")
{
isShooting = false;
}
if (a == "playerReload")
{
bullets++;
}
};
}
public bool IsAlive { get { return isAlive; } }
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft",
"playerJumpRight" , "playerJumpLeft"}, "playerStayLeft");
"playerJumpRight" , "playerJumpLeft", "playerShootLeft", "playerShootRight", "playerReload"}, "playerReload");
public void Attack()
{
@ -54,6 +79,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
isVisible = false;
}
}
public override void OnCollision(GameObject gameObject)
{
@ -68,6 +94,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
public void Death(string monsterName)
{
return; //godmode
isAttacked = true;
if(monsterName == "Zombie")
{
@ -103,13 +130,56 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
public void Shoot()
{
if (bullets > 0)
{
if (!isShooting)
{
isShooting = true;
bullets--;
if (isRight)
{
if (GraphicsComponent.GetCurrentAnimation != "playerShootRight")
{
GraphicsComponent.StartAnimation("playerShootRight");
}
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), 100, 10), typeof(Zombie));
if (targets != null)
{
foreach (var target in targets)
{
Zombie targetZombie = (Zombie)target;
targetZombie.TakeDamage();
}
}
}
else
{
if (GraphicsComponent.GetCurrentAnimation != "playerShootRight")
{
GraphicsComponent.StartAnimation("playerShootRight");
}
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), -100, 10), typeof(Zombie));
if (targets != null)
{
foreach (var target in targets)
{
Zombie targetZombie = (Zombie)target;
targetZombie.TakeDamage();
}
}
}
}
}
}
public override void Update(GameTime gameTime)
{
GraphicsComponent.CameraPosition = (_pos-new Vector2(200, 350)).ToPoint();
if (!isAttacked)
if (isOnGround && FallingThroughPlatform)
{
FallingThroughPlatform = false;
AppManager.Instance.DebugHUD.Log("not falling");
}
GraphicsComponent.SetCameraPosition(Pos);
if (!isAttacked || isInvincible)
{
Move(gameTime);
}
@ -124,8 +194,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
float delta = (float)gameTime.ElapsedGameTime.TotalSeconds;
velocity.X = 5 * AppManager.Instance.InputManager.VectorMovementDirection.X;
if (GraphicsComponent.GetCurrentAnimation != "playerShootLeft" && GraphicsComponent.GetCurrentAnimation != "playerShootRight")
{
if (AppManager.Instance.InputManager.VectorMovementDirection.X > 0)
{
isRight = true;
if (GraphicsComponent.GetCurrentAnimation != "playerMoveRight")//идёт направо
{
GraphicsComponent.StartAnimation("playerMoveRight");
@ -133,16 +206,29 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
else if (AppManager.Instance.InputManager.VectorMovementDirection.X < 0)//идёт налево
{
isRight = false;
if (GraphicsComponent.GetCurrentAnimation != "playerMoveLeft")
{
GraphicsComponent.StartAnimation("playerMoveLeft");
}
}
else if(AppManager.Instance.InputManager.VectorMovementDirection.X == 0)//стоит
else if (AppManager.Instance.InputManager.VectorMovementDirection.X == 0)//стоит
{
if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveLeft")
if(bullets < 5)
{
GraphicsComponent.StartAnimation("ZombieMoveLeft");
if (GraphicsComponent.GetCurrentAnimation != "playerReload")
{
GraphicsComponent.StartAnimation("playerReload");
}
}
else if (isRight)
{
GraphicsComponent.StartAnimation("playerRightStay");
}
else if (!isRight)
{
GraphicsComponent.StartAnimation("playerStayLeft");
}
}
}
if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.SinglePlayer)
@ -153,8 +239,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
public void MoveDown()
{
// ПОЧЕМУ
velocity.Y = -11;
FallingThroughPlatform = true;
isOnGround = false;
AppManager.Instance.DebugHUD.Log("FallingThroughPlatform");
}
}

47
DangerousD/GameCore/Graphics/GraphicsComponent.cs
View file

@ -1,4 +1,5 @@
using Microsoft.Xna.Framework;
using DangerousD.GameCore.Managers;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
using System;
@ -16,6 +17,7 @@ namespace DangerousD.GameCore.Graphics
private List<Texture2D> textures;
private List<string> texturesNames;
private AnimationContainer currentAnimation;
static private int scaling = 4;
public AnimationContainer CurrentAnimation
{
get
@ -128,7 +130,7 @@ namespace DangerousD.GameCore.Graphics
{
if (!currentAnimation.IsCycle)
{
if(actionOfAnimationEnd != null)
if (actionOfAnimationEnd != null)
{
actionOfAnimationEnd(currentAnimation.Id);
}
@ -151,10 +153,10 @@ namespace DangerousD.GameCore.Graphics
{
Texture2D texture = textures[texturesNames.FindIndex(x => x == currentAnimation.TextureName)];
float scale;
if (currentAnimation.Offset.X!=0)
if (currentAnimation.Offset.X != 0)
{
destinationRectangle.X -= (int)currentAnimation.Offset.X;
scale=destinationRectangle.Height/sourceRectangle.Height;
scale = destinationRectangle.Height / sourceRectangle.Height;
destinationRectangle.Width = (int)(sourceRectangle.Width * scale);
}
@ -167,6 +169,8 @@ namespace DangerousD.GameCore.Graphics
destinationRectangle.X -= CameraPosition.X;
destinationRectangle.Y -= CameraPosition.Y;
destinationRectangle = Scaling(destinationRectangle);
_spriteBatch.Draw(texture,
destinationRectangle, sourceRectangle, Color.White);
}
@ -191,10 +195,18 @@ namespace DangerousD.GameCore.Graphics
destinationRectangle.X -= CameraPosition.X;
destinationRectangle.Y -= CameraPosition.Y;
destinationRectangle = Scaling(destinationRectangle);
_spriteBatch.Draw(texture,
destinationRectangle, sourceRectangle, Color.White);
}
private Rectangle Scaling(Rectangle destinationRectangle)
{
destinationRectangle.X *= scaling;
destinationRectangle.Y *= scaling;
destinationRectangle.Width *= scaling;
destinationRectangle.Height *= scaling;
return destinationRectangle;
}
private void buildSourceRectangle()
{
sourceRectangle = new Rectangle();
@ -222,6 +234,29 @@ namespace DangerousD.GameCore.Graphics
interval = lastInterval;
}
}
public static Point CameraPosition = new Point(0, 0);
public static void SetCameraPosition(Vector2 playerPosition)
{
CameraPosition = (playerPosition).ToPoint();
CameraPosition.X -= 300;
CameraPosition.Y -= 200;
if (CameraPosition.X < AppManager.Instance.GameManager.CameraBorder.X)
{
CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.X;
}
if (CameraPosition.X > AppManager.Instance.GameManager.CameraBorder.Y - 460)
{
CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.Y - 460;
}
if (CameraPosition.Y < AppManager.Instance.GameManager.CameraBorder.Z)
{
CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.Z;
}
if (CameraPosition.Y > AppManager.Instance.GameManager.CameraBorder.W - 470)
{
CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 470;
}
AppManager.Instance.DebugHUD.Set("CameraPosition", $"{CameraPosition.X}, {CameraPosition.Y}");
}
public static Point CameraPosition = new Point(-700, 300);
}
}

33
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -12,6 +12,7 @@ using MonogameLibrary.UI.Base;
using DangerousD.GameCore.Managers;
using DangerousD.GameCore.GameObjects.LivingEntities;
using DangerousD.GameCore.GameObjects;
using System.Threading.Tasks;
namespace DangerousD.GameCore
{
@ -111,6 +112,8 @@ namespace DangerousD.GameCore
if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || Keyboard.GetState().IsKeyDown(Keys.Escape))
Exit();
if (GameManager.GetPlayer1 != null)
DebugHUD.Set("Objid: ", GameManager.GetPlayer1.id.ToString());
InputManager.Update();
SoundManager.Update();
@ -202,7 +205,12 @@ namespace DangerousD.GameCore
case GameState.Lobby:
break;
case GameState.Game:
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
=======
GameManager.mapManager.LoadLevel("lvl");
GameManager.FindBorders();
>>>>>>> main
break;
case GameState.Death:
break;
@ -225,24 +233,41 @@ namespace DangerousD.GameCore
case NetworkTaskOperationEnum.CreateEntity:
break;
case NetworkTaskOperationEnum.SendPosition:
if (networkTask.objId != GameManager.GetPlayer1.id)
{
LivingEntity entity = GameManager.livingEntities.Find(x => x.id == networkTask.objId);
entity.SetPosition(networkTask.position);
if (multiPlayerStatus == MultiPlayerStatus.Host)
{
NetworkTasks.Add(networkTask);
}
}
break;
case NetworkTaskOperationEnum.ChangeState:
break;
case NetworkTaskOperationEnum.ConnectToHost:
Player connectedPlayer = new Player(Vector2.Zero);
Player connectedPlayer = new Player(Vector2.Zero, true);
NetworkTasks.Add(new NetworkTask(connectedPlayer.id));
NetworkTask task = new NetworkTask();
NetworkTasks.Add(task.AddConnectedPlayer(GameManager.GetPlayer1.id, GameManager.GetPlayer1.Pos));
foreach (Player player in GameManager.players)
{
if (player.id != connectedPlayer.id)
{
NetworkTasks.Add(task.AddConnectedPlayer(player.id, player.Pos));
}
}
break;
case NetworkTaskOperationEnum.GetClientPlayerId:
if (!GameManager.GetPlayer1.isIdFromHost)
{
GameManager.GetPlayer1.id = networkTask.objId;
GameManager.GetPlayer1.isIdFromHost = true;
}
break;
case NetworkTaskOperationEnum.AddConnectedPlayer:
Player remoteConnectedPlayer = new Player(networkTask.position);
Player remoteConnectedPlayer = new Player(networkTask.position, true);
remoteConnectedPlayer.id = networkTask.objId;
GameManager.players.Add(remoteConnectedPlayer);
break;
default:
break;

62
DangerousD/GameCore/Managers/GameManager.cs
View file

@ -28,7 +28,7 @@ namespace DangerousD.GameCore
public PhysicsManager physicsManager;
public List<Player> players;
public List<GameObject> otherObjects = new();
public Vector4 CameraBorder;
public Player GetPlayer1 { get; private set; }
public GameManager()
{
@ -42,6 +42,7 @@ namespace DangerousD.GameCore
players = new List<Player>();
mapManager = new MapManager(1);
physicsManager = new PhysicsManager();
CameraBorder = Vector4.Zero;
}
@ -83,6 +84,36 @@ namespace DangerousD.GameCore
otherObjects.Add(gameObject);
}
}
public void Remove(GameObject gameObject)
{
GetAllGameObjects.Remove(gameObject);
if (gameObject is Player objPl)
{
livingEntities.Remove(gameObject as LivingEntity);
players.Remove(objPl);
}
else if (gameObject is LivingEntity objLE)
{
livingEntities.Remove(objLE);
}
else if (gameObject is Entity objE)
{
entities.Remove(objE);
}
else if (gameObject is MapObject obj)
{
if (obj.IsColliderOn)
mapObjects.Remove(obj);
else
BackgroundObjects.Remove(obj);
}
else
{
otherObjects.Remove(gameObject);
}
}
public void Draw(SpriteBatch _spriteBatch)
{
foreach (var item in BackgroundObjects)
@ -99,7 +130,6 @@ namespace DangerousD.GameCore
public void Update(GameTime gameTime)
{
AppManager.Instance.DebugHUD.Set("playerId: ", GetPlayer1.id.ToString());
if (AppManager.Instance.NetworkTasks.Count > 0)
{
AppManager.Instance.NetworkManager.SendMsg(AppManager.Instance.NetworkTasks.ToList());
@ -117,21 +147,43 @@ namespace DangerousD.GameCore
{
livingEntitiesWithoutPlayers[i].Update(gameTime);
}
GetPlayer1.Update(gameTime);
}
else
{
for (int i = 0; i < livingEntitiesWithoutPlayers.Count; i++)
{
livingEntitiesWithoutPlayers[i].PlayAnimation();
}
GetPlayer1.Update(gameTime);
}
GetPlayer1.Update(gameTime);
foreach (var item in otherObjects)
item.Update(gameTime);
physicsManager.UpdateCollisions(entities, livingEntities, mapObjects, gameTime);
physicsManager.UpdateCollisions(entities, livingEntities, mapObjects, players, gameTime);
}
public void FindBorders()
{
foreach (var item in GetAllGameObjects)
{
if (item.Pos.X<CameraBorder.X)
{
CameraBorder.X = item.Pos.X;
}
if (item.Pos.X > CameraBorder.Y)
{
CameraBorder.Y = item.Pos.X;
}
if (item.Pos.Y < CameraBorder.Z)
{
CameraBorder.Z = item.Pos.X;
}
if (item.Pos.Y > CameraBorder.W)
{
CameraBorder.W = item.Pos.X;
}
}
}
}
}

34
DangerousD/GameCore/Managers/MapManager.cs
View file

@ -9,6 +9,7 @@ using Microsoft.Xna.Framework.Graphics;
using System.Xml.Serialization;
using DangerousD.GameCore.GameObjects;
using System.Globalization;
using DangerousD.GameCore.GameObjects.LivingEntities;
namespace DangerousD.GameCore.Managers
{
@ -70,21 +71,7 @@ namespace DangerousD.GameCore.Managers
Rectangle sourceRect = new(new Point((tiles[i] -1) % _columns, (tiles[i] -1) / _columns) * tileSize.ToPoint(), tileSize.ToPoint());
Type type = Type.GetType($"DangerousD.GameCore.GameObjects.MapObjects.{tileType}");
Activator.CreateInstance(type, pos, tileSize * _scale, sourceRect);
/*switch (tileType)
{
case "collidable":
new StopTile(pos, tileSize * _scale, sourceRect);
break;
case "platform":
new Platform(pos, tileSize * _scale, sourceRect);
break;
case "non_collidable":
new Tile(pos, tileSize * _scale, sourceRect);
break;
}*/
}
}
}
}
@ -100,13 +87,30 @@ namespace DangerousD.GameCore.Managers
private void InstantiateEntities(XmlNode group)
{
string entityType = group.Attributes["class"].Value;
string entityGroup = group.Attributes["class"] is not null ? group.Attributes["class"].Value : "";
float offsetX = group.Attributes["offsetx"] is not null ? float.Parse(group.Attributes["offsetx"].Value) : 0;
float offsetY = group.Attributes["offsety"] is not null ? float.Parse(group.Attributes["offsety"].Value) : 0;
foreach (XmlNode entity in group.ChildNodes)
{
<<<<<<< HEAD
Type type = Type.GetType($"DangerousD.GameCore.GameObjects.{entityType}");
Entity inst = (Entity)Activator.CreateInstance(type, new Vector2(float.Parse(entity.Attributes["x"].Value, CultureInfo.InvariantCulture) + offsetX, float.Parse(entity.Attributes["y"].Value, CultureInfo.InvariantCulture) + offsetY ) * _scale);
=======
string entityType = entity.Attributes["type"] is not null ? "." + entity.Attributes["type"].Value : "";
Type type = Type.GetType($"DangerousD.GameCore.GameObjects.{entityGroup}{entityType}");
Vector2 pos =
new Vector2(float.Parse(entity.Attributes["x"].Value, CultureInfo.InvariantCulture) + offsetX,
float.Parse(entity.Attributes["y"].Value, CultureInfo.InvariantCulture) + offsetY) * _scale;
Entity inst;
if (type.Equals(typeof(Player)))
{
inst = (Entity)Activator.CreateInstance(type, pos, false);
}
else
{
inst = (Entity)Activator.CreateInstance(type, pos);
}
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
inst.SetPosition(new Vector2(inst.Pos.X, inst.Pos.Y - inst.Height));
inst.Height *= _scale;
inst.Width *= _scale;

43
DangerousD/GameCore/Managers/PhysicsManager.cs
View file

@ -5,6 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DangerousD.GameCore.GameObjects.LivingEntities;
using DangerousD.GameCore.GameObjects.MapObjects;
using Microsoft.Xna.Framework;
namespace DangerousD.GameCore.Managers
@ -13,7 +14,7 @@ namespace DangerousD.GameCore.Managers
{
public void UpdateCollisions(List<Entity> entities, List<LivingEntity> livingEntities,
List<MapObject> mapObjects, GameTime gameTime)
List<MapObject> mapObjects, List<Player> players, GameTime gameTime)
{
float delta = (float)gameTime.ElapsedGameTime.TotalSeconds;
foreach (var item in livingEntities)
@ -21,7 +22,8 @@ namespace DangerousD.GameCore.Managers
item.velocity = item.velocity + item.acceleration * delta;
}
CheckCollisionsLE_MO(livingEntities, mapObjects);
CheckCollisionsLE_MO(livingEntities, mapObjects.Where(mo => mo is StopTile).ToList());
CheckCollisionsPlayer_Platform(players, mapObjects.OfType<Platform>().ToList());
CheckCollisionsE_LE(entities, livingEntities);
CheckCollisionsLE_LE(livingEntities);
@ -75,6 +77,7 @@ namespace DangerousD.GameCore.Managers
if (currentEntity is Player)
{
AppManager.Instance.DebugHUD.Set("velocity", currentEntity.velocity.ToString());
AppManager.Instance.DebugHUD.Set("falling", (currentEntity as Player).FallingThroughPlatform.ToString());
AppManager.Instance.DebugHUD.Set("intersects y", "");
}
foreach (var mapObject in mapObjects)
@ -100,6 +103,42 @@ namespace DangerousD.GameCore.Managers
currentEntity.SetPosition(new Vector2(newRect.X, newRect.Y));
}
}
private void CheckCollisionsPlayer_Platform(List<Player> players, List<Platform> platforms)
{
foreach (var player in players)
{
if (player.velocity.Y <= 0 || player.FallingThroughPlatform)
{
continue;
}
var currentRect = player.Rectangle;
var newRect = currentRect;
var collidedY = false;
var tryingRectY = currentRect;
tryingRectY.Offset(0, (int)Math.Ceiling(player.velocity.Y));
AppManager.Instance.DebugHUD.Set("intersects platform", "false");
foreach (var platform in platforms)
{
if (tryingRectY.Intersects(platform.Rectangle))
{
AppManager.Instance.DebugHUD.Set("intersects platform", "true");
collidedY = true;
break;
}
}
if (collidedY)
{
// костыль потому что в CheckCollisionsLE_MO он спускается
newRect.Y -= (int)Math.Ceiling(player.velocity.Y);
player.isOnGround = true;
player.velocity.Y = 0;
}
player.SetPosition(new Vector2(newRect.X, newRect.Y));
}
}
private void CheckCollisionsE_LE(List<Entity> entities, List<LivingEntity> livingEntities)
{

8
DangerousD/GameCore/Network/NetworkManager.cs
View file

@ -91,7 +91,7 @@ namespace DangerousD.GameCore.Network
}
catch { }
}
public void SendMsg(List<NetworkTask> networkTask)
public void SendMsg(List<NetworkTask> networkTask, Socket ignoreSocket = null)
{
byte[] Data = Encoding.Unicode.GetBytes(JsonConvert.SerializeObject(networkTask));
int count = Data.Length;
@ -100,11 +100,14 @@ namespace DangerousD.GameCore.Network
try
{
foreach (Socket socket in clientSockets)
{
if (!(socket == ignoreSocket))
{
socket.Send(BitConverter.GetBytes(count));
socket.Send(Data);
}
}
}
catch { }
}
else
@ -148,7 +151,8 @@ namespace DangerousD.GameCore.Network
}
else
{
GetReceivingMessages(JsonConvert.DeserializeObject<List<NetworkTask>>(so.sb.ToString()));
List<NetworkTask> tasks = JsonConvert.DeserializeObject<List<NetworkTask>>(so.sb.ToString());
GetReceivingMessages(tasks);
}
}
catch { }

4
MonogameLibrary/UI/Base/UIManager.cs
View file

@ -51,8 +51,10 @@ namespace MonogameLibrary.UI.Base
}
}
}
public void Update()
public GameTime gameTime;
public void Update(GameTime gameTime)
{
this.gameTime = gameTime;
try
{
keyboardState = Keyboard.GetState();

41
MonogameLibrary/UI/Elements/ButtonText.cs
View file

@ -16,22 +16,57 @@ namespace MonogameLibrary.UI.Elements
public ButtonText(UIManager manager, int layerIndex = 0) : base(manager, layerIndex)
{
}
float gameTime = 0;
public override bool InteractUpdate(MouseState mouseState, MouseState prevmouseState)
{
gameTime += (float)Manager.gameTime.ElapsedGameTime.TotalSeconds;
return base.InteractUpdate(mouseState, prevmouseState);
}
public override void Draw(SpriteBatch _spriteBatch)
{
if (hoverState == HoverState.None)
{
fontColor = Color.White;
var d = (float)(((Math.Sin(gameTime * 2 - Math.PI) + 1) / 2f) * 0.1 + 0.7f);
fontColor = Color.FromNonPremultiplied(new Vector4(0.8f,0.15f, 0.15f, 1) * d
);
}
else if (hoverState == HoverState.Hovering)
{
fontColor = new Color(211, 211, 211);
var d2 = (float)(((Math.Sin(gameTime * 2 - Math.PI) + 1) / 2f) * 0.1 + 0.7f);
fontColor = Color.FromNonPremultiplied(new Vector4(0.8f, 0.15f, 0.15f, 1) * d2
);
}
else
{
fontColor = new Color(112, 128, 144);
//fontColor = new Color(112, 128, 144);
fontColor = new Color(212, 228, 244);
}
if (hoverState == HoverState.Hovering)
{
int kk = 50;
scale += 0.005f;
var d = (float)(((Math.Sin(gameTime * 1 - Math.PI) + 1) / 2f) * 0.1 + 1f);
Color oldColor = fontColor;
fontColor = Color.FromNonPremultiplied(new Vector4(252 / 255f, 231 / 255f, 124 / 255f, 1) * d
);
DrawText(_spriteBatch);
fontColor = oldColor;
fontColor.A = 255;
scale -= 0.005f;
scale -= 0.0002f;
}
if (hoverState == HoverState.Pressing)
{
scale -= 0.025f;
DrawText(_spriteBatch);
scale += 0.025f;
}
else
{
DrawText(_spriteBatch);
}
}
}
}

2
MonogameLibrary/UI/Elements/Label.cs
View file

@ -19,8 +19,10 @@ namespace MonogameLibrary.UI.Elements
}
protected HoverState hoverState = HoverState.None;
float gameTime = 0;
public virtual bool InteractUpdate(MouseState mouseState, MouseState prevmouseState)
{
gameTime += (float)Manager.gameTime.ElapsedGameTime.TotalSeconds;
if (rectangle.Intersects(new Rectangle(mouseState.Position, Point.Zero)))
{
if (mouseState.LeftButton == ButtonState.Pressed)