Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

겜블 리뷰 내용 수정 #19

Closed
wants to merge 35 commits into from
Closed

겜블 리뷰 내용 수정 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
26edb38
1.I have implemented a simplified graphic for the boss and enabled th…
Ahnjunyoung1110 Nov 16, 2023
5ae71d8
1.I have implemented a simplified graphic for the boss and enabled th…
Ahnjunyoung1110 Nov 16, 2023
4de8a9c
Merge remote-tracking branch 'origin/Boss_monster' into Boss_monster
Ahnjunyoung1110 Nov 16, 2023
3bf1424
1. I have created a boss health gauge that changes based on the boss'…
Ahnjunyoung1110 Nov 19, 2023
76a2d6e
commit to pull
yuna0833 Nov 19, 2023
66708d2
Merge branch 'main' of https://github.com/khj0998/Invaders into yuna_…
yuna0833 Nov 19, 2023
6a57ae9
약간의 겜블 스크린 제작
khj0998 Nov 20, 2023
e7a210d
4번째 줄 적 색깔 하늘색으로 변경
jangseowon03 Nov 23, 2023
a425010
Merge pull request #15 from khj0998/enemy_color
Ahnjunyoung1110 Nov 23, 2023
e5a32f9
1. Implemented the boss's patterns.
Ahnjunyoung1110 Nov 23, 2023
b7a27a3
Add the boss pattern
Ahnjunyoung1110 Nov 23, 2023
d2ef551
Add gamble button on titlescreen
khj0998 Nov 24, 2023
46632d8
Merge branch 'Develop' of https://github.com/khj0998/Invaders into yu…
yuna0833 Nov 26, 2023
ce98bf4
파칭코 거의 다 만듬. 스프라이트 변경 속도 조정 필요, Currency 제대로 저장되는지 확인 필요, 몇 배인지 표기 필요
khj0998 Nov 26, 2023
ee5c508
스킨 색상 변경
yuna0833 Nov 27, 2023
d37bc1e
Eliminate the scheduler
Ahnjunyoung1110 Nov 27, 2023
e36c16b
Merge pull request #14 from khj0998/Boss_monster
yuna0833 Nov 27, 2023
50b6d70
Add the boss pattern
Ahnjunyoung1110 Nov 27, 2023
f7f56db
파칭코 제작
khj0998 Nov 27, 2023
649e023
가위바위보 제작
khj0998 Nov 29, 2023
363641c
함수 변수 설명 추가
khj0998 Nov 30, 2023
e794e66
겜블 배율 설명 추가,
khj0998 Nov 30, 2023
2844203
피드백 반영
yuna0833 Nov 30, 2023
0dee60e
Merge branch 'Develop' of https://github.com/khj0998/Invaders into yu…
yuna0833 Nov 30, 2023
adaabc7
I fixed the bug that prevented the skin change from being applied.
Ahnjunyoung1110 Nov 30, 2023
bcdeed6
I fixed the bug that prevented the skin change from being applied.
Ahnjunyoung1110 Nov 30, 2023
3e5f991
Merge pull request #16 from khj0998/yuna_skinwors
khj0998 Nov 30, 2023
5666c69
Merge branch 'Develop' into BossMonster_Pattern
Ahnjunyoung1110 Dec 1, 2023
753b7d0
Merge remote-tracking branch 'origin/BossMonster_Pattern' into BossMo…
Ahnjunyoung1110 Dec 2, 2023
eb2a553
총알이 이상한 방향으로 튕겨져 나가던 버그를 고쳤습니다.
Ahnjunyoung1110 Dec 2, 2023
a1b4c9c
Merge pull request #17 from khj0998/BossMonster_Pattern
yuna0833 Dec 3, 2023
ad4cfd3
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Ga…
khj0998 Dec 3, 2023
765f96f
Merge pull request #18 from khj0998/Gamble
myunghong Dec 3, 2023
b96d1a6
리뷰 내용 수정
khj0998 Dec 4, 2023
6aade46
Merge branch 'Develop' of https://github.com/khj0998/Invaders into Ga…
khj0998 Dec 4, 2023
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
15 changes: 14 additions & 1 deletion res/graphics
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,17 @@
010000100110011111000110
1000101010001000101010001
00110110110001100011
00110000111100000011
00110000111100000011
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
10000000000000000000110000000000000000001110000000000000000011110000000000000000111110000000000000001111110000000000000011111110000000000000111111110000000000001111111110000000000011111111110000000000111111111110000000001111111111110000000011111111111110000000111111111111110000001111111111111110000011111111111111110000111111111111111110001111111111111111110011111111111111111110111111111111111111111111111111111111111111111111111111111110111111111111111111001111111111111111100011111111111111110000111111111111111000001111111111111100000011111111111110000000111111111111000000001111111111100000000011111111110000000000111111111000000000001111111100000000000011111110000000000000111111000000000000001111100000000000000011110000000000000000111000000000000000001100000000000000000010000000000000000000
1000000000000000000011000000000000000000111000000000000000001111000000000000000011111000000000000000111111000000000000001111111000000000000011111111000000000000
15 changes: 11 additions & 4 deletions src/engine/Core.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,15 @@ public static void main(final String[] args) {
returnCode = frame.setScreen(currentScreen);
LOGGER.info("Closing title screen.");
break;
case 7:
case 10:
// Game & score.
do {
SoundManager.stopSound("selection",2f);
// One extra live every few levels.
int mode = gameState.getMode();
boolean bonusLife = gameState.getLevel() % EXTRA_LIFE_FRECUENCY == 0;

if (mode == 1) {
// 1P mode
if (mode == 1) {// 1P mode
bonusLife = bonusLife && gameState.getLivesRemaining1p() < MAX_LIVES;
} else {
// 2P mode (Give bonusLife if either player has less than max lives.)
Expand Down Expand Up @@ -309,14 +308,22 @@ public static void main(final String[] args) {
returnCode = frame.setScreen(currentScreen);
LOGGER.info("Closing select screen.");
break;
case 8:
case 9:
// Select Skin.
currentScreen = new SkinSelectionScreen(width, height, FPS);
LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
+ " Skin Selection screen at " + FPS + " fps.");
returnCode = frame.setScreen(currentScreen);
LOGGER.info("Closing SkinSelection screen.");
break;
case 7:
// Gamble.
currentScreen = new GambleScreen(width, height, FPS);
LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
+ " Gamble screen at " + FPS + " fps.");
returnCode = frame.setScreen(currentScreen);
LOGGER.info("Closing Gamble screen.");
break;
default:
break;
}
Expand Down
Loading
Loading