mrtoth
/
cicaprojekt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
420 Commits 1 Branch 0 Tags 44 MiB
Commit Graph

368 Commits

Author SHA1 Message Date
Bokros Bálint ce5d34232c Wall now is steppable only if the stargate is open 2016-05-14 23:23:21 +02:00
ericnerdo b92f164948 ZPM generation fixed. 2016-05-14 23:19:11 +02:00
Kjistóf 74a34e61ad fixed a bug where a Player would win the game twice 2016-05-14 22:46:04 +02:00
ericnerdo 68253e7a5b A ZPM is generated after every 2 picked up ZPMs. 2016-05-14 22:39:07 +02:00
Kjistóf 5af0bcfd76 implemented end of games properly 2016-05-14 21:32:08 +02:00
Kjistóf 5acae3c527 fixed a bug where AbstractDrawer would load images several times 2016-05-14 21:04:13 +02:00
ericnerdo 12ac49938d Gates' extraordinal behavior with boxes fixed. 2016-05-14 21:01:17 +02:00
Kjistóf 47b894f99e rewritten AbstractDrawer to use ImageStorage 2016-05-14 20:48:48 +02:00
Kjistóf a7a530a9aa added ImageStorage to precache images to remove IO bottleneck 2016-05-14 20:48:48 +02:00
ericnerdo 743686aa8e Open Gates now handle boxes visually. 2016-05-14 20:33:36 +02:00
Kjistóf 378f26fdff Closes #13. Boxes are now purrfectly stackable. 2016-05-14 19:47:29 +02:00
Kjistóf 230f36d856 removed unnecessary throw statement. we'll miss you. 
throw new IllegalStateException("Hiba! Te hogy kerültél a falba?")
best exception evör.
 2016-05-14 19:00:47 +02:00
Bokros Bálint da5640592d Removed unnecessary, but compile-breaking import by Kjizstov 2016-05-14 18:46:59 +02:00
Kjistóf f16571390d now Display's visuals are in order 2016-05-14 18:46:59 +02:00
Kjistóf 759322c6e1 added setters to Tiles in Gate&ScaleDrawer classes 2016-05-14 18:46:59 +02:00
Kjistóf 9e81e7cb3d fixed bug where non square shaped maps wouldn't load 2016-05-14 18:46:59 +02:00
Kjistóf 23271cc086 fixed bug where Tiles would be replaced with Fields on PlayerBase.destroy() 2016-05-14 18:46:59 +02:00
ericnerdo 55cae38f5f Jaffa, O'Neill and Replicator now inicialized as null. 
Bypassing purrpurr errors, the default value of these attributes is null.
 2016-05-14 14:13:27 +02:00
