diff --git a/objects/bg_status_accessory/Draw_0.gml b/objects/bg_status_accessory/Draw_0.gml index c784a5b0..e1dd42af 100644 --- a/objects/bg_status_accessory/Draw_0.gml +++ b/objects/bg_status_accessory/Draw_0.gml @@ -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) diff --git a/objects/bg_upgrage/Step_1.gml b/objects/bg_upgrage/Step_1.gml index 504696f2..e70a573c 100644 --- a/objects/bg_upgrage/Step_1.gml +++ b/objects/bg_upgrage/Step_1.gml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml index 29bf57fd..4d039b4f 100644 --- a/objects/code/Create_0.gml +++ b/objects/code/Create_0.gml @@ -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); @@ -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 @@ -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++) { diff --git a/objects/code/Step_2.gml b/objects/code/Step_2.gml index dab5bb48..98c072f0 100644 --- a/objects/code/Step_2.gml +++ b/objects/code/Step_2.gml @@ -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 ++ } diff --git a/objects/obj_messi/Step_0.gml b/objects/obj_messi/Step_0.gml index 1373fc46..db8a74b0 100644 --- a/objects/obj_messi/Step_0.gml +++ b/objects/obj_messi/Step_0.gml @@ -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 diff --git a/objects/obj_namebar/Destroy_0.gml b/objects/obj_namebar/Destroy_0.gml index 9bb87856..5d00d7cb 100644 --- a/objects/obj_namebar/Destroy_0.gml +++ b/objects/obj_namebar/Destroy_0.gml @@ -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) @@ -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 +} + diff --git a/objects/obj_wakdroid_ending/Step_0.gml b/objects/obj_wakdroid_ending/Step_0.gml index 72d2ac16..6466c982 100644 --- a/objects/obj_wakdroid_ending/Step_0.gml +++ b/objects/obj_wakdroid_ending/Step_0.gml @@ -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) @@ -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 { @@ -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 diff --git a/scripts/give_item/give_item.gml b/scripts/give_item/give_item.gml index 252d7cc9..b03621a7 100644 --- a/scripts/give_item/give_item.gml +++ b/scripts/give_item/give_item.gml @@ -114,6 +114,11 @@ function give_item(argument0,argument1) { chat_up("탈리스만 '3차 테스터 기념 동상'을 획득하였다!") } + + if _cal__ = 23 + { + chat_up("탈리스만 '버그 사냥꾼'을 획득하였다!") + } } else if argument0 = 2 { diff --git a/sprites/item_accessory/3b596825-4daa-4098-929a-a4748d215d1e.png b/sprites/item_accessory/3b596825-4daa-4098-929a-a4748d215d1e.png new file mode 100644 index 00000000..171d848d Binary files /dev/null and b/sprites/item_accessory/3b596825-4daa-4098-929a-a4748d215d1e.png differ diff --git a/sprites/item_accessory/item_accessory.yy b/sprites/item_accessory/item_accessory.yy index 754e9ccd..caa05be3 100644 --- a/sprites/item_accessory/item_accessory.yy +++ b/sprites/item_accessory/item_accessory.yy @@ -51,6 +51,7 @@ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"21788fb4-7197-46f6-b228-7dc9aba90d07",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c77e5213-7980-40c7-b915-147b6f699f62",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9eef1fa8-246d-4e6b-b48c-7391d22ac2f2",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3b596825-4daa-4098-929a-a4748d215d1e",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c0a167b3-e5b7-4fd8-879e-cde29a54ea87",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f211f998-5acd-44fe-bd3c-0335570e9be9",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5c803754-a043-4103-8aa2-62bf01987d61",}, @@ -65,7 +66,7 @@ "playbackSpeedType": 0, "autoRecord": true, "volume": 1.0, - "length": 26.0, + "length": 27.0, "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ @@ -93,9 +94,10 @@ {"id":"29a8da0d-154d-4793-86b7-ff654e836638","Key":20.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"21788fb4-7197-46f6-b228-7dc9aba90d07","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"ed96694a-9be8-43b1-aed5-667bef926246","Key":21.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c77e5213-7980-40c7-b915-147b6f699f62","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"4e5de19f-b227-4ad7-b2d9-3b286590fff9","Key":22.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9eef1fa8-246d-4e6b-b48c-7391d22ac2f2","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"9ce3a2fb-393f-4967-8616-0d79ab1eaf23","Key":23.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c0a167b3-e5b7-4fd8-879e-cde29a54ea87","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"3e4cace5-e532-4e09-a0ce-d081013b75d3","Key":24.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f211f998-5acd-44fe-bd3c-0335570e9be9","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"f1039232-b1a8-4c20-9525-d7b5995d72fa","Key":25.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c803754-a043-4103-8aa2-62bf01987d61","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"eb1aeb91-949e-4b17-8f47-0912095fcaf4","Key":23.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3b596825-4daa-4098-929a-a4748d215d1e","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"9ce3a2fb-393f-4967-8616-0d79ab1eaf23","Key":24.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c0a167b3-e5b7-4fd8-879e-cde29a54ea87","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"3e4cace5-e532-4e09-a0ce-d081013b75d3","Key":25.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f211f998-5acd-44fe-bd3c-0335570e9be9","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f1039232-b1a8-4c20-9525-d7b5995d72fa","Key":26.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5c803754-a043-4103-8aa2-62bf01987d61","path":"sprites/item_accessory/item_accessory.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, diff --git a/sprites/item_accessory/layers/3b596825-4daa-4098-929a-a4748d215d1e/3f952d5d-54d0-4364-9bcc-f1f5d26545c0.png b/sprites/item_accessory/layers/3b596825-4daa-4098-929a-a4748d215d1e/3f952d5d-54d0-4364-9bcc-f1f5d26545c0.png new file mode 100644 index 00000000..171d848d Binary files /dev/null and b/sprites/item_accessory/layers/3b596825-4daa-4098-929a-a4748d215d1e/3f952d5d-54d0-4364-9bcc-f1f5d26545c0.png differ