492f37bda5
Pressing 'u' now selects random interactable entity
2020-05-15 08:54:49 +02:00
a40a598ffe
Added getEntitiesByType method
2020-05-15 08:54:21 +02:00
dae94576e7
Fixed debug text
2020-05-15 08:54:05 +02:00
4fff56bd7d
Better debug output
2020-05-15 08:52:06 +02:00
569128763b
Entities list is now a pygame.sprite.Group
2020-05-14 16:33:35 +02:00
fad3d68b55
getFacingCoord screenRelative now defaults to false
2020-05-14 16:30:10 +02:00
3924023a92
Documentation fixes
2020-05-14 16:24:59 +02:00
c806d99d49
Changed tooltip from except to raises
2020-05-14 16:18:29 +02:00
085446ea93
Added more documentation
2020-05-14 16:16:19 +02:00
1610f9c0da
Fixed imports
2020-05-14 14:54:11 +02:00
844397191a
Added tooltips to getCoords and SetCoords
2020-05-14 12:56:33 +02:00
fed30b0ade
Added tooltips
2020-05-14 12:44:27 +02:00
cc98db0a96
Methods now use relative coords
2020-05-14 12:39:09 +02:00
776be8fb90
A* uses relative coords
2020-05-14 12:38:48 +02:00
95972ac969
Entities now load with relative coords
2020-05-14 12:11:57 +02:00
065111dee9
Changed default param
2020-05-14 12:11:46 +02:00
dac8583665
Changed tooltips
2020-05-14 12:07:35 +02:00
824a7e33ea
draw method sets mapOffset field properly
2020-05-14 12:05:52 +02:00
93f4e9f53d
Changed tooltip
2020-05-14 12:05:32 +02:00
2618bbdf9c
moveForward method uses relative coords
2020-05-14 12:05:12 +02:00
7ed974b194
Added newlines in docstrings
2020-05-14 11:46:52 +02:00
269e376756
getFacingCoord can now return non-relative coords
2020-05-14 11:46:06 +02:00
107bd0d8f7
Changed constructor
2020-05-14 11:32:13 +02:00
1eb75fc354
Fixed abysmal draw method
2020-05-14 11:27:54 +02:00
e66b0d4a59
Removed redundant draw method params
2020-05-14 11:24:51 +02:00
6ed8423463
Added setter method usage
2020-05-14 11:23:04 +02:00
823eefac86
Fixed relative coord update
2020-05-14 11:18:58 +02:00
2bf0ed035b
Added map coord offset
2020-05-14 11:15:27 +02:00
f224c8c657
Removed removeSprite method
2020-05-14 11:13:29 +02:00
ce50622b89
Removed removeSprite method
2020-05-14 11:13:09 +02:00
57b95e10df
Added relative coords
2020-05-14 11:03:50 +02:00
cba207f98c
Changed item pickup method
2020-05-13 20:17:32 +02:00
649b61a84e
Added pickup to move method
2020-05-13 20:17:17 +02:00
b3d38403ad
Added documentation
2020-05-13 19:50:53 +02:00
93472900b9
Removed A* calls from game
2020-05-13 19:48:51 +02:00
48e81e206b
Enums refactor
2020-05-13 19:48:08 +02:00
effa48d7c3
Fixing item pickup action after completing the movement
2020-05-13 19:47:53 +02:00
a51661ae6e
on_interaction method now removes the entity itself
2020-05-13 19:45:52 +02:00
28d9013983
Enums refactor
2020-05-13 19:36:06 +02:00
d6cf76f6bc
Updated A* function calls
2020-05-13 19:34:16 +02:00
3ac188103a
Player's movement adds fatigue
2020-05-13 19:32:52 +02:00
549c4f207f
Movement moved to Entity
2020-05-13 19:31:51 +02:00
81bed4adeb
All entities can now move
2020-05-13 19:25:08 +02:00
25345ae317
Removed objective implementation
2020-05-13 19:02:31 +02:00
dcdb4ac87e
Fixed major bug
2020-05-13 19:00:33 +02:00
e270360690
Added non-objective implementation
2020-05-13 18:08:22 +02:00
11b467db32
Added pickup action in Movement enum
2020-05-13 17:36:54 +02:00
45e7c412f8
rotation field and getFacingCoord method moved from Player to Entity
2020-05-13 17:33:45 +02:00
16bb2cd311
Cleanup
2020-05-10 14:25:30 +02:00
f104e90a0f
Added documentation
2020-05-10 13:27:06 +02:00
0eea13331f
Added documentation & code beautification
2020-05-10 13:17:11 +02:00
01ce5796da
Removed timer
2020-05-10 12:53:08 +02:00
a76965cd91
Player now keeps track of the movement delay
2020-05-09 22:54:15 +02:00
752c3daa24
Added TODO markers
2020-05-09 22:30:21 +02:00
fc47c697df
Added more comments
2020-05-09 22:03:36 +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
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
c69c923d31
Lowered walking fatigue values
2020-04-06 10:26:16 +02:00
903a406c74
Added invoking sprites update() method every frame
2020-04-06 10:25:28 +02:00
052e56836b
Player now passively looses stats
2020-04-06 10:25:01 +02:00
8339797409
Removed unnecessary line
2020-04-06 09:56:07 +02:00
318f7881a1
Fixed imports
2020-04-06 09:54:51 +02:00
0c46a6ec32
Run.py refactor
2020-04-06 09:53:27 +02:00
Michał Czekański
50d8f78ac8
Fix thirst console info print
2020-04-06 01:08:31 +02:00
998c6c0094
Merge remote-tracking branch 'origin/passingEvents'
2020-04-06 01:01:27 +02:00
Michał Czekański
880c0af3c2
Move updating time text view to Ui class
2020-04-06 01:00:02 +02:00
Michał Czekański
ee20ac3214
Add appending time stamps before console lines
2020-04-06 00:55:43 +02:00
d45eb55b28
Hunger now rises instead of falling
2020-04-06 00:53:51 +02:00
b110ee9f34
Hunger now starts from 0
2020-04-06 00:52:34 +02:00
325adc7de5
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
2020-04-06 00:50:20 +02:00
3dd6a4a7e7
Implemented fatigue system
2020-04-06 00:50:12 +02:00
Michał Czekański
a0abfdf11e
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
2020-04-06 00:49:20 +02:00
Michał Czekański
04898fc27b
Fix console scrolling
2020-04-06 00:45:52 +02:00
Wirus
cfd3b05981
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
2020-04-06 00:43:35 +02:00
Wirus
752284a90d
transparent textures
2020-04-06 00:43:20 +02:00
9a5556ff7b
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
...
# Conflicts:
# src/entities/Player.py
2020-04-06 00:41:37 +02:00
bc8474b4c5
Player can now pick up items
2020-04-06 00:40:16 +02:00
a45befd4fa
Implemented getFacingCoord method
2020-04-06 00:39:58 +02:00
Michał Czekański
53417ecab9
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
2020-04-06 00:11:12 +02:00
Michał Czekański
679cc3f9f4
Add writing to console when player stats change
2020-04-06 00:10:40 +02:00
Michał Czekański
30896285db
Add value field in Bar class
2020-04-06 00:06:19 +02:00
Wirus
e8e9cca0bb
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
...
# Conflicts:
# data/mapdata/mapEntities.json
2020-04-06 00:03:06 +02:00
Wirus
38b6adc8a1
add bush and rabbit in mapEntities
2020-04-06 00:01:16 +02:00
Michał Czekański
076a377cda
Add pass after empty elif in Player
2020-04-06 00:00:00 +02:00
Michał Czekański
b56269888c
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
2020-04-05 23:59:13 +02:00
Michał Czekański
932073d72a
Reformat file Ui.py
2020-04-05 23:58:45 +02:00
2af94a27e9
Fixed filename
2020-04-05 23:58:03 +02:00
Michał Czekański
4985794b44
Add updating time in top left corner
2020-04-05 23:57:53 +02:00
