Commit Graph

189 Commits

Author SHA1 Message Date
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
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
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
Michał Czekański
0084750629 Add todo at TerrainTile class 2020-04-25 23:18:29 +02:00
e37a17cadd Added getTileOnCoord method 2020-04-25 22:49:57 +02:00
5ca1a0b4d0 New movement testing 2020-04-25 22:02:21 +02:00
d7e0b37666 Added new movement methods 2020-04-25 22:02:08 +02:00
Michał Czekański
69313b0984 Add antialiasing 2020-04-06 15:45:05 +02:00
Michał Czekański
774d186653 Add "s" after printing time alive 2020-04-06 13:51:05 +02:00
Michał Czekański
3f7ed1e4b3 Add updating console on players death and closing game after time delay 2020-04-06 13:48:36 +02:00
Michał Czekański
2893b4dd2c Merge branch 'writingInfoToConsole' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into writingInfoToConsole 2020-04-06 13:44:39 +02:00
deec08cec7 Changed alive checking 2020-04-06 13:42:56 +02:00
Michał Czekański
9d8768cb15 Add method updating console on player's death 2020-04-06 13:41:33 +02:00
Michał Czekański
b22e69712c Add updating ui bars and updating console on interaction in EventManager 2020-04-06 13:20:28 +02:00
Michał Czekański
178115cc4d Add method updating console on player interaction in Ui and fix bar updating 2020-04-06 13:20:04 +02:00
Michał Czekański
156f9977e0 Add ui updates on player pickup in EventManager 2020-04-06 13:13:47 +02:00
Michał Czekański
01511757a0 Change console updates
Added updateOnPlayerPickup method and modified updateBasedOnPlayerStats so that is used in former method.
Now info is written only on player pickup so that there is no spam.
2020-04-06 13:13:28 +02:00
748e317e2e Merge remote-tracking branch 'origin/development'
# Conflicts:
#	environment.md
2020-04-06 12:37:01 +02:00
8f65ce87e2 Entities load using abs path 2020-04-06 12:31:44 +02:00
89cf106432 Loads tiles from file properly on all platforms 2020-04-06 12:30:21 +02:00
479c6eece7 Game now knows the abs path of the program 2020-04-06 12:30:03 +02:00
e3b3fdd74f Events won't be handled if the player is dead 2020-04-06 12:05:57 +02:00
f1232956a0 Player cannot rotate dead 2020-04-06 11:55:56 +02:00
a275678e3f Implemented player death mechanism 2020-04-06 11:51:46 +02:00
04a3eaf928 Merge remote-tracking branch 'origin/master' 2020-04-06 11:13:17 +02:00
c080816908 Removed obsolete Collidable class 2020-04-06 11:12:49 +02:00
5542acc443 Player may now self regenerate stamina 2020-04-06 11:03:01 +02:00
6994f39864 Player cannot walk if it runs out of stamina 2020-04-06 10:57:44 +02:00
87c7198199 Player can now interact with interactable entities 2020-04-06 10:38:12 +02:00
9e7c4f1ae0 Map can now load interactable entities 2020-04-06 10:35:58 +02:00
6d1dc4ffb7 Refactor Interactable.py and Pickupable.py 2020-04-06 10:33:29 +02:00
c6ab7cc2f4 Refactor: interactable now has methods from pickupable 2020-04-06 10:29:43 +02:00