Erik Näslund
6b15da6e44
Merge remote-tracking branch 'origin/main' into inventory_mocks
2025-10-30 07:52:25 +01:00
Erik Näslund
2f2cc54472
Remove unused imports
2025-10-30 07:51:07 +01:00
Erik Näslund
cbae93ee93
Add coverage tests
2025-10-30 07:44:38 +01:00
Erik Näslund
0c5de2518d
Add itemstack test
2025-10-30 07:20:30 +01:00
Erik Näslund
5f24f1afb9
Add branch coverage
2025-10-30 07:18:14 +01:00
Erik Näslund
adcba0468b
Fix inventory weight calculation
2025-10-30 07:09:32 +01:00
Erik Näslund
7dc1fb7edd
Cleanup
2025-10-30 07:01:48 +01:00
Erik Näslund
0858d492e5
Remove unused import
2025-10-30 06:49:46 +01:00
Erik Näslund
33e351dec0
Add ItemTests
2025-10-30 06:49:17 +01:00
Erik Näslund
a24e8777af
Simplify test
2025-10-30 06:44:10 +01:00
ceff81f2b0
Merge pull request 'Changed Equipment related classes, Player class and added tests for new functionality' ( #16 ) from equipments into main
...
Reviewed-on: #16
2025-10-30 06:39:54 +01:00
HellaBased
38cbbbe8f3
Merge branch 'main' into equipments
2025-10-30 06:29:05 +01:00
HellaBased
f33ad67a2f
Changed Equipment related classes.
...
Created a new Job to be able to test certain Equipment functionalities.
Modified Player by adding 4 new variables representing stats, added a list representing equipment slots to player, changed constructor of player so the equipment list starts with 4 slots, changed getHealth and getMana methods to account for equipments, added methods to get the added variables, added method to get equipments
2025-10-30 06:21:41 +01:00
Erik Näslund
e98d99598d
Remove unused code
2025-10-30 05:08:28 +01:00
Erik Näslund
d094c3954d
Rename Has-interfaces
2025-10-30 04:44:18 +01:00
Erik Näslund
0e6ff9320e
Implement canMove check
2025-10-29 16:12:39 +01:00
Erik Näslund
acf513341c
Merge branch 'main' into inventory_mocks
2025-10-29 15:50:45 +01:00
03273f4d7b
Merge pull request 'magic' ( #15 ) from magic into main
...
Reviewed-on: #15
2025-10-29 15:31:39 +01:00
TricyOne
eb2f67fa57
Ekvivalensklass
2025-10-29 15:28:11 +01:00
Erik Näslund
c207766e0d
Miner can dig multiple times
2025-10-29 15:23:11 +01:00
Erik Näslund
89ea411493
Check dig use worker inventory
2025-10-29 15:02:56 +01:00
bfb8abb721
Merge pull request 'inventory' ( #14 ) from inventory into main
...
Reviewed-on: #14
2025-10-29 14:21:29 +01:00
Erik Näslund
fa6c8022e4
Make test pass
2025-10-29 14:20:58 +01:00
Erik Näslund
85f9e4340d
Merge remote-tracking branch 'origin/main' into inventory
2025-10-29 14:13:48 +01:00
40edb02352
Merge pull request 'equipments' ( #13 ) from equipments into main
...
Reviewed-on: #13
2025-10-29 14:12:59 +01:00
TricyOne
61245b81b4
idk
2025-10-29 13:37:43 +01:00
Erik Näslund
1e321bbb92
Cleanup
2025-10-29 10:41:37 +01:00
Erik Näslund
c52b3f114f
Add instantiator test
2025-10-29 10:36:57 +01:00
97854b0bd5
Merge branch 'main' into equipments
2025-10-29 10:36:09 +01:00
HellaBased
50f0672278
fixade jdk23
2025-10-29 10:34:52 +01:00
406910dea7
Merge pull request 'magic' ( #11 ) from magic into main
...
Reviewed-on: #11
2025-10-29 10:30:18 +01:00
HellaBased
7a76f479b9
Push equipments
2025-10-29 10:06:27 +01:00
HellaBased
048a369927
please don't break
2025-10-29 09:56:46 +01:00
Erik Näslund
5bcf93d6e1
Refactor weight calculation
2025-10-28 16:26:56 +01:00
Erik Näslund
6d4d99d240
Add substack if weight is too large
2025-10-28 15:41:33 +01:00
Erik Näslund
1f3ac903c1
Add weight check before adding item to inventory
2025-10-28 12:19:25 +01:00
Erik Näslund
042a08de73
Add inventory test
2025-10-28 12:04:52 +01:00
Erik Näslund
17e8a945b2
Check that player called the method
2025-10-28 12:04:38 +01:00
Erik Näslund
b0614649d2
Mock random provider
2025-10-28 11:59:50 +01:00
Erik Näslund
5500656e46
Add item quantity
2025-10-28 11:47:48 +01:00
86691f1a67
Merge pull request 'Job terrain' ( #12 ) from job_terrain into main
...
Reviewed-on: #12
2025-10-28 11:21:35 +01:00
Erik Näslund
b61d678b5c
Implement Item
2025-10-28 11:20:43 +01:00
TricyOne
51ab4f5100
spell targeting system complete
2025-10-28 10:13:26 +01:00
TricyOne
3d5466a97e
merge fixes
2025-10-28 08:53:03 +01:00
TricyOne
bcfe476c67
preparation for spell targeting system
2025-10-28 08:48:06 +01:00
Erik Näslund
8ebe495c83
Implement loot table
2025-10-27 23:31:28 +01:00
Erik Näslund
3107451ec0
Rename Biomes -> Biome
2025-10-27 22:44:51 +01:00
Erik Näslund
dec4206024
Update mockito
2025-10-27 22:42:49 +01:00
Erik Näslund
8a8930c44c
Impl LootTable
2025-10-27 22:42:43 +01:00
Erik Näslund
d72e0a8765
Impl LootTable
2025-10-27 22:42:17 +01:00