Bokros Bálint 2b81b8ae03 Removed redundant initialization 2016-05-14 13:48:19 +02:00
Bokros Bálint f8eb39d2fb Added missing override annotations 2016-05-14 13:47:14 +02:00
Bokros Bálint b02a5756a5 Removed unnecessary semicolon from GameoverCause enum 2016-05-14 13:44:45 +02:00
Bokros Bálint aa22ef49f0 Removed unnecessary modifier in Pickable interface 2016-05-14 13:43:57 +02:00
Bokros Bálint eb7ac569b8 Refactored dimension int local variable 2016-05-14 13:33:09 +02:00
Bokros Bálint aef1c12b22 Made filelist a local variable in AF 2016-05-14 13:29:24 +02:00
Bokros Bálint 657aff15f9 Made enclosed model objects private in all drawers 2016-05-14 13:27:34 +02:00
Bokros Bálint 27fa81c601 Simplified onEntry in Wall 2016-05-14 13:25:04 +02:00
Bokros Bálint c2053fae96 Simplified isSteppable in Wall 2016-05-14 13:23:59 +02:00
Bokros Bálint 92f894c5a5 Removed unnecessary return from spawnStargate 2016-05-14 13:23:20 +02:00
Bokros Bálint cb26b8e97d Simplified hasZPM in Tile 2016-05-14 13:22:22 +02:00
Bokros Bálint 830899d0b9 Replaced explicit type argument with diamond expression 2016-05-14 13:21:40 +02:00
Bokros Bálint 5a617ed04f Fixed too many args in Stargate.toString 2016-05-14 13:20:38 +02:00
Bokros Bálint 2aeb5b4503 Simplified if statement in setCurrentWall in Stargate 2016-05-14 13:19:24 +02:00
Bokros Bálint 57543ff23c Removed unnecessary method from Scale 2016-05-14 13:19:24 +02:00
Bokros Bálint 4aed0db284 Simplified if statement in isSteppable in Scale 2016-05-14 13:19:24 +02:00
Bokros Bálint 43686db0b0 Replaced explicit type argument with diamond expression 2016-05-14 13:19:24 +02:00
Kjistóf 1bf4903b40 removed never used code from FlowOfTime 2016-05-14 13:19:07 +02:00
Bokros Bálint 1856974cc7 Removed redundant cast 2016-05-14 13:13:44 +02:00
Bokros Bálint 2564aca663 Removed Menu as it is replaced by the GUI 2016-05-14 13:12:44 +02:00
Bokros Bálint bb6c46827f Removed unnecessary modifier from MEasurable interface 2016-05-14 13:11:48 +02:00
Bokros Bálint c4ed7807cb Simplified isSteppable in Gate 2016-05-14 13:11:10 +02:00
Bokros Bálint fd18cc72d0 Simplified onEntry in Gate 2016-05-14 13:09:25 +02:00
Bokros Bálint 73f01495f2 Removed unnecessary proxy method 2016-05-14 13:07:27 +02:00
Bokros Bálint f04b62ec78 Removed unnecessary return from noop onExit method 2016-05-14 13:04:16 +02:00
Bokros Bálint 367c313af3 Simplified isSteppable in Field 2016-05-14 13:03:16 +02:00
Bokros Bálint a0c2c24328 Removed unnecessary errors from Field 2016-05-14 13:02:43 +02:00
Bokros Bálint 6904ba4c89 Removed unnecessíry modifiers from Drawer interface 2016-05-14 13:01:18 +02:00
Bokros Bálint 7b15bb29d2 Removed unnecessary method from display 2016-05-14 13:00:43 +02:00
Bokros Bálint 7f1c6c480d Removed unnecessary modifier 2016-05-14 12:58:33 +02:00
Bokros Bálint bb1ef28f71 Removed unnecessary imports, which also made the package unbuildable 2016-05-14 12:54:37 +02:00
Kjistóf 872ea1170d made Dungeoun.buildDungeon() avoid exceptions when parsing bad files 2016-05-14 12:45:59 +02:00
Kjistóf a9939b3600 Closes #11. Now there list is scrollable in case of > 4 maps. 2016-05-14 12:45:36 +02:00
Kjistóf 6c375f94bf fixed a bug where a Player would destroy a Gap as PlayerBases do 2016-05-14 10:44:36 +02:00
Kjistóf 7da9cf928e removed resolved TODO 2016-05-14 03:18:07 +02:00
Kjistóf 12f151478f fixed fix: ApplicationFrame now goes to the center again 2016-05-14 03:13:47 +02:00
Bokros Bálint 80ff3e4383 Reworked window size handling 
Window is now resized properly at all times to embed the current frame purrfectly
 2016-05-14 03:07:11 +02:00
Bokros Bálint 4f11f60b50 Implemented proper map size handling in Display 2016-05-14 03:05:17 +02:00
Bokros Bálint df3bb34969 Removed unnecessary commented code line 2016-05-14 03:05:17 +02:00
Bokros Bálint b5df8cfcaf Stored height alongside width in dungeon 2016-05-14 03:05:17 +02:00
Kjistóf a9263a41e4 ApplicationFrame now opens up on the center of the screen 2016-05-14 02:22:52 +02:00
Kjistóf 665ac519c2 fixed typo in Dungeon.buildDungeon()'s documentation comment 2016-05-14 02:21:56 +02:00
Bokros Bálint f3b5cb5d57 Implemented window resizing for the lulz 
Target size is static for the time being
 2016-05-14 02:08:00 +02:00
Bokros Bálint c75c277403 Implemented background music 2016-05-14 00:15:50 +02:00
Bokros Bálint a17de768eb Implemented main menu 2016-05-14 00:15:50 +02:00
Kjistóf 9d551ad376 fixed a bug where Stargate.teleport() wouldn't call Tile.onEntry() 2016-05-14 00:03:47 +02:00
Kjistóf 89a1da497f now "flying" Stargates destroy Replicators, and belonging bugfix 
Game.playerBaseDestroyed() is not called everythime a PlayerBase is
destroyed.
 2016-05-13 23:52:10 +02:00
