Skip to content

Commit 4790f56

Browse files
TML233TML233
authored
Merge pull request #50 from TML233/develop
v0.4.0
2 parents 11d8e0b + 2d6e816 commit 4790f56

52 files changed

Lines changed: 743 additions & 48 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎datafiles/locale/english/string/menu.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
"menu.begin" "Begin Game"
22
"menu.settings" "Settings"
3-
"menu.save.continue" "Continue"
4-
"menu.save.reset" "Reset"
5-
"menu.save.reset.true" "True Reset"
3+
"menu.continue" "Continue"
4+
"menu.reset" "Reset"
5+
"menu.reset.true" "True Reset"
66
"menu.naming.title" "Name the fallen human."
77
"menu.naming.quit" "Quit"
88
"menu.naming.backspace" "Backspace"
99
"menu.naming.done" "Done"
1010
"menu.confirm.title" "Is this name correct?"
11+
"menu.confirm.title.reset" "A name has already&been chosen."
1112
"menu.confirm.title.aaaaaa" "Not very creative...?"
1213
"menu.confirm.title.alphys" "D-don't do that."
1314
"menu.confirm.title.alphy" "Uh.... OK?"

‎datafiles/locale/english/string/ui.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@
1111
"ui.save.name.empty" "EMPTY"
1212
"ui.save.save" "Save"
1313
"ui.save.return" "Return"
14-
"ui.save.saved" "File Saved."
14+
"ui.save.saved" "File Saved."
15+
16+
"ui.box.inventory" "INVENTORY"
17+
"ui.box.box" "BOX"
18+
"ui.box.finish" "Press [X] to finish"

‎objects/char_player/Create_0.gml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ _moveable_dialog=true;
1616
_moveable_menu=true;
1717
_moveable_save=true;
1818
_moveable_warp=true;
19-
_moveable_encounter=true;
19+
_moveable_encounter=true;
20+
_moveable_box=true;

‎objects/menu/Create_0.gml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
_menu=0;
2-
_mode=file_exists(Flag_GetSavePath(FLAG_TYPE.INFO));
32
_mode=0;
43

54
_prefix="{gui true}{instant true}{shadow false}{font 1}{scale 2}";
65
_inst_instruction=noone;
76
_inst_begin=noone;
87
_inst_settings=noone;
9-
_inst_save_name=noone;
10-
_inst_save_lv=noone;
11-
_inst_save_time=noone;
12-
_inst_save_room=noone;
13-
_inst_save_continue=noone;
14-
_inst_save_reset=noone;
15-
_inst_save_settings=noone;
8+
_inst_name=noone;
9+
_inst_lv=noone;
10+
_inst_time=noone;
11+
_inst_room=noone;
12+
_inst_continue=noone;
13+
_inst_reset=noone;
14+
_inst_settings=noone;
1615
_inst_naming_title=noone;
1716
_inst_naming_letters=noone;
1817
_inst_naming_quit=noone;

‎objects/menu/Draw_0.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(_menu==0){
22
if(_mode==1){
3-
//draw_sprite(spr_bg_area_1,0,0,-120);
3+
draw_sprite(spr_bg_area_1,0,0,-120);
44
}
55
}

