169 Commits

Author SHA1 Message Date
Erik Näslund
e32ea55172 Make biomes available to project 2025-10-27 14:06:54 +01:00
Erik Näslund
10cd7cbba7 Create dig on biome test 2025-10-27 14:05:39 +01:00
Erik Näslund
2d4b5d21a7 remove unused import statement 2025-10-27 13:52:46 +01:00
Erik Näslund
11da3ee4aa Make Miner require HasInventory actor 2025-10-27 13:52:20 +01:00
Erik Näslund
d7cfa47277 Replace assertTrue with assertThat hasItem 2025-10-27 13:44:30 +01:00
Aster000000
426eaa0d4e Merge remote-tracking branch 'refs/remotes/origin/main' into monster
# Conflicts:
#	src/main/java/Character.java
2025-10-27 13:40:01 +01:00
886ca60f8e Merge pull request 'Job + Spell merge' (#9) from Job into main
Reviewed-on: #9
2025-10-27 12:18:21 +01:00
Aster000000
afdd4ff6a4 Merge remote-tracking branch 'refs/remotes/origin/main' into monster
# Conflicts:
#	src/main/java/Character.java
2025-10-27 12:16:58 +01:00
Erik Näslund
4e0d180903 Merge magic 2025-10-27 12:16:37 +01:00
Erik Näslund
65b2478be7 Merge remote-tracking branch 'origin/magic' into Job
# Conflicts:
#	pom.xml
#	src/main/java/Entity/Player.java
2025-10-27 12:05:06 +01:00
TricyOne
bcb236a7f6 conditions and more fixes 2025-10-27 11:39:32 +01:00
Erik Näslund
af344e1c36 Formatting 2025-10-27 10:26:17 +01:00
Erik Näslund
d1a1047682 Create XP lookup table 2025-10-27 10:18:13 +01:00
Erik Näslund
8390d152ce xp carries over on level up 2025-10-27 09:59:32 +01:00
TricyOne
e476a7e0a6 tests 2025-10-27 09:31:07 +01:00
Erik Näslund
3d36d69ed1 Remove unused file 2025-10-26 23:25:08 +01:00
Erik Näslund
82bd72fcb4 Import position 2025-10-26 23:24:56 +01:00
Erik Näslund
46259011c8 Merge remote-tracking branch 'origin/monster' into Job
# Conflicts:
#	src/main/java/Character.java
2025-10-26 21:26:49 +01:00
Erik Näslund
0fe58bc02e Merge remote-tracking branch 'origin/main' into Job 2025-10-26 21:25:32 +01:00
TricyOne
9892a229dc A lot of magic work 2025-10-24 12:02:40 +02:00
Joakim Lysén
1a2796aed7 Commit init 2025-10-24 10:28:48 +02:00
Joakim Lysén
588f4715f6 Commit init 2025-10-24 10:21:55 +02:00
Joakim Lysén
5fbe61d427 Commit init 2025-10-24 10:19:36 +02:00
Erik Näslund
a5620a7611 Set default position 2025-10-24 01:00:01 +02:00
Erik Näslund
33a2132e07 Create Inventory 2025-10-24 00:58:28 +02:00
Erik Näslund
2587acc00b Change spelling 2025-10-24 00:58:00 +02:00
Erik Näslund
acc365c78a Correct spelling 2025-10-24 00:57:24 +02:00
Erik Näslund
98e7589d04 Base implementation of test 2025-10-23 12:31:16 +02:00
Erik Näslund
b2dcc73453 Install mockito 2025-10-23 12:05:12 +02:00
TricyOne
c0e93c9a42 starting to work on wizard actions 2025-10-23 10:20:38 +02:00
09ca0698d3 Merge pull request 'Implement job experience' (#7) from Job into main
Reviewed-on: #7
2025-10-18 20:16:29 +02:00
Erik Näslund
aa3e24c228 Implement job experience 2025-10-18 20:14:51 +02:00
2f43f4145d Merge pull request 'Create modules' (#6) from player into main
Reviewed-on: #6
2025-10-17 16:09:38 +02:00
Erik Näslund
2d43758747 Merge remote-tracking branch 'origin/player' into player
# Conflicts:
#	src/main/java/Action/Dig.java
#	src/main/java/Job/HasJob.java
#	src/main/java/Job/Miner.java
#	src/main/java/Player.java
#	src/test/java/MinerTest.java
2025-10-17 16:08:33 +02:00
Erik Näslund
2c0534e27a Refactor job into interfaces 2025-10-17 16:07:56 +02:00
7048d66628 Merge pull request 'Basic job implementation' (#5) from player into main
Reviewed-on: #5
2025-10-17 10:06:38 +02:00
Erik Näslund
f730cee3a3 Refactor job into interfaces 2025-10-17 10:02:56 +02:00
Joakim Lysén
b8fc93a1bf Commit init 2025-10-17 02:39:17 +02:00
Joakim Lysén
a36b5923ae Commit init 2025-10-17 00:40:13 +02:00
Erik Näslund
72b357d817 Level up miner 2025-10-17 00:00:58 +02:00
Erik Näslund
b0438755e5 Code cleanup 2025-10-16 12:44:44 +02:00
Erik Näslund
d9411b67f0 Merge remote-tracking branch 'origin/player' into player
# Conflicts:
#	src/main/java/Movable.java
#	src/main/java/Player.java
#	src/test/java/PlayerTest.java
2025-10-16 12:44:01 +02:00
Erik Näslund
4df1e1e292 Code cleanup 2025-10-16 12:41:51 +02:00
Joakim Lysén
5e7d100b27 Commit init 2025-10-16 12:13:53 +02:00
Aster000000
dcbd8baf95 Merge remote-tracking branch 'origin/monster' into monster
# Conflicts:
#	src/main/java/Character.java
#	src/main/java/Monster.java
#	src/test/java/MonsterTest.java
2025-10-16 11:54:45 +02:00
Aster000000
fdf039348e Allt jag jobbat på under morgonen. Mycket kommer nog tas bort/integreras med andras delar framåt, så många av dom nya klasserna är främst för att illustrera logiken jag tänker mig/funderar över. 2025-10-16 11:36:26 +02:00
Erik Näslund
b98392813b Refactor job into Interface 2025-10-16 11:06:06 +02:00
Erik Näslund
6e7f435e85 Add notes to gitignore 2025-10-16 11:05:31 +02:00
Erik Näslund
c40b5a0c84 Player can change job
Steps 1 and 2 TDD.
Written a test and made it pass.
This is most definitely not the best solution.

I would like to know how to handle cases where I think Job should be abstract further down the line. How is this handled in TDD?
2025-10-16 10:13:43 +02:00
Erik Näslund
141dff8af1 Implement moveable 2025-10-16 10:00:04 +02:00