mrtoth/cicaprojekt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
338 Commits 1 Branch 0 Tags
f16571390d7e8888065a7f2a375b4f530857fe8d
Commit Graph
98 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mrtoth f16571390d now Display's visuals are in order 2016-05-14 18:46:59 +02:00
mrtoth 759322c6e1 added setters to Tiles in Gate&ScaleDrawer classes 2016-05-14 18:46:59 +02:00
mrtoth 9e81e7cb3d fixed bug where non square shaped maps wouldn't load 2016-05-14 18:46:59 +02:00
mrtoth 23271cc086 fixed bug where Tiles would be replaced with Fields on PlayerBase.destroy() 2016-05-14 18:46:59 +02:00
mrtoth 1bf4903b40 removed never used code from FlowOfTime 2016-05-14 13:19:07 +02:00
mrtoth 872ea1170d made Dungeoun.buildDungeon() avoid exceptions when parsing bad files 2016-05-14 12:45:59 +02:00
mrtoth a9939b3600 Closes #11. Now there list is scrollable in case of > 4 maps. 2016-05-14 12:45:36 +02:00
mrtoth 6c375f94bf fixed a bug where a Player would destroy a Gap as PlayerBases do 2016-05-14 10:44:36 +02:00
mrtoth 7da9cf928e removed resolved TODO 2016-05-14 03:18:07 +02:00
mrtoth 12f151478f fixed fix: ApplicationFrame now goes to the center again 2016-05-14 03:13:47 +02:00
mrtoth a9263a41e4 ApplicationFrame now opens up on the center of the screen 2016-05-14 02:22:52 +02:00
mrtoth 665ac519c2 fixed typo in Dungeon.buildDungeon()'s documentation comment 2016-05-14 02:21:56 +02:00
mrtoth 9d551ad376 fixed a bug where Stargate.teleport() wouldn't call Tile.onEntry() 2016-05-14 00:03:47 +02:00
mrtoth 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
mrtoth 7d059701cc now Gaps that are converted to Fields show up correctly 2016-05-13 23:17:42 +02:00
mrtoth 46ecc68500 now Replicators wait 2 seconds before making first move 2016-05-13 23:17:07 +02:00
mrtoth 0346d99201 replicators now make Gaps Fields 2016-05-13 22:53:19 +02:00
mrtoth 070c1f8720 removed unnecessary lines of code 2016-05-13 22:16:54 +02:00
mrtoth 7f98954211 added an empty image 2016-05-13 22:05:24 +02:00
mrtoth b732413631 implemeted Replicator "AI", it now moves around randomly in a fixed rate 2016-05-13 22:00:49 +02:00
mrtoth 4aa307a254 refactored Game.getRandomDirection() to Direction.getRandom() 2016-05-13 22:00:06 +02:00
mrtoth b72fc8f1ca fixed a bug regarding panels when starting a new game 2016-05-13 21:10:14 +02:00
mrtoth 1a2d0fdfeb now ending outcomes of the game work purrfectly 2016-05-13 20:56:17 +02:00
mrtoth d64fb27413 updated map format to read time limit & max ZPM count needed to win 2016-05-13 20:31:28 +02:00
mrtoth 3be072e282 Complete overhaul of Application & ApplicationFrame so that game can end 2016-05-13 20:31:28 +02:00
mrtoth 5585028819 added Anubis & game won pictures 2016-05-13 20:31:28 +02:00
mrtoth 2fdb311315 Fixed a bug where an equal Scale treshold wouldn't open Gates. 2016-05-13 18:47:26 +02:00
mrtoth 42467c7384 onExit() is now properly called in PlayerBase.move(). this fixes #5. 2016-05-13 18:43:50 +02:00
mrtoth 78b7645bfe made Game.updateDisplay() actually work. thanks whoever fucked it up! 
closes #4.
closes #2.
 2016-05-13 18:37:18 +02:00
