Skip to content

Commit

Permalink
2022_12_12
Browse files Browse the repository at this point in the history
transplanted "Project wak" skills, weapons, images, etc.
fixed some bugs
changed old songs
changed/added some effects
etc.
  • Loading branch information
ABER1047 committed Dec 11, 2022
1 parent 1f6438d commit 7fcbbfe
Show file tree
Hide file tree
Showing 3,445 changed files with 7,083 additions and 12,745 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
420 changes: 207 additions & 213 deletions Arena_of_Woowakgood.yyp

Large diffs are not rendered by default.

Binary file modified fonts/font0/font0.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,546 changes: 774 additions & 772 deletions fonts/font0/font0.old.yy

Large diffs are not rendered by default.

Binary file modified fonts/font0/font0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions fonts/font0/font0.yy

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

6 changes: 3 additions & 3 deletions fonts/font01/font01.old.yy

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

Binary file modified fonts/font01/font01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,519 changes: 1,266 additions & 1,253 deletions fonts/font01/font01.yy

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions notes/Note1/Note1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ if dash_attack >= 4.6
if place_meeting(x,y+2,obj_floor) && hurt = 0 && hurt_little = 0
{
dash_attack = 0
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
cannot_move = 0
sprite_index = move_sprite
image_index = 0
Expand Down Expand Up @@ -555,8 +555,8 @@ if dash_attack >= 4.6
}