‎objects/menu/Other_10.gml‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
///@desc Menu Switch
22
if(_menu==0){
3+
_mode=file_exists(Flag_GetSavePath(FLAG_TYPE.INFO));
34
if(_mode==0){
45
_inst_instruction=instance_create_depth(170,40,0,text_typer);
56
_inst_instruction.text=_prefix+"{color_text `gray_light`} --- Instruction ---{space_y -1}&&{space_y 2}[Z or ENTER] - Confirm&[X or SHIFT] - Cancel&[C or CTRL] - Menu (In-game)&[F4] - Fullscreen&[Hold ESC] - Quit&When HP is 0, you lose.";
@@ -11,6 +12,30 @@ if(_menu==0){
1112
event_user(15);
1213
}
1314
event_user(2);
15+
}else{
16+
Flag_Load(FLAG_TYPE.INFO);
17+
_inst_name=instance_create_depth(140,124,0,text_typer);
18+
_inst_name.text=_prefix+Flag_Get(FLAG_TYPE.INFO,FLAG_INFO.NAME,Lang_GetString("ui.save.name.empty"));
19+
_inst_lv=instance_create_depth(308,124,0,text_typer);
20+
_inst_lv.text=_prefix+"LV "+string(Flag_Get(FLAG_TYPE.INFO,FLAG_INFO.LV));
21+
_inst_time=instance_create_depth(452,124,0,text_typer);
22+
var time=Flag_Get(FLAG_TYPE.INFO,FLAG_INFO.TIME);
23+
var minute=time div 60;
24+
var second=time mod 60;
25+
_inst_time.text=_prefix+string(minute)+":"+(second<10 ? "0" : "")+string(second);
26+
_inst_room=instance_create_depth(140,160,0,text_typer);
27+
_inst_room.text=_prefix+Player_GetRoomName(Flag_Get(FLAG_TYPE.INFO,FLAG_INFO.ROOM));
28+
_inst_continue=instance_create_depth(170,210,0,text_typer);
29+
_inst_continue.text=_prefix+Lang_GetString("menu.continue");
30+
_inst_continue.override_color_text_enabled=true;
31+
_inst_reset=instance_create_depth(390,210,0,text_typer);
32+
_inst_reset.text=_prefix+Lang_GetString("menu.reset");
33+
_inst_reset.override_color_text_enabled=true;
34+
_inst_settings=instance_create_depth(264,250,0,text_typer);
35+
_inst_settings.text=_prefix+Lang_GetString("menu.settings");
36+
_inst_settings.override_color_text_enabled=true;
37+
event_user(2);
38+
1439
}
1540
}else{
1641
if(instance_exists(_inst_instruction)){
@@ -22,26 +47,23 @@ if(_menu==0){
2247
if(instance_exists(_inst_settings)){
2348
instance_destroy(_inst_settings);
2449
}
25-
if(instance_exists(_inst_save_name)){
26-
instance_destroy(_inst_save_name);
27-
}
28-
if(instance_exists(_inst_save_lv)){
29-
instance_destroy(_inst_save_lv);
50+
if(instance_exists(_inst_name)){
51+
instance_destroy(_inst_name);
3052
}
31-
if(instance_exists(_inst_save_time)){
32-
instance_destroy(_inst_save_time);
53+
if(instance_exists(_inst_lv)){
54+
instance_destroy(_inst_lv);
3355
}
34-
if(instance_exists(_inst_save_room)){
35-
instance_destroy(_inst_save_room);
56+
if(instance_exists(_inst_time)){
57+
instance_destroy(_inst_time);
3658
}
37-
if(instance_exists(_inst_save_continue)){
38-
instance_destroy(_inst_save_continue);
59+
if(instance_exists(_inst_room)){
60+
instance_destroy(_inst_room);
3961
}
40-
if(instance_exists(_inst_save_reset)){
41-
instance_destroy(_inst_save_reset);
62+
if(instance_exists(_inst_continue)){
63+
instance_destroy(_inst_continue);
4264
}
43-
if(instance_exists(_inst_save_settings)){
44-
instance_destroy(_inst_save_settings);
65+
if(instance_exists(_inst_reset)){
66+
instance_destroy(_inst_reset);
4567
}
4668
}
4769

‎objects/menu/Other_12.gml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ if(_mode==0){
66
_change_inst=_inst_settings;
77
_change_color=(_choice==1 ? c_yellow : c_white);
88
event_user(1);
9+
}else{
10+
_inst_continue.override_color_text=(_choice==0 ? c_yellow : c_white);
11+
_inst_reset.override_color_text=(_choice==1 ? c_yellow : c_white);
12+
_inst_settings.override_color_text=(_choice==2 ? c_yellow : c_white);
913
}

‎objects/menu/Step_0.gml‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,46 @@ if(_menu==0){
1818
room_goto(room_settings);
1919
}
2020
}
21+
}else{
22+
if(Input_CheckPressed(INPUT.LEFT)){
23+
if(_choice==1){
24+
_choice=0;
25+
event_user(2);
26+
}
27+
}else if(Input_CheckPressed(INPUT.RIGHT)){
28+
if(_choice==0){
29+
_choice=1;
30+
event_user(2);
31+
}
32+
}else if(Input_CheckPressed(INPUT.DOWN)){
33+
if(_choice!=2){
34+
_choice=2;
35+
event_user(2);
36+
}
37+
}else if(Input_CheckPressed(INPUT.UP)){
38+
if(_choice==2){
39+
_choice=0;
40+
event_user(2);
41+
}
42+
}else if(Input_CheckPressed(INPUT.CONFIRM)){
43+
if(_choice==0){
44+
Flag_Load(FLAG_TYPE.STATIC);
45+
Flag_Load(FLAG_TYPE.DYNAMIC);
46+
var target=Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.ROOM,-1);
47+
if(room_exists(target)){
48+
room_goto(target);
49+
}else{
50+
show_message("ERROR:\nAttempt to goto an unexisting room "+string(target));
51+
}
52+
}else if(_choice==1){
53+
_menu=2;
54+
_naming_name=Flag_Get(FLAG_TYPE.INFO,FLAG_INFO.NAME,Lang_GetString("ui.save.name.empty"));
55+
_confirm_title=Lang_GetString("menu.confirm.title.reset");
56+
event_user(0);
57+
}else if(_choice==2){
58+
room_goto(room_settings);
59+
}
60+
}
2161
}
2262
}else if(_menu==1){
2363
if(_choice_naming==0){
@@ -148,7 +188,7 @@ if(_menu==0){
148188
}
149189
}else if(Input_CheckPressed(INPUT.CONFIRM)){
150190
if(_choice_confirm==0){
151-
_menu=1;
191+
_menu=(_mode==0 ? 1 : 0);
152192
event_user(0);
153193
}else{
154194
_menu=3;

‎objects/text_typer/Other_10.gml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ if(_char!=" "&&_char!="　"){
5151
ds_list_add(_list_inst,INST);
5252

5353
if(!_voice_played&&!_skipping&&!_instant&&_voice>=0){
54-
var sound=_group_voice[_voice,irandom(array_length_2d(_group_voice,_voice)-1)];
54+
var sound=-1;
55+
if(_voice_single>=0&&_voice_single<array_length_2d(_group_voice,_voice)){
56+
sound=_group_voice[_voice,_voice_single];
57+
}else{
58+
sound=_group_voice[_voice,irandom(array_length_2d(_group_voice,_voice)-1)];
59+
}
5560
if(audio_exists(sound)){
5661
audio_stop_sound(sound);
5762
audio_play_sound(sound,0,false);

‎objects/text_typer/Other_12.gml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,14 @@ switch(cmd[|0]){
212212
}
213213
break;
214214

215+
case "voice_single":
216+
if(is_real(cmd[|1])){
217+
if(cmd[|1]==-1 || cmd[|1]>=0 && cmd[|1]<array_length_2d(_group_voice,_voice)){
218+
_voice_single=cmd[|1];
219+
}
220+
}
221+
break;
222+
215223
case "font":
216224
if(is_real(cmd[|1])){
217225
if(cmd[|1]>=0&&cmd[|1]<array_height_2d(_group_font)){

0 commit comments

Comments
 (0)