Gabriel Ksawery Skowron-Rodriguez
28f7e76c0b
sort of fix
2022-05-23 14:15:06 +02:00
Gabriel Ksawery Skowron-Rodriguez
42452e6e64
Cleanup Soldiers and Bases (make Entity base class)
2022-05-23 14:04:53 +02:00
Gabriel Ksawery Skowron-Rodriguez
4ff01692aa
Merge branch 'Development' into SpartaqS-AddingSoldiersToSquad
2022-05-23 13:21:13 +02:00
Gabriel Ksawery Skowron-Rodriguez
a4f64abb66
cleaned up OnDestroy()
2022-05-23 13:20:08 +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
Gabriel Ksawery Skowron-Rodriguez
81cb9f5489
Merge branch 'Development' into SpartaqS-AddingSoldiersToSquad
2022-05-23 13:00:02 +02:00
4b607e25f0
feat: more hp for base
2022-05-23 12:58:45 +02:00
Gabriel Ksawery Skowron-Rodriguez
65899a25e5
WIP, before tilemap manager changes
2022-05-23 12:57:50 +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
40dfa80f14
SquadManager progress
...
+ added prfab for squad manager
+ now squads are spawned dynamically by squad manager
2022-05-23 12:41:33 +02:00
Gabriel Ksawery Skowron-Rodriguez
decfc8bfca
cleanup Squad code
2022-05-23 12:22:06 +02:00
Gabriel Ksawery Skowron-Rodriguez
23de96c839
Merge branch 'SpartaqS-SoldierMovementInterrupt' into 'Development'
...
Soldier: Added preliminary interrupt handling
See merge request gskowron/eopsy-lab-567-project!9
2022-05-22 21:37:36 +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
2c52961575
Merge branch 'SpartaqS-SoldierInterruptQueue' into 'Development'
...
Added soldier's queue functionality
See merge request gskowron/eopsy-lab-567-project!8
2022-05-22 21:19:45 +02:00
Gabriel Ksawery Skowron-Rodriguez
0fcd903343
made basic soldiers attack no faster than every second tick
...
+ one tick to reload the gun I guess
2022-05-22 21:19:05 +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
Krzysztof Stefan Rudnicki
2515dfe567
Merge branch 'Main-Scene_impr' into 'Development'
...
fix: concept file
See merge request gskowron/eopsy-lab-567-project!7
2022-05-22 20:32:16 +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
0d1d5e778a
feat: newline readme
2022-05-17 18:05:09 +02:00
4b856731bc
feat: Add unity version readme
2022-05-17 18:04:27 +02:00
36b9de2d15
chore: rename project folder
2022-05-17 17:59:44 +02:00
Gabriel Ksawery Skowron-Rodriguez
53d8ec2fb1
Merge branch 'SpartaqS-OrderIssuing' into 'Development'
...
plugged in new soldier prefab in my scene
See merge request gskowron/eopsy-lab-567-project!6
2022-05-17 15:21:55 +02:00
Gabriel Ksawery Skowron-Rodriguez
fb77c28429
Merge branch 'SpartaqS-OrderIssuing' into 'Development'
...
Clicking on tile progress
See merge request gskowron/eopsy-lab-567-project!5
2022-05-17 15:18:21 +02:00
Gabriel Ksawery Skowron-Rodriguez
da49ee256b
plugged in new soldier prefab in my scene
2022-05-17 15:17:46 +02:00
Gabriel Ksawery Skowron-Rodriguez
e8fc12960e
fixed compilation error
2022-05-17 15:16:12 +02:00
Gabriel Ksawery Skowron-Rodriguez
3dc631a5f4
Merge branch 'Development' into SpartaqS-OrderIssuing
2022-05-17 15:12:47 +02:00
Gabriel Ksawery Skowron-Rodriguez
e804e6bff6
PlayerClickSystem fix and Soldier world position adjusted
...
+ PlayerClickSytem
++ now pass position of raycast hit not position of object iht
+ TilemapManager
++ added world space offset to place soldiers within the tile they stand at
2022-05-17 13:37:02 +02:00
Maciekxdabu
01db1678d8
merloj/kuch: soldiers attack
2022-05-16 15:23:39 +02:00
Gabriel Ksawery Skowron-Rodriguez
d6f6631de8
clicking on tile wip
...
+ Added PlayerClickSystem
++ raycasts and tries to hit the grid
+TilemapManager
++ some access level changes to get stuff out of it
++ GetTIleFromWorldCoords()
+++ to get the tile that was clicked
--- TO DO: FIGURE OUT HOW TO MAKE IT POSISBLE TO CLICK ON A TILE WITH NO SOLDIER
2022-05-16 15:22:02 +02:00
Maciekxdabu
93ff6c93d4
merloj: getallsoldiers()
2022-05-16 15:09:43 +02:00
c5bde051c5
chore
2022-05-16 15:01:00 +02:00
Maciekxdabu
eb98f2b09f
merloj: new Soldier spawns
2022-05-16 14:56:01 +02:00
Krzysztof Stefan Rudnicki
635597680b
Merge branch 'kuchy-soldier-tick' into 'Development'
...
feat: add tick system soldier, add set tag
See merge request gskowron/eopsy-lab-567-project!4
2022-05-16 14:45:38 +02:00
Maciekxdabu
6019a8eccd
merloj: applied new soldiers to tilemap
2022-05-16 14:44:45 +02:00
6881d889a0
feat: add tick system soldier, add set tag
2022-05-16 14:44:12 +02:00
Maciekxdabu
3e6fb92ac2
Merge branch 'merloj-tilemap' into Development
2022-05-16 14:33:20 +02:00
Gabriel Ksawery Skowron-Rodriguez
2c248b7de0
Merge remote-tracking branch 'origin/merloj-tilemap' into SpartaqS-OrderIssuing
2022-05-16 14:33:05 +02:00
Maciekxdabu
acf737cbad
merloj: base tilemap done
2022-05-16 14:32:01 +02:00
Krzysztof Stefan Rudnicki
b2f57b9e92
Merge branch 'kuchy-soldiers' into 'Development'
...
Merge Soldiers
See merge request gskowron/eopsy-lab-567-project!3
2022-05-16 14:26:32 +02:00
Krzysztof Stefan Rudnicki
c9ab4e1f93
Merge branch 'Development' into 'kuchy-soldiers'
...
# Conflicts:
# The project/Assets/Scenes/SpartaqS.unity
2022-05-16 12:26:26 +00:00
Gabriel Ksawery Skowron-Rodriguez
523b73bcb3
Merge branch 'SpartaqS-Squad' into Development
2022-05-16 14:23:46 +02:00
ba336cd776
chore
2022-05-16 14:23:32 +02:00
Gabriel Ksawery Skowron-Rodriguez
50882e48db
Added basic Squad logic
...
+ Squad
++ aggregates soldiers
++ orders are passed to soldiers (one order per tick)
+- for now debug functions to simulate player inputting of a movement order
2022-05-16 14:21:52 +02:00
