Commit Graph

60 Commits

Author SHA1 Message Date
9f62bb1a93 Merge pull request 'a_star' (#21) from a_star into master
Reviewed-on: #21
2022-04-27 19:50:51 +02:00
korzepadawid
55c3ea0aa8 fix: changed sand cost 2022-04-13 18:56:39 +02:00
korzepadawid
1dbb1a0e4c feat: field costs 2022-04-13 18:35:02 +02:00
korzepadawid
af2f61984a feat: logs queue 2022-04-12 20:44:27 +02:00
korzepadawid
04f17e3293 feat: a_star without tile costs 2022-04-12 20:21:29 +02:00
korzepadawid
7131d1f905 feat: movement 2022-04-12 19:12:41 +02:00
korzepadawid
6d4891fab8 fix: integration with level 2022-04-12 00:35:01 +02:00
korzepadawid
286164c1dd feat: a_star implementation 2022-04-12 00:21:30 +02:00
korzepadawid
544c5276d5 feat: added a_star method 2022-04-12 00:05:47 +02:00
korzepadawid
2bfaff8a30 update: changed variable name in a_star.py 2022-04-11 23:56:35 +02:00
korzepadawid
6c27199988 feat: result function 2022-04-11 23:53:50 +02:00
korzepadawid
fbbb521a4b fix: actions 2022-04-11 22:52:58 +02:00
korzepadawid
b68013a0cd feat: actions 2022-04-11 21:52:21 +02:00
korzepadawid
019b3c86be feat: expand and child node 2022-04-11 20:04:53 +02:00
korzepadawid
10485ce39d feat: enums 2022-04-11 19:49:32 +02:00
korzepadawid
f4ec5b5869 feat: models 2022-04-11 19:18:03 +02:00
05fcfc76f3 Merge pull request 'bfs' (#19) from bfs into master
Reviewed-on: #19
2022-04-11 13:49:11 +02:00
Angelika Iskra
404eb8e70d refactor bfs; 2022-04-11 13:13:03 +02:00
Angelika Iskra
e98a4da2aa finished bfs; 2022-04-11 12:56:22 +02:00
Angelika Iskra
88297d0b9b added collision to bfs; 2022-04-11 12:08:03 +02:00
Angelika Iskra
57cdb87820 worked on bfs; 2022-04-11 12:00:15 +02:00
Angelika Iskra
8196a5ec62 bfs - knights are moving but idk where 2022-04-11 00:01:57 +02:00
Angelika Iskra
ac74280271 work on new logic; 2022-04-10 20:28:50 +02:00
c1d05eb1d1 Merge pull request 'mozna zgetowac tile po row i column do tego jest funkcja get_tile w grid;' (#18) from field into master
Reviewed-on: #18
2022-04-08 17:16:51 +02:00
deabeeac43 mozna zgetowac tile po row i column do tego jest funkcja get_tile w grid;
step_onto -> put_on(zmiana nazwy), dziala poprawnie(maly bug byl);funkcja put_on_tile(row, column, obj) sluzy polozeniu danego obiektu na danym tilu, przyklad uzycia zakomentowany w game.py(wywolujcie po spawnerze, bo nadpisze pozycje xd); dorobilem wlasny exception, gdy tile jest zajety w pliku exceptions.py - moze sie przyda ten plik
2022-04-08 17:15:01 +02:00
e768a534a4 Merge pull request 'zmiana rzedow z sprite.Group na pythonowa tablice' (#17) from grid into master
Reviewed-on: #17
2022-04-08 11:25:28 +02:00
XsedoX
5700cd89c8 zmiana rzedow z sprite.Group na pythonowa tablice 2022-04-08 11:24:03 +02:00
37eb63705d Merge pull request 'controlling fields with water and trees' (#16) from field into master
Reviewed-on: #16
2022-04-06 21:14:41 +02:00
GeorgeTom17
7286171207 controlling fields with water and trees 2022-04-06 21:08:32 +02:00
9b6f9ea003 Merge pull request 'field' (#15) from field into master
Reviewed-on: #15
2022-04-05 15:39:36 +02:00
08ccd74413 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft 2022-04-05 15:38:30 +02:00
c75299e152 poprawki field.py 2022-04-05 15:38:26 +02:00
d0f9a66888 Merge pull request 'wejscie na pole' (#14) from field into master
Reviewed-on: #14
2022-04-05 10:55:49 +02:00
c927bab887 wejscie na pole 2022-04-05 10:54:30 +02:00
21c05e4f40 Merge pull request 'field zna swoj stan ale go sam nie odswieza(trzeba recznie zmieniac wartosc - todo); field jest teraz spritem(co przyda sie pozniej); spawner.py dostosowany do nowego kodu; game.py dostosowane do zmian; twierdza dalej jest widziana jako 1x1' (#13) from field into master
Reviewed-on: #13
2022-04-05 10:49:57 +02:00
86aa939433 field zna swoj stan ale go sam nie odswieza(trzeba recznie zmieniac wartosc - todo); field jest teraz spritem(co przyda sie pozniej); spawner.py dostosowany do nowego kodu; game.py dostosowane do zmian; twierdza dalej jest widziana jako 1x1 2022-04-05 10:47:45 +02:00
0d6fdcbfea Merge pull request 'knights_queue' (#12) from knights_queue into master
Reviewed-on: #12
2022-04-04 21:58:14 +02:00
korzepadawid
621a36461c fixed bug :~DDD 2022-04-04 21:51:32 +02:00
korzepadawid
4caba91c7e tests: added edge case 2022-04-04 21:27:47 +02:00
korzepadawid
f06ea9e5b0 tests: added test case 2022-04-04 21:23:32 +02:00
korzepadawid
bef17bccd1 feat: round queue 2022-04-04 21:07:40 +02:00
37c58763f8 Merge pull request 'random monster images and stats added (monsters, knights)' (#11) from monsters_and_stats into master
Reviewed-on: #11
2022-03-24 21:46:02 +01:00
d6c281c814 random monster images and stats added (monsters, knights) 2022-03-24 21:45:17 +01:00
65afafb642 Merge pull request 'added castle;' (#10) from castle into master
Reviewed-on: #10
2022-03-24 16:33:08 +01:00
Angelika Iskra
cacb305d47 added castle; 2022-03-24 16:32:14 +01:00
7d73f30a7c Merge pull request 'monsters v2 (max będzie v4)' (#9) from monster_update into master
Reviewed-on: #9
2022-03-24 13:10:19 +01:00
25d46a1baf monsters v2 (max będzie v4) 2022-03-24 13:09:43 +01:00
035f8470a6 Merge pull request 'niekompletny update potworów' (#8) from monster_update into master
Reviewed-on: #8
2022-03-24 12:55:41 +01:00
bc6aa0a558 niekompletny update potworów 2022-03-24 12:54:22 +01:00
58518c3120 Merge pull request 'feat: spawning teams' (#7) from Knights_team_spawn into master
Reviewed-on: #7
2022-03-21 21:13:30 +01:00