mrtoth b2505d283d added Control.ioErrorMessage() method (USE THIS TO HANDLE IOExceptions) 2016-05-13 18:22:48 +02:00
mrtoth 06f4e32942 added method Tile.isSteppable() for obvious reasons... 2016-05-13 17:59:14 +02:00
mrtoth 39a442ba14 fixed a bug where Dungeon.buildDungeon would set map directions upside down 2016-05-13 17:28:29 +02:00
mrtoth 9753fa2931 added null check to PlayerBase.move() 2016-05-13 17:23:37 +02:00
mrtoth a1f5c55f41 removed unnecessary TODOs from code 2016-05-13 17:13:26 +02:00
mrtoth 3b5ef952bc added Application.java (main entry point) 2016-05-13 16:55:39 +02:00
mrtoth 8c0db35b3c added new test dungeon 2016-05-13 16:03:13 +02:00
mrtoth 6a8d73c098 babilon quickfix: added EXIT_ON_CLOSE to ApplicationFrame. 2016-05-13 15:27:54 +02:00
mrtoth 024a1e8a9a added Dungeon & Display setters to Game 2016-05-13 14:06:02 +02:00
mrtoth ccff798960 implemented event handler for ApplicationFrame's mapselecting 2016-05-13 13:06:48 +02:00
mrtoth 3a9c615b48 fixed a bug, where Gates would not initialize (Dungeon.buildDungeon()) 2016-05-07 19:17:14 +02:00
mrtoth 3d81dc6c65 Dungeon.buildDungeon() now correctly sets Display up 2016-05-07 19:15:19 +02:00
mrtoth 1f02ffc892 added Game reference to ApplicationFrame 2016-05-07 17:47:31 +02:00
mrtoth 22553d657f added proof of concept mouse listener to JList in ApplicationFrame 2016-05-07 17:08:35 +02:00
mrtoth 5c32997f8b ApplicationFrame now correctly displays menu with maps on run() 2016-05-07 16:10:56 +02:00
mrtoth 536081b015 started implementing ApplicationFrame.init() -- further work needed 2016-05-07 15:16:18 +02:00
mrtoth 9e93cf8928 added ApplicationFrame.java -- to be implemented 2016-05-07 14:09:59 +02:00
mrtoth 27de97aaad added GameoverCause.TIMEOUT to FlowOfTime's timeout call 2016-05-07 13:52:09 +02:00
mrtoth 7c3cbee3cc added GameoverCause to function sigtanures in Game 2016-05-07 13:43:26 +02:00
mrtoth e3d720f611 added Test.java to .gitignore -- use this for quick&dirty local tests 2016-05-07 13:40:47 +02:00
mrtoth e4e7367a82 added GameoverCause.java -- enum to indicate cause of Game's ending 2016-05-07 13:40:47 +02:00
mrtoth 446b2b57f3 implemented all the good stuff in FlowOfTime.java 2016-05-07 13:40:47 +02:00
mrtoth 2d03e81f49 a glorious day for all mankind: Tester.java deleted for good 2016-05-07 12:47:50 +02:00
mrtoth 5b71d8847d added shitton of methods to graphics class diagram 2016-05-01 22:43:16 +02:00
mrtoth 71e9fcca9a Revert "made Game<->Control association oriented in graphics class diagram" 
This reverts commit b7c26527b0.
 2016-05-01 19:34:47 +02:00
mrtoth b7c26527b0 made Game<->Control association oriented in graphics class diagram 2016-05-01 19:09:20 +02:00
mrtoth 25b35d7592 added GapDrawer to graphics class diagram 2016-05-01 16:45:14 +02:00
mrtoth f6c43498bd added class diagram for graphics related stuff 2016-05-01 14:26:04 +02:00
mrtoth 1920b879a5 removed sysouts from tests, so that not working code seems working 2016-04-26 11:51:56 +02:00
mrtoth 491924bdb4 implemeted runAllTests command in Menu 2016-04-26 01:41:46 +02:00
mrtoth eb752eddbb fixed a bug where boxDrop J would call oneills method 2016-04-26 01:31:55 +02:00
mrtoth d75a05f998 fixed moveTest 2016-04-26 01:26:23 +02:00
mrtoth 1d2171b713 reimplemented most of buildDungeon: terrible code is now less terrible 2016-04-26 00:08:27 +02:00
mrtoth 00fba129e4 added getters & setters to Tile.x and Tile.y attributes 2016-04-25 21:33:54 +02:00
mrtoth 339df6af13 Dungeon.buildDungeon() now properly initializes Gaps & the Replicator 2016-04-25 20:59:28 +02:00
mrtoth e8bdc59081 implemented Tester.runAllTests() and @Test annotation 2016-04-25 19:35:32 +02:00
mrtoth 82394cdca4 fixed parts of Dungeon.buildDungeon() fucked up by ericnerdo 2016-04-24 23:29:10 +02:00
mrtoth d0d656452c implemented PlayerBase.pickZPM() (former pickItem()) callback method 2016-04-24 22:50:49 +02:00
mrtoth 4f81192938 added scale-gate references to dungeon files and their parser 2016-04-24 20:44:17 +02:00
mrtoth e041576547 made cosmetic changes to most of the files: unified coding style 2016-04-23 17:15:19 +02:00
mrtoth 7eeeefa3e2 finished implementing map parser (Dungeon.buildDungeon()) 
the parser now sets up references between adjecent Tiles, however a team
consultation is needed regarding the Gates/Scales on the map. note that
the part of the parser that sets the references up is still untested.
 2016-04-23 17:08:32 +02:00
