2023_04_19

Just-Wak-Beat · Apr 18, 2023 · e1cac58 · e1cac58
1 parent f18e8be
commit e1cac58
Show file tree

Hide file tree

Showing 89 changed files with 1,770 additions and 1,625 deletions.
diff --git a/Just Wak and Beats.resource_order b/Just Wak and Beats.resource_order
@@ -45,6 +45,7 @@
     {"name":"create_circle_misile","order":4,"path":"scripts/create_circle_misile/create_circle_misile.yy",},
     {"name":"hitbox_6","order":6,"path":"objects/hitbox_6/hitbox_6.yy",},
     {"name":"ine_hurt","order":2,"path":"sounds/ine_hurt/ine_hurt.yy",},
+    {"name":"spr_illustrationCG","order":9,"path":"sprites/spr_illustrationCG/spr_illustrationCG.yy",},
     {"name":"bamguy_timeline","order":2,"path":"timelines/bamguy_timeline/bamguy_timeline.yy",},
     {"name":"hitbox_11","order":12,"path":"objects/hitbox_11/hitbox_11.yy",},
     {"name":"tutorial_part4","order":6,"path":"sounds/tutorial_part4/tutorial_part4.yy",},

diff --git a/Just Wak and Beats.yyp b/Just Wak and Beats.yyp
diff --git a/fonts/normal_font/normal_font.old.png b/fonts/normal_font/normal_font.old.png
diff --git a/fonts/normal_font/normal_font.old.yy b/fonts/normal_font/normal_font.old.yy
diff --git a/fonts/normal_font/normal_font.png b/fonts/normal_font/normal_font.png
diff --git a/fonts/normal_font/normal_font.yy b/fonts/normal_font/normal_font.yy
diff --git a/imgs/illustration_CG_ingame/릴파1.png b/imgs/illustration_CG_ingame/릴파1.png
diff --git a/imgs/illustration_CG_ingame/릴파2.png b/imgs/illustration_CG_ingame/릴파2.png
diff --git a/imgs/illustration_CG_ingame/릴파3.png b/imgs/illustration_CG_ingame/릴파3.png
diff --git a/imgs/illustration_CG_ingame/릴파4.png b/imgs/illustration_CG_ingame/릴파4.png
diff --git a/imgs/illustration_CG_ingame/버거1.png b/imgs/illustration_CG_ingame/버거1.png
diff --git a/imgs/illustration_CG_ingame/버거2.png b/imgs/illustration_CG_ingame/버거2.png
diff --git a/imgs/illustration_CG_ingame/버거3.png b/imgs/illustration_CG_ingame/버거3.png
diff --git a/imgs/illustration_CG_ingame/비챤1.png b/imgs/illustration_CG_ingame/비챤1.png
diff --git a/imgs/illustration_CG_ingame/비챤2.png b/imgs/illustration_CG_ingame/비챤2.png
diff --git a/imgs/illustration_CG_ingame/비챤3.png b/imgs/illustration_CG_ingame/비챤3.png
diff --git a/imgs/illustration_CG_ingame/세구1.png b/imgs/illustration_CG_ingame/세구1.png
diff --git a/imgs/illustration_CG_ingame/세구2.png b/imgs/illustration_CG_ingame/세구2.png
diff --git a/imgs/illustration_CG_ingame/세구3.png b/imgs/illustration_CG_ingame/세구3.png
diff --git a/imgs/illustration_CG_ingame/아이네1.png b/imgs/illustration_CG_ingame/아이네1.png
diff --git a/imgs/illustration_CG_ingame/아이네2.png b/imgs/illustration_CG_ingame/아이네2.png
diff --git a/imgs/illustration_CG_ingame/아이네3.png b/imgs/illustration_CG_ingame/아이네3.png
diff --git a/imgs/illustration_CG_ingame/주르르1.png b/imgs/illustration_CG_ingame/주르르1.png
diff --git a/imgs/illustration_CG_ingame/주르르2.png b/imgs/illustration_CG_ingame/주르르2.png
diff --git a/imgs/illustration_CG_ingame/주르르3.png b/imgs/illustration_CG_ingame/주르르3.png
diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml
@@ -33,6 +33,7 @@ global.player_skin = 0
 global.b_player_skin = 0
 global.master_volume = 1
 global.bgm_volume = 0.5
