- Timestamp:
- 2014-07-21 14:21:17 (7 years ago)
- Location:
- 2014/27/AleksanteriV/Protokolla236TrueSurvivor
- Files:
-
- 7 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Hud.cs
r5461 r5499 7 7 using Jypeli.Widgets; 8 8 9 class Hud : GameObject9 public class Hud : GameObject 10 10 { 11 11 private Player boundPlayer; -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs
r5495 r5499 9 9 public class Player : PhysicsObject 10 10 { 11 Proto236b parent; 11 12 GameObject thrusterEffect; 12 Proto236b parent;13 13 private List<Weapon> weapons = new List<Weapon>(); 14 14 private SoundEffect weaponSound; -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs
r5495 r5499 11 11 private Player player; 12 12 public Player Player { get { return player; } set { player = value; } } 13 Hud hud; 13 private Hud hud; 14 public Hud Hud { get { return hud; } set { hud = value; } } 14 15 private ColorTileMap map; 15 16 public ColorTileMap Map { get { return map; } set { map = value; } } … … 27 28 private Galaxy galaxy; 28 29 public Galaxy Galaxy { get { return galaxy; } set { galaxy = value; } } 30 private Dictionary<int, Dictionary<int, Dictionary<int, GameObject>>> positionGrid = new Dictionary<int, Dictionary<int, Dictionary<int, GameObject>>>(); 29 31 30 32 void AssignKeys() … … 205 207 else 206 208 { 207 CreateBg("space_background", 0,1,-1);209 CreateBg("space_background", 0, 1, -1); 208 210 } 209 211 } … … 240 242 { 241 243 Planet planet = new Planet(this, position, 5000, id); 242 Add (planet);244 AddCheap(planet); 243 245 } 244 246 void createShop(Vector position, double w, double h) … … 281 283 protected override void Update(Microsoft.Xna.Framework.GameTime gameTime) 282 284 { 283 MessageDisplay.Add("update"); 285 Predicate<GameObject> predicate = isGameObject; 286 List<GameObject> list = this.GetObjects(predicate); 287 foreach (GameObject obj in list) 288 { 289 290 } 284 291 base.Update(gameTime); 285 292 } 293 private bool isGameObject(GameObject obj) 294 { 295 return (obj is GameObject); 296 } 297 private void AddCheap(GameObject o){ 298 int x = Convert.ToInt32(o.X), y = Convert.ToInt32(o.Y); 299 if (!positionGrid.ContainsKey(x)) 300 { 301 Dictionary<int, Dictionary<int, GameObject>> posGridX = new Dictionary<int, Dictionary<int, GameObject>>(); 302 positionGrid.Add(x, posGridX); 303 } 304 if (!positionGrid[x].ContainsKey(y)) 305 { 306 Dictionary<int, GameObject> posGridY = new Dictionary<int, GameObject>(); 307 positionGrid[x].Add(y, posGridY); 308 } 309 GameObject uusi = ((GameObject)o); 310 positionGrid[x][y].Add(positionGrid[x][y].Count - 1, uusi); 311 Add(o); 312 } 286 313 } -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj
r5495 r5499 111 111 </ItemGroup> 112 112 <ItemGroup> 113 <Compile Include="cheapGameObject.cs" />114 113 <Compile Include="Enemy1.cs" /> 115 114 <Compile Include="Galaxy.cs" /> -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj.Debug.cachefile
r5495 r5499 6 6 Content\graphics\Enemy\Enemy1.2.xnb 7 7 Content\graphics\Enemy\Enemy2.0.xnb 8 Content\graphics\backgrounds\Mars.xnb9 Content\graphics\backgrounds\planet1.xnb10 8 Content\graphics\levels\standardi.xnb 11 9 Content\graphics\HUD\HUD_radar1.0.xnb … … 16 14 Content\graphics\levels\planet1.xnb 17 15 Content\graphics\levels\planet2.xnb 18 Content\graphics\backgrounds\planet2.xnb19 16 Content\graphics\levels\!space.xnb 20 Content\graphics\backgrounds\Space_esim.xnb21 17 Content\graphics\HUD\galaxy_map.xnb 22 18 Content\graphics\tiles\tilegraniitti.xnb … … 24 20 Content\graphics\tiles\tilenurmi.xnb 25 21 Content\graphics\tiles\tilepuu.xnb 26 Content\graphics\backgrounds\planet2_valetta.xnb27 22 Content\graphics\Planets\MapPlanet1.xnb 28 23 Content\graphics\Planets\MapPlanet2.xnb … … 36 31 Content\graphics\ships\player1.0.xnb 37 32 Content\graphics\levels\planet3.xnb 38 Content\graphics\backgrounds\planet3_valetta.xnb39 33 Content\graphics\backgrounds\Space.xnb 40 34 Content\music\cold_heart_of_the_klondike-j7JwprGVSjA_fmt43.xnb -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml
r5495 r5499 18 18 <Options>None</Options> 19 19 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb</Output> 20 <Time>2014-07-21T1 0:21:21.1018747+03:00</Time>20 <Time>2014-07-21T12:05:41.3552747+03:00</Time> 21 21 </Item> 22 22 <Item> … … 66 66 </Item> 67 67 <Item> 68 <Source>graphics\backgrounds\Mars.png</Source>69 <Name>graphics\backgrounds\Mars</Name>70 <Importer>TextureImporter</Importer>71 <Processor>TextureProcessor</Processor>72 <Options>None</Options>73 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Mars.xnb</Output>74 <Time>2014-07-21T10:21:24.3154747+03:00</Time>75 </Item>76 <Item>77 <Source>graphics\backgrounds\planet1.png</Source>78 <Name>graphics\backgrounds\planet1</Name>79 <Importer>TextureImporter</Importer>80 <Processor>TextureProcessor</Processor>81 <Options>None</Options>82 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet1.xnb</Output>83 <Time>2014-07-21T10:21:24.3310747+03:00</Time>84 </Item>85 <Item>86 68 <Source>graphics\levels\standardi.png</Source> 87 69 <Name>graphics\levels\standardi</Name> … … 156 138 </Item> 157 139 <Item> 158 <Source>graphics\backgrounds\planet2.png</Source>159 <Name>graphics\backgrounds\planet2</Name>160 <Importer>TextureImporter</Importer>161 <Processor>TextureProcessor</Processor>162 <Options>None</Options>163 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet2.xnb</Output>164 <Time>2014-07-21T10:21:24.3466747+03:00</Time>165 </Item>166 <Item>167 140 <Source>graphics\levels\!space.png</Source> 168 141 <Name>graphics\levels\!space</Name> … … 174 147 </Item> 175 148 <Item> 176 <Source>graphics\backgrounds\Space_esim.jpg</Source>177 <Name>graphics\backgrounds\Space_esim</Name>178 <Importer>TextureImporter</Importer>179 <Processor>TextureProcessor</Processor>180 <Options>None</Options>181 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space_esim.xnb</Output>182 <Time>2014-07-21T10:21:24.3154747+03:00</Time>183 </Item>184 <Item>185 149 <Source>graphics\HUD\galaxy_map.png</Source> 186 150 <Name>graphics\HUD\galaxy_map</Name> … … 228 192 </Item> 229 193 <Item> 230 <Source>graphics\backgrounds\planet2_valetta.png</Source>231 <Name>graphics\backgrounds\planet2_valetta</Name>232 <Importer>TextureImporter</Importer>233 <Processor>TextureProcessor</Processor>234 <Options>None</Options>235 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet2_valetta.xnb</Output>236 <Time>2014-07-21T10:21:24.3466747+03:00</Time>237 </Item>238 <Item>239 194 <Source>graphics\Planets\MapPlanet1.png</Source> 240 195 <Name>graphics\Planets\MapPlanet1</Name> … … 334 289 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\planet3.xnb</Output> 335 290 <Time>2014-07-21T10:21:25.5010747+03:00</Time> 336 </Item>337 <Item>338 <Source>graphics\backgrounds\planet3_valetta.png</Source>339 <Name>graphics\backgrounds\planet3_valetta</Name>340 <Importer>TextureImporter</Importer>341 <Processor>TextureProcessor</Processor>342 <Options>None</Options>343 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet3_valetta.xnb</Output>344 <Time>2014-07-21T10:21:24.3778747+03:00</Time>345 291 </Item> 346 292 <Item> -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt
r5495 r5499 28 28 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 29 29 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 30 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Mars.xnb31 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet1.xnb32 30 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\standardi.xnb 33 31 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar1.0.xnb … … 67 65 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\planet1.xnb 68 66 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\planet2.xnb 69 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet2.xnb70 67 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\!space.xnb 71 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space_esim.xnb72 68 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\galaxy_map.xnb 73 69 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilegraniitti.xnb … … 75 71 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilenurmi.xnb 76 72 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilepuu.xnb 77 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet2_valetta.xnb78 73 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\music\cold_heart_of_the_klondike-j7JwprGVSjA_fmt43.xnb 79 74 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\music\nitrome - Canopy.xnb … … 110 105 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player1.0.xnb 111 106 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\planet3.xnb 112 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet3_valetta.xnb113 107 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilegraniitti.xnb 114 108 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilemulta.xnb -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/cachefile-{5156C658-EF8C-4216-BA6D-9928D133FE72}-targetpath.txt
r5495 r5499 6 6 Content\graphics\Enemy\Enemy1.2.xnb 7 7 Content\graphics\Enemy\Enemy2.0.xnb 8 Content\graphics\backgrounds\Mars.xnb9 Content\graphics\backgrounds\planet1.xnb10 8 Content\graphics\levels\standardi.xnb 11 9 Content\graphics\HUD\HUD_radar1.0.xnb … … 16 14 Content\graphics\levels\planet1.xnb 17 15 Content\graphics\levels\planet2.xnb 18 Content\graphics\backgrounds\planet2.xnb19 16 Content\graphics\levels\!space.xnb 20 Content\graphics\backgrounds\Space_esim.xnb21 17 Content\graphics\HUD\galaxy_map.xnb 22 18 Content\graphics\tiles\tilegraniitti.xnb … … 24 20 Content\graphics\tiles\tilenurmi.xnb 25 21 Content\graphics\tiles\tilepuu.xnb 26 Content\graphics\backgrounds\planet2_valetta.xnb27 22 Content\graphics\Planets\MapPlanet1.xnb 28 23 Content\graphics\Planets\MapPlanet2.xnb … … 36 31 Content\graphics\ships\player1.0.xnb 37 32 Content\graphics\levels\planet3.xnb 38 Content\graphics\backgrounds\planet3_valetta.xnb39 33 Content\graphics\backgrounds\Space.xnb 40 34 Content\music\cold_heart_of_the_klondike-j7JwprGVSjA_fmt43.xnb -
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/Protokolla236TrueSurvivorContent.contentproj
r5462 r5499 90 90 </ItemGroup> 91 91 <ItemGroup> 92 <Compile Include="graphics\backgrounds\Mars.png">93 <Name>Mars</Name>94 <Importer>TextureImporter</Importer>95 <Processor>TextureProcessor</Processor>96 </Compile>97 </ItemGroup>98 <ItemGroup>99 <Compile Include="graphics\backgrounds\planet1.png">100 <Name>planet1</Name>101 <Importer>TextureImporter</Importer>102 <Processor>TextureProcessor</Processor>103 </Compile>104 </ItemGroup>105 <ItemGroup>106 92 <Compile Include="graphics\levels\standardi.png"> 107 93 <Name>standardi</Name> … … 154 140 </ItemGroup> 155 141 <ItemGroup> 156 <Compile Include="graphics\backgrounds\planet2.png">157 <Name>planet2</Name>158 <Importer>TextureImporter</Importer>159 <Processor>TextureProcessor</Processor>160 </Compile>161 </ItemGroup>162 <ItemGroup>163 142 <Compile Include="graphics\levels\!space.png"> 164 143 <Name>!space</Name> … … 168 147 </ItemGroup> 169 148 <ItemGroup> 170 <Compile Include="graphics\backgrounds\Space_esim.jpg">171 <Name>Space_esim</Name>172 <Importer>TextureImporter</Importer>173 <Processor>TextureProcessor</Processor>174 </Compile>175 </ItemGroup>176 <ItemGroup>177 149 <Compile Include="graphics\HUD\galaxy_map.png"> 178 150 <Name>galaxy_map</Name> … … 199 171 <Compile Include="graphics\tiles\tilepuu.png"> 200 172 <Name>tilepuu</Name> 201 <Importer>TextureImporter</Importer>202 <Processor>TextureProcessor</Processor>203 </Compile>204 </ItemGroup>205 <ItemGroup>206 <Compile Include="graphics\backgrounds\planet2_valetta.png">207 <Name>planet2_valetta</Name>208 173 <Importer>TextureImporter</Importer> 209 174 <Processor>TextureProcessor</Processor> … … 340 305 <Compile Include="graphics\levels\planet3.png"> 341 306 <Name>planet3</Name> 342 <Importer>TextureImporter</Importer>343 <Processor>TextureProcessor</Processor>344 </Compile>345 </ItemGroup>346 <ItemGroup>347 <Compile Include="graphics\backgrounds\planet3_valetta.png">348 <Name>planet3_valetta</Name>349 307 <Importer>TextureImporter</Importer> 350 308 <Processor>TextureProcessor</Processor>
Note: See TracChangeset
for help on using the changeset viewer.