Commit Graph

18 Commits

Author SHA1 Message Date
Maciekxdabu
68a93d8891 merloj: missing function fix (SetTileCoord()) 2022-05-23 14:00:59 +02:00
Maciekxdabu
ae04f9f4af Merge branch 'merloj-full_soldier_movement' into Development 2022-05-23 13:52:24 +02:00
Maciekxdabu
5fb48804ad merloj: final movement 2022-05-23 13:48:02 +02:00
f9804b48bb Soldier is a child of base 2022-05-23 13:18:37 +02:00
Krzysztof Stefan Rudnicki
b41c920fb2 Merge branch 'kuchy-enemy-base' into 'Development'
feat: add base

See merge request gskowron/eopsy-lab-567-project!10
2022-05-23 13:00:08 +02:00
4b607e25f0 feat: more hp for base 2022-05-23 12:58:45 +02:00
Maciekxdabu
16365477b0 merloj: spawn bases 2022-05-23 12:55:42 +02:00
8085bbb2e7 feat: add base 2022-05-23 12:54:59 +02:00
Maciekxdabu
2645aad5f4 merloj: added Soldier onDeath UnityEvent 2022-05-23 12:48:43 +02:00
Gabriel Ksawery Skowron-Rodriguez
decfc8bfca cleanup Squad code 2022-05-23 12:22:06 +02:00
Gabriel Ksawery Skowron-Rodriguez
1469eadfd5 Soldier: Added preliminary interrupt handling
+ soldier can now set its target destination when ordered to move to a position
+/- Squad: refactored MovementOrder to be less error prone
- cleaned up NotImplementedException for Exeecuting a Movement order
2022-05-22 21:37:03 +02:00
Gabriel Ksawery Skowron-Rodriguez
70c7414a0b Added soldier's queue functionality
+ actions: basic actions that can the soldier creates on its own
+ interrupts: actions that are enqueued as a result of receiving orders. Executed before basic actions
+/- renamed "UpdateTarget" to "TryAttackEnemy"
+ made "speedAttack" (attack delay) functional
+ prepared target position (modified by movement orders)
2022-05-22 21:17:29 +02:00
Gabriel Ksawery Skowron-Rodriguez
e9f69fbd88 added temp code for squad WIP for showcase
proabbly need to refactor stuff that starts with "Temp" and was added in this commit
2022-05-20 11:51:59 +02:00
Gabriel Ksawery Skowron-Rodriguez
2d1aa7cb9c added important comment to PlayerClickSystem 2022-05-20 11:30:15 +02:00
Gabriel Ksawery Skowron-Rodriguez
ee7c0fdfa1 added clicking on tiles to main scene
+ temp plane below tilemap to catch raycasts, need tofind a real way to do this on the tilemap itself (Tilemap2D collider does nto work)
2022-05-20 11:27:04 +02:00
Gabriel Ksawery Skowron-Rodriguez
de67d01f08 added hp display and improved main scene 2022-05-17 22:33:59 +02:00
Maciekxdabu
94a32459ea merloj: finished demo 1 2022-05-17 22:22:04 +02:00
36b9de2d15 chore: rename project folder 2022-05-17 17:59:44 +02:00