+global.custom_map_volume_control = 1
 global.sfx_volume = 1
 global.window_width = 1920
 global.window_height = 1080
@@ -46,6 +47,7 @@ global.n_rank_display = "--"
 
 global.automatic_sycn_fixing = 0
 global.n_sync = 0
+global.random_illustration = 0
 
 
 global.select_map = 2 //global.show_music_title = 0로 게임 시작

diff --git a/objects/code/Draw_73.gml b/objects/code/Draw_73.gml
@@ -70,6 +70,8 @@ col = c_white
 draw_text_k_scale(xx+xx_w-music_title_alpha*128*font_size,yy+yy_h-350*font_size,"by",64*font_size,-1,music_title_alpha,col,0,1,light_font,font_size*0.7*global.font_ratio_resolution_xx,font_size*0.7,0)
 draw_text_k_scale(xx+xx_w-music_title_alpha*128*font_size,yy+yy_h-256*font_size,string(global.n_music_artist),64*font_size,-1,music_title_alpha,col,0,1,light_font,font_size*0.85*global.font_ratio_resolution_xx,font_size*0.85,0)
 
+draw_sprite_ext(spr_illustrationCG,global.player_skin*3+global.random_illustration,xx+music_title_alpha*430*font_size,yy+yy_h,font_size*2,font_size*2,0,c_white,music_title_alpha)
+
 
 
 for(var i = 0; i <= 5; i++)

diff --git a/objects/code/Other_11.gml b/objects/code/Other_11.gml
@@ -5,28 +5,30 @@
 global.reload_n_map_list_value = 0
 	if keyboard_check_pressed(vk_left)
 	{
-	global.n_map_list--
+		global.n_map_list--
 	}
 
 	if keyboard_check_pressed(vk_right)
 	{
-	global.n_map_list++
+		global.n_map_list++
 	}
 
 	if global.n_map_list = 2 && global.mobile_mode == 1
 	{
-	global.n_map_list += sign(global.n_map_list - global.b_map_list)
+		global.n_map_list += sign(global.n_map_list - global.b_map_list)
 	}
 
 	if global.n_map_list < 0
 	{
-	global.n_map_list = 3
+		global.n_map_list = 3
 	}
 
 	if global.n_map_list > 3
 	{
-	global.n_map_list = 0
+		global.n_map_list = 0
 	}
 
+
+
 load_musicList(global.n_map_list)
 load_custom_map_files()
diff --git a/objects/code/Step_0.gml b/objects/code/Step_0.gml
@@ -193,7 +193,7 @@ global.joystick_alpha += (sign(global.joystick_activated+1) - global.joystick_al
 				global.hp = 5
 				var _audio_asset = (global.n_map_list != 2) ? asset_get_index(global.n_music_name) : global.custom_audio_asset[n_stage];
 				global.n_music_id = _audio_asset
-				global.n_music_instance = audio_play_sound(global.n_music_id,0,false,0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1))
+				global.n_music_instance = audio_play_sound(global.n_music_id,0,false,global.custom_map_volume_control*0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1))
 
 				var _timeline_index_ = asset_get_index(string(global.n_music_name)+"_timeline")
 				if timeline_exists(_timeline_index_)
@@ -480,7 +480,7 @@ audio_sound_pitch(global.n_music_instance,global.rewind/90-1)
 			player.x = room_width*0.5
 			player.y = room_height*0.5
 		}
-		global.n_music_instance = audio_play_sound(global.n_music_id,0,false,0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1),global.start_point/60)
+		global.n_music_instance = audio_play_sound(global.n_music_id,0,false,global.custom_map_volume_control*0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1),global.start_point/60)
 		global.rewind_effect_line_angle = 0
 		audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4)
 	}

diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml
@@ -197,10 +197,10 @@ if gamestart = 0
 		global.highlight_time ++
 	}
 
