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.

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

Testmerge #23

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
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
ad16e21
Update README.rst
dyyeon Nov 13, 2024
c2f7474
add stop key
dyyeon Nov 20, 2024
c4c521b
라운드, 진행도 표시 구현
kbh0218 Nov 23, 2024
48398d1
first merge
dyyeon Nov 24, 2024
aa3255f
RM change
dyyeon Nov 24, 2024
356ad7c
translate
dltkdqlsco Nov 24, 2024
fc6d4a2
Update README.rst
dltkdqlsco Nov 24, 2024
3488a13
Update README.rst
dyyeon Nov 24, 2024
4c1273a
대각선이동
TaejunLim7588 Nov 25, 2024
92a09d5
menu translate
dltkdqlsco Nov 28, 2024
75610bb
readme commit
dltkdqlsco Nov 28, 2024
7255dc6
README commit
dltkdqlsco Nov 28, 2024
59a5f63
README commit
dltkdqlsco Nov 28, 2024
57750bf
README commit
dltkdqlsco Nov 28, 2024
7dac5d9
README commit
dltkdqlsco Nov 28, 2024
8133043
README commit
dltkdqlsco Nov 28, 2024
dc573a1
README commit
dltkdqlsco Nov 28, 2024
51e34e3
README commit
dltkdqlsco Nov 28, 2024
bf8521a
translate finish
dltkdqlsco Nov 28, 2024
6014c2a
README commit 5
dltkdqlsco Nov 28, 2024
80231cc
score.py and README fix
dltkdqlsco Nov 28, 2024
a249c31
README 2
dltkdqlsco Nov 28, 2024
737e16a
score conflict resolve
dltkdqlsco Nov 28, 2024
7df100e
디버프 아이템 추가
kbh0218 Nov 28, 2024
c3bb8cc
한글패치 pull 및 디버프 아이템 추가
kbh0218 Nov 28, 2024
2f9053f
ult update
dyyeon Nov 29, 2024
9228806
.
dyyeon Nov 29, 2024
afdb454
ult 최종
dyyeon Nov 29, 2024
d56daba
galaga 1
dyyeon Dec 1, 2024
6d1e6aa
galaga 2
dyyeon Dec 1, 2024
a5c41d1
유도탄, 대각선이동
TaejunLim7588 Dec 1, 2024
051ba96
galaga fin
dyyeon Dec 2, 2024
ec2fdef
1202 수정본
kbh0218 Dec 2, 2024
98a8ccb
kim lee yun merge
dyyeon Dec 2, 2024
5af20e9
merge 1111
dyyeon Dec 2, 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
Binary file added .DS_Store
Binary file not shown.
11 changes: 11 additions & 0 deletions .vscode/easycode.ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node_modules/
dist/
vendor/
cache/
.*/
*.min.*
*.test.*
*.spec.*
*.bundle.*
*.bundle-min.*
*.log
41 changes: 27 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
SolarWolf - http://pygame.org/shredwheat/solarwolf/index.shtml
by Pete "ShredWheat" Shinners" - [email protected]
<수정사항>

SolarWolf is an action/arcade game written entirely in Python.
It is free and open source, released under the LGPL license.
-플레이어 정지
게임 플레이 중 30초마다 s키를 눌러 화면 내의 모든 총알을 삭제하는 궁극기 추가했습니다.
(gameplay.py/input.py/objship.py)

The game is originally based of one of my childhood favorites,
SolarFox on the Atari 2600.
-게임중 라운드 표시
제 버전에선 한글패치가 안된 버전이라 우선 Stage1,2,3 등으로 출력되게 했습니다.
또 stage0은 출력된 후 사라지지 않아서 0은 뜨지않도록 했습니다.
(score.py)

The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.
-게임 진행도 표시
바 형태로 게임 진행도를 표시하게 했습니다.
(hud.py)

Solarwolf runs on nearly every platform. Windows, Mac OSX, Linux,
BeOS, and a large variety of Unix platforms.
-한글 패치
메뉴 png를 새로 만들어서 한글로 바꾸고 한글로 바꾸면서 폰트가 너무 커지는 바람에 폰트 조절을 했습니다.
그리고 첫 화면에 나오는 우주선?이 너무 커서 메뉴 글자가 잘 안보여서 크기를 줄였습니다.
(menu_creds_on.png, menu_news_on.png, menu_quit_on.png, menu_setup_on.png, menu_start_on.png,/ ..._off.png/ ship-big.png) -> 새로 만든 png
(gamemenu.py/ gamepref.py/ gamestart.py/ gamewin.py/ txt.py/ gamecreds.py/ gamenews.py/ score.py) -> 한글 번역, 한글 폰트 크기 수정
(NanumGothic-Bold.ttf) -> 한글 폰트 추가

-디버프 아이템 추가
FastBullet이란 아이템을 추가해서 먹으면 속도가 4배 빨라지고 원래대로 돌아오도록 하였습니다.
help문구도 추가했습니다.
(objpowerup.py) FastBullet 아이템 추가
(objshot.py) 총알 속도 조정하기위한 수정
(gamehelp.py) help문구 추가

Pygame Powered
-미니게임
cred자리에 추후에 보너스 스테이지로 이용할 갤러그 형태의 미니게임을 추가했습니다.
(gamecreds.py)

Binary file added solarwolf/.DS_Store
Binary file not shown.
Binary file added solarwolf/NanumGothic-Bold.ttf
Binary file not shown.
Binary file added solarwolf/__pycache__/__init__.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/__init__.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/__main__.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/__main__.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/allmodules.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/allmodules.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/cli.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/cli.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/game.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/game.cpython-313.pyc
Binary file not shown.
Binary file not shown.
Binary file added solarwolf/__pycache__/gamecreds.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamefinish.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamefinish.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamehelp.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamehelp.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gameinit.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gameinit.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamemenu.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamemenu.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamename.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamename.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamenews.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamenews.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamepause.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamepause.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gameplay.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gameplay.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamepref.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamepref.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamesetup.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamesetup.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamestart.cpython-312.pyc
Binary file not shown.
Binary file not shown.
Binary file added solarwolf/__pycache__/gamewin.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gamewin.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gfx.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/gfx.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/hud.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/hud.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/input.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/input.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/levels.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/levels.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/main.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/main.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objasteroid.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objasteroid.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objbox.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objbox.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objexplode.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objexplode.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objguard.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objguard.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objpopshot.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objpopshot.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objpowerup.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objpowerup.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objship.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objship.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objshot.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objshot.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objsmoke.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objsmoke.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objtele.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objtele.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objtext.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objtext.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objwarp.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/objwarp.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/players.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/players.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/score.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/score.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/snd.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/snd.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/stars.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/stars.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/txt.cpython-312.pyc
Binary file not shown.
Binary file added solarwolf/__pycache__/txt.cpython-313.pyc
Binary file not shown.
Binary file added solarwolf/data/enemy1.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 solarwolf/data/enemy2.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 solarwolf/data/enemy3.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 solarwolf/data/menu_creds_off.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 solarwolf/data/menu_creds_on.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 solarwolf/data/menu_news_off.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 solarwolf/data/menu_news_on.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 solarwolf/data/menu_quit_off.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 solarwolf/data/menu_quit_on.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 solarwolf/data/menu_setup_off.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 solarwolf/data/menu_setup_on.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 solarwolf/data/menu_start_off.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 solarwolf/data/menu_start_on.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 solarwolf/data/players
Binary file not shown.
Binary file modified solarwolf/data/powereffects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions solarwolf/data/prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
music = 2
volume = 2
display = 0
comments = 1
help = 0
thruster = 0
Binary file modified solarwolf/data/ship-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion solarwolf/errorbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __pygame(title, message):
pygame.font.init()
screen = pygame.display.set_mode((460, 140))
pygame.display.set_caption(title)
font = pygame.font.Font(None, 18)
font = pygame.font.Font(None, 15)
foreg = 0, 0, 0
backg = 200, 200, 200
liteg = 255, 255, 255
Expand Down
41 changes: 21 additions & 20 deletions solarwolf/game.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,32 +43,33 @@

#number of insults must match num of complements, be careful
Complements = (
'Keep it up!',
'Looking Great!',
'Hotshot',
'Too Hot to Handle',
'Bring it on',
'Beautiful',
'Own the Zone',
'Too Cool For School',
'So Hot Right Now',
'Smooth Moves'
'계속 잘해봐!',
'멋져 보여!',
'슈퍼스타',
'너무 뜨거워서 다룰 수 없네',
'한번 붙어보자!',
'아름다워',
'영역을 지배해',
'학교에서 너무 쿨한 사람',
'지금 완전 핫해',
'완벽한 움직임'
)
Insults = (
'Not so good',
'Ouch',
'Rookie',
'Sloppy',
'Choke Choke',
'Not Today',
'Hall of Shame',
'Wrong way',
'Clumsy, Clumsy',
'Medic',
'별로 좋지 않네',
'아야',
'초보자',
'엉성해',
'실수 연발',
'오늘은 아니야',
'굴욕의 전당',
'잘못된 방향이야',
'어설퍼, 어설퍼',
'의무병 불러!'
)




player = None
name_maxlength = 10 #longest name
max_players = 5 #most player accounts available
Expand Down
Loading