From 85af72cfa1c870fee0bcb6accef059dbbdfb2658 Mon Sep 17 00:00:00 2001 From: Solargale Date: Tue, 21 Apr 2020 13:39:42 -0600 Subject: [PATCH] Added back the map, movement and zooming. Also changed all Textures to 32bit --- Collector.sln.DotSettings.user | 2 + Collector/Collector.csproj | 1 + Collector/Content/Content.mgcb | 384 +++++++++++++++++++++ Collector/Content/air.png | Bin 1450 -> 2330 bytes Collector/Content/crosshair.png | Bin 1435 -> 1472 bytes Collector/Content/grass.png | Bin 2268 -> 2434 bytes Collector/Content/jungleGrass.png | Bin 1163 -> 3359 bytes Collector/Content/man/man-0.png | Bin 0 -> 248 bytes Collector/Content/man/man-1.png | Bin 0 -> 262 bytes Collector/Content/man/man-10.png | Bin 0 -> 268 bytes Collector/Content/man/man-11.png | Bin 0 -> 285 bytes Collector/Content/man/man-12.png | Bin 0 -> 268 bytes Collector/Content/man/man-13.png | Bin 0 -> 281 bytes Collector/Content/man/man-14.png | Bin 0 -> 268 bytes Collector/Content/man/man-15.png | Bin 0 -> 280 bytes Collector/Content/man/man-16.png | Bin 0 -> 248 bytes Collector/Content/man/man-17.png | Bin 0 -> 259 bytes Collector/Content/man/man-18.png | Bin 0 -> 248 bytes Collector/Content/man/man-19.png | Bin 0 -> 263 bytes Collector/Content/man/man-2.png | Bin 0 -> 248 bytes Collector/Content/man/man-20.png | Bin 0 -> 246 bytes Collector/Content/man/man-21.png | Bin 0 -> 262 bytes Collector/Content/man/man-22.png | Bin 0 -> 246 bytes Collector/Content/man/man-23.png | Bin 0 -> 260 bytes Collector/Content/man/man-24.png | Bin 0 -> 268 bytes Collector/Content/man/man-25.png | Bin 0 -> 279 bytes Collector/Content/man/man-26.png | Bin 0 -> 268 bytes Collector/Content/man/man-27.png | Bin 0 -> 285 bytes Collector/Content/man/man-28.png | Bin 0 -> 268 bytes Collector/Content/man/man-29.png | Bin 0 -> 281 bytes Collector/Content/man/man-3.png | Bin 0 -> 263 bytes Collector/Content/man/man-30.png | Bin 0 -> 268 bytes Collector/Content/man/man-31.png | Bin 0 -> 280 bytes Collector/Content/man/man-4.png | Bin 0 -> 267 bytes Collector/Content/man/man-5.png | Bin 0 -> 281 bytes Collector/Content/man/man-6.png | Bin 0 -> 267 bytes Collector/Content/man/man-7.png | Bin 0 -> 283 bytes Collector/Content/man/man-8.png | Bin 0 -> 268 bytes Collector/Content/man/man-9.png | Bin 0 -> 279 bytes Collector/Content/roof.png | Bin 2960 -> 3097 bytes Collector/Content/sand.png | Bin 2156 -> 2267 bytes Collector/Content/snow.png | Bin 2155 -> 2230 bytes Collector/Content/stone.png | Bin 2230 -> 2247 bytes Collector/Content/wall.png | Bin 1380 -> 1402 bytes Collector/Content/water.png | Bin 1139 -> 2822 bytes Collector/Content/wood.png | Bin 3006 -> 3189 bytes Collector/Main.cs | 53 +-- Collector/Restrictions.cs | 2 +- Collector/src/Character/InputController.cs | 105 ++++-- Collector/src/Character/Mouse.cs | 44 ++- Collector/src/Character/Player.cs | 73 +--- Collector/src/Dimension/Block.cs | 8 +- Collector/src/Dimension/BlockMaterials.cs | 4 +- Collector/src/Dimension/Chunks.cs | 40 ++- Collector/src/Dimension/World.cs | 89 ++--- Collector/src/Dimension/WorldRenderer.cs | 95 ++--- 56 files changed, 659 insertions(+), 241 deletions(-) create mode 100644 Collector/Content/man/man-0.png create mode 100644 Collector/Content/man/man-1.png create mode 100644 Collector/Content/man/man-10.png create mode 100644 Collector/Content/man/man-11.png create mode 100644 Collector/Content/man/man-12.png create mode 100644 Collector/Content/man/man-13.png create mode 100644 Collector/Content/man/man-14.png create mode 100644 Collector/Content/man/man-15.png create mode 100644 Collector/Content/man/man-16.png create mode 100644 Collector/Content/man/man-17.png create mode 100644 Collector/Content/man/man-18.png create mode 100644 Collector/Content/man/man-19.png create mode 100644 Collector/Content/man/man-2.png create mode 100644 Collector/Content/man/man-20.png create mode 100644 Collector/Content/man/man-21.png create mode 100644 Collector/Content/man/man-22.png create mode 100644 Collector/Content/man/man-23.png create mode 100644 Collector/Content/man/man-24.png create mode 100644 Collector/Content/man/man-25.png create mode 100644 Collector/Content/man/man-26.png create mode 100644 Collector/Content/man/man-27.png create mode 100644 Collector/Content/man/man-28.png create mode 100644 Collector/Content/man/man-29.png create mode 100644 Collector/Content/man/man-3.png create mode 100644 Collector/Content/man/man-30.png create mode 100644 Collector/Content/man/man-31.png create mode 100644 Collector/Content/man/man-4.png create mode 100644 Collector/Content/man/man-5.png create mode 100644 Collector/Content/man/man-6.png create mode 100644 Collector/Content/man/man-7.png create mode 100644 Collector/Content/man/man-8.png create mode 100644 Collector/Content/man/man-9.png diff --git a/Collector.sln.DotSettings.user b/Collector.sln.DotSettings.user index 5af94cd..7b5f6af 100644 --- a/Collector.sln.DotSettings.user +++ b/Collector.sln.DotSettings.user @@ -1,4 +1,6 @@  True + True + True True True \ No newline at end of file diff --git a/Collector/Collector.csproj b/Collector/Collector.csproj index 49d6549..9520261 100644 --- a/Collector/Collector.csproj +++ b/Collector/Collector.csproj @@ -12,6 +12,7 @@ + diff --git a/Collector/Content/Content.mgcb b/Collector/Content/Content.mgcb index 62e11c6..f6fb229 100644 --- a/Collector/Content/Content.mgcb +++ b/Collector/Content/Content.mgcb @@ -73,6 +73,390 @@ /processorParam:TextureFormat=Color /build:man.png +#begin man/man-0.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-0.png + +#begin man/man-1.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-1.png + +#begin man/man-10.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-10.png + +#begin man/man-11.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-11.png + +#begin man/man-12.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-12.png + +#begin man/man-13.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-13.png + +#begin man/man-14.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-14.png + +#begin man/man-15.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-15.png + +#begin man/man-16.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-16.png + +#begin man/man-17.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-17.png + +#begin man/man-18.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-18.png + +#begin man/man-19.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-19.png + +#begin man/man-2.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-2.png + +#begin man/man-20.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-20.png + +#begin man/man-21.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-21.png + +#begin man/man-22.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-22.png + +#begin man/man-23.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-23.png + +#begin man/man-24.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-24.png + +#begin man/man-25.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-25.png + +#begin man/man-26.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-26.png + +#begin man/man-27.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-27.png + +#begin man/man-28.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-28.png + +#begin man/man-29.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-29.png + +#begin man/man-3.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-3.png + +#begin man/man-30.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-30.png + +#begin man/man-31.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-31.png + +#begin man/man-4.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-4.png + +#begin man/man-5.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-5.png + +#begin man/man-6.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-6.png + +#begin man/man-7.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-7.png + +#begin man/man-8.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-8.png + +#begin man/man-9.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:man/man-9.png + #begin roof.png /importer:TextureImporter /processor:TextureProcessor diff --git a/Collector/Content/air.png b/Collector/Content/air.png index 22d5f8a3ef41351e3b32db68b3f562a379c10793..4cd04ce1736927e2705a09f9d4edb81622843985 100644 GIT binary patch delta 2273 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 delta 1386 zcmV-w1(o`m5~>S-iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVE_OFNqSUR zbW&k=AaHVTW@&6?Aar?fWgumEX=VTbc-rljTXy6q42IuX#Vi3yfW&ezmvd$Zv;6tN z*hwXw?j%zW^AJ-8EM!UO16;2E^Y?In;bJf5LR3pRC66nAz2{?+1T% z9^~#GV2A{*oR5~ayhF~==Pj?>PJukWGL-usI35SeHpI3aTpqV0q0@nH+fdntgtzB# zJ|Ek2%BHWUu;24zkFPY~cC!kioMIvkr~`Y|l+ic#L6Nr>*NdFzd-1poJwCfj6`5!5 zLgH7=XOwb(-UWA9b%q{B(I?SWZvqa;5CZyn=a&6%uaBa4ufyNiAF$p%`ar&EyNg2N zJs@u=rMvy5oZ@BZ4c5i(mFHx)=Lfmj?cz-Kg>T+tG#jIzvnwHC%4tvPn#$@y@0i(I zZzUA<$zc&1I! z!z?sdB})?n?208Jkn$Z1Ew_2Ot7N`8-w3KqFgDl6w~PC%;#hlv$lIMO#Km*fAqr2x zKO3ll2#uZ8xDtGox7XwaHokQ(#ztK1zMmO(Vm-_v~2@O5nM+ELjnRm zkwi*=h)9{02#GWRDhQn=@Bso8BR2%eK_meV_Aq?o9i^qpkxwxWLkUizBy2wep#oST zM64eThBZ{8#1LalQKQ8iOOiBqSW24asajMtXw;;t<}_4Rymt9_6OCvA!!`phlY-FH%!cZ)%XLUM6TBCvh?ZF%AUa z3ThyRg*};hqY!wKo6LM>?25<;GEO*+CNU5Uoj4A<*==$TS$qmNr?$B9ePhJtIFe4EH_%?_2kb{QMaDG4x~T$I$=6&_1T!bI!-Ff7d?zOg#B>^o=;)w(c4E zdHY@ajb9n~n~~kWE@Q+#e+0}O0004hglR)VP)S2WAaHVTW@&6?001bFeUUv#!$2Ix zUq7TpDh_rKamY}etcZ#_Y88r5A=C=3I+$Gg1x*@~6c~9Dn_Cq^uLvTH2u3k~EiqG{ z6U7uf$Jaf4e7%eFEbnuFjvgg%GQcMg&obSxh&PC*HZ7g=K5>+lB!&2#c*LL!5H^RA3=at44}{i8SpeJp2QWUnG}It}+-o7Epx>$?=2#!S8O(!o;|n z6iEPGFSh+L1cY{hX5F^Gk8Qho0tB9cE3NIXHh`H=((7$4b_Dcp0~gnAP2K}8cYyvU zT{0v`3efZy3c&jreNztTy9K(}+}>LIIDG&z)K%&RI5-4`iG7tlh^`LS{ s1poj4XJBF&1*2eifC0}7jFe_)0B?*J_4J1DZvX%Q07*qoM6N<$f~3NOsQ>@~ diff --git a/Collector/Content/crosshair.png b/Collector/Content/crosshair.png index 5635c25430c9af46a27007242fdb968d604e82c3..02a82cd11efe69a3f05a46e6d8cb2f95f70723c7 100644 GIT binary patch delta 1390 zcmV-!1(Euj3&0B{iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<@PLU-i ze?>0=Nr1$1Fqd;?2ebVC!IYD#B;84-9_AsY3|I(B)(56s|M#Eae&J#-=0a3UIVF!P zz2{uZ#B(p6}%D8eoV7t(=dRw!A|QCEAKsx19ocd}S#2J#gF)lx>J@ zJJ|A@BcaoQZ`)AWhJ?50a6TW~bIPW#e_vtG^J9;%G~jl#3Zk51A`Pemd)1WDH}*l1 zw-(n#&U0QoZieok-AxslXYNAcSIuXXa^3}ZK+S?w%~AA466#YE(K;YQ2}@?oZ`*U1J=dvmFHxa=R3LC<>E~Ce+}Qf z$7nW2Ki{r|gjY`crEagXdeA#&w$`kKqCPn+LPKYkjAGap6>F*a>JOAknHVSs1!`1i zP+x7OiVy>LRe}I2BPy-PfJE?Ic_*NdT$yGowt~487u=vBBCXPri zi%S-0fnr2^Zer554Io8u9T5x(2>3)2DIp?dRw5+Q0H`2zmcR!HP>kFVBnNCOz`-7d zZ_H6zsvP+g<6|hnNyO$;u*p&YD};#kqrtF-N|YF4j45igm}5zj<_=3qf7AS`78MN| zHL0pO&00(>ShQqnX4y*SEcoiijQyA`=UfV$7FaHrU7%3P!G|2-h(|i~up_&pR4ktw zYOJYhwVG>b+@xV2x74&*%dK?kSV}$g*i+YTJ@+!O)P{^O;z&c?u#rc(sBNro$``27 zrpAlZRMd+aq^dU)G(RVCe=-9x4g}x|Y9NM%J(+o<5O|WC%zS3-ipU5uPB@JwF%S%$ zI1aklZE_A-d`d=8@ zpK14;@8j3cwGWSpCm%=Oh~u$!&&bc?x%LOYGVnJeyWb*l#66C*e{t5;!Br3hA0SSSPKqv4;{TFDix>}%`|;gttSBkO=fvX%U6A;Z>$1yloC^;7d1ly1r{;;nf5bwejpa6GMMEWy5l0kN zqkMnHWrgz=XSG~q&3p0}hH~13_a~)WKceVHS@0n(QKW*P~r8X_QMF0Q*24YJ`L;(K){{a7>y{D6t2L&Gq z1Qik_3^ckZ%9AezC{sR3L_t(o!|m6x4FDhv1HnA|?`$eMkSHQi@V7u5cP2?{1E3n6 w?u>ejm8|>Y+eV%@U;s&yB*|T10KQ+x6CINv1<;#HM*si-07*qoM6N<$g7$@rh5!Hn delta 1338 zcmV-A1;zTn3!4iiiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVE_OFN|7Ze zf5j{TNr1$1Fqd;?2ebV7!PrS9o$e%45AzUH1}s1l`nZ(q|NK4NUwGJyxe(P-PRZj5 zIb<%Vm_MJga`Iv2`@>(A2f4c&7$QL_=clDD?~pV4^Oo1Gr$8QGDaw5}9FGlUD`MLQ zE{ofc&}qQ8t*C58!rO8Wz*MFf7s*v*zGF}c-_o`D5sc61MLhZ=a96 zcdy;w*dMUoHTpolX}gO;;@u!`D5bmnrJUlW=ndAz?v>?ax8(=9*=^zs_Jwc0e`7Qo zqo1=YAz{jCPwJY=s-fR8qqRmQB=yN*5gIBpWhBG4s8~zQSAQT?%EUl9C{Uw9gZe5f zRk#?qv!Z0Kj%5iAFfvz}aKlVASS3pn1N4d|A&~Oz3oWyGnX6>JIo}9fnV<}-=ljWh zw&PfPg2>w)EBM88)xir-z&{Ige*+O3JE(C5_)2e|$yGowt}q)WSp4Bm6-T6(#U%^0 zpkqXNZer556(B?~9pMZK2>3)2DZwLURw4w_0I0xqmcR!HP>kH*BnOcMIM`;ejWJ5A zD@Q)XI1D8?iP(G!HdzW_g%GiRG#J)Ui4sGMF-46Qb1X^H++itcnx|?}f6<^(ld782 zti{BFMN6h;maSyYf>SqU?8j_5=Tcy_Ky$(9f)1q|e8>@wc%(xQJF+`U#qz14#+s^D ztGSlOO&a!bOHG@#+)Ag8rPM=@J$3EYb1wr+ZO8~Cjx^K_8+nwQ+Q#}WeSsQnYP?9z zj(SsrRP|Cp^Eio<8HjNpe*jld12HV@$;=ytz?0l$<}+hgM23@b!f7;#fneywanQ|f zlXHmTQ@A;`#f|?fIXBULlH7Z4zoORW^;{RRa~sZ}dcp1+Itm+pxHTV3=`SMpL7%Ud z;`$hW>eD}?&OODSTamo?>vMj*lfZ4E)W=?q9In#7958eQA?>0~vokNW(xJ#a~mU zDisksh;+!%I$01Eanvdlp+cw?T6HkF^b49aBq=VAf@{ISkHxBki?gl{u7V)=0pjH7 zr060g{x2!Ci1pyOAMfrx?%n}Hz05SLYaGyY+e{_mVkWyP243Mu7`+%oRA!bjCrL?k z9AEeF@%1jovpS#qbM$|!Ig0^4k$9FFrcJy-JiTcfocD=CtSGC*=fqx##3 zoC_`sJTqjbQ}e_jVzJQ1N*lAHsS!^RM^sIxd?Dkp%6W^kR<5$omhi zU=d4@AVNVEC6r+!MypPWg%s__JNQRjzeFyDTqQ7aET94nvg>~b|AXJ%TKUNdFDV!Y zx?ddUBMJm|fkw@7zKjJ_!g4BY~KYhG{7eVjf3Y3eF@0~{OzqXo)d@9^%P_TK(I)9mjDRSR;P zJjgIK00009a7dFQ1sMqg92YJFmkErZlSKt6L@!B1K~y-)WBmXB|9=K3U}R)uWFP_{ w>p|s^2>$>7|DTCr6pVu50R}uTFjAVG0V(z$?~XkXy8r+H07*qoM6N<$f_`0hJOBUy diff --git a/Collector/Content/grass.png b/Collector/Content/grass.png index a554e52226ca5e45b2b9f0f6631500be8f9bc11d..85e4972cbfc1182a0b6e8d8607c614e1e3cfc020 100644 GIT binary patch delta 2293 zcmVY>zJ7R7y$DafwTz2(~c(d41HU^DFqN#;+?L&%9BH_=luA3qe8Qx=Zr zLKQ{CVnF8Akax>~?V_lPB2QvDtnWiCf2YFvGX&XZFIk^yz|V|F@R?FfE(bgV*_>0s zn8}8Wy!ALYQW^W=p^Bd0Mnwre(dnJH^GVA~zkU_JfG2sRYOG@HeZ({Rm3V6a8C<}) zNN#ubf4+X@z4>%sV1K~6NA4H%g0@i<63K#pp_KOf$9Wf3(F@jz-G}AG+wx<+lRg0l ze}321`MS;(T@48#CkaYJnIp&@BU^Jbro8J|@CMTS;ymJM=XjC1%f3Oblj~B#%h`S`IaVA*r_cd_!KrqfUGXkvk zFiXV|-CbOM0_`Cf@m?f$xr+j%2&N;PaUKZRl^+Ks#{t8#T(v{7{ zSGnp&O|5X>7jf6V5rD%@x%abO0-C^!I~ff^7)VGqnKyAWs~H!!n> zMiV4B83#Ds4a9(8I32~yZR`X&L-qf`&19aq(SJqG4CsCnxo_NlLamSExlP0t4M$R~ z2m8jhN?flJ{fVldA0WzjQQ?-m3(=X-(5)~)X3EIG4=uTel8vjonZ23SCq;k8 z34f?w<$8Ll+mR^x=yxhhQrWvelm>STh?-7%^5U+CwsU973ovDh)-ipAkksV)O!R1= zMruV)n@QPNG%0@pu|GMTqIsA6&7kn=M>mSf0Mh1z(l=kZ)uI*8 zK97|0tWoW6Gk7DNJZrGKKa^LI?iO-0@)Uo7OE6L*5+ME?P;qVLl$L60uXb;DLx|6l zw&=mUTOIzOedR6P$I@nYQi|-7?%Lb@K2P+ZbML0P|AtT^nA;sKJ0;DA|9vE!+6404M~cNqu^R_@Ud8RaB}%`|;g4rtTK|H-_>74h8!>lMN#OK8023?T&k?XR{Z=4Gb`*~*A zNT=qB!^A?Njpa6GMMEWy5l0kNqkMnHWrgz=XSG~q&3p0}hH~1+gyEXGulWtNd4s^WO_QxpD zxeGLEw*7r<+l><-@C;mOEq|pB%zTnwYiW@qpl=(vxNd3k9&ot>3_a~)WKceVHS@0n(QKW*P~r8X_QMF0Q* z24YJLM??Vs0RI60puMM)lRyU`2o(||GP;_hrjuv~D1X{XL_t(Y$L-d^&Lk%c1mMp= zZ=@)fynP;Z_iw;CxVL+h@eKm7b+H+*XY2CTiX=E4pb+3{@* ze9tfBPVBXD^aGo)uwz4Z?4BP% z5E0lCF@FNH^1c&Cc8J7?j%b1J^9zRqGZrEmWTBb&{`Vs&o>awCB4c9~bF74U8lGB!BIRgqDHP8n%sdP4v;9Q?qdR2!hgH zTvC3aB$Weyu)gct3)=KI`UqrE+3lm3X4df6p&= zy`B(HR^ELmXk9M0G55Ybxq3_W&T_GH zPjd9?MZM!kE));Xb%I~hld~tzePXS+m2r7;{_n}3_2g+{u3ycQ3<^`g41#&+~unMI%6>xt{7cfP(tYF=;bYiG;Pb<@8AHZDB^)YBR& P00000NkvXXu0mjf17Bx? delta 2157 zcmV-z2$J`L6WkFciBL{Q4GJ0x0000DNk~Le0000G0000G2m$~A0FaSrHUIzxagik- ze_Il)C=C5)6|)2gudo~ht(qOo^5*~vw)VZZ?mV(9&lfrA_c6Jq96 zQnENg356;KY}Zle-Pthj@?v%Hm^b?aVans_*DEKPKQT{`Cz)@er(!;SC@QCXIG!J> zC?XaEYEcY%w+z@WimE8`B$mT^Kg4n>f1E!fFu`V8}==p9`l;9Jc-g!Ikw7m4|s<^_uXUJLaF^-U`7>TzAkii9vi{zH< zFOQ#jZ$8}@*dMU&k^9NKpluX|MDoGEP)hsx!+94~(F@jz-G}AG+wx<+pWDPrf40Im zuIuW2UFV9fhJ=ul1f`+O5#)}Mt+^`U%r+SmA!9Jkf|EguhFa>j*#l>D#Sx&qTyWi0 zce!&un`>|}&`H3Nh?*fkCmCQAYJk=OXq@h%?2GT7Q2-4k0iZo?U)(fXrn%`^`JRk-{+$BkkGr@YkkAbTPf^nvq5n#24 zSt^d`?&9(jXb-`N=OVGoT@)ZiFdgBH^FY8R=c7yTC=+GpkVpnV6|R#HbN~StBXu}Q z!TSVoz+u?Nn(U@1MOxEnhCUdOFZm2?imw1Ggoygdfl)&>`WRx2Ddxzrf5e)68VpM* zr_ohw_BrI3Q_h)9F1fPjz>yPYW-eR{6_2hP3;0;Llu|2|E8>@bL z)-~4Xgp?IarDKgcXT-9%yK-ewlPo6rbeAc;CSb6VS(JD(k?mcE)bJ@J^P&@+-W!G_9ocy zc=oxalxK}Ev01-Tk4wigdS-n~|sZ16+cU5|IG$Z$QPhl~Y=(slD30-3=i= zciN&G^KNzcLHo*Ey0@jx?4%UgCEc~R`Msa$M(5s5bN_}=BADA9EjuO6hX1`Jo!oxe zn_uQLmQDK@_Kx$_PImLxiG1NlQ89l5qjS*pVSWt}?mh0_0Yam~R5LIJsG4P@6LB${TNQ(^2q1_aj3X>DQ=dzvlJFc~_we!c zF2=LG&;2?2f0Vq*0G~)a%XGsc-XNadv~{K$3L|nWrS;by?xO#aXS?SnHnrg`vE*vdndwLr7o|OGrV4 zj2gUHlM`-IC=PVJ*!IUT z5Znctb=&?vw(aH#;C}|Lw6?$60A@Z(ueY`65fI)6F0R{}ya!zF00U3DWJr$WrzsQ) z!220}Qx53A1$x)q-dg)OeE>4lRq_TnI0QzDl)dip?(WXs{yo#`?*}{ca*-1$Viy1a z00v@9G)F`L005Z)1Ptu_82|tP32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1P2K- zA_t6e7L#iSD1SFeL_t(2&$W`Vjuv4I1IJ1BkPr=T&!gV``^Bc%<0>d=T#X{j6aD=4 z1CZ;jhGD&X)?(6cGw*rD@%rj(x`e8zQ6=82ET!mL_V(@dRWm&*EEBm>k_;Lh_QSUf z$*8;f{k(i~yi$?eKA2grP)Ou+)+|F+FMGTn_xax6B7Z_cUgwPMQc3EXxq@X|p`xiW zzW4MrKoXd%F98A(L@`VfsVW?)x`c#WRx(#j$YKSOq7ZU$5}-}h!VR-N**9i5)_4iYUA7IG=O(}XN z&!|kI+)jJ1-BkV6bXs@r*WTG&{r^lK&e?yMekSOinGo%6Y#}vTzDy?pCP|XII!c;& jfoILbZN diff --git a/Collector/Content/jungleGrass.png b/Collector/Content/jungleGrass.png index ecff7a219dcc0af21f626653c45e901bcf4bac10..fb2e1ae29fa6f548cd42a246ea2c16620c0b7779 100644 GIT binary patch delta 3356 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 delta 1142 zcmV-+1d02f8jA^kiBL{Q4GJ0x0000DNk~Le0000G0000G2m$~A0FaSrHUIztg=s@W zP)S2WAaHVTW@&6?001bFeUUv#!$2IxU(;$uS{&>k;*g;_SrHY{O{-9Z3ZYhL)xqS_ z51~mz(&FMMxE37zSgbm@IP2=*DhPrfAWn`>iY`*(|B^y~ix>}%`|J&+&B+A7AfcJj?sspChd1EC%>Q;u&U` z721F$e^Afkw@?zmILZaRT_Cfh)b` zFV}&oPtt2GEqVm>Yy%h9Elt@2E_Z;wCqp)6NAlBM6!LlC{fxdT3-sOs-K%bI&3&9c z0BPzfc>^3A0z(DLUh{Z&S9@>&o@w^?1Eh~~yWu%=F8}}l32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1O^TO0qk=Zw3B)XCw~HTNkl+Q7P3C2atfSE)?PWw7OzCeXVS$|-Y z!;(!}gGEVuZrq#w)c&DwH1QBg1$U~AmDaClBvN&nbK23qP`H<1v^QKbxB9)|hSO0M zRCI<@F+8+P<9hro5u!xS1`a>|ximt2nIErqR$@K<->T~yMn!$%#$`E4Tj4D;Qk;}*pAkYQX$?|gR*o#n!nmYp z0y?vDgb$?cp$W;P?4gJeM28LLWt#7tkTG;F%5>gMu!S<}CJRdTVf6)o%Xlo+adv&G zcT7n?D!pQ#is_;=o1F~ccW{(jGWTHn87_MV`^&3!5}<+ysvw|nE;AV-pnt&2-DOi8 zg>|qPO(nxhpkmk8>SfAIj%BAQ++Tm>iFqB%&V=KJ+dbe*x(Kx3D^#IELDHHzz$Vn- zGq>eDRdS9tE-5~cvE$d|j8c&F0DU(08+{cELZHHT(7;cwUn_OX`Jk3(WXW0$c>=J* zzHan_OwoWE{9(Vf_qZI?%zpv3GST#zY-%~;OSSYbwrw4ug?WT+76_;Zd%9oj12xGCrE$`v;8s*2L1 z`WV5WOPNclV^5ae6J=Mrgem)c4m+F5q4sd? zPL@K0gVs~n9`s3V;dBUPG+;P=du`qS4H*jaO-+nf%Gq|@*=t_CZ-T-K$Cik*P74|X zidmcfai@KAKYy8VQ|Y3{6P%*r3G5fF51eDU(HM8<%rx~-wnz@j_yu81Qq4l<&X?4r4-#}M0c)I$ztaD0e0sxZEU3&lk literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-1.png b/Collector/Content/man/man-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bd111f1da2d63ea3258de6e4aafad9633c5bd58c GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eGZ z#W5tJ^=+87*Z~EO$@}j8KUGq+qRUrlpI+LQ8YhP=O?LakEb{(6uGX$6Q-yjChZl7o zIV$nqL5i_FWPvYBhzt`?W5KSg|NNW%9xQH2Q#-m?eB$owDR0?3S+;fvtc(;|p*ST* z(eZxM#6O!qmoVMj5$L?c$(1#Nv4ri$Tn6oc=Gl=ED>qG8^8G-H;Kjn5p?}U@(!O}J zrZMXv$E&ZaPwZ>^BA}xkaOC=juHxvYLX6v3fA#-=pm2aW>bt(p${br2pdT1KUHx3v IIVCg!0K-#e^Z)<= literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-10.png b/Collector/Content/man/man-10.png new file mode 100644 index 0000000000000000000000000000000000000000..bcfe857f79a4da42bb3d52261e80fd43c2ae51ee GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ^=+6VUxNbA?VkVtKiOz>HeKGzv-iSm!Q1OLbe=eJKH!t}=|{;t6^}&JvmW@$ zJd1T?-p!p|yP|0K&XkVt3}y;NYp1QqpF$Peg@Y`AdA(Ox zPBjV^%sQ;T@KneQam$t{;rl8V*PJvlV7ct@ZLP#JXWrOn}`; z{08f3_KCcHf4iS@%2>_kYEs%HzwCsh;0LvyU;nZvZ;*buS>f>nPsOno=q+a~t~xi_k%1#KAf_v);ewN#wp`f8s; g-=6OHIKP7N&T$)OgYKQdK(8@)y85}Sb4q9e0BT5X82|tP literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-12.png b/Collector/Content/man/man-12.png new file mode 100644 index 0000000000000000000000000000000000000000..6dddff982a85a84f2688b9915e072a04b67028ad GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ_3gBae60#R&ex^?|DXQRvzhDqw!Rq>zcOx=nJp18{JJUO$dn^7MFHz~@GfMz zBf4EdEcN5EpmjP8TbVy@UL=*}$jiFIx@`A!#yfhK8M3Y#_#Y5qV6YHj{*duUaGBs= zOIGLF1pRxjcKygTe~DWM4frrB+n literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-13.png b/Collector/Content/man/man-13.png new file mode 100644 index 0000000000000000000000000000000000000000..0c84de9203d356dd1ff08d65eeba985bdbd8b63f GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0te_ z#W5tJ^=+6V-(dre!%HOu= z)n}(z317U$-tm6MH|^d>iyu3x`IU!l5Szrx$$2$b!@jA6?a-Yz<74hqHJLzcOx=nJp18{JJUO$dn^7MFHz~@GfMz zBf4EdEcN5EpmjP8TbVy@UL=*}$jiFIx@`A!#yfhK8M3Y#_#Y5qV6YHj{*duUaGBs= zOIGLF1pRxjcKygTe~DWM4frrB+n literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-15.png b/Collector/Content/man/man-15.png new file mode 100644 index 0000000000000000000000000000000000000000..53243c6ca0d7a9d4cb7e9221cd03823778405d30 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0s@# z#W5tJ^=+6VU$X&E_wv90Pv7m-bg<4@&SCgaIZMb|HBU({hDX9MH%ZSjBjk?SLKYd( z?H+rk9_Eg^UCg*fx?{TNRmc7-D_J%rh41w_5Ng@$;HDO=xJ-bdA=Hpz={NToZeNnQ z{Ju8kf1LN~OYA94Nx|alTAbe$LhmRl`X79;eD@vB*bDiLi!Z!ny36=YKET(rig$XT zv}UQy#arwh&u5&|j{Im=xLkO*vHJ$GNvr;+-$~~Y-t^~FQ^4D&(;DXFe-k|uKU40H at)0gtYnSPTxoSXPF?hQAxvX4&ub-(`85mM_G;>yAzw2pXRYA*N5ngrak##%{`j$^Sna)f) zyic5Cf}X?yov0RHhMQIlA_tzxyVDja-wO4?aKNlL=& zoWp_k3)=r*R9ZP~dzX=r(&{66NVH=f~MIZ`!~7rTMmmH1({k;AFVlbf@vd3lA4L!AE+wYc%!#0X@Lr>FVdQ&MBb@ E0D{Y4;Q#;t literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-18.png b/Collector/Content/man/man-18.png new file mode 100644 index 0000000000000000000000000000000000000000..e126b675e5072c15a881c00e6f218791b5b55616 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ebg z#W5tJ_3bokz6JvxXW=7%*UO0Q`qG}eG^x{_<6QUEOS7idP3ykzI&D7FhAh3xO$_m8 zGw*k^c!=`~G`1CRC`7X=FxISTUVQt*TYIJ*yPvrKXIENe`a0f2z~^Jhr-Kt(9Jm)g z<6_y%k^b@hyyeU(uidyOa!wU_z;eO#z&z0crn7hMPM@sBF1nSsyw_@l@^{Afz3QGk trZXAbLl|yuPrB9btMJ_^LTlzt=8ye)rhTbtTY;`-@O1TaS?83{1OP?p`;4MF{NQtYgpmVC~K)Cz*O? zUEaseIYCeAfR5B5rG}hb2F`>HeADs{@2=-%aQL+NJfm^-te@gSEWvkVDpNh2T)3Uj zigHv5ZhQ3J)}Q^vHA&r`o&Zn9ISwVf8~%3{F!ftDT%V|AuazbJP0DhG>UYM9$8JKQ zXFaZnlt`UU+Mf6>cgY9N9}E4N&!)X(%-BD3vO%rYwtp+Rg$fL;XIt*d0eXVL)78&q Iol`;+0MtWa0RR91 literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-2.png b/Collector/Content/man/man-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2ee3277d2913952ee19deb64930f2fe62fc23c GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ebg z#W5tJ_3bokz6JvxXXzt<*UK#9yI^)BOpEQ2;HOGcRj=%&{i#lU>em)c4m+F5q4sd? zPL@K0gVs~n9`s3V;dBUPG+;P=du`qS4H*jaO-+nf%Gq|@*=t_CZ-T-K$Cik*P74|X zidmcfai@KAKYy8VQ|Y3{6P%*r3G5fF51eDU(HM8<%rx~-wnz@j_yu81Qq4l<&X?4r4-#}M0c)I$ztaD0e0sxZEU3&lk literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-20.png b/Collector/Content/man/man-20.png new file mode 100644 index 0000000000000000000000000000000000000000..18fe18ecc37a4b132eba440573ba9abc94567e16 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eDY z#W5tJ^=+7;P=f)7_Pqc9jr?S{=&D&(@l6U;T(a?5#@Y{tJ}*AH=+<=iKZb&4sehr~3`*PU799{4sIws9u&$M${`VOF*89ZJ6T-G@yGywqhy;f}i literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-21.png b/Collector/Content/man/man-21.png new file mode 100644 index 0000000000000000000000000000000000000000..3149474618189ccf330647574b4f062e2a0ec00a GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eGZ z#W5tJ^=+6XUxNXUx4{4ZMKi1}aNqVl8q`1Ga3SB-HxJTxJP_{On6W&tXeP_!4^v~5 z3Js50PjFLU63q~16m4g4PO!L}^?$jedPkg7`SeE@+clKDHvMXMX|i(ZxT3>(MZjy_ zgaz9dsQ-UcZPl1_XN6+W!bMDL7_6Az_%?`Y9K2f_v9f5wlJ5te2wW_@8T{wmC9R7$ zY8tZ~`Ct7KO+<=iKZb&4sehr~3`*PU799{4sIws9u&$M${`VOF*89ZJ6T-G@yGywqhy;f}i literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-23.png b/Collector/Content/man/man-23.png new file mode 100644 index 0000000000000000000000000000000000000000..2bc82ce8165a2290807d270f281a6f25b301da93 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ekj z#W5tJ^=+6VUxNZq@v;B)mGgWA61SBek$4&Cep_^g-svN!4HA3Ri!OFoJ=(;Xc5v>F zl%&)ycZIVJ)>0P~n6;KM9&`9!vii6DB(@LJ7R>al`Jzzt-FZ!&;>-nXf~NmJTKEAAUyyUuG}SJ5*q zU$9Lzopr E0KWiUcmMzZ literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-24.png b/Collector/Content/man/man-24.png new file mode 100644 index 0000000000000000000000000000000000000000..bcfe857f79a4da42bb3d52261e80fd43c2ae51ee GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ^=+6VUxNbA?VkVtKiOz>HeKGzv-iSm!Q1OLbe=eJKH!t}=|{;t6^}&JvmW@$ zJd1T?-p!p|yP|0K&XkVt3}y;NYp1QqpF$Peg@Y`AdA(Ox zPBjV^%sQ;T@KneQam$t{;rl8V*PJvlV7ct@ZLP#JXW9jjVH~-dbXEV?x;EN6}YVq}2sn#N^s0{a&Lbr+h$pdD0># zwQ3f9trNx#tQ|6&Q;q#OKOETM%y~mNwZEmzA(a2y?3>?gxAN4- z;1RH!SFQaY(>YnQ323+}-=vI9ChSaVtq0>9xpq++*Bg=(zr2 zSXSIJpYWDbAG%fuiuQHKIOQ_Wx45`gvQf%|O-bR8zhs<3s^ig+IYJF`j&B`yY*0{= Yzhi0TddkC&5$GufPgg&ebxsLQ0PRX>n*aa+ literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-26.png b/Collector/Content/man/man-26.png new file mode 100644 index 0000000000000000000000000000000000000000..bcfe857f79a4da42bb3d52261e80fd43c2ae51ee GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ^=+6VUxNbA?VkVtKiOz>HeKGzv-iSm!Q1OLbe=eJKH!t}=|{;t6^}&JvmW@$ zJd1T?-p!p|yP|0K&XkVt3}y;NYp1QqpF$Peg@Y`AdA(Ox zPBjV^%sQ;T@KneQam$t{;rl8V*PJvlV7ct@ZLP#JXWrOn}`; z{08f3_KCcHf4iS@%2>_kYEs%HzwCsh;0LvyU;nZvZ;*buS>f>nPsOno=q+a~t~xi_k%1#KAf_v);ewN#wp`f8s; g-=6OHIKP7N&T$)OgYKQdK(8@)y85}Sb4q9e0BT5X82|tP literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-28.png b/Collector/Content/man/man-28.png new file mode 100644 index 0000000000000000000000000000000000000000..6dddff982a85a84f2688b9915e072a04b67028ad GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ_3gBae60#R&ex^?|DXQRvzhDqw!Rq>zcOx=nJp18{JJUO$dn^7MFHz~@GfMz zBf4EdEcN5EpmjP8TbVy@UL=*}$jiFIx@`A!#yfhK8M3Y#_#Y5qV6YHj{*duUaGBs= zOIGLF1pRxjcKygTe~DWM4frrB+n literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-29.png b/Collector/Content/man/man-29.png new file mode 100644 index 0000000000000000000000000000000000000000..0c84de9203d356dd1ff08d65eeba985bdbd8b63f GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0te_ z#W5tJ^=+6V-(dre!%HOu= z)n}(z317U$-tm6MH|^d>iyu3x`IU!l5Szrx$$2$b!@jA6?a-Yz<74hqHJLq=$W?6BANrLh4<+bnXZSqLk4yg@1YAnu&AR66tQGb> zE4@OOqa$_0^??7ccn(+v^xNrXTss}ba97`&^YZqL$NzUQOcph;mXcns0`vrfr>mdK II;Vst0Nt@;H~;_u literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-30.png b/Collector/Content/man/man-30.png new file mode 100644 index 0000000000000000000000000000000000000000..6dddff982a85a84f2688b9915e072a04b67028ad GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eql z#W5tJ_3gBae60#R&ex^?|DXQRvzhDqw!Rq>zcOx=nJp18{JJUO$dn^7MFHz~@GfMz zBf4EdEcN5EpmjP8TbVy@UL=*}$jiFIx@`A!#yfhK8M3Y#_#Y5qV6YHj{*duUaGBs= zOIGLF1pRxjcKygTe~DWM4frrB+n literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-31.png b/Collector/Content/man/man-31.png new file mode 100644 index 0000000000000000000000000000000000000000..53243c6ca0d7a9d4cb7e9221cd03823778405d30 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0s@# z#W5tJ^=+6VU$X&E_wv90Pv7m-bg<4@&SCgaIZMb|HBU({hDX9MH%ZSjBjk?SLKYd( z?H+rk9_Eg^UCg*fx?{TNRmc7-D_J%rh41w_5Ng@$;HDO=xJ-bdA=Hpz={NToZeNnQ z{Ju8kf1LN~OYA94Nx|alTAbe$LhmRl`X79;eD@vB*bDiLi!Z!ny36=YKET(rig$XT zv}UQy#arwh&u5&|j{Im=xLkO*vHJ$GNvr;+-$~~Y-t^~FQ^4D&(;DXFe-k|uKU40H at)0gtYnSPTxoSXPF?hQAxvXWIa+JYFs=g)DrQYvg zfc%Z_?Yq|P^R`q~PWl$rnjju@RF>nX$d|fZ*XLdktra(rwF+LKe&8STDoxMr56iAp z&9&;w*vsDWdd4~J$d8tV$wJdjXEHdOFdEH&8n*9E`c78Eueoda4_Mh&ur!tcJ;LDW L>gTe~DWM4f@iAg7 literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-5.png b/Collector/Content/man/man-5.png new file mode 100644 index 0000000000000000000000000000000000000000..47e60f731612e06a358220b1a60f549e4fc75e6d GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0te_ z#W5tJ^=+7=P>TXjcG;i*(?2e0=JKBOsN#Z*D-sHIIduJOOgRs z-o%J0r=`7i7BQ~jI&ywf)&kd8VN6?-!uR?d2(|2W=$+-$Hp2;M$w7uCm*f-q7TL!Z zyq3AqygelR`6T~L0mH3fo*TqhKH%fr$z9d|?xW|6rhnWLt$t!JcsAra$a-DM-?25y zf2FbD+S-O6eVO|&Y1mokr93K1XUSHSoG`&)H}6yT3FjPU+%7owV~vrkgYLmUQ(qi@ by^-n3S!bP0l+XkK!HIAh literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-6.png b/Collector/Content/man/man-6.png new file mode 100644 index 0000000000000000000000000000000000000000..09a2a894b5a4a360742208687192a92273efed99 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7e?t z#W5tJ_3boAp;iSR=h^o6{-4@$$+0zG==6>WIa+JYFs=g)DrQYvg zfc%Z_?Yq|P^R`q~PWl$rnjju@RF>nX$d|fZ*XLdktra(rwF+LKe&8STDoxMr56iAp z&9&;w*vsDWdd4~J$d8tV$wJdjXEHdOFdEH&8n*9E`c78Eueoda4_Mh&ur!tcJ;LDW L>gTe~DWM4f@iAg7 literal 0 HcmV?d00001 diff --git a/Collector/Content/man/man-7.png b/Collector/Content/man/man-7.png new file mode 100644 index 0000000000000000000000000000000000000000..f68f4a890686bb4855e4d57ee3d76d0a3b0d72d4 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tS> z#W5tJ^=;Tiz7_+H#n1lzpI+`Sm6z8i)^qZx-7H4k$wr&S`I()3w9mM*pY1xWGNU21 zu=7Z}<(|b`jl~^yG2ULXg3)bBp6Ub9)vq#{R-H0plAGt#CgIG$P}jxivGu->$)aw} z9aq`=9w}daXFYYY(V`Qvn^hLEJ0BGl`XX|sZrAa-0j?F|E+Sg79OVkX_%|$b$vs?q zCCy9Jeab!N#!{Jc-jRj#D=u_io+-M7-SgUi+Z%>D_mAhWSG~-1x*7M4HeKGzv-iSm!Q1OLbe=eJKH!t}=|{;t6^}&JvmW@$ zJd1T?-p!p|yP|0K&XkVt3}y;NYp1QqpF$Peg@Y`AdA(Ox zPBjV^%sQ;T@KneQam$t{;rl8V*PJvlV7ct@ZLP#JXW9jjVH~-dbXEV?x;EN6}YVq}2sn#N^s0{a&Lbr+h$pdD0># zwQ3f9trNx#tQ|6&Q;q#OKOETM%y~mNwZEmzA(a2y?3>?gxAN4- z;1RH!SFQaY(>YnQ323+}-=vI9ChSaVtq0>9xpq++*Bg=(zr2 zSXSIJpYWDbAG%fuiuQHKIOQ_Wx45`gvQf%|O-bR8zhs<3s^ig+IYJF`j&B`yY*0{= Yzhi0TddkC&5$GufPgg&ebxsLQ0PRX>n*aa+ literal 0 HcmV?d00001 diff --git a/Collector/Content/roof.png b/Collector/Content/roof.png index 21534abea4aead6a410e68ee1f69f90702cabe93..debd59c2ccfb3985dbf8061d1433b1cda378ecb1 100644 GIT binary patch delta 3025 zcmV;?3oi7K7nv9(iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<{9g!s| ze~?(jao8L&H<;s30s_~2-5t@hl%vWvn?z*HEM$EGZau7t zl;^xq&q80{%^6DYi3U5i>zB5dyuSrsk6&UyHGA>Q99D~ZYd{%Xz;jk?FZw_K{K|Xt z>Auqbh1UDze$lRMo5MmR?ci@L#e4s0y9;NbZ?rD%J}gJMmcO+31<3m`hraoJf1WPS zGxqL^kJxh5O`WZ*Cyc8Ttu-s+N;VpZQ1CFXj7ty}4O;59*@~;V>!%p*^J%4JPy{o(ot ztT|*nlMcZf`3uV%fktJmj=|9k?Kla)2QgQC{cdI3gl2d$O?mwdvil*bKK7&7k=c#CMw?dnSaFHeO5r%ftRXbb=rYxg#BoE0 zj@nw#4lqW~-o3a^f4=Lk{X}enjWdrzR_55Y$Jz*{ceCYW*OTCsvv*RnxUfB~NQHsS zwj8<0HVoa{J=V{%wz@m8;8>26Me<(aV_h*$QEYA2!{w{kO|D?}>I03mX>3uIVB4OC z#JlYq=XMtkHg0d4oG#S7QjS`n+vw2V*{|iSh;(8cM(duAf7F5-ovj4gs8pO>>ZUdN zkjs8V>FhD`_Mjtl0ruW`mnO&8x-}RnmZ-qDdGyK8Uc|d5VXLshp5kR%tMv54DQm7MGp$@8g{{ixL1|N)Q^}-|9}Vm~P8_<6Zbvk%VK5+;8)EfE z$iI4QR^w`he^qvSr?U#q(1Wrei)-Ejn7x*qAVPxWZ5UtKRtr+h?u}|v%sVxnNSBuO zC_>O5l?gdT;B^;8SaVKclNGqm+{UMTeJeL^Zj2Y?Ts|R$oU5ct3IxL<^vh=fyYV3 zM{Lma%?b^v#p||l;MV}l+27o2b__~p4bV|Ix0CO)9dgo2&WAmewJ+hZfJGWa+v$_nEoAG~RP!c+6ZD9-?eEFtIJIx5a1hvVqn;eCpl)p)6%0D! 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 diff --git a/Collector/Content/sand.png b/Collector/Content/sand.png index 3d354caab8d721fd66af77229f574bb3681a9b25..1295fe83a1759c2cf5493403412f5baa9cf52d1a 100644 GIT binary patch delta 2173 zcmV-@2!i+Q5Ze(YiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<_E0HBR ze>3;q)=Uf*vR+3LjyeDN`!avwVzSZrkR;|9EiRvZ=7NRTd6jV|>&JautXp`#(aqjq zkQ`<=A0;aN1RYGIj8auj0X@74%BOA|_l=^0SX6=1mm)_~fo&?Ns36Cx+0W-gHODOJ z-35KmUb;WRfS>6%?-IulDS6yI+mvF)e_Gi3gt)bCXmu1-;kcg9X0b9zd^&P=+<7v& z`78K&+}R;ieHUxz0`BD0Z3D<)0@hh$yQBa8`pJ6pZoa~PgLSXy2fCtd77CGd!#z-n zd;UtNumn9|9oW5Tj}{uGG3!5h^*{b!7lDu2P-TA{yu>X zh|r}$4I{v7Jg<(c1A<|MS>Rx?e}|bOjzF*Easy}w#(;SiF{P#g5F)4!Foqluu#sG# z2#XSPB0?Yq02P?d&hr5TCff(F~n8D81+su*t3fEbjyI zCwV~*mEeL8A;ge^gd9qAu~%4(DfX^fl1n~?6jMrKQcgvjcnK0EiAa``e>ppJ-H=g_ zS#r*$Kxu*Gg0~A8N;&v&hd;s*k95e9%~2}Sr}`Rdtf@-PwKQ(7p^jT@sY%PNoOB|U zPJf0op6Qe`pXEZTUGDN%xZ;(}C0D-6MonS;7{7rUDQY~B>Wpcl25L%61od_jI%YtO zJpu3p)PNWgyJKdByyuQwf5*&b?oE(kWa!{D>WBeBe-ej_Hg<}fK@|TN+)R>z8~<12 zOo#3lk^98$8)~f|&vhU+%diL4I#l0<^Mj@EQG;tl%?I-6@Q7MpS(^vJpm+wG=#0il z%IadLmwwvL*$<8^HmHnaax$cwui{_QY4S43dDFM%EHcF#@J_{eoVT z^OjWKc9hIo%pFpb7Qu^}@0OaX4hn4tuTDT7A<^zZfRU4cv+k=u5b`13e8|_JERW&n zUAo<1XkcaNHv@&d9D7J3IUWf54a?fm_!(Otel2NrnX;t$Pla`|;QOPRnLP3oBhj6| zrNB%LZKc||R6Hz~e`lITd^Kq zg~*=ww-%Iep{k!oS0J?&i)$`e!aZy3n>SCL(JYs@Jy8MPg&|A*%bxig6ke3Xpd%ve{&^(q#1jBH$7@(brSHb zCcrB(939-SJ!zS0iru~q?MVew~^v|R(?TY zwXAyAZ1AmHf1VwkZw`2=KegbUT7o|{&!SnXWheHMyU&vCZF+T7bL%>F2ZEnRRC^o) z53})K#$addnOB@aOG>GT-H^_=L|L*lzv>mwmyqe*^yBp#T5@glR)VP)S2WAaHVT zW@&6?001bFeUUpz!$2IyzdpnV6+tVAIAo|!7DS6UY88r5A=C=3I+$Ggf+h_~ii@M* zT5#~OSaoo5*44pP5Ck6}PL58BE>hzEl0u6Z503ls-F+W--vR!5nW<)Q0#G%}NG0Mz zCc7$hf4(A!LG+^=F^QS_oG2#YIlk`UnD6JYPCQ`H?_wWxpevw=D^HY;5?HiQh=sEp9kL0=$o>@z%9_T=JwXy$LRx*rmm7Vz`-Ff zDORBDb&q#R9M69S4)<|APkcs_wSMBCUX+NU5rdeZu-bBESe1=C8|HN?AY(m z!vUa_0st^G0DwDJ{9Oed|1Tdd`{B9=an`suUx$Uk(=}P<4IOw{Uc&Qu-?+M*TjAax zftQI;n^Q_li5${HPac{t{^|qn{T#3=Ne;Hw#A=6s$vR?B$Es;Wy89*E4LA@Urkomc zI^0gH0RzH`&Ih%sPb=K}BM=rwT~D&|hj`ps@Nv$)%k$8I`NBoq4LLA#M0V4}BW|pa z<(=gp=gEPgWLe?vpaZmIlD!JsZAw?Taxf6A@6mX!Xs@`4y8{QbONRLZ_{C7v!}TL!e%hXo`=8%?nb=;dHU5kekxc>?Lnz)gWVCT^()*Bs$goj z=E|p#rG6h8@7g1(ozIXf-0zps_si(^2s{B4`pn&y?y3$Q00000NkvXXu0mjf=Fl4c delta 2061 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 delta 2029 zcmV(B9J)5(Y2%ms$XVzk%S=!g7-oT1M{ehfPqa(Oe9&atq6 zF63c|<8YuJha*dugRKlhc^I-hJiF`rk;6QHu0I8O*W6j@61t)_pbQ~ko(8tO{q6M> zy?GCR(EdT|oY8}Pux*qD&tt(ZEcrQpm6NEUh1Sm9n`a-V=MVXjri%+~rLTQzEwR?~ z$}T&Pl>JCbQ|UA4?G3HI%i|84Hz>l0NxKv7h_*OTOJzH@9rr+ z=ePN-V(mRaw8e=P;^J0yh+-qq-v+3G5vl`J=>Y4!UX51^2BpIskzn3-bD7wMUd3fQ z(H4q=@oHiUWf%ZNa4iUiEEw24Ss{;qhyrsU0+0~|WrWVw@eT$^gbRXXXRQZ0=wbNA zoP-00XpLC*>PIt=b&v3>wow=gas;#a{^);9pYpQv&HfX)w z{|9R{SmVxAQw);I=Axc;Vo&p+>og?4h7vUO^CMOB%9&^K`}CuENVoqoB=P34ns-`%V_Vwvt$ln4`@Lj+SsID&l|Nfok+iw@+N(HU-SMiG8(DK@ z{}kXiWKxk&tI`Su->XwoFl&d-m5F@40jp^rY7W2F%;#w^cZsapGfYRf-ju7?zO}@2 z86`zaUW61iWMxhH2D0!BaV@(pF<(1fZpHNDXcoatDc-tVRs1Y}k{s4vyB#Etr_n2) z`Hmz#{O6(1XZdzyy$7SvQ#hA?F|@D6rhvbyj&5AsIv|;cWBRS$V|l3e`C@K|g!z6d z@U1}e55EM=D&YAVaJN#r^~PHtX=*YJRYe9rb?|?#`3vfNwTo1$xdH$H0fcEoLr_UW zLm+T+Z)Rz1WdHzwD3N`UJxIeq9K~PLmP)BO*g?c0Llp!Iq9Tr3g(6f4wL+^7Cf84B z(vYOMI0~)>2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um_qclp2+b-}&A>RI zYL<~sCd6!RRSdl%fFQycMMP$%J|{^jc#f}o`1pDk=ULu==l&eM`GUy+pGZ8*bi*Rv zAfDc|bk6(4QC61o#OK6g23?T&k?V@fZ=6dG3p_JwWYY7*QDU*w#Yz{mvY`@B5y$eX zM)^Y4u?>ZqU!3vpUCQcR?2KjGmYbo>&z z6mnI-$gzNb8dS)RAN&t~cWV|WC)}h+0tmj?_Qx;~+67t-+x|Yb?bZq4e+I6!j=$Cf zWIOJC1V&1fz3%bup6=fMJ=5;*2Oa-%g_Me>J^%m^00v@9M??Ss0H*-cI<9l{lZOT% z2n7l)12^j{MU$@vD1U-UL_t(I%XL%PZo@DPqwFR~TD1TFkqOWPu^k`c9yV*sy7A4n z4w8~lYh_A_BpE_rN3E5=p{n*4VEQbbT| zg>w$hIZN309jXfNJ;rea04oq<#5~WCFRD;g3(7fT97m9Zh=05>DWzZ-hEJAV7fH6( z-gG}6kHfi?a`42p)<6>5w!t}voHJsKrulZeVObXI-X*ryAR;(zI~00000 LNkvXXu0mjfT-MCr diff --git a/Collector/Content/stone.png b/Collector/Content/stone.png index 7e65b12cb7c463d75bd06d30263372cc459ce905..4c83b3fc944dd53346113e4809c218b01b7dc62b 100644 GIT binary patch delta 2204 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 TkzGQn00000NkvXXu0mjff_4sO diff --git a/Collector/Content/wall.png b/Collector/Content/wall.png index df0596da385e38cfb86e642a76b2c3c5e53064e0..b29aa1ed854d4a77bd934bcf378ab332ef153f0d 100644 GIT binary patch delta 1267 zcmVsgUajMdjQR$LmDhirBY-Ex!#3 zT?S&`it1J*ye+5e{n(asar=0Ly)TYEzruhg%qEF()=ZYrCXQygVC)=|A#PpQMlN%o z9=D>`_i!&|_{67>#MScUrCd+NlhCptRC5+%S(1M!2n-3QCrAImRt)5pXW>>J;F#^^rAd7ZAN zj3eiLsQV~ugmuS^*4mX(E#`nEbPQ%KsE%vVkV`$bc%U{a#6USHQKw3S&eb<+a53@8 zhMs@91rVJ=2aLi^CfqbD4K^v##R0n^B_?iue4%BwEOU)K_7FQ^DHD{<{P^t}esgAXV;gl9NaV9Nb~p#vY@!l$9?r zK8BKlsAMs)DN+F|B}M*Na^z4|(WI(bOuEDRrI)Q8%}`a}H%YP6~GA~hG27Q;#c!?AHJLT)&8yM zt>~@jt>~@jt>~@j|Di|*{(!)LkKu23-?%>;>8xRsKm!?nJ4nMo9LB#s#0M2YD~LE` zs7@9{i#Tc(iclfc3avVrT>6404M~cNqu^R_@Ud8RaB}%`|;g4rtTK|H-_>74h8!>lMN#OK8023?T&k?XR{Z=4Gb`*~*A zNT=qB!^A?Njpa6GMMEWy5l0kNqkMnHWrgz=XSG~q&3p0}hH~1+gyEXGulWtNd4s^WO_QxpD zxeGLEw*7r<+l><-@C;mOEq|pB%zTnwYiW@qpl=(vxNd3k9&ot>3_a~)WKceVHS@0n(QKW*P~r8X_QMF0Q* z24YJzM??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX2XskIMF->r6%rx| z5{i4nlL`eWMKDQ3K~z}7?an~~06+u)FfOHvDk*bf_-qN5)Ai%fi(>);0s;a80s;a8 d0s;a80t*WO0~%d_d`AEP002ovPDHLkV1mVKPQCyD delta 1238 zcmV;{1S$La3gikUiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVE_OF6Oko4 z0?yWvVJm-M;yrkghi8Hz67+JtdfxIAa>jbz^0xI<$n}Gwa_))ab)s%X?AyR?aT^l4 z48*<_)vZW)TTa*eu`TD~_VEaNUmSaWg#k~PO%mg*nJl4A9L;jU*f}Oc+`6ufT;@JK zZbh%};a0{yw_Kj~oV{{+myiQkB#*yP|p5L$GXBUojCy1gy zv4USbvkqQF0{+=y8Hmu>LDd!DyM8W{tAL=cFgp%d;}I?uhtfaEB@47*p`yPoFGjXg$dDJx%Md<-Q8 zQOROpQ=|e`N{alk}2w+fn{ z6P?UJj1vL4ff|S*u_v?WloC&JlUXc`TcHdmb;9X1iGg4`iFMG!Zj%d$;(x*|m@jVp zZ^?y;?kCB8%k6vA`uurri`aDyXHb8m;P#yd?6cQVM0$&Jh+oamefVnPSNpf3x1zVA zx1zVAx1zVA|A!(O_yYp}J%+ylA5OSAhp!M;0004mX+uL$Nkc;*aB^>EX>4Tx04R}t zkv&MmP!xqv(~43m4t5X`$xxjvh>AFB6^c+H)C#RSn7s54nlvOSE{=k0!NGr@#j1mg zv#t)Vf*|+<;^gS0=prTFmlRsW_~7zB&U@!@-+h44s4&e6jRTr)o9Sdi%;r|b?pK5m zhCnqeGs~Ehq!fJD*F6G!zl-xM|9gL~UNvtqARrRYGQ+fqH;AV#0mH3=^ z%%ld1AGxl0{KmQHvcNN=W+s0WE+8f*2* zUl_^jE6ZG`8bT6_Sb_u*3Th~$0vmDKby6&(={(`%A9Vc^xfF7h!N{?IDm2KhAN&t~ z&(4lwX!$foQ{K`Nn80N&5&n{q(^Ef8Mw=GHpL=>w3VS*31(gF|4nNZIQ?@9ycG z+rM{O^ZNny;Bs}*n0fU8000JJOGiWi@Bq31V%h?bkdx&EAP5Qq3o79EapRK>1t>Bd zNklXDbN~PV07*qoM6N<$g2eVi Ay#N3J diff --git a/Collector/Content/water.png b/Collector/Content/water.png index 8a0445194d021426c51e1d30892dfcc308ca5b37..a7221d76e5012d479b60ea3c333d230394601bba 100644 GIT binary patch delta 2785 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 delta 2924 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 W6g0mITEe*i0000> animations; - int i = 0; + private Player _player; + private Mouse _mouse; + private OrthographicCamera _cam; + private Dictionary animations; + public string Input { get; set; } + private SpriteBatch _spriteBatch; + private ContentManager _content; - public InputController(Player player, Mouse mouse) + public InputController(Player player, Mouse mouse, OrthographicCamera cam, SpriteBatch spriteBatch, ContentManager contentManager) { - this.player = player; - this.mouse = mouse; + _player = player; + _mouse = mouse; + _cam = cam; + _spriteBatch = spriteBatch; + _content = contentManager; + Input = "Down"; + + animations = new Dictionary + { + ["Up"] = new Rectangle(0, 0, 32, 32), + ["Right"] = new Rectangle(0, 0, 32, 32), + ["Left"] = new Rectangle(0, 0, 32, 32), + ["Right"] = new Rectangle(0, 0, 32, 32) + }; } - public InputController() { - - /* - animations = new HashMap<>(); - animations.put("Up", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Up"))); - animations.put("UpRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpRight"))); - animations.put("UpLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "UpLeft"))); - animations.put("Down", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Down"))); - animations.put("DownRight", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownRight"))); - animations.put("DownLeft", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "DownLeft"))); - animations.put("Left", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Left"))); - animations.put("Right", new Animation<>(1 / 4f, player.getTextureAtlas().findRegions(player.getSpriteName() + "_" + "Right"))); - */ - } - - private void PlayerInput() + public void PlayerInput(Main main, SpriteBatch spriteBatch) { - if (Keyboard.GetState().IsKeyDown(Keys.Escape)) + var keyboardState = Keyboard.GetState(); + const int movementSpeed = IRestrictions.MovementSpeed; + if (keyboardState.IsKeyDown(Keys.Escape)) { - Exit(); + Quit(main); } - else if(Keyboard.GetState().IsKeyDown(Keys.W)) + if (keyboardState.IsKeyDown(Keys.W)) { - + Input = "Up"; + Player.Y += -movementSpeed; + _cam.Move(new Vector2(0,-movementSpeed)); } - else if(Keyboard.GetState().IsKeyDown(Keys.A)) + if (keyboardState.IsKeyDown(Keys.A)) { - + Player.X += -movementSpeed; + _cam.Move(new Vector2(-movementSpeed,0)); + Input = "Left"; } - else if(Keyboard.GetState().IsKeyDown(Keys.S)) + if (keyboardState.IsKeyDown(Keys.S)) { - + Player.Y += movementSpeed; + _cam.Move(new Vector2(0,movementSpeed)); + Input = "Down"; } - else if(Keyboard.GetState().IsKeyDown(Keys.D)) + + if (keyboardState.IsKeyDown(Keys.D)) { - + Player.X += movementSpeed; + _cam.Move(new Vector2(movementSpeed, 0)); + Input = "Right"; } + + if (keyboardState.IsKeyDown(Keys.Q)) + { + _cam.ZoomIn(0.05f); + } + + if (keyboardState.IsKeyDown(Keys.E)) + { + _cam.ZoomOut(0.05f); + } + + } + + private static void Quit(Game main) + { + main.Exit(); } /* @@ -138,5 +170,10 @@ public void handleInput() { } */ - + + public void Draw() + { + var texture = _content.Load("man/man-0"); + _spriteBatch.Draw(texture,new Vector2(Player.X,Player.Y),Color.White); + } } diff --git a/Collector/src/Character/Mouse.cs b/Collector/src/Character/Mouse.cs index 2f7f713..e7a366f 100644 --- a/Collector/src/Character/Mouse.cs +++ b/Collector/src/Character/Mouse.cs @@ -1,25 +1,33 @@ -package Collector.Character; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Content; +using Microsoft.Xna.Framework.Graphics; -import Collector.Restrictions; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.math.Vector3; +namespace Collector.Character +{ + public class Mouse : IRestrictions { + private SpriteBatch _spriteBatch; + private ContentManager _contentManager; + private Texture2D Crosshair { get; set; } -public class Mouse implements Restrictions { - Texture crosshair; + public Mouse(ContentManager contentManager, SpriteBatch spriteBatch) + { + _spriteBatch = spriteBatch; + _contentManager = contentManager; + Crosshair = _contentManager.Load("crosshair"); + } - public Mouse() { - this.crosshair = new Texture("assets/crosshair.png"); - } + public void Draw() + { + _spriteBatch.Draw(Crosshair, new Vector2(Player.X, Player.Y),Color.Aqua); + } - public Texture getCrosshair() { - return crosshair; - } + + public int GetSelectedX(Vector3 mousePos) { + return ((int)(mousePos.X)>>4)<<4; + } - public int getSelectedX(Vector3 mousePos) { - return ((int)(mousePos.x)>>4)<<4; - } - - public int getSelectedY(Vector3 mousePos) { - return ((int)(mousePos.y)>>4)<<4; + public int GetSelectedY(Vector3 mousePos) { + return ((int)(mousePos.Y)>>4)<<4; + } } } diff --git a/Collector/src/Character/Player.cs b/Collector/src/Character/Player.cs index eb04caa..6b5f3a0 100644 --- a/Collector/src/Character/Player.cs +++ b/Collector/src/Character/Player.cs @@ -1,62 +1,19 @@ -using Collector; +using System.Collections.Generic; +using Microsoft.Xna.Framework; -public class Player : IRestrictions { - private static int X; - private static int Y; - private string SpriteName; - private Inventory playerInventory; +namespace Collector.Character +{ + public class Player : IRestrictions + { + public static int X { get; set; } + public static int Y { get; set; } + public Dictionary Animation { get; set; } + //private Inventory PlayerInventory { get; } - public Player(int x, int y) { - //Player location - X = x< keyFrames = textureAtlas.findRegions(spriteName + "_Down"); - //float frameDuration = 1 / 4f; - //animation = new Animation<>(frameDuration, keyFrames); + public Player(int x, int y) { + X = x< getAnimation() { - return animation; - } - - public void setAnimation(Animation animationTemp) { - animation = animationTemp; - } - - public void dispose(){ - //textureAtlas.dispose(); - } - - public TextureAtlas getTextureAtlas() { - return textureAtlas; - } - */ } diff --git a/Collector/src/Dimension/Block.cs b/Collector/src/Dimension/Block.cs index 26acd57..f91c5c3 100644 --- a/Collector/src/Dimension/Block.cs +++ b/Collector/src/Dimension/Block.cs @@ -1,12 +1,8 @@ public class Block { - private string name = null; + public string Name { get; } public Block(string name) { - this.name = name; - } - - public string getName() { - return name; + Name = name; } } diff --git a/Collector/src/Dimension/BlockMaterials.cs b/Collector/src/Dimension/BlockMaterials.cs index 3a8379e..b38699e 100644 --- a/Collector/src/Dimension/BlockMaterials.cs +++ b/Collector/src/Dimension/BlockMaterials.cs @@ -12,7 +12,7 @@ namespace Collector.Dimension //Private so the singleton can't be instantiated internal BlockMaterials() {} - public static void LoadContent(ContentManager content){ + public static void Initialize(ContentManager content){ Materials.Add("grass",new Block("grass")); Materials.Add("wood",new Block("wood")); Materials.Add("water",new Block("water")); @@ -27,11 +27,11 @@ namespace Collector.Dimension { Textures.Add(name,content.Load(name)); } + } public static void Draw(string name,SpriteBatch _spriteBatch,int x, int y) { - _spriteBatch.Draw(Textures[name],new Vector2(x, y),Color.Aqua); } } } diff --git a/Collector/src/Dimension/Chunks.cs b/Collector/src/Dimension/Chunks.cs index 41f0d14..1c7d263 100644 --- a/Collector/src/Dimension/Chunks.cs +++ b/Collector/src/Dimension/Chunks.cs @@ -7,36 +7,38 @@ using Collector.ThirdPartyCode; namespace Collector.Dimension { public class Chunks: IRestrictions { - public static Dictionary, Block> LoadedChunks = new Dictionary, Block>(); - public static Dictionary, Block> SavedChunks = new Dictionary, Block>(); - public static OpenSimplexNoise Gen1 = new OpenSimplexNoise(IRestrictions.Seed+ 1); - public static OpenSimplexNoise Gen2 = new OpenSimplexNoise(IRestrictions.Seed); + public static Dictionary, Block> LoadedChunks { get; } = + new Dictionary, Block>(); + + private static readonly Dictionary, Block> SavedChunks = new Dictionary, Block>(); + private static readonly OpenSimplexNoise _gen1 = new OpenSimplexNoise(IRestrictions.Seed+ 1); + private static readonly OpenSimplexNoise _gen2 = new OpenSimplexNoise(IRestrictions.Seed); public static void CreateStructures() { - var i = 10; + const int i = 10; SetBlock(3 + i, 2,1,"wall"); SetBlock(4 + i, 2,1,"wall"); SetBlock(3 + i, 3,1, "roof"); SetBlock(4 + i, 3,1,"roof"); } - public static void SetBlock(int x, int y,int z, String name) { + public static void SetBlock(int x, int y,int z, string name) { LoadedChunks.Add(new Tuple(x, y, z), BlockMaterials.Materials[name]); SavedChunks.Add(new Tuple(x, y, z), BlockMaterials.Materials[name]); } - public static void PlaceBlock(int x, int y, String name){ + public static void PlaceBlock(int x, int y, string name){ var triple = new Tuple(x, y, 1); - if (!Chunks.LoadedChunks[triple].getName().Equals("air")) return; - Chunks.LoadedChunks[triple] = BlockMaterials.Materials[name]; - Chunks.SavedChunks[triple] = BlockMaterials.Materials[name]; + if (!LoadedChunks[triple].Name.Equals("air")) return; + LoadedChunks[triple] = BlockMaterials.Materials[name]; + SavedChunks[triple] = BlockMaterials.Materials[name]; } public static void RemoveBlock(int x, int y){ var triple = new Tuple(x, y, 1); - if (Chunks.LoadedChunks[triple].getName().Equals("air")) return; - Chunks.LoadedChunks[triple] = BlockMaterials.Materials["air"]; - Chunks.SavedChunks[triple] = BlockMaterials.Materials["air"]; + if (LoadedChunks[triple].Name.Equals("air")) return; + LoadedChunks[triple] = BlockMaterials.Materials["air"]; + SavedChunks[triple] = BlockMaterials.Materials["air"]; } public static void UngenerateChunk(int x, int y) { @@ -70,7 +72,7 @@ namespace Collector.Dimension for (var i = startX; i != endX; i++) { for (var j = startY; j != endY; j++) { var triple = new Tuple(i, j, 0); - if(SavedChunks[triple] != null){ + if(SavedChunks.ContainsKey(triple)){ LoadedChunks.Add(triple,SavedChunks[triple]); } else { @@ -84,8 +86,8 @@ namespace Collector.Dimension for (var i = startX; i != endX; i++){ for (var j = startY; j != endY; j++) { var triple = new Tuple(i, j,1); - LoadedChunks.Add(triple, GetBlocks(i,j,1)); - SavedChunks.Add(triple, GetBlocks(i,j,1)); + LoadedChunks[triple] = GetBlocks(i,j,1); + SavedChunks[triple] = GetBlocks(i,j,1); } } } @@ -95,11 +97,11 @@ namespace Collector.Dimension } private static double Noise1(double nx, double ny) { - return Gen1.Evaluate(nx, ny) / 2 + 0.5; + return _gen1.Evaluate(nx, ny) / 2 + 0.5; } private static double Noise2(double nx, double ny) { - return Gen2.Evaluate(nx, ny) / 2 + 0.5; + return _gen2.Evaluate(nx, ny) / 2 + 0.5; } private static Block GetTerrain(int x, int y) { @@ -174,7 +176,7 @@ namespace Collector.Dimension } public static bool IsEmpty(int x, int y){ - return LoadedChunks[new Tuple(x * 8, y * 8,0)] == null; + return !LoadedChunks.ContainsKey(new Tuple(x * 8, y * 8,0)); } } } diff --git a/Collector/src/Dimension/World.cs b/Collector/src/Dimension/World.cs index 1e1de6f..d6d39c3 100644 --- a/Collector/src/Dimension/World.cs +++ b/Collector/src/Dimension/World.cs @@ -1,53 +1,56 @@ -using Collector; -using Collector.Dimension; +using System; +using Collector.Character; -public class World { - public static void generateWorld(int x, int y) { - if (Chunks.IsEmpty(x, y)) { - Chunks.GenerateChunk(x, y); +namespace Collector.Dimension +{ + public static class World { + private static void GenerateWorld(int x, int y) { + if (Chunks.IsEmpty(x, y)) { + Chunks.GenerateChunk(x, y); + } } - } - public static void ungenerateWorld(int x, int y) { - if (!Chunks.IsEmpty(x, y)) { - Chunks.UngenerateChunk(x, y); + private static void UngenerateWorld(int x, int y) { + if (!Chunks.IsEmpty(x, y)) { + Chunks.UngenerateChunk(x, y); + } } - } - public static void loadChunks() { - for (var i = -(IRestrictions.RenderDistance); i < IRestrictions.RenderDistance; i++) { - for (var j = -(IRestrictions.RenderDistance); j < IRestrictions.RenderDistance; j++) { - generateWorld( - i + Player.getX() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize), - j + Player.getY() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize) + public static void LoadChunks() + { + for (var i = -(IRestrictions.RenderDistance); i < IRestrictions.RenderDistance; i++) { + for (var j = -(IRestrictions.RenderDistance); j < IRestrictions.RenderDistance; j++) { + GenerateWorld( + i + Player.X / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize), + j + Player.Y / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize) + ); + } + } + } + + public static void UnloadChunks() { + for (var i = -IRestrictions.RenderDistance; i < IRestrictions.RenderDistance+1; i++) { + //Down + UngenerateWorld( + Player.X / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i, + (Player.Y / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+3 + ); + //Up + UngenerateWorld( + Player.X / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i-1, + (Player.Y / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))-4 + ); + //Right + UngenerateWorld( + Player.X / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)-4, + (Player.Y / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i + ); + //Left + UngenerateWorld( + Player.X / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+3, + (Player.Y / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i ); } } } - - public static void unloadChunks() { - for (var i = -IRestrictions.RenderDistance; i < IRestrictions.RenderDistance+1; i++) { - //Down - ungenerateWorld( - Player.getX() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i, - (Player.getY() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+3 - ); - //Up - ungenerateWorld( - Player.getX() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i-1, - (Player.getY() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))-4 - ); - //Right - ungenerateWorld( - Player.getX() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)-4, - (Player.getY() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i - ); - //Left - ungenerateWorld( - Player.getX() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+3, - (Player.getY() / (IRestrictions.TileSize * IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i - ); - } - - } } diff --git a/Collector/src/Dimension/WorldRenderer.cs b/Collector/src/Dimension/WorldRenderer.cs index 2690a5a..694070a 100644 --- a/Collector/src/Dimension/WorldRenderer.cs +++ b/Collector/src/Dimension/WorldRenderer.cs @@ -1,51 +1,66 @@ +using System.Linq; +using Collector.Character; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Graphics; +using MonoGame.Extended; namespace Collector.Dimension { - public class WorldRenderer : IRestrictions { - //private Mouse mouse; - //private InputController inputController; - //private Player _player; + public class WorldRenderer : IRestrictions + { + private Mouse _mouse; + private InputController _inputController; + private Player _player; + private SpriteBatch _spriteBatch; + private Main _main; + private OrthographicCamera _orthographicCamera; -/* - public WorldRenderer(InputController inputController, Mouse mouse, Player player) { - this.inputController = inputController; - this.mouse = mouse; - this.player = player; - } -*/ - public void DrawWorld(SpriteBatch batch, int layer) + public WorldRenderer(Mouse mouse, InputController inputController, Player player, SpriteBatch spriteBatch, Main main, OrthographicCamera orthographicCamera) { - /* - foreach (var chunkpair in Chunks.LoadedChunks.Keys.Where(chunkpair => chunkpair.Item3 == layer)) + _mouse = mouse; + _inputController = inputController; + _player = player; + _spriteBatch = spriteBatch; + _main = main; + _orthographicCamera = orthographicCamera; + } + + private static void DrawWorld(SpriteBatch batch, int layer) { - batch.draw( - //BlockMaterials.Textures[Chunks.LoadedChunks[chunkpair].getName()], - chunkpair.Item1 << IRestrictions.TileShift, - chunkpair.Item2 << IRestrictions.TileShift - ); + foreach (var chunkpair in Chunks.LoadedChunks.Keys.Where(chunkpair => chunkpair.Item3 == layer)) + { + batch.Draw( + BlockMaterials.Textures[Chunks.LoadedChunks[chunkpair].Name], + new Rectangle( + chunkpair.Item1 << IRestrictions.TileShift, + chunkpair.Item2 << IRestrictions.TileShift, + IRestrictions.TileSize, IRestrictions.TileSize + ), + Color.White + ); + } + } + + /* + private void mouseCrosshair(SpriteBatch batch) + { + Vector3 mousePos = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0); + Main.cam.unproject(mousePos); + int x = mouse.getSelectedX(mousePos); + int y = mouse.getSelectedY(mousePos); + batch.draw(mouse.getCrosshair(), x, y); } */ + + public void Draw() + { + //Higher means draws in a lower layer + DrawWorld(_spriteBatch, 0); + _inputController.Draw(); + DrawWorld(_spriteBatch, 1); + //mouseCrosshair(batch); + _inputController.PlayerInput(_main,_spriteBatch); } - -/* - private void mouseCrosshair(SpriteBatch batch) { - Vector3 mousePos = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0); - Main.cam.unproject(mousePos); - int x = mouse.getSelectedX(mousePos); - int y = mouse.getSelectedY(mousePos); - batch.draw(mouse.getCrosshair(), x, y); } - - public void render(SpriteBatch batch, float timeSinceLastUpdate) { - //Higher means draws in a lower layer - drawWorld(batch,0); - batch.draw(player.getAnimation().getKeyFrame(timeSinceLastUpdate, true), Player.x, Player.y,TILE_SIZE,TILE_SIZE); - drawWorld(batch,1); - mouseCrosshair(batch); - inputController.handleInput(); - batch.setProjectionMatrix(Main.cam.combined); - } - */ - } -} +} \ No newline at end of file