-	if global.highlight_time > 360 || (gamestart != 0 && gamestart != 1.1)
+	if global.highlight_time > 420 || (gamestart != 0 && gamestart != 1.1)
 	{
 		global.highlight_music_volume += (-0.01 - global.highlight_music_volume)*0.05
-		if global.highlight_time > 440 && (gamestart = 0 || gamestart = 1.1) && global.sync_setting_alpha < 0.1
+		if global.highlight_time > 500 && (gamestart = 0 || gamestart = 1.1) && global.sync_setting_alpha < 0.1
 		{
 			play_highlight = 1
 		}
@@ -223,7 +223,7 @@ if gamestart = 0
 	//자동 볼륨 조절
 	if audio_is_playing(global.highlight_music)
 	{
-		audio_sound_gain(global.highlight_music,(1-gamestart_anime)*0.8*global.highlight_music_volume*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1),0)
+		audio_sound_gain(global.highlight_music,global.custom_map_volume_control*(1-gamestart_anime)*0.8*global.highlight_music_volume*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1),0)
 	}
 
 
@@ -250,6 +250,7 @@ if gamestart = 0
 				global.select_map = 0
 				global.t_select_map = 0
 				global.show_music_title = 1
+				global.random_illustration = (global.n_music_title == "겨울봄 (Winter Spring)") ? 2 : irandom_range(0,1);
 				gamestart = 2
 				global.background_color = c_black
 				global.t_bg_color = 1

diff --git a/objects/code/Step_2.gml b/objects/code/Step_2.gml
@@ -112,21 +112,16 @@ if global.phony_effect != 0 && instance_exists(hitbox_11)
 
 	if phony_y_timer%5 = 0
 	{
+		for(var i = 0; i < 4; i++)
+		{
 		var attack_ef = instance_create_depth(_xx_,_yy_,depth+1,hitbox_2)
-		attack_ef.direction = hitbox_11.image_angle
+		attack_ef.direction = hitbox_11.image_angle+i*90
 		attack_ef.speed = 24
 		attack_ef.keep_spin_angle = 2
 		attack_ef.image_xscale = 0.4
 		attack_ef.image_yscale = 0.4
 		attack_ef.w_alpha = 10
-
-		var attack_ef = instance_create_depth(_xx_,_yy_,depth+1,hitbox_2)
-		attack_ef.direction = hitbox_11.image_angle+180
-		attack_ef.speed = 24
-		attack_ef.keep_spin_angle = -2
-		attack_ef.image_xscale = 0.4
-		attack_ef.image_yscale = 0.4
-		attack_ef.w_alpha = 10
+		}
 	}
 
 

diff --git a/objects/hitbox_11/Step_0.gml b/objects/hitbox_11/Step_0.gml
@@ -34,6 +34,13 @@ if image_yscale < 0
 image_yscale = 0
 }
 
+if abs(t_scale-image_xscale) >= 
+
+10
+{
+image_alpha += (0 - image_alpha)*0.1
+}
+
 image_xscale += (t_scale - image_xscale)*0.1
 image_yscale += (t_scale - image_yscale)*0.1
 

diff --git a/objects/hitbox_4/Step_0.gml b/objects/hitbox_4/Step_0.gml
@@ -1,6 +1,6 @@
 /// @description Insert description here
 // You can write your code in this editor
-if audio_is_playing(phony)
+if audio_is_playing(Yoong)
 {
 x -= global.map_speed
 }

diff --git a/objects/movement_effect/Create_0.gml b/objects/movement_effect/Create_0.gml
@@ -3,6 +3,6 @@
 
 
 image_alpha = 0.8