Kjistóf 7d059701cc now Gaps that are converted to Fields show up correctly 2016-05-13 23:17:42 +02:00
Kjistóf 46ecc68500 now Replicators wait 2 seconds before making first move 2016-05-13 23:17:07 +02:00
Kjistóf 0346d99201 replicators now make Gaps Fields 2016-05-13 22:53:19 +02:00
Kjistóf 070c1f8720 removed unnecessary lines of code 2016-05-13 22:16:54 +02:00
Bokros Bálint 1974396f61 Implemented initial player death 2016-05-13 22:10:54 +02:00
Kjistóf b732413631 implemeted Replicator "AI", it now moves around randomly in a fixed rate 2016-05-13 22:00:49 +02:00
Kjistóf 4aa307a254 refactored Game.getRandomDirection() to Direction.getRandom() 2016-05-13 22:00:06 +02:00
Bokros Bálint 5db401d2ab Fixed issue where mapselectorpanel would initialize more than once 2016-05-13 21:34:13 +02:00
Bokros Bálint 12cb4fd10f Fixed multiple key handlers being registered on restarted game 2016-05-13 21:31:46 +02:00
Kjistóf b72fc8f1ca fixed a bug regarding panels when starting a new game 2016-05-13 21:10:14 +02:00
Bokros Bálint 37fa657720 Refactored flowoftime construction, fixes #9 2016-05-13 21:05:34 +02:00
Kjistóf 1a2d0fdfeb now ending outcomes of the game work purrfectly 2016-05-13 20:56:17 +02:00
Bokros Bálint cb99f84ded Boxes now cannot be put on walls -- and other places, where they don't belong 
fixes #8
 2016-05-13 20:54:17 +02:00
Bokros Bálint 6700c33b8d Player is now floating between dimensions if the exit of the other stargate is blocked 
also fixes #7
 2016-05-13 20:48:48 +02:00
Kjistóf d64fb27413 updated map format to read time limit & max ZPM count needed to win 2016-05-13 20:31:28 +02:00
Kjistóf 3be072e282 Complete overhaul of Application & ApplicationFrame so that game can end 2016-05-13 20:31:28 +02:00
Bokros Bálint e3ce590d1d Fixed remaining errors with teleporting 
closes #6
 2016-05-13 20:27:05 +02:00
Bokros Bálint d14ce39ee1 Added invert to Direction 2016-05-13 20:26:02 +02:00
Bokros Bálint 595d5d6048 Stargates are now finally spawned correctly 
Fixes #3
 2016-05-13 19:15:53 +02:00
Bokros Bálint d1a20ff5dc Added isSpawned method to Stargate 2016-05-13 19:15:28 +02:00
Kjistóf 2fdb311315 Fixed a bug where an equal Scale treshold wouldn't open Gates. 2016-05-13 18:47:26 +02:00
Kjistóf 42467c7384 onExit() is now properly called in PlayerBase.move(). this fixes #5. 2016-05-13 18:43:50 +02:00
Bokros Bálint 314428b273 Refactored spawnStargate, with default implementation in base class 2016-05-13 18:38:56 +02:00
Kjistóf 78b7645bfe made Game.updateDisplay() actually work. thanks whoever fucked it up! 
closes #4.
closes #2.
 2016-05-13 18:37:18 +02:00
Kjistóf b2505d283d added Control.ioErrorMessage() method (USE THIS TO HANDLE IOExceptions) 2016-05-13 18:22:48 +02:00
Kjistóf 06f4e32942 added method Tile.isSteppable() for obvious reasons... 2016-05-13 17:59:14 +02:00
Kjistóf 39a442ba14 fixed a bug where Dungeon.buildDungeon would set map directions upside down 2016-05-13 17:28:29 +02:00
Kjistóf 9753fa2931 added null check to PlayerBase.move() 2016-05-13 17:23:37 +02:00
Kjistóf a1f5c55f41 removed unnecessary TODOs from code 2016-05-13 17:13:26 +02:00
Bokros Bálint 7f7025219e Dirty, but working event subscribe 2016-05-13 17:11:01 +02:00
Bokros Bálint 76057a4712 KeyHandler is properly nested now 2016-05-13 17:11:01 +02:00
Kjistóf 3b5ef952bc added Application.java (main entry point) 2016-05-13 16:55:39 +02:00
Bokros Bálint a0f47a6e05 Added rotate to key options 2016-05-13 16:08:53 +02:00
Bokros Bálint c9ec85cec5 Implemented updateDisplay 2016-05-13 16:08:27 +02:00
ericnerdo 3522c83baa ApplicationFrame now calls gamepanel.DrawVisuals(). 
Meow. :3
 2016-05-13 15:32:32 +02:00