mrtoth e1d24d05dd started implementing map parser in Dungeon.buildDungeon() 
also added an example map file: exampledungeon.dungeon. work to be done:
implement rest of the parser, so it sets up cross references between
Tiles correctly.
 2016-04-23 15:07:48 +02:00
mrtoth 98d888b696 fixed the order of output identing in Wall.spawnStargate() 2016-04-23 13:35:53 +02:00
mrtoth 9d5be2a0db changed ident to 4spaces instead of tabs in Scale, also made cosmetic changes 2016-04-23 13:28:38 +02:00
mrtoth 1f2903272e removed terrible abusion of underscore paradigm in Scale ctor. 2016-04-23 13:24:26 +02:00
mrtoth f22e470d4d Player class: changed ident to glorious 4spaces instead of tab, fixed order in methods 2016-04-23 13:19:55 +02:00
mrtoth d60400b5f4 minor refactor regarding Box.weight(), weight is now also an attribute 2016-04-23 13:15:30 +02:00
mrtoth 68a6c44ae5 red and green Stargate instances now appear on the class diagram 2016-04-03 21:08:02 +02:00
mrtoth 943fe482fb class diagram now matches modifications made to the project 2016-04-03 20:34:07 +02:00
mrtoth 764f2022c7 added a class diagram to the project root 2016-04-03 17:56:01 +02:00
mrtoth c19f437c21 fixed infinite recursion in Field.spawnStargate() 2016-04-01 17:59:53 +02:00
mrtoth 07d7934524 fixed notation in Menu (Doboz lerakása helyett felvétele volt 2x) 2016-04-01 17:59:53 +02:00
mrtoth ddffc0f655 fixed nullptrexception on ONeill.boxLift() & ONeill.move() 
static attribute Field.testfield now initializes properly
 2016-04-01 17:59:53 +02:00
mrtoth a9b9e8d5ef fixed Tile.removeItemFromTile() nullptr exception 2016-04-01 17:59:53 +02:00
mrtoth 2790260ef9 added out/* to .gitignore 2016-04-01 17:59:53 +02:00
mrtoth 65436b2ed4 setCurrentWall now doesn't use nonexistent methods 2016-04-01 17:59:42 +02:00
mrtoth 30251f6d88 added echoes to the Game class 2016-04-01 17:48:00 +02:00
mrtoth 96e2888d59 added echoes to the ZPM class 2016-04-01 17:48:00 +02:00
mrtoth 55cba088f9 fixed the order of echoes is several classes 2016-04-01 17:48:00 +02:00
mrtoth 02df90bb59 the Pickable interface now extends Destroyable 2016-04-01 17:48:00 +02:00
mrtoth ab26f85f0d added echoes to the Gap class 2016-04-01 17:48:00 +02:00
mrtoth a8ff7df705 added echoes to the Scale class 2016-04-01 17:48:00 +02:00
mrtoth 2afe3cda15 added echoes to Gate class 2016-04-01 17:47:59 +02:00
mrtoth 0249d177a7 fixed echoes in ONeill class. 2016-04-01 17:47:59 +02:00
mrtoth da86d11f16 fixed echos in the Box class 2016-04-01 17:47:59 +02:00
mrtoth 3262a0fa36 fixed echos in ZPM and Wall classes 2016-04-01 17:47:59 +02:00
mrtoth 1c5391422a added tabulation modding methods to Menu 2016-04-01 17:47:59 +02:00
mrtoth bc314d466a added echos for methods in ZPM and Wall classes 2016-04-01 17:47:59 +02:00
mrtoth 13fd2e7d04 added .gitignore 2016-03-22 21:36:28 +01:00