dash_attack = 0
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
cannot_move = 0
sprite_index = move_sprite
image_index = 0
Expand Down Expand Up @@ -650,8 +650,8 @@ if guarding > 0
{
global.stemina_cooltime = 0
movement_speed += (0 - movement_speed)*0.1
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
cannot_move = 1
sprite_index = guard_sprite
image_index = guarding
Expand Down Expand Up @@ -769,8 +769,8 @@ if global.grabed > 0 || hurt > 0 || skill_combo >= 1
if dash_attack > 0
{
dash_attack = 0
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
cannot_move = 0
sprite_index = move_sprite
image_index = 0
Expand Down Expand Up @@ -875,8 +875,8 @@ pressing = 1

if global.never_move = 0 && global.run_key != "Non" && pressing = 1
{
double_pressed_right = 2
double_pressed_left = 2
double_pressed_run_key = 2
double_pressed_run_key = 2
}


Expand Down Expand Up @@ -1226,7 +1226,7 @@ if !place_meeting(x,y+2,obj_floor)
}
else
{
if (double_pressed_left >= 2 || double_pressed_right >= 2) && global.rage_gauge >= 27
if (double_pressed_run_key >= 2 || double_pressed_run_key >= 2) && global.rage_gauge >= 27
{
if gravity = 0 && dash_attack = 0 && cannot_move = 0 && cooltime = 0 && spin = 0 && down_attack_plusing = 0 && hurt = 0 && hurt_little = 0
{
Expand Down Expand Up @@ -1363,8 +1363,8 @@ if !place_meeting(x,y+10,obj_floor)

if global.stemina <= 1 || global.nickname = "씹찐따"
{
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
}


Expand Down Expand Up @@ -2779,8 +2779,8 @@ image_index = dash_attack

if dash_attack > 10
{
double_pressed_left = 0
double_pressed_right = 0
double_pressed_run_key = 0
double_pressed_run_key = 0
dash_attack = 0
cannot_move = 0
sprite_index = move_sprite
Expand Down
3 changes: 0 additions & 3 deletions objects/blood_on_floor/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@ else
alarm[1] = 30
}


var sfx = audio_play_sound(footstep_sfx,0,0)
audio_sound_gain(sfx,0.03*global.master_volume*2*global.sfx_volume,0)
6 changes: 3 additions & 3 deletions objects/blood_on_floor/Step_1.gml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ if a = 0

if sign(scale_dir) > 0
{
if image_xscale < 1*random_scale
if image_xscale < 0.7*random_scale
{
image_xscale += 0.1
}
}
else
{
if image_xscale > -1*random_scale
if image_xscale > -0.7*random_scale
{
image_xscale -= 0.1
}
}

if image_yscale < 1*random_scale
if image_yscale < 0.7*random_scale
{
image_yscale += 0.05
}
Expand Down
14 changes: 7 additions & 7 deletions objects/blood_on_floor/blood_on_floor.yy

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

23 changes: 10 additions & 13 deletions objects/charging_attack/charging_attack.yy

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

17 changes: 7 additions & 10 deletions objects/charging_attack_attacked/charging_attack_attacked.yy

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

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

10 changes: 5 additions & 5 deletions objects/code/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ created_platfrom = 0

th_afas = 0
room_speed = 60
server_ip = "211.192.230.184";//"175.196.5.129";
server_port = 12524;
server_ip = "192.168.0.5"//"211.192.230.184";//"208.67.222.222";
server_port = 42524;
is_server = false;
sepa_power = 0

Expand Down Expand Up @@ -271,18 +271,18 @@ global.max_stemina_plus = 0 //최대 스테미나 증가 +10%
global.movementspeed_plus = 0 //이동 속도 증가 +5%
global.jump_plus = 0 //점프력 증가 +15%
global.low_gravity_plus = 1 //중력 감소 -10%
global.mental_plus = 0 //멘탈 게이지 충전량 +5%
global.mental_plus = 0 //레이지 게이지 충전량 +5%
global.max_armor_plus = 0 //방어력 증가 +15%
global.damage_plus = 0 //데미지 증가 +10%
global.damage_plus_multi = 0
global.full_mental_plus = 0 //다음 라운드 시작시 멘탈게이지 100% (1회용)
global.full_mental_plus = 0 //다음 라운드 시작시 레이지게이지 100% (1회용)
global.taking_hp_plus = 0 //상대 공격시 체력 흡혈 +5%
global.laser_num_plus = 0 //레이저 스킬의 레이저 갯수 증가
global.critical_plus = 0 //크리티컬 데미지 확률 증가 +10%
global.critical_plus_multi = 0
global.ignore_falling_plus = 0 //낙사 무시 1회
global.ignore_falling_check = 0
global.mental_attack_sp_plus = 0 //멘탈 게이지 스킬 시전 속도 +50%
global.mental_attack_sp_plus = 0 //레이지 게이지 스킬 시전 속도 +50%
global.automatic_guard_plus = 0 //공격 자동 방어 확률 +10%
global.waiting_choosing = 0
global.choice = 0
Expand Down
8 changes: 4 additions & 4 deletions objects/code/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gamemode_val_ = "1 vs 1"
if gamemode_val_ = 2
{
gamemode_val_ = "외나무 다리 (1 vs 1)"
setting_buff = "차지 밀치기 거리 400% 및 멘탈 게이지 충전 속도 200%"
setting_buff = "차지 밀치기 거리 400% 및 레이지 게이지 충전 속도 200%"
}

if gamemode_val_ = 3
Expand All @@ -58,7 +58,7 @@ setting_buff = "매 라운드 마다 진 팀은 특수한 능력 하나를 획
if gamemode_val_ = 6
{
gamemode_val_ = "분조장 (1 vs 1)"
setting_buff = "멘탈 게이지 지속적으로 참 (레이지 모드 상태 제외)"
setting_buff = "레이지 게이지 지속적으로 참 (레이지 모드 상태 제외)"
}

if gamemode_val_ = 7
Expand Down Expand Up @@ -216,12 +216,12 @@ _playing_music_name = "Wakgood Records - Wak'rio"

if audio_get_name(global.now_music) = audio_get_name(shake_it_bgm)
{
_playing_music_name = "Wakgood Records - Escape"
_playing_music_name = "제이타지 - 왁굳향100% 첨가"
}

if audio_get_name(global.now_music) = audio_get_name(tong_tiring)
{
_playing_music_name = "Uoohbues - 붕붕붕 vs 빨리 접속하세요"
_playing_music_name = "이세계아이돌(ISEGYE IDOL) - 리와인드 (RE:WIND)"
}

if audio_get_name(global.now_music) = audio_get_name(wak_surada)
Expand Down
Loading

0 comments on commit 7fcbbfe

Please sign in to comment.