-w_alpha = 1
+w_alpha = 1.1
 
 
diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml
@@ -138,13 +138,24 @@ var fontsize3 = 0.52*(1+global.mobile_mode*0.3)
 
 if instance_exists(code) && code.gamestart != 1 && code.gamestart != 2 && code.gamestart != 3
 {
-draw_text_k_scale(x-260-global.mobile_mode*64,middle_yy+590+global.mobile_mode*96,"Normal\nRank",64,-1,dis__,c_white,0,0,light_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
+draw_text_k_scale(x-260-global.mobile_mode*64,middle_yy+590+global.mobile_mode*104+8,"Normal\nRank",64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
+draw_text_k_scale(x-260-global.mobile_mode*64,middle_yy+680+global.mobile_mode*96+8,string(global.n_rank[code.n_stage]),64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
+
+draw_text_k_scale(x-global.mobile_mode*64,middle_yy+590+global.mobile_mode*96+8,"Hardcore\nRank",64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
+draw_text_k_scale(x-global.mobile_mode*64,middle_yy+680+global.mobile_mode*96+8,string(global.n_rank_hardcore[code.n_stage]),64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
+
+draw_text_k_scale(x+260+global.mobile_mode*64,middle_yy+620+global.mobile_mode*96+8,"아티팩트 수집",64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize3*global.font_ratio_resolution_xx,fontsize3,0)
+draw_text_k_scale(x+260+global.mobile_mode*64,middle_yy+680+global.mobile_mode*96+8,string(global.n_artifact[code.n_stage]),64,-1,0.3*dis__,c_black,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
+
+
+
+draw_text_k_scale(x-260-global.mobile_mode*64,middle_yy+590+global.mobile_mode*96,"Normal\nRank",64,-1,dis__,c_white,0,0,normal_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
 draw_text_k_scale(x-260-global.mobile_mode*64,middle_yy+680+global.mobile_mode*96,string(global.n_rank[code.n_stage]),64,-1,dis__,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
 
-draw_text_k_scale(x-global.mobile_mode*64,middle_yy+590+global.mobile_mode*96,"Hardcore\nRank",64,-1,dis__,c_white,0,0,light_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
+draw_text_k_scale(x-global.mobile_mode*64,middle_yy+590+global.mobile_mode*96,"Hardcore\nRank",64,-1,dis__,c_white,0,0,normal_font,fontsize1*global.font_ratio_resolution_xx,fontsize1,0)
 draw_text_k_scale(x-global.mobile_mode*64,middle_yy+680+global.mobile_mode*96,string(global.n_rank_hardcore[code.n_stage]),64,-1,dis__,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
 
-draw_text_k_scale(x+260+global.mobile_mode*64,middle_yy+620+global.mobile_mode*96,"아티팩트 수집",64,-1,dis__,c_white,0,0,light_font,fontsize3*global.font_ratio_resolution_xx,fontsize3,0)
+draw_text_k_scale(x+260+global.mobile_mode*64,middle_yy+620+global.mobile_mode*96,"아티팩트 수집",64,-1,dis__,c_white,0,0,normal_font,fontsize3*global.font_ratio_resolution_xx,fontsize3,0)
 draw_text_k_scale(x+260+global.mobile_mode*64,middle_yy+680+global.mobile_mode*96,string(global.n_artifact[code.n_stage]),64,-1,dis__,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
 }
 

diff --git a/objects/obj_album_ui/Step_0.gml b/objects/obj_album_ui/Step_0.gml
@@ -52,7 +52,7 @@ image_yscale = 0
 image_angle = 0
 }
 
-if global.highlight_time <= 360 && global.highlight_time > 30 && code.gamestart != 1 && code.gamestart != 2 && code.gamestart != 3
+if global.highlight_time <= 440 && global.highlight_time > 30 && code.gamestart != 1 && code.gamestart != 2 && code.gamestart != 3
 {
 bpm_timer ++
 	if bpm_timer >= (3600/global.bpm)+global.music_sync_offset*3*60
@@ -63,7 +63,7 @@ bpm_timer ++
 		repeat(irandom_range(8,10)*5)
 		{
 		var random_dir = irandom_range(0,359)
-		var effect_ = instance_create_depth(x+lengthdir_x(image_xscale*240,random_dir),y+lengthdir_y(image_xscale*240,random_dir),depth+1,movement_effect)
+		var effect_ = instance_create_depth(x+lengthdir_x(image_xscale*250,random_dir),y+lengthdir_y(image_xscale*250,random_dir),depth+1,movement_effect)
 		effect_.image_xscale = 0.3
 		effect_.image_yscale = 0.3
 		effect_.direction = random_dir