Skip to content

Commit

Permalink
최종테스트 완료
Browse files Browse the repository at this point in the history
  • Loading branch information
ABER1047 committed Dec 28, 2022
1 parent 0769c17 commit bd376dc
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 19 deletions.
5 changes: 5 additions & 0 deletions objects/bg_status_accessory/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ if (pressed > 0 && global.key_setting_message > 0) || global.key_setting_message
item_name__ = "3차 테스터 기념 동상"
item_desc__ = "프로젝트 왁 3차 테스터 기념 동상\n\n특수효과 : 방어력 5%, 크리티컬 데미지 확률 12%, 기본 데미지 10% 증가"
}
if cal__img = 23
{
item_name__ = "버그 사냥꾼"
item_desc__ = "프로젝트 왁 출시 직전에 진행한 디버그 테스트에 참가해주신 테스터에게 지급되는 특수 탈리스만\n\n특수효과 : 크리티컬 데미지 확률 15%, 기본 데미지 20% 증가"
}

draw_text_kl_scale(xx+50*_c_x-global.key_setting_message*_c_x*70,yy-16*_c_x+global.key_setting_message*_c_x*80,item_name__,16,999,0.74,image_blend,0,-1,font0,1/3.5*_c_x,1/3.5*_c_x,image_angle)
draw_text_kl_scale(xx+50*_c_x-global.key_setting_message*_c_x*70,yy+global.key_setting_message*_c_x*80,item_desc__,60*_c_x,2300*_c_x,0.4,image_blend,0,-1,font0,1/4*_c_x,1/4*_c_x,image_angle)
Expand Down
12 changes: 6 additions & 6 deletions objects/bg_upgrage/Step_1.gml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ requirement[1] = -4
requirement_amount[1] = 0
requirement[2] = -4
requirement_amount[2] = 0
requirement_gold = 3700+500*global.weapon_upgraded[cal__img]
requirement_gold = 8700+1500*global.weapon_upgraded[cal__img]
}

if cal__img = 2
Expand All @@ -28,7 +28,7 @@ requirement[1] = 1
requirement_amount[1] = 2
requirement[2] = -4
requirement_amount[2] = 0
requirement_gold = 2300+500*global.weapon_upgraded[cal__img]
requirement_gold = 5300+1500*global.weapon_upgraded[cal__img]
}

if cal__img = 3
Expand All @@ -39,7 +39,7 @@ requirement[1] = -4
requirement_amount[1] = 0
requirement[2] = -4
requirement_amount[2] = 0
requirement_gold = 2300+500*global.weapon_upgraded[cal__img]
requirement_gold = 5300+1500*global.weapon_upgraded[cal__img]
}

if cal__img = 4
Expand All @@ -50,7 +50,7 @@ requirement[1] = -4
requirement_amount[1] = 0
requirement[2] = -4
requirement_amount[2] = 0
requirement_gold = 2300+500*global.weapon_upgraded[cal__img]
requirement_gold = 5300+500*global.weapon_upgraded[cal__img]
}

if cal__img = 5
Expand All @@ -61,12 +61,12 @@ requirement[1] = 4
requirement_amount[1] = 2
requirement[2] = -4
requirement_amount[2] = 0
requirement_gold = 2300+500*global.weapon_upgraded[cal__img]
requirement_gold = 5300+1500*global.weapon_upgraded[cal__img]
}

if cal__img = 6
{
requirement_gold = 3300+3000*global.weapon_upgraded[cal__img]
requirement_gold = 5300+3000*global.weapon_upgraded[cal__img]
requirement[0] = -4
requirement_amount[0] = 0
requirement[1] = -4
Expand Down
6 changes: 3 additions & 3 deletions objects/code/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ twitch_chat_connect("woowakgood","우왁굳","oauth:43rzue6rdcldus9fomqrwmtfuaum

global.chat_sender = noone
global.chat_data = noone
global.game_ver = "Alpha 1.0"
global.game_ver = "Alpha 1.1"

global.bubble_surf = surface_create(1920, 1080);
global.rage_surf = surface_create(1920, 1080);
Expand All @@ -15,7 +15,7 @@ global.guisanga_doo_event = 0
global.already_played_platform_scene = 0
////////////////////////////////////////////////////////////////////////
global.simhaedoo_stage = 0
global.credit_message = "\n\n\n\nDirector\n아버 (1인 개발)\n\n\nProgramer\n아버\n\n\nStory\n아버\n\n\nEnemy design\n아버\n\n\nUI design\n아버\n\n\nStage design\n아버\n\n\nEffect design\n아버\n\n\n\n\n\nBackground Music\nSymphony of Specters - Intense Cinematic Trailer\n\nSharo - Atorie to denno sekai\n\nBrightwaltz - Touch a flower softly\n\nBrightwaltz - Trifolium repens f. roseum\n\nSharou - Jinro no tame no komori uta\n\nBrightwaltz - Piano Improvisation 2020 Spring No2\n\nBrightwaltz - Dance in the Air\n\n\nilodolly - Raison d'etre\n\nMakai Symphony - Dragon Castle\n\n\nTrailer Music\nak+q - Ignotus\nZekk - Libertas\n\n\n\n\n\n\n\nReference\n\n\nThe Legend of Gockgang-E\n\nElden Ring\n\nMegaman Z\n\nTerraria\n\n심해두 팬아트\n\n메시 팬아트\n\n왁두 팬아트\n\nNier:Automata\n\n이세돌 팬아트\n\n\n\n\n\n1차 QA\n(피드백/버그 제보)\n\n\nStellarSea\n서장님\n오코츠유타\n옥수수칲\n탄창\n황금뿌리\n러머\nSsab\n공벌\n화염뽱어\n젓가락아저씨\n진성e\n벼슬\n페르마벤\n댐쿵이\n쓰레기맛캔디\n1잡탕1\nzun\n왁만치\nalpamin\nBackSang\nNANFREE\n쥬기\n참이프\n광부\nContra\nQuiettBee\n사미니\n(이외의 많은 여러 사람들)\n\n\n\n\n2차 QA\n\n\n댐쿵이\nBackSang\n모니타리\n스즈메의 문단속\n벤찌\n별명1577\nKastle\n고 라니임니다\n재영이요\n윤석\n러머\n최민우\nㅁㅈ\n허미온\n아리에스\nNAㅅ\nMang0_k\nLadon\nTJD\najdkg296\n쥬기\n잠복근무\n도트박스\n재영\n윤석\n허미온\ncccc\n원시인\n징버거의 돗대\n면주바이\n뱌밍\n\n\n\n\n3차 QA\n\n\n세구세구세구야사랑해\n1잡탕1\n백상\nKIM DDi YOMG\nTT1\nACHI99\nNikemach\ndamku1214\n왁만치\n로얄플러쉬\nDO_S\n이미지박스\n킹츄러스\nseesaw\n소다쿤\n플로토돔\n펭구\n입꼬기\n명준\n갱후니\n조금하는바드\n은색의하늘\najdkg296\nChungYeo\nsda\njustahirman\n허거덩\nEluhu\nlibertad\n\n\n\n\n\n\n\nSpecial Thanks\n(개발에 큰 도움 주신 분들과 추가 아이디어 제공자)\n\n\n\nBackSang\n쓰레기맛캔디\nzun\n왁만치\nNANFREE\nalpamin\n1잡탕1\n쥬기\n댐쿵이\n\n\n\n\n\n\n\nThanks for playing\n\n\n\n\n\n\n\nMade with Gamemaker studio 2"
global.credit_message = "\n\n\n\nDirector\n아버 (1인 개발)\n\n\nProgramer\n아버\n\n\nStory\n아버\n\n\nEnemy design\n아버\n\n\nUI design\n아버\n\n\nStage design\n아버\n\n\nEffect design\n아버\n\n\n\n\n\nBackground Music\nSymphony of Specters - Intense Cinematic Trailer\n\nSharo - Atorie to denno sekai\n\nBrightwaltz - Touch a flower softly\n\nBrightwaltz - Trifolium repens f. roseum\n\nSharou - Jinro no tame no komori uta\n\nBrightwaltz - Piano Improvisation 2020 Spring No2\n\nBrightwaltz - Dance in the Air\n\n\nilodolly - Raison d'etre\n\nMakai Symphony - Dragon Castle\n\n\nTrailer Music\nak+q - Ignotus\nZekk - Libertas\n\n\n\n\n\n\n\nReference\n\n\nThe Legend of Gockgang-E\n\nElden Ring\n\nMegaman Z\n\nTerraria\n\n심해두 팬아트\n\n메시 팬아트\n\n왁두 팬아트\n\nNier:Automata\n\n이세돌 팬아트\n\n\n\n\n\n1차 QA\n(피드백/버그 제보)\n\n\nStellarSea\n서장님\n오코츠유타\n옥수수칲\n탄창\n황금뿌리\n러머\nSsab\n공벌\n화염뽱어\n젓가락아저씨\n진성e\n벼슬\n페르마벤\n댐쿵이\n쓰레기맛캔디\n1잡탕1\nzun\n왁만치\nalpamin\nBackSang\nNANFREE\n쥬기\n참이프\n광부\nContra\nQuiettBee\n사미니\n(이외의 많은 여러 사람들)\n\n\n\n\n2차 QA\n\n\n댐쿵이\nBackSang\n모니타리\n스즈메의 문단속\n벤찌\n별명1577\nKastle\n고 라니임니다\n재영이요\n윤석\n러머\n최민우\nㅁㅈ\n허미온\n아리에스\nNAㅅ\nMang0_k\nLadon\nTJD\najdkg296\n쥬기\n잠복근무\n도트박스\n재영\n윤석\n허미온\ncccc\n원시인\n징버거의 돗대\n면주바이\n뱌밍\n\n\n\n\n3차 QA\n\n\n세구세구세구야사랑해\n1잡탕1\n백상\nKIM DDi YOMG\nTT1\nACHI99\nNikemach\ndamku1214\n왁만치\n로얄플러쉬\nDO_S\n이미지박스\n킹츄러스\nseesaw\n소다쿤\n플로토돔\n펭구\n입꼬기\n명준\n갱후니\n조금하는바드\n은색의하늘\najdkg296\nChungYeo\nsda\njustahirman\n허거덩\nEluhu\nlibertad\n\n\n\n\n\n\n\nSpecial Thanks\n(개발에 큰 도움 주신 분들과 추가 아이디어 제공자)\n\n\n\nBackSang\n쓰레기맛캔디\nzun\n왁만치\nNANFREE\nalpamin\n1잡탕1\n쥬기\n댐쿵이Special Thanks\n(최종 디버그 테스터)\n\n\n\nEluhu\nseesaw\n뱌밍\n우소\nlibertad\n랑 이\n갱후니\n러머\najdkg296\nHermione\n대충지은닉네임\n\n\n\n\n\n\n\nThanks for playing\n\n\n\n\n\n\n\nMade with Gamemaker studio 2"
//text_color = 0 //Initialize text color variable
ip_for_calcul = ""
//created_platfrom = 0
Expand Down Expand Up @@ -474,7 +474,7 @@ global.weapon_owned[i] = 0
global.weapon_upgraded[i] = 0
}

var total_accessories = 22
var total_accessories = 23
global.total_accessories_num = total_accessories
for(var i = 0; i <= total_accessories; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion objects/code/Step_2.gml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ for(var i = 0; i <= 20; i++)
var all_accessory = 0
for(var i = 2; i <= 19; i++)
{
if (global.accessories_owned[i] > 0 && i != 9 && i != 18)
if (global.accessories_owned[i] > 0 && i != 9 && i != 17 && i != 18)
{
all_accessory ++
}
Expand Down
4 changes: 2 additions & 2 deletions objects/obj_messi/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,9 @@ activated = 2

var cal_ = (hp/max_hp)*1.2

if cal_ < 0.5
if cal_ < 0.64
{
cal_ = 0.5
cal_ = 0.64
}

if cal_ > 1
Expand Down
14 changes: 14 additions & 0 deletions objects/obj_namebar/Destroy_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
var first_testers = "StellarSea 서장님 오코츠유타 옥수수칲 탄창 황금뿌리 러머 Ssab 공벌 화염뽱어 젓가락아저씨 진성e 벼슬 페르마벤 댐쿵이 쓰레기맛캔디 1잡탕1 zun 왁만치 alpamin BackSang NANFREE 쥬기 참이프 광부 Contra QuiettBee 사미니 "
var second_testers = "댐쿵이 BackSang 모니타리 스즈메의 문단속 벤찌 별명1577 Kastle 고 라니임니다 재영이요 윤석 러머 최민우 ㅁㅈ 허미온 아리에스 NAㅅ Mang0_k Ladon TJD ajdkg296 쥬기 잠복근무 도트박스 재영 윤석 허미온 cccc 원시인 징버거의 돗대 면주바이 뱌밍 "
var third_testers = "세구세구세구야사랑해 1잡탕1 백상 KIM DDi YOMG TT1 ACHI99 Nikemach damku1214 왁만치 로얄플러쉬 DO_S 이미지박스 킹츄러스 seesaw 소다쿤 플로토돔 펭구 입꼬기 명준 갱후니 조금하는바드 은색의하늘 ajdkg296 ChungYeo sda justahirman 허거덩 Eluhu libertad "
var last_debugers = "뱌밍 우소 libertad 랑 이 갱후니 러머 ajdkg296 Hermione 대충지은닉네임 "

var cre_achievement = 0
if (string_pos(global.nickname,first_testers) != 0)
Expand Down Expand Up @@ -41,3 +42,16 @@ if (string_pos(global.nickname,third_testers) != 0)
give_item(1,22)
cre_achievement = 1
}

if (string_pos(global.nickname,last_debugers) != 0)
{
if cre_achievement = 0
{
var _achievement = instance_create_depth(x,y,depth,bg_achievement)
_achievement.text = "마지막 디버그 테스터 참여 감사합니다!"
_achievement.icon_num = 0
}
give_item(1,23)
cre_achievement = 1
}

6 changes: 3 additions & 3 deletions objects/obj_wakdroid_ending/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ if interecting_now = 1 && (global.real_ending = 0 || (message_phase >= 61 && mes
}
}

if global.show_credits > 11000
if global.show_credits > 12000
{
volume_downer -= 0.001
audio_sound_gain(bgm,0.23*global.master_volume*2*global.bgm_volume*global.certain_music_volume*volume_downer,0)
Expand Down Expand Up @@ -1268,7 +1268,7 @@ global.never_move = 1
}
}

if show_cinematic_sec >= 10000 && show_cinematic_sec < 11000
if show_cinematic_sec >= 10000 && show_cinematic_sec < 12000
{
if show_cinematic_sec <= 10000
{
Expand All @@ -1284,7 +1284,7 @@ global.never_move = 1
}
}

if show_cinematic_sec >= 11000
if show_cinematic_sec >= 12000
{
global.t_b_alpha = 2.1
if global.b_alpha >= 1 && room != room_main
Expand Down
5 changes: 5 additions & 0 deletions scripts/give_item/give_item.gml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ function give_item(argument0,argument1)
{
chat_up("탈리스만 '3차 테스터 기념 동상'을 획득하였다!")
}

if _cal__ = 23
{
chat_up("탈리스만 '버그 사냥꾼'을 획득하였다!")
}
}
else if argument0 = 2
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions sprites/item_accessory/item_accessory.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bd376dc

Please sign in to comment.