173 Commits

Author SHA1 Message Date
Erik Näslund
6c1e8a21a2 Remove unused print 2025-10-30 22:20:59 +01:00
Erik Näslund
0c11af6dc1 Fix DigAction 2025-10-30 22:20:46 +01:00
Erik Näslund
16a49b8463 Cover Player 2025-10-30 22:20:35 +01:00
a7afa89cef Merge pull request 'equipments' (#22) from equipments into main
Reviewed-on: #22
2025-10-30 12:09:42 +01:00
Viud03
439582bc16 Merge remote-tracking branch 'origin/main' into equipments
# Conflicts:
#	src/main/java/Attack.java
#	src/test/java/MonsterTest.java
2025-10-30 12:08:59 +01:00
3383cc0d2f Merge pull request 'static-cleanup' (#21) from static-cleanup into main
Reviewed-on: #21
2025-10-30 12:07:21 +01:00
4aef58f8c2 Merge branch 'main' into static-cleanup 2025-10-30 12:07:14 +01:00
d904feefd0 Merge pull request 'monster' (#20) from monster into equipments
Reviewed-on: #20
2025-10-30 12:05:39 +01:00
Erik Näslund
f9d3ae88a4 Remove unused import 2025-10-30 12:05:03 +01:00
Erik Näslund
7e2b9911c6 Add dictionary words 2025-10-30 12:04:02 +01:00
Erik Näslund
6280f6df09 Remove hortlog 2025-10-30 12:03:11 +01:00
Erik Näslund
76f8eacc61 Fix typos 2025-10-30 12:03:04 +01:00
Erik Näslund
5c3182c32f Fix grammatical error 2025-10-30 12:00:29 +01:00
Erik Näslund
5402b79581 Remove unused import 2025-10-30 11:59:08 +01:00
Erik Näslund
a9a93c441f Make final variables final 2025-10-30 11:56:22 +01:00
Aster000000
1c1d49b774 Merge remote-tracking branch 'origin/main' into monster
# Conflicts:
#	src/main/java/Monster.java
#	src/main/java/Monster/Biomes.java
2025-10-30 11:53:29 +01:00
6e1904bdba Merge pull request 'Fixade 100% coverage i EquipmentTest' (#18) from equipments into main
Reviewed-on: #18
2025-10-30 11:46:08 +01:00
e54d4f93ed Merge branch 'main' into equipments 2025-10-30 11:45:46 +01:00
Viud03
c950eb9d6b Fixade 100% coverage i EquipmentTest 2025-10-30 11:43:58 +01:00
1abadd74e6 Merge pull request 'inventory_mock tests' (#17) from inventory_mocks into main
Reviewed-on: #17
2025-10-30 07:52:54 +01:00
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
Aster000000
ec17ff8dd3 Ökat test-coverage 2025-10-29 23:33:17 +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
Aster000000
ec9de94019 Beslutstabellstesterna har implementerats. 2025-10-29 15:44:25 +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
Aster000000
68080cd15a Nu är allt bra!!! :) 2025-10-29 14:58:30 +01:00
Aster000000
5476e8633d Merge remote-tracking branch 'origin/monster' into monster 2025-10-29 14:39:19 +01:00
Aster000000
bfeb33c4ea Bugg i Trolls moveTo fixad! 2025-10-29 14:39:05 +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