Skip to content

Commit

Permalink
Merge pull request #87 from TML233/develop
Browse files Browse the repository at this point in the history 
v0.6.0
  • Loading branch information
@TML233
TML233 committed Sep 21, 2019
2 parents 26ea86c + 78de175 commit ad47e13
Show file tree
Hide file tree
Showing 26 changed files with 138 additions and 74 deletions.
2 changes: 1 addition & 1 deletion objects/battle_result_flee/Other_0.gml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if(!_ended){
alarm[0]=20;
Fader_Fade(-1,1,18);
BGM_Fade(5,0,18);
BGM_SetVolume(5,0,18);
_ended=true;
}
4 changes: 3 additions & 1 deletion objects/char_save/Other_10.gml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
event_inherited();
if(text!=""){
event_inherited();
}

Player_Heal(999);
audio_play_sound(snd_item_heal,0,false);
Expand Down
4 changes: 2 additions & 2 deletions objects/encounter_anim/Alarm_0.gml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
if(Encounter_IsExists(_encounter)&&instance_exists(char_player)){
if(_exclam){
var inst=instance_create_depth(0,0,0,exclamation);
inst.x=char_player.x+sprite_get_xoffset(spr_exclamation);
inst.y=char_player.y-char_player.sprite_height-11+sprite_get_yoffset(spr_exclamation);
inst.x=char_player.x;
inst.y=char_player.y-char_player.sprite_height;
var time=30+irandom(10);
inst.time=time;
audio_play_sound(snd_exclamation,0,false);
Expand Down
4 changes: 2 additions & 2 deletions objects/encounter_anim/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_draw_black=true;
_draw_player=true;
_draw_soul_x=(char_player.x-char_player.sprite_width/2+5-camera.x)*2+sprite_get_width(spr_battle_soul_red)/2;
_draw_soul_y=(char_player.y-char_player.sprite_height+17-camera.y)*2+sprite_get_height(spr_battle_soul_red)/2;
_draw_soul_x=(char_player.x-camera.x)*2;
_draw_soul_y=(char_player.y-char_player.sprite_height+17-camera.y)*2;
if(Encounter_IsPauseBGM(_encounter)){
BGM_Pause(0);
}
Expand Down
3 changes: 1 addition & 2 deletions objects/menu/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ if(_menu==0){
}
}else if(Input_IsPressed(INPUT.CONFIRM)){
if(_choice==0){
Flag_Load(FLAG_TYPE.STATIC);
Flag_Load(FLAG_TYPE.DYNAMIC);
Player_Load(0);
var target=Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.ROOM,-1);
if(room_exists(target)){
room_goto(target);
Expand Down
2 changes: 1 addition & 1 deletion objects/trigger_warp/Other_10.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if(room_exists(target_room)){
char_player._moveable_warp=false;
}
if(bgm_fade){
BGM_Fade(0,0,bgm_fade_time);
BGM_SetVolume(0,0,bgm_fade_time);
}
alarm[0]=fade_in_time+warp_wait+1;
}else{
Expand Down
4 changes: 1 addition & 3 deletions objects/ui_save/Other_10.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ if(_state==0){
_inst_return.text=_prefix+Lang_GetString("ui.save.return");
}
if(_state==1){
Flag_Save(FLAG_TYPE.STATIC);
Player_UpdateSaveInfo();
Flag_Save(FLAG_TYPE.INFO);
Player_Save(0);

audio_play_sound(snd_save,0,false);

Expand Down
1 change: 1 addition & 0 deletions objects/world/Step_0.gml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Anim_Step();
BGM_Step();

if(_time>=60){
Flag_Set(FLAG_TYPE.STATIC,FLAG_STATIC.TIME,Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.TIME)+1);
Expand Down
1 change: 1 addition & 0 deletions rooms/room_area_0/InstanceCreationCode_inst_6F1617EB.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
text="* DETERMINATION."
24 changes: 13 additions & 11 deletions rooms/room_area_0/room_area_0.yy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"ffb6a8c5-a301-4327-ae05-a286a934a0f7",
"03a3aceb-2b60-4b00-8e57-dea72cfb9ee6",
"a1338eee-7a9f-4264-8418-da673a5f02ff",
"bb55704a-bb77-4510-969c-230926753a25"
"bb55704a-bb77-4510-969c-230926753a25",
"a3d02403-21b6-47e7-9a1e-4af072cc30bf"
],
"IsDnD": false,
"layers": [
Expand All @@ -23,23 +24,24 @@
"name": "Instances",
"id": "0ae18403-3e5e-49bc-9530-3820924224e5",
"depth": 0,
"grid_x": 20,
"grid_y": 20,
"grid_x": 10,
"grid_y": 10,
"hierarchyFrozen": false,
"hierarchyVisible": true,
"inheritLayerDepth": false,
"inheritLayerSettings": false,
"inheritSubLayers": false,
"inheritVisibility": false,
"instances": [
{"name": "inst_40A2516B","id": "5061e962-e7d9-415d-868c-e981e603b84b","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_40A2516B","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 9,"scaleY": 1,"mvc": "1.0","x": 60,"y": 60},
{"name": "inst_B19D8C","id": "0b8cf8e8-9d2a-4bb5-846f-2d06f2a5b858","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_B19D8C","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 7,"mvc": "1.0","x": 60,"y": 80},
{"name": "inst_4944F116","id": "6e418fc5-c567-494c-81c8-76636d8b79c3","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_4944F116","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 4,"mvc": "1.0","x": 220,"y": 80},
{"name": "inst_592B7019","id": "ffb6a8c5-a301-4327-ae05-a286a934a0f7","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_592B7019","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 8,"scaleY": 1,"mvc": "1.0","x": 80,"y": 200},
{"name": "inst_8BE49B8","id": "d9b9c90b-cda7-422e-aa1e-5d2f1e64e05d","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_8BE49B8","objId": "7164f880-1d5c-45f5-be69-ff9c6224c933","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 150,"y": 140},
{"name": "inst_244C311E","id": "03a3aceb-2b60-4b00-8e57-dea72cfb9ee6","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_244C311E.gml","creationCodeType": ".gml","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_244C311E","objId": "b1035071-e196-4f46-999c-c6d6b0355533","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 120,"y": 160},
{"name": "inst_68B03D3C","id": "a1338eee-7a9f-4264-8418-da673a5f02ff","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_68B03D3C.gml","creationCodeType": ".gml","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_68B03D3C","objId": "3faa5fb2-034f-429b-9366-32273e5f9170","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 80,"y": 80},
{"name": "inst_14B7C8A3","id": "bb55704a-bb77-4510-969c-230926753a25","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_14B7C8A3.gml","creationCodeType": ".gml","ignore": false,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_14B7C8A3","objId": "fa212389-f9e3-4a23-a2c9-e59e9ebb7769","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 2,"mvc": "1.0","x": 220,"y": 160}
{"name": "inst_40A2516B","id": "5061e962-e7d9-415d-868c-e981e603b84b","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_40A2516B","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 9,"scaleY": 1,"mvc": "1.0","x": 60,"y": 60},
{"name": "inst_B19D8C","id": "0b8cf8e8-9d2a-4bb5-846f-2d06f2a5b858","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_B19D8C","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 7,"mvc": "1.0","x": 60,"y": 80},
{"name": "inst_4944F116","id": "6e418fc5-c567-494c-81c8-76636d8b79c3","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_4944F116","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 4,"mvc": "1.0","x": 220,"y": 80},
{"name": "inst_592B7019","id": "ffb6a8c5-a301-4327-ae05-a286a934a0f7","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_592B7019","objId": "b2a89c23-a716-4f1e-8a58-3649cd82560c","properties": null,"rotation": 0,"scaleX": 8,"scaleY": 1,"mvc": "1.0","x": 80,"y": 200},
{"name": "inst_8BE49B8","id": "d9b9c90b-cda7-422e-aa1e-5d2f1e64e05d","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_8BE49B8","objId": "7164f880-1d5c-45f5-be69-ff9c6224c933","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 150,"y": 140},
{"name": "inst_244C311E","id": "03a3aceb-2b60-4b00-8e57-dea72cfb9ee6","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_244C311E.gml","creationCodeType": ".gml","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_244C311E","objId": "b1035071-e196-4f46-999c-c6d6b0355533","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 120,"y": 160},
{"name": "inst_68B03D3C","id": "a1338eee-7a9f-4264-8418-da673a5f02ff","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_68B03D3C.gml","creationCodeType": ".gml","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_68B03D3C","objId": "3faa5fb2-034f-429b-9366-32273e5f9170","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.0","x": 80,"y": 80},
{"name": "inst_14B7C8A3","id": "bb55704a-bb77-4510-969c-230926753a25","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_14B7C8A3.gml","creationCodeType": ".gml","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_14B7C8A3","objId": "fa212389-f9e3-4a23-a2c9-e59e9ebb7769","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 2,"mvc": "1.0","x": 220,"y": 160},
{"name": "inst_6F1617EB","id": "a3d02403-21b6-47e7-9a1e-4af072cc30bf","colour": { "Value": 4294967295 },"creationCodeFile": "InstanceCreationCode_inst_6F1617EB.gml","creationCodeType": ".gml","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_6F1617EB","objId": "ac0ce3c2-9a56-4701-94c1-a890bfff4a82","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 150,"y": 120}
],
"layers": [

Expand Down
17 changes: 0 additions & 17 deletions scripts/BGM_Fade/BGM_Fade.gml
View file

This file was deleted.

2 changes: 2 additions & 0 deletions scripts/BGM_Init/BGM_Init.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ var proc=0;
repeat(6){
global._bgm_id[proc]=-1;
global._bgm_audio[proc]=-1;
global._bgm_loop_start[proc]=-1;
global._bgm_loop_end[proc]=-1;
proc+=1;
}
19 changes: 17 additions & 2 deletions scripts/BGM_Play/BGM_Play.gml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
///@arg bgm_slot
///@arg audio
///@arg loop*
///@arg loop_start*
///@arg loop_end*
var SLOT=argument[0];
var AUDIO=argument[1];

var LOOP=true;
var LOOP_START=-1;
var LOOP_END=-1;
if(argument_count>=3){
LOOP=argument[2];
}
if(argument_count>=4){
LOOP_START=argument[3];
}
if(argument_count>=5){
LOOP_END=argument[4];
}
if(BGM_IsSlotValid(SLOT)&&audio_exists(AUDIO)){
BGM_Stop(SLOT);
global._bgm_audio[SLOT]=AUDIO;
global._bgm_id[SLOT]=audio_play_sound(AUDIO,1,true);
global._bgm_id[SLOT]=audio_play_sound(AUDIO,1,LOOP);
global._bgm_loop_start[SLOT]=LOOP_START;
global._bgm_loop_end[SLOT]=LOOP_END;
return true;
}else{
return false;
Expand Down
11 changes: 10 additions & 1 deletion scripts/BGM_SetVolume/BGM_SetVolume.gml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
///@arg bgm_slot
///@arg volume
///@arg time*
var SLOT=argument[0];
var VOLUME=argument[1];
var TIME=0;
if(argument_count>=3){
TIME=argument[2]*(1000/game_get_speed(gamespeed_fps));
}

if(BGM_IsSlotValid(SLOT)&&VOLUME>=0){
if(BGM_IsPlaying(SLOT)){
audio_sound_gain(BGM_GetID(SLOT),VOLUME,0);
if(TIME>0){
audio_sound_gain(BGM_GetID(SLOT),VOLUME,TIME);
}else{
audio_sound_gain(BGM_GetID(SLOT),VOLUME,0);
}
return true;
}else{
return false;
Expand Down
16 changes: 16 additions & 0 deletions scripts/BGM_Step/BGM_Step.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
var proc=0;
repeat(6){
var audio=BGM_GetID(proc);
if(audio_exists(audio)){
var start=global._bgm_loop_start[proc];
var endt=global._bgm_loop_end[proc];
if(start>=0 && endt>=0){
var pos=audio_sound_get_track_position(audio);
if(pos>=endt){
audio_sound_set_track_position(audio,start+(pos-endt));
}
}
}
proc+=1;
}
return true;
4 changes: 2 additions & 2 deletions scripts/BGM_Fade/BGM_Fade.yy → scripts/BGM_Step/BGM_Step.yy
View file

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

2 changes: 1 addition & 1 deletion scripts/Battle_End/Battle_End.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ if(room_exists(room_return)){
Fader_Fade(-1,0,20);
BGM_Resume(0);
BGM_SetVolume(0,0);
BGM_Fade(0,1,50);
BGM_SetVolume(0,1,50);
}
2 changes: 1 addition & 1 deletion scripts/Macro_Engine/Macro_Engine.gml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#macro ENGINE_VERSION "v0.5.1"
#macro ENGINE_VERSION "v0.6.0"
10 changes: 10 additions & 0 deletions scripts/Player_Load/Player_Load.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
///@arg slot
var SLOT=argument[0];

Flag_SetSaveSlot(SLOT);

Flag_Load(FLAG_TYPE.STATIC);
Flag_Load(FLAG_TYPE.DYNAMIC);
Flag_Load(FLAG_TYPE.INFO);

return true;
4 changes: 2 additions & 2 deletions ...r_UpdateSaveInfo/Player_UpdateSaveInfo.yy → scripts/Player_Load/Player_Load.yy
View file

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

8 changes: 8 additions & 0 deletions ..._UpdateSaveInfo/Player_UpdateSaveInfo.gml → scripts/Player_Save/Player_Save.gml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
///@arg slot
var SLOT=argument[0];

Flag_SetSaveSlot(SLOT);

Flag_Save(FLAG_TYPE.STATIC);
Flag_Set(FLAG_TYPE.INFO,FLAG_INFO.LV,Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.LV));
Flag_Set(FLAG_TYPE.INFO,FLAG_INFO.TIME,Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.TIME));
Flag_Set(FLAG_TYPE.INFO,FLAG_INFO.ROOM,Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.ROOM));
Flag_Set(FLAG_TYPE.INFO,FLAG_INFO.NAME,Flag_Get(FLAG_TYPE.STATIC,FLAG_STATIC.NAME));
Flag_Save(FLAG_TYPE.INFO);

return true;
8 changes: 8 additions & 0 deletions scripts/Player_Save/Player_Save.yy
View file

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

6 changes: 3 additions & 3 deletions sprites/spr_exclamation/spr_exclamation.yy
View file

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

Loading

0 comments on commit ad47e13

Please sign in to comment.