Hegedus Fanni
70fd002f47
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
2016-04-25 21:48:28 +02:00
Hegedus Fanni
56c58ffcde
added testBoxes test in Tester.java
2016-04-25 21:40:22 +02:00
00fba129e4
added getters & setters to Tile.x and Tile.y attributes
2016-04-25 21:33:54 +02:00
ericnerdo
41b132df46
boolean rotationTest() added to Tester
2016-04-25 21:27:10 +02:00
ericnerdo
1dfe318b10
boolean timeUpTest() added to Tester
2016-04-25 21:22:05 +02:00
Hegedus Fanni
19ff22905d
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
2016-04-25 21:19:39 +02:00
Hegedus Fanni
518fdd0586
fixed typos in testExtraZPMs and testReplicatorPosition in Tester.java
2016-04-25 21:16:05 +02:00
Bokros Bálint
6810ec02bc
Implemented rotate
2016-04-25 21:15:24 +02:00
ericnerdo
fbdb7ba867
fixed fucked up merge
2016-04-25 21:11:37 +02:00
ericnerdo
934c358da8
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
...
boolean ZPMTest() added to Tester
2016-04-25 21:08:52 +02:00
Hegedus Fanni
806c6ae37c
added replicatorPosition test in Tester.java
2016-04-25 21:05:24 +02:00
ericnerdo
0a240e59f9
boolean ZPMTest() added to Tester
2016-04-25 21:02:52 +02:00
Bokros Bálint
1b2c8c8478
Implemented shootONeillsGun
2016-04-25 21:02:30 +02:00
339df6af13
Dungeon.buildDungeon() now properly initializes Gaps & the Replicator
2016-04-25 20:59:28 +02:00
Hegedus Fanni
328107adb8
fixed extraZPMs test in Tester.java
2016-04-25 20:55:28 +02:00
ericnerdo
689e7c6324
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
2016-04-25 20:50:42 +02:00
ericnerdo
712f35f245
boolean gapTest() added to Tester
2016-04-25 20:49:01 +02:00
Bokros Bálint
cf356806c5
Implemented move in Tester
2016-04-25 20:44:22 +02:00
ericnerdo
9e2a21f967
boolean testScalesAndGates() added to Tester
2016-04-25 20:40:56 +02:00
Hegedus Fanni
68c0dd96e3
added extraZPMs test to Tester.java
2016-04-25 20:32:58 +02:00
ericnerdo
1bf5df9b08
boolean moveTest() modified, boolean testStargates() added to Tester
2016-04-25 20:21:11 +02:00
Bokros Bálint
d61be1d967
Players are now properly initialized
2016-04-25 20:02:48 +02:00
ericnerdo
9f5c310e12
boolean moveTest() was added to Test
2016-04-25 19:55:09 +02:00
e8bdc59081
implemented Tester.runAllTests() and @Test annotation
2016-04-25 19:35:32 +02:00
Bokros Bálint
43653de8c9
Implemented listPlayers
2016-04-25 19:18:22 +02:00
Bokros Bálint
c26b3ae75f
Added toString to PlayerBase
2016-04-25 19:14:54 +02:00
Bokros Bálint
c577bb1471
Added coords and toString to Tile
2016-04-25 19:14:08 +02:00
Bokros Bálint
7b531fecdd
Refactored Player and PlayerBase ctors
2016-04-25 13:56:41 +02:00
Bokros Bálint
1a23abbe47
Added Tester class
2016-04-25 13:02:45 +02:00
82394cdca4
fixed parts of Dungeon.buildDungeon() fucked up by ericnerdo
2016-04-24 23:29:10 +02:00
Bokros Bálint
1ab13398bb
reformatted code
2016-04-24 23:01:34 +02:00
d0d656452c
implemented PlayerBase.pickZPM() (former pickItem()) callback method
2016-04-24 22:50:49 +02:00
ericnerdo
69a2384160
Wall - finished
2016-04-24 22:37:27 +02:00
ericnerdo
1c8566d96c
Scale - finished
2016-04-24 22:36:54 +02:00
ericnerdo
fd64fd9165
Gate - finished
2016-04-24 22:36:20 +02:00
ericnerdo
cbd196532f
Gap - finished
2016-04-24 22:28:09 +02:00
ericnerdo
a276a9e6e1
Field - finished
2016-04-24 22:27:30 +02:00
ericnerdo
924a5acc26
Tile refactored
...
Every setItemOnTile call were replaced.
2016-04-24 22:25:20 +02:00
ericnerdo
0a4b00aad3
Tile-attributes changed
...
Tile.itemOnTile no longer exists, it was replaced by boxStack and zpmOnTile. Getter-Setter methods were added.
2016-04-24 21:19:35 +02:00
4f81192938
added scale-gate references to dungeon files and their parser
2016-04-24 20:44:17 +02:00
Bokros Bálint
794378a919
Removed unneeded 'cicaprojekt.'-s from the project
2016-04-24 20:44:10 +02:00
Bokros Bálint
b32fec8c52
Stargate's isSpawned attribute is now properly initialized
2016-04-24 20:10:31 +02:00
Bokros Bálint
c6a0b984eb
Added red and green Stargates
2016-04-24 20:09:53 +02:00
Bokros Bálint
708ad09c5e
Cosmetic fixes in Stargate
2016-04-24 20:09:02 +02:00
ericnerdo
73c42991eb
OnEntry/OnExit changed
...
The argument of these methods were changed from void to PlayerBase playerBase.
2016-04-24 19:49:27 +02:00
ericnerdo
64e6aec176
Implemented onExit in Wall
2016-04-24 18:38:39 +02:00
ericnerdo
6b11456b7a
Abstract class finished
...
Method-calling texts were removed and methods were implemented.
2016-04-24 18:27:36 +02:00
muskenum
13a8adec82
Deleted echoes from all classes
2016-04-24 18:21:01 +02:00
e041576547
made cosmetic changes to most of the files: unified coding style
2016-04-23 17:15:19 +02:00
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
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
98d888b696
fixed the order of output identing in Wall.spawnStargate()
2016-04-23 13:35:53 +02:00
9d5be2a0db
changed ident to 4spaces instead of tabs in Scale, also made cosmetic changes
2016-04-23 13:28:38 +02:00
1f2903272e
removed terrible abusion of underscore paradigm in Scale ctor.
2016-04-23 13:24:26 +02:00
f22e470d4d
Player class: changed ident to glorious 4spaces instead of tab, fixed order in methods
2016-04-23 13:19:55 +02:00
d60400b5f4
minor refactor regarding Box.weight(), weight is now also an attribute
2016-04-23 13:15:30 +02:00
ericnerdo
19aad35791
Measurable interface implemented
...
Method int weight() overridden, the return value is 0.
2016-04-22 10:43:45 +02:00
ericnerdo
d1d6e8b725
Boolean isOpen fixed
...
"return open" was in the middle of the code, I moved it to the end of it. Methods onEntry, onExit are still unfinished.
2016-04-22 10:38:18 +02:00
ericnerdo
6868baec84
Weight of Box finished
...
After implementing the Measurable interface, the constant weight of Boxes in the int weight method is 5. Attribute int weight, methods set- and getWeight were removed.
2016-04-22 10:18:31 +02:00
muskenum
a30cb01cd0
Ready Gate except onEntry and onExit.
2016-04-21 23:39:00 +02:00
muskenum
d735d72a78
Added weight to Box, not finished
2016-04-21 23:32:14 +02:00
muskenum
a83a849ac0
Added weight to Box, + getter/setter
2016-04-21 23:01:20 +02:00
muskenum
ab02de6e86
Finished Gate class, except onEntry and onExit.
2016-04-21 21:57:45 +02:00
Bokros Bálint
b8b79db028
Added threshold initialization to ctor
2016-04-19 11:46:59 +02:00
Bokros Bálint
f45ed417ae
Refactored ONeill into PlayerBase and Player
...
Change was needed because of updated specification.
2016-04-19 11:46:06 +02:00
Bokros Bálint
db54dcdd1d
Implemented stack in Scale
...
Implemented a stack of items on the Scale, instead of one item, change was needed due to the modified specification
2016-04-19 11:31:56 +02:00
Bokros Bálint
7f98d7ff3d
Pickable now extends Measurable
2016-04-19 11:01:26 +02:00
Bokros Bálint
78b3fb0986
Created Measurable interface
2016-04-19 11:01:09 +02:00
muskenum
cfb630ff18
Little changing in the echoes of Wall
...
Megcseréltem a két részt, mert a metódus törzse az echo után jött csak.
2016-04-03 23:14:59 +02:00
c19f437c21
fixed infinite recursion in Field.spawnStargate()
2016-04-01 17:59:53 +02:00
Bokros Bálint
a06feaa0ca
attempt to fix stargate spawning
...
still gives stackoverflow, as there's no stop condition
2016-04-01 17:59:53 +02:00
Bokros Bálint
5ece8b8f27
Stargate isn't initialized with nullpointers now
2016-04-01 17:59:53 +02:00
07d7934524
fixed notation in Menu (Doboz lerakása helyett felvétele volt 2x)
2016-04-01 17:59:53 +02:00
ddffc0f655
fixed nullptrexception on ONeill.boxLift() & ONeill.move()
...
static attribute Field.testfield now initializes properly
2016-04-01 17:59:53 +02:00
a9b9e8d5ef
fixed Tile.removeItemFromTile() nullptr exception
2016-04-01 17:59:53 +02:00
Bokros Bálint
a8a938ee14
added default ctor to Tile
2016-04-01 17:59:53 +02:00
Bokros Bálint
b3ecdf2b95
implemented misteriously gone setAdjacentTile
2016-04-01 17:59:53 +02:00
Bokros Bálint
0230aec6d8
ONeill is now constructed with an existing ctor
2016-04-01 17:59:53 +02:00
Bokros Bálint
59d03d193f
added testField as a temporary measure
...
this field can be set as all adjacentFields in the skeleton
2016-04-01 17:59:53 +02:00
Bokros Bálint
15c9306d95
setItemOnTile doesn't use nonexistent methods
2016-04-01 17:59:52 +02:00
65436b2ed4
setCurrentWall now doesn't use nonexistent methods
2016-04-01 17:59:42 +02:00
muskenum
562015b7ab
added Scale constructor
2016-04-01 17:51:58 +02:00
muskenum
127da96aea
added ONeill constructor
2016-04-01 17:51:30 +02:00
muskenum
dbdcae7742
added Tile constructor
2016-04-01 17:50:06 +02:00
hegedusfanni
120c459df9
added echo to Wall.clearStargate() method
2016-04-01 17:49:14 +02:00
hegedusfanni
94965f70fb
added echoes to the Tile class
2016-04-01 17:48:38 +02:00
muskenum
b1f38c6afc
fixed echoes in the Dungeon class
2016-04-01 17:48:38 +02:00
muskenum
10bb64282b
fixed echoes in the FlowOfTime class
2016-04-01 17:48:38 +02:00
hegedusfanni
50456d092a
added echoes to the Stargate class
2016-04-01 17:48:00 +02:00
muskenum
0bd209e1f5
fixed echoes in the Field class
2016-04-01 17:48:00 +02:00
muskenum
5f56ed4062
fixed echoes in the Dungeon class
...
A metódus paraméterét nem tudom, hogy jól írtam-e be a sysoutba
2016-04-01 17:48:00 +02:00
muskenum
79bd5062ec
fixed echoes in the Box class
...
Hiányzott még két sysout, meg az egyik addTab helyett remove volt, ezek lettek javítva.
2016-04-01 17:48:00 +02:00
Bokros Bálint
3a975047c4
removed unnecessary import from gap
2016-04-01 17:48:00 +02:00
Bokros Bálint
017e24a484
added rotateLeft and rotateRight methods to ONeill
2016-04-01 17:48:00 +02:00
Bokros Bálint
b7b182cf7d
created Menu
2016-04-01 17:48:00 +02:00
30251f6d88
added echoes to the Game class
2016-04-01 17:48:00 +02:00
96e2888d59
added echoes to the ZPM class
2016-04-01 17:48:00 +02:00
55cba088f9
fixed the order of echoes is several classes
2016-04-01 17:48:00 +02:00
02df90bb59
the Pickable interface now extends Destroyable
2016-04-01 17:48:00 +02:00
ab26f85f0d
added echoes to the Gap class
2016-04-01 17:48:00 +02:00
a8ff7df705
added echoes to the Scale class
2016-04-01 17:48:00 +02:00
2afe3cda15
added echoes to Gate class
2016-04-01 17:47:59 +02:00
0249d177a7
fixed echoes in ONeill class.
2016-04-01 17:47:59 +02:00
da86d11f16
fixed echos in the Box class
2016-04-01 17:47:59 +02:00
3262a0fa36
fixed echos in ZPM and Wall classes
2016-04-01 17:47:59 +02:00
1c5391422a
added tabulation modding methods to Menu
2016-04-01 17:47:59 +02:00
bc314d466a
added echos for methods in ZPM and Wall classes
2016-04-01 17:47:59 +02:00
Bokros Bálint
7d45ab6b79
created Menu skeleton
2016-04-01 17:47:59 +02:00
ericnerdo
88b594b666
Initial commit
...
Base files for the project were added.
Update ONeill.java
Update Box.java
fixed everything, code now compiles correctly
2016-04-01 17:47:22 +02:00
