Commit Graph

91 Commits

Author SHA1 Message Date
7fe9e0958c diversified agents speed on different terrain types; temporarily disabled GameOver screen 2021-05-18 20:37:31 +02:00
9918bf64d8 merged GameOverScreen branch 2021-05-18 19:46:04 +02:00
Tomek Sidoruk
cc7c556d0c
add time mine explosion detection and game over screen 2021-05-16 17:34:05 +02:00
af238a6ed6 added agent movement animations; redefined game loop; added turn counting; adjusted classes; fixed a bug; code refactoring 2021-05-12 14:33:26 +02:00
0fc5cedae6 redesigned in-game gui; added UiComponentsList class; added goal highlighting; fixed some bugs; code refactoring 2021-05-11 20:30:01 +02:00
346fe641d4 fixed a_star (new priority bug) 2021-05-09 19:39:00 +02:00
cf4b3f9027 map and cost adjustments 2021-05-09 18:38:52 +02:00
03b17f293f final a_star adjustments 2021-05-09 17:55:42 +02:00
36258b11d0 Fixed cost and priority calculation 2021-05-09 02:06:13 +02:00
7d16dcc616 Merge branch 'master' into a_star
# Conflicts:
#	main.py
2021-05-09 01:17:09 +02:00
8ffdacd603 coordinated project modules; fully implemented blitting using display_assets.py; updated maps; fixed some bugs 2021-05-07 22:26:58 +02:00
Jakub Danilewicz
e7270b8c3a Merge branch 'master' of https://git.wmi.amu.edu.pl/s452711/Projekt_Sztuczna_Inteligencja 2021-05-07 20:05:12 +02:00
Jakub Danilewicz
436a155b7e Dodany Enum Terrain; Dodany koszt na Tile; Używana jest nowa mapa testowa (reskin secondmap) 2021-05-07 19:58:16 +02:00
Jakub Danilewicz
f82d6657ef Dodany Enum Terrain; Dodany koszt na Tile; Używana jest nowa mapa testowa (reskin secondmap) 2021-05-07 19:02:09 +02:00
46b6db6c00 made ui components inherit one from the other; added new ui components functionality; improved "menu" 2021-05-07 13:54:42 +02:00
d8f1101bc6 minor changes in main; code refactoring 2021-05-05 13:48:48 +02:00
7f13631996 implemented a_star with simple heuristics 2021-05-05 12:51:41 +02:00
Tomek Sidoruk
0d2955f90a
refacetor 2021-05-04 21:40:18 +02:00
Tomek Sidoruk
72ae67adb9
Merge branch 'master' into addDestinationPoPup 2021-05-04 20:59:43 +02:00
Jakub Radowicz
8c7426ef9b deleted unnecessary files. updated .gitignore file to ignore the files in the future 2021-05-04 18:22:00 +02:00
b1d1066e00 added simple ui classes; updated .gitignore file to ignore .idea files 2021-05-04 17:04:43 +02:00
Tomek Sidoruk
7d7281db06
remove unwanted shortingof sllep 2021-05-04 16:46:38 +02:00
Tomek Sidoruk
5773c6e1bb
added prompt to asking user of target coorfinates 2021-05-04 16:43:01 +02:00
s452635
fa5339685d moved and removed blitting from minefield 2021-05-03 20:33:17 +02:00
s452635
b9128bc7c8 added display_assets, added new tiles (mud, grass and concrete) 2021-05-03 20:03:32 +02:00
s452635
d47e46313c added coords to background 2021-05-02 21:04:41 +02:00
a4bc74d5f2 added useful functions to json_generator.py; code refactoring 2021-04-21 20:10:18 +02:00
7b87cb71ed merged bfs into master 2021-04-18 18:23:14 +02:00
01cf653c7d changed error message 2021-04-18 18:09:39 +02:00
03c37d17e8 picked a more aesthetically pleasing map 2021-04-17 23:47:47 +02:00
be43e8aeb8 adjusted JsonGenerator class; added newly generated map; minor code refactoring 2021-04-17 23:22:27 +02:00
b9bda6f883 fixed mine in GOAL bug 2021-04-17 21:33:50 +02:00
28cb1c1343 performance boost by Jakub Radowicz TM 2021-04-17 21:14:57 +02:00
fd6fabfc00 merged new agent, display_assets and bfs 2021-04-17 19:56:34 +02:00
Jakub Danilewicz
1d9e45c631 Movemen has been moved to agent, functions are all there ready to be used. Also new functions in project_constants in Direction Class 2021-04-17 18:03:16 +02:00
1efe763937 Merge remote-tracking branch 'origin/bfs' into bfs 2021-04-17 16:45:50 +02:00
1783e2bb26 enums and goal fixes 2021-04-17 16:45:20 +02:00
s452635
a8424a3859 added sapper asset direction, moved blitting sapper to a separate function called from main 2021-04-17 15:29:36 +02:00
1d9a07a7ce created bfs.py scaffolding 2021-04-14 23:45:34 +02:00
925350569d changed move validation return type to Boolean 2021-04-14 22:41:07 +02:00
s452635
9e429dff9f Merge remote-tracking branch 'origin/master' 2021-04-14 12:01:31 +02:00
s452635
84431ca398 robotic assets 2021-04-14 12:01:20 +02:00
c2a80c56ab minor Minefield changes 2021-04-11 19:29:12 +02:00
edca418fed Merge remote-tracking branch 'origin/master' 2021-04-11 19:04:37 +02:00
3f5d27e414 changed coordinates naming convention to (row, column) 2021-04-11 19:04:06 +02:00
0af9fa4b30 deleted invalid field in STRUCT_MINE_ATTRIBUTE_TYPES from project constants 2021-04-03 23:10:13 +02:00
b08ecef061 fixed bug related to agent's starting position. reworked map generating method 2021-04-03 23:00:46 +02:00
bf5e88a667 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452711/Projekt_Sztuczna_Inteligencja 2021-03-31 22:01:16 +02:00
acb231f049 added JsonGenerator method for setting agent's starting position, also minor code refactoring 2021-03-31 21:56:53 +02:00
502dc62700 Usuń 'resources/minefields/there's_a_file_here_'cause_I_cannot_commit_an_empty_directory' 2021-03-28 19:51:53 +02:00