Commit Graph

432 Commits

Author SHA1 Message Date
Mateusz
d537eb089d Merge remote-tracking branch 'origin/master' 2020-04-27 14:18:02 +02:00
Mateusz
c96ecc64d8 README.md add A* information in Sterowanie 2020-04-27 14:17:48 +02:00
389183a4c2 Zaktualizuj 'route-planning.md' 2020-04-27 12:14:02 +00:00
Mateusz
b433b588f5 route-planning.md change screenshots to code mark
delete screenshots files
2020-04-27 14:06:23 +02:00
Mateusz
ddb30859d1 route-planning.md "u" more visible and correct project progress 2020-04-27 14:00:13 +02:00
Mateusz
3632a9ffbb route-planning.md add all screenshots and correct project progress section 2020-04-27 13:41:58 +02:00
Mateusz
ae551703fd add screenshots folder and images to route-planning.md raport
correct path in environment.md
style progress in route-planning.md
2020-04-27 13:33:01 +02:00
Mateusz
b23865b090 route-planning.md - successor function content 2020-04-27 12:47:59 +02:00
Mateusz
a6a8812ace route-planning.md - file links corrections 2020-04-27 12:23:40 +02:00
Mateusz
5a4228fcff route-planning.md - space corrections #1 2020-04-27 12:15:48 +02:00
Mateusz
20c3c269de route-planning.md - endline corrections #1 2020-04-27 12:08:30 +02:00
Mateusz
0d8d9309ae Raport route-planning.md main loop describe 2020-04-27 12:05:24 +02:00
Mateusz
b4624c4c56 raport progress 2020-04-27 11:06:14 +02:00
6fbc9184f4 Algorithm now picks up items 2020-04-26 20:22:16 +02:00
Michał Czekański
a6b717935f Extract clicks on collidables to new method - make code clear 2020-04-26 18:45:07 +02:00
Michał Czekański
013e8b524d Add new getTileOnCoord method
New method uses pygame.rect.collidepoint method which doesn't need exact tile's coordinates
2020-04-26 18:42:00 +02:00
Michał Czekański
2ba090b2d4 Add debug printing terrain tiles under mouse click 2020-04-26 18:41:05 +02:00
Michał Czekański
87fc6bea1f Fix not adding grass tiles to terrainTilesList 2020-04-26 18:34:38 +02:00
Michał Czekański
08d425b938 Fix sea being not collidable
Player can't walk over sea
2020-04-26 18:11:54 +02:00
Michał Czekański
1255ab8e16 Fix problems with pathfinding to some map locations and add go-to on click
succesor method fixed
2020-04-26 18:09:02 +02:00
Michał Czekański
31d2bf0009 Fix random A* target selection
There was try catch catching all Exceptions, now it's only catching IndexErrors
2020-04-26 16:33:39 +02:00
Michał Czekański
dee9ebb77c Fix not stepping on final entity 2020-04-26 16:04:47 +02:00
Michał Czekański
b12c969d14 Add changes to last move detection 2020-04-26 15:20:17 +02:00
Michał Czekański
1edaa1f74e If A* destination is entity - disable stepping on it
Player shouldn't step on berry or rabbit, etc...
2020-04-26 14:41:22 +02:00
Michał Czekański
f1e0c3c593 Add automatic player movement delay 2020-04-26 14:33:04 +02:00
Michał Czekański
b8abacd4cc Add picking random target for A* algorithm
When user clicks "u" key target is being picked.
2020-04-26 14:13:27 +02:00
Michał Czekański
ab1b4e9efc Fix going to target in goToTarget method
Disabled trying to retrieve moves from empty movement list.
2020-04-26 14:12:54 +02:00
Michał Czekański
d5c9f5f801 Fix player rotation 2020-04-26 14:09:35 +02:00
Michał Czekański
a5569f0b8f Disable player stats lowering for A* test 2020-04-26 14:08:38 +02:00
Michał Czekański
0151413cdd Merge remote-tracking branch 'origin/latestThing' into latestThing 2020-04-26 13:47:40 +02:00
Michał Czekański
5facbfb2fd Update A_star so that it generates some movements (not always correct) 2020-04-26 13:47:22 +02:00
Mateusz
53ee1e1f10 refactor and describe map lists and methods 2020-04-26 13:36:19 +02:00
Michał Czekański
deeba7c740 Spaghetti code, not working 2020-04-26 03:59:09 +02:00
Michał Czekański
39b689d8f0 Merge remote-tracking branch 'origin/terrainTilesList' into NewMovementFinishing 2020-04-26 01:39:18 +02:00
Mateusz
8b9d953553 add terrainTilesList 2020-04-26 01:37:27 +02:00
Michał Czekański
b7f4bc6101 Merge remote-tracking branch 'origin/NewMovement' into NewMovementFinishing 2020-04-26 01:08:58 +02:00
Mateusz
c14ed38df2 add clay sprite and route-planning document skelethon 2020-04-26 01:08:15 +02:00
Michał Czekański
7a79ccc9c2 Finish graphSearch method in AutomaticMovement.py 2020-04-26 00:55:36 +02:00
Michał Czekański
e01dfeb85a Change priority method in AutomaticMovement.py
Now priority method calculates pr for given node
2020-04-26 00:22:03 +02:00
Michał Czekański
2e6f2db543 Merge remote-tracking branch 'origin/NewMovement' into NewMovementFinishing 2020-04-26 00:18:37 +02:00
Michał Czekański
b6234b1a93 Move node class to separate AStarNode.py file 2020-04-26 00:13:31 +02:00
Michał Czekański
b296fbe492 Rename coords field to state 2020-04-26 00:06:20 +02:00
Michał Czekański
5af76a1b16 Change succesor method in AutomaticMovement.py
Now succesor takes state as an argument and returns all possible moves for that state.
2020-04-26 00:03:38 +02:00
Michał Czekański
cdcf5fb052 Add coordination field in node class 2020-04-25 23:56:07 +02:00
Michał Czekański
cef686a74f Add method calculating new state with given action 2020-04-25 23:55:31 +02:00
Mateusz
d44274397d describe sprites costs 2020-04-25 23:34:49 +02:00
Mateusz
91efd32d87 add clay sprite 2020-04-25 23:34:18 +02:00
Mateusz
4d6de52e8c add cost attribute 2020-04-25 23:33:55 +02:00
Michał Czekański
7d9dd06d09 Add import new class in Game.py 2020-04-25 23:19:41 +02:00
Michał Czekański
e6c36eea8d Add partially finished AutomaticMovement class 2020-04-25 23:19:19 +02:00