Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
1d1f733
add dockerfile
phuonnngminh May 1, 2024
b9fc046
add item duration
phuonnngminh May 3, 2024
8c9d30e
select level
BichHang21522041 May 6, 2024
471cbc5
select level keyboard input
BichHang21522041 May 6, 2024
4262397
update keyboard input
BichHang21522041 May 7, 2024
8ad3da9
Pause_game w P,and Button on Screen
ikruL May 10, 2024
e4d259d
Pause-game
ikruL May 11, 2024
091ad4e
display item time
phuonnngminh May 11, 2024
fb64fc0
Pause_Button_Fixed
ikruL May 12, 2024
5ca0502
add level, create enemy
Huy010302 May 12, 2024
47ee260
Merge pull request #7 from phuonnngminh/Huy
phuonnngminh May 12, 2024
1d316e9
Merge branch 'master' into HangLTB
BichHang21522041 May 12, 2024
17681a6
Merge pull request #2 from phuonnngminh/HangLTB
BichHang21522041 May 12, 2024
e6441d4
Revert "Select level"
phuonnngminh May 12, 2024
be353cd
Merge pull request #8 from phuonnngminh/revert-2-HangLTB
phuonnngminh May 12, 2024
49bc95c
Revert "Revert "Select level""
BichHang21522041 May 14, 2024
f0a9bcd
use constant for TICKS_PER_SECOND
phuonnngminh May 14, 2024
165c802
Changes Pause to ESC
ikruL May 15, 2024
24904be
Merge branch 'master' into Pause_Game
ikruL May 15, 2024
a791aaf
Fixed
ikruL May 15, 2024
2854cdb
Merge pull request #6 from phuonnngminh/Pause_Game
phuonnngminh May 15, 2024
a228e7c
update infopanel
BichHang21522041 May 15, 2024
4042a32
extract interface IEntityManager and IMessageManager from Board
phuonnngminh May 16, 2024
b4efc1c
merge from master
phuonnngminh May 16, 2024
d6d405d
Merge pull request #12 from phuonnngminh/refactor
phuonnngminh May 16, 2024
e7b5244
decouple Bomber class by adding isPlayer()
phuonnngminh May 16, 2024
c4869f8
Merge pull request #13 from phuonnngminh/refactor
phuonnngminh May 16, 2024
68cb07d
move camera snapping from Bomber to Board
phuonnngminh May 16, 2024
9c7c88e
refactor Bomber input
phuonnngminh May 16, 2024
af1da66
SpeedItem managed by Character instead of global Game
phuonnngminh May 16, 2024
d49cc1d
move BombItem to Bomber instead of Game
phuonnngminh May 16, 2024
53b74c6
move FlameItem to Bomber instead of Game
phuonnngminh May 17, 2024
8c2b256
Merge pull request #14 from phuonnngminh/refactor
phuonnngminh May 17, 2024
68ac3fc
Dead_Screen_Changes
ikruL May 17, 2024
2b3c2c4
Fixed Text
ikruL May 17, 2024
2e9dcc6
Merge branch 'master' into Dead_Game_Changes
ikruL May 17, 2024
53f10aa
decouple bomber stats from global Game
phuonnngminh May 18, 2024
87cbe71
Merge pull request #16 from phuonnngminh/refactor
phuonnngminh May 18, 2024
f705f8d
Fixed Error
ikruL May 18, 2024
c8ba195
Merge branch 'Dead_Game_Changes' of https://github.com/phuonnngminh/b…
ikruL May 18, 2024
1eecfdd
.
ikruL May 19, 2024
56550d3
Merge branch 'master' into HangLTB
BichHang21522041 May 19, 2024
0320c2d
update selected level
BichHang21522041 May 19, 2024
e6cf880
Merge pull request #9 from phuonnngminh/HangLTB
phuonnngminh May 19, 2024
35a1432
select game mode screen
BichHang21522041 May 19, 2024
ef3a988
refactor collision logic: split into collide and canBePassedThroughBy
phuonnngminh May 20, 2024
53c746a
Merge branch 'master' into refactor
phuonnngminh May 20, 2024
04de1be
Merge pull request #18 from phuonnngminh/HangLTB
phuonnngminh May 20, 2024
a3f9b22
Merge pull request #19 from phuonnngminh/refactor
phuonnngminh May 20, 2024
cd22642
DeadScreen
ikruL May 20, 2024
f277c5e
rename Board.getPlayerActiveItems()
phuonnngminh May 21, 2024
d2d0208
edit text
BichHang21522041 May 21, 2024
cbddb14
standardize character action
phuonnngminh May 21, 2024
4c1e2d2
fix enter input
BichHang21522041 May 21, 2024
fc08d34
fix enter input
BichHang21522041 May 21, 2024
44e7275
Merge pull request #20 from phuonnngminh/HangLTB
phuonnngminh May 22, 2024
561fd77
make player move 1 tile at a time
phuonnngminh May 22, 2024
fa67ef9
remove moving state in Character
phuonnngminh May 22, 2024
28e2755
chore
phuonnngminh May 22, 2024
f106af9
init code for agent
phuonnngminh May 22, 2024
376abe1
fix: Doll not walking in right direction
phuonnngminh May 22, 2024
cf1be0c
Merge branch 'master' into refactor
phuonnngminh May 22, 2024
af27ce1
Merge pull request #21 from phuonnngminh/refactor
phuonnngminh May 22, 2024
54b28a9
refactor IEntityManager
phuonnngminh May 22, 2024
acc5cbb
split CanUseItem from Character
phuonnngminh May 22, 2024
be1af54
reduce responsibility for Board by splitting into more Manager classes
phuonnngminh May 22, 2024
edfa6ea
Merge branch 'master' into refactor
phuonnngminh May 22, 2024
a9d0535
Merge pull request #22 from phuonnngminh/refactor
phuonnngminh May 22, 2024
1585ee6
fix move player 2
Huy010302 May 22, 2024
5a9950b
split Board into GameInfoManager
phuonnngminh May 22, 2024
42e071b
implement KeyboardAgent
phuonnngminh May 23, 2024
004ad75
test
Huy010302 May 24, 2024
12c350c
change Keyboard to singleton
phuonnngminh May 24, 2024
ab17938
Merge pull request #23 from phuonnngminh/refactor
phuonnngminh May 24, 2024
1efb301
merge with master
Huy010302 May 24, 2024
1fd6a07
fix: item not displaying because IGameInfoManager is outdated
phuonnngminh May 24, 2024
1579bdd
Merge pull request #24 from phuonnngminh/refactor
phuonnngminh May 24, 2024
a82605e
Deadscreen
ikruL May 26, 2024
bc36c1d
fix: flame not stopped on first brick
phuonnngminh May 26, 2024
a26c065
Merge pull request #25 from phuonnngminh/fix/flame-stop-on-first-brick
phuonnngminh May 26, 2024
56d689f
change fields to private in Character
phuonnngminh May 26, 2024
dbce61c
remove IActiveItemManager and IBombManager from Bomber
phuonnngminh May 26, 2024
8042ddb
move endGame to GameInfoManager, remove win game logic from Bomber
phuonnngminh May 26, 2024
1fbbb0e
Merge branch 'master' into Dead_Game_Changes
phuonnngminh May 26, 2024
7244333
Merge branch 'feat/minimax-agent' into Dead_Game_Changes
phuonnngminh May 26, 2024
8706cda
fix merge conflicts
phuonnngminh May 26, 2024
112b8f7
Merge pull request #15 from phuonnngminh/Dead_Game_Changes
phuonnngminh May 26, 2024
2ba0234
restore soundtrack
phuonnngminh May 26, 2024
26745c9
fix choose level not work
phuonnngminh May 26, 2024
19abe85
Merge pull request #26 from phuonnngminh/feat/minimax-agent
phuonnngminh May 26, 2024
2a16e79
fix: user can still input after selecting restart in dead screen
phuonnngminh May 26, 2024
45a9192
Merge pull request #27 from phuonnngminh/feat/minimax-agent
phuonnngminh May 26, 2024
dd851d5
fix level 3, fix display of enemy
Huy010302 May 26, 2024
7918ca0
fix level 3, and fix display enemy
Huy010302 May 26, 2024
6cda072
Merge pull request #28 from phuonnngminh/fixlevel3
phuonnngminh May 27, 2024
ef63d20
add player 2, not fix collide of 2 player with item yet
Huy010302 May 29, 2024
a5b54f3
add player 2, not fix collide of 2 player with item yet
Huy010302 May 29, 2024
d5fac22
fix move for 2 player
Huy010302 May 29, 2024
d1286f8
add background for select game mode and select level screen
BichHang21522041 May 29, 2024
4023241
fix collide for player 1
Huy010302 May 30, 2024
5cd832d
fix collide for player 1
Huy010302 May 30, 2024
5f3cc34
Merge pull request #29 from phuonnngminh/player2
Huy010302 May 30, 2024
1752556
fix render for player 2
Huy010302 May 31, 2024
c541da3
Merge pull request #31 from phuonnngminh/player2
phuonnngminh May 31, 2024
93a2946
create LevelManager
phuonnngminh May 31, 2024
a69fb1d
remove endGame() from GameInfoManager
phuonnngminh May 31, 2024
ed0a111
Merge branch 'master' into feat/minimax-agent
phuonnngminh May 31, 2024
69d0a77
change background, font
BichHang21522041 Jun 1, 2024
3234909
Merge pull request #30 from phuonnngminh/HangLTB
phuonnngminh Jun 1, 2024
0bf4896
Merge pull request #32 from phuonnngminh/feat/minimax-agent
phuonnngminh Jun 1, 2024
d6450f7
update background game mode,select level
Huy010302 Jun 2, 2024
6b861d8
Merge branch 'master' of https://github.com/phuonnngminh/bom-ai into …
Huy010302 Jun 2, 2024
d5ea373
adjust background imgage
Huy010302 Jun 2, 2024
2f6c79a
fix position
Huy010302 Jun 2, 2024
314f564
Merge pull request #34 from phuonnngminh/updateBG
phuonnngminh Jun 3, 2024
354c35f
fix logic 1 player death, 1 player still play
Huy010302 Jun 4, 2024
2d67ae2
fix logic
Huy010302 Jun 4, 2024
bc02598
next to level 2
Huy010302 Jun 4, 2024
e67cec5
Merge pull request #35 from phuonnngminh/fixLogicGameOver
phuonnngminh Jun 6, 2024
9bc6335
change info panel for 2 players, count enemies
BichHang21522041 Jun 6, 2024
05c01dd
update
BichHang21522041 Jun 6, 2024
09be47f
update info panel
BichHang21522041 Jun 7, 2024
f19d80a
Merge branch 'master' into HangLTB
BichHang21522041 Jun 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM openjdk:8-slim-buster

COPY . .
RUN apt update && \
apt install -y vim git && \
apt install -y libxext6 libxrender1 libxtst6 libfreetype6 libfontconfig1 && \
echo "Done!"

# Dev environment:
# docker run -d --name bom-ai -e DISPLAY="host.docker.internal:0" -v /tmp/.X11-unix:/tmp/.X11-unix -v $HOME:/root openjdk:8-slim-buster sleep 999999999
Binary file added res/font/Minecraft.ttf
Binary file not shown.
Binary file added res/font/SuperPixel-m2L8j.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions res/levels/Level1.txt → res/levels/Level1P_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# # # #*# # #*#*# # # #*#*#*# #
# x* b** * * * * #
# # # # # #*# # #*#*# # # # #*#
#f x ** * * #
# x ** * * #
# # # # # # # # # #*# #*# # # #
#* * * * * #
# * * * * #
# # # # #*# # # #*#*# # # # # #
#* ** * * #
# #*# # # # # # #*# # # # # # #
Expand Down
File renamed without changes.
14 changes: 14 additions & 0 deletions res/levels/Level1P_3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
3 13 31
###############################
#p * *3 * ** * * *#
# # # # #*# # #*# # # # # #*# #
# * * *** ** # * ** #
# #*# # # # #4# #b#1# # # # #*#
# * ** * **#
# # #*# 3 # # # #*#*#*#*# # # #
# * * * *x* * 4 #
# # # # #*# # # # # # #*# #*# #
# **2* *2 #
# # # # # # # # # #*# # # # #*#
# **4 ** * 5 #
###############################
14 changes: 14 additions & 0 deletions res/levels/Level2P_1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
1 13 31
###############################
#p s* * 1 * * * * * #
# # # #*# # #*#*# # # #*#*#*# #
# x* b** * * * * #
# # # # # #*# # #*#*# # # # #*#
# x ** * * #
# # # # # # # # # #*# #*# # # #
# * * * * #
# # # # #*# # # #*#*# # # # # #
#* ** * * #
# #*# # # # # # #*# # # # # # #
#a * * * #
###############################
14 changes: 14 additions & 0 deletions res/levels/Level2P_2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
2 13 31
###############################
#p * *2 * ** * * *#
# # # # #*# # #*# # # # # #*# #
# * * *** ** * ** #
# #*# # # # #1# #b#1# # # # #*#
# * ** * **#
# # #*# # # # # #*#*#*#*# # # #
# * * * *x* * #
# # # # #*# # # # # # #*# #*# #
# **** *1 #
# # # # # # # # # #*# # # # #*#
#a ** * * 3 #
###############################
14 changes: 14 additions & 0 deletions res/levels/Level2P_3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
3 13 31
###############################
#p * *3 * ** * * *#
# # # # #*# # #*# # # # # #*# #
# * * *** ** # * ** #
# #*# # # # #4# #b#1# # # # #*#
# * ** * **#
# # #*# 3 # # # #*#*#*#*# # # #
# * * * *x* * 4 #
# # # # #*# # # # # # #*# #*# #
# **2* *2 #
# # # # # # # # # #*# # # # #*#
#a**4 ** * 5 #
###############################
1 change: 1 addition & 0 deletions res/menu/7729559.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/9165683_home_house_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/bgBombman.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/f15591389f71a57ec5e54ba0f48ed385.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/gameover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/icons8-menu-50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/icons8-restart-50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/pointer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/menu/restart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/fireIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_down_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_down_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_left_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_left_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_right_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_right_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_up_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/sprites/player2_up_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/textures/classic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading