Skip to content

Feather Fixed (SyntaxErrors). #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ceyase wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feather Fixed (SyntaxErrors). #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion objects/battle_soul_red/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ event_inherited();
//移动
if(Battle_GetState()==BATTLE_STATE.IN_TURN && moveable){
var SPD=Player_GetSpdTotal()
var SPD=(Input_IsHeld(INPUT.CANCEL) ? SPD/2 : SPD);
SPD=(Input_IsHeld(INPUT.CANCEL) ? SPD/2 : SPD);
repeat(SPD*10){
if(Input_IsHeld(INPUT.UP)){
if(!position_meeting(x,y-sprite_height/2,block)){
Expand Down
11 changes: 6 additions & 5 deletions objects/closed_captions/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var proc=0;
//处理新增字幕队列
while(!ds_queue_empty(_queue_text)){
var text=ds_queue_dequeue(_queue_text);
Expand All @@ -17,7 +18,7 @@ while(!ds_queue_empty(_queue_text)){
}

//处理显示时间
var proc=0;
proc=0;
repeat(ds_list_size(_list_inst)){
if(instance_exists(_list_inst[|proc])){
if(_list_time[|proc]>0){
Expand All @@ -30,7 +31,7 @@ repeat(ds_list_size(_list_inst)){
}

//处理字幕显示完毕
var proc=0;
proc=0;
repeat(ds_list_size(_list_inst)){
if(_list_time[|proc]<=0){
var inst=_list_inst[|proc];
Expand All @@ -49,7 +50,7 @@ repeat(ds_list_size(_list_inst)){
}

//处理字幕高度
var proc=0;
proc=0;
var height=0;
repeat(ds_list_size(_list_inst)){
var inst=_list_inst[|proc];
Expand Down Expand Up @@ -77,7 +78,7 @@ if(height>_up){
}

//处理字幕位置
var proc=0;
proc=0;
var yy=_y-up_show;
repeat(ds_list_size(_list_inst)){
var inst=_list_inst[|proc];
Expand All @@ -94,7 +95,7 @@ repeat(ds_list_size(_list_inst)){
}

//处理销毁实例列表
var proc=0;
proc=0;
repeat(ds_list_size(_list_destroy_inst)){
if(_list_destroy_time[|proc]<=0){
var inst=_list_destroy_inst[|proc];
Expand Down
12 changes: 6 additions & 6 deletions objects/face/Step_2.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
if(emotion!=_emotion_previous || talking!=_talking_previous){
if(talking){
sprite_index=((emotion>=0 && emotion<array_length_1d(talk_sprite)) ? talk_sprite[emotion] : spr_default);
image_index=((emotion>=0 && emotion<array_length_1d(talk_image)) ? talk_image[emotion] : 0);
image_speed=((emotion>=0 && emotion<array_length_1d(talk_speed)) ? talk_speed[emotion] : 0);
sprite_index=((emotion>=0 && emotion<array_length(talk_sprite)) ? talk_sprite[emotion] : spr_default);
image_index=((emotion>=0 && emotion<array_length(talk_image)) ? talk_image[emotion] : 0);
image_speed=((emotion>=0 && emotion<array_length(talk_speed)) ? talk_speed[emotion] : 0);
}else{
sprite_index=((emotion>=0 && emotion<array_length_1d(idle_sprite)) ? idle_sprite[emotion] : spr_default);
image_index=((emotion>=0 && emotion<array_length_1d(idle_image)) ? idle_image[emotion] : 0);
image_speed=((emotion>=0 && emotion<array_length_1d(idle_speed)) ? idle_speed[emotion] : 0);
sprite_index=((emotion>=0 && emotion<array_length(idle_sprite)) ? idle_sprite[emotion] : spr_default);
image_index=((emotion>=0 && emotion<array_length(idle_image)) ? idle_image[emotion] : 0);
image_speed=((emotion>=0 && emotion<array_length(idle_speed)) ? idle_speed[emotion] : 0);
}
_emotion_previous=emotion;
_talking_previous=talking;
Expand Down
4 changes: 2 additions & 2 deletions objects/text_typer/Other_10.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ if(_char!=" "&&_char!="　"){

if(!_voice_played&&!_skipping&&!_instant&&_voice>=0){
var sound=-1;
if(_voice_single>=0&&_voice_single<array_length_2d(_group_voice,_voice)){
if(_voice_single>=0&&_voice_single<array_length(_group_voice[_voice])){
sound=_group_voice[_voice,_voice_single];
}else{
sound=_group_voice[_voice,irandom(array_length_2d(_group_voice,_voice)-1)];
sound=_group_voice[_voice,irandom(array_length(_group_voice[_voice])-1)];
}
if(audio_exists(sound)){
audio_stop_sound(sound);
Expand Down
20 changes: 11 additions & 9 deletions objects/text_typer/Other_12.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
///@desc Command
var cmd=_list_cmd;
var ARGC;
var target;

switch(cmd[|0]){
case "speed":
Expand Down Expand Up @@ -51,7 +53,7 @@ switch(cmd[|0]){
break;

case "color_text":
var ARGC=ds_list_size(cmd)-1;
ARGC=ds_list_size(cmd)-1;
if(ARGC==1||ARGC==4){
var proc=0;
repeat(ARGC){
Expand All @@ -75,7 +77,7 @@ switch(cmd[|0]){
break;

case "color_shadow":
var ARGC=ds_list_size(cmd)-1;
ARGC=ds_list_size(cmd)-1;
if(ARGC==1||ARGC==4){
var proc=0;
repeat(ARGC){
Expand All @@ -99,7 +101,7 @@ switch(cmd[|0]){
break;

case "color_outline":
var ARGC=ds_list_size(cmd)-1;
ARGC=ds_list_size(cmd)-1;
if(ARGC==1||ARGC==4){
var proc=0;
repeat(ARGC){
Expand Down Expand Up @@ -206,23 +208,23 @@ switch(cmd[|0]){

case "voice":
if(is_real(cmd[|1])){
if(cmd[|1]==-1 || (cmd[|1]>=0 && cmd[|1]<array_height_2d(_group_voice))){
if(cmd[|1]==-1 || (cmd[|1]>=0 && cmd[|1]<array_length(_group_voice))){
_voice=cmd[|1];
}
}
break;

case "voice_single":
if(is_real(cmd[|1])){
if(cmd[|1]==-1 || cmd[|1]>=0 && cmd[|1]<array_length_2d(_group_voice,_voice)){
if(cmd[|1]==-1 || cmd[|1]>=0 && cmd[|1]<array_length(_group_voice[_voice])){
_voice_single=cmd[|1];
}
}
break;

case "font":
if(is_real(cmd[|1])){
if(cmd[|1]>=0&&cmd[|1]<array_height_2d(_group_font)){
if(cmd[|1]>=0&&cmd[|1]<array_length(_group_font)){
_font=cmd[|1];
}
}
Expand Down Expand Up @@ -348,7 +350,7 @@ switch(cmd[|0]){
x-=58*_scale_x;
event_user(4);
}
}else if(fface>=0 && fface<array_length_1d(_group_face)){
}else if(fface>=0 && fface<array_length(_group_face)){
if(instance_exists(_face)){
instance_destroy(_face);
}else{
Expand Down Expand Up @@ -415,7 +417,7 @@ switch(cmd[|0]){
break;

case "sound":
var target=-1;
target=-1;
if(is_real(cmd[|1])){
target=cmd[|1];
}else{
Expand All @@ -427,7 +429,7 @@ switch(cmd[|0]){
break;

case "script":
var target=-1;
target=-1;
if(is_real(cmd[|1])){
target=cmd[|1];
}else{
Expand Down
6 changes: 2 additions & 4 deletions scripts/Anim_Create/Anim_Create.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ function Anim_Create() {
}

var inst_result=-1;

var proc_result=0;

if(DURATION>=0){
if(instance_exists(TARGET)){
var proc=0;
var proc_result=0;
var inst_find=noone;

repeat(instance_number(TARGET)){
Expand Down Expand Up @@ -90,6 +90,4 @@ function Anim_Create() {
}
}
return inst_result;


}
19 changes: 10 additions & 9 deletions scripts/Anim_GetValue/Anim_GetValue.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ function Anim_GetValue() {
var b=0;
var c=1;
var d=1;

var s;

switch(TWEEN){
case ANIM_TWEEN.LINEAR:
r=(t/d)*c+b;
Expand Down Expand Up @@ -185,9 +186,9 @@ function Anim_GetValue() {

case ANIM_TWEEN.BACK:
if(ARG_0>0){
var s=ARG_0;
s=ARG_0;
}else{
var s=1.70158;
s=1.70158;
}
switch(EASE){
case ANIM_EASE.IN:
Expand Down Expand Up @@ -230,9 +231,9 @@ function Anim_GetValue() {
}
if(a==0||a<abs(c)){
a=c;
var s=p/4;
s=p/4;
}else{
var s=p/(2*pi)*arcsin(c/a);
s=p/(2*pi)*arcsin(c/a);
}
t-=1;
r=-(a*power(2,10*t)* sin((t*d-s)*(2*pi)/p))+b;
Expand All @@ -252,9 +253,9 @@ function Anim_GetValue() {
}
if(a==0||a<abs(c)){
a=c;
var s=p/4;
s=p/4;
}else{
var s=p/(2*pi)*arcsin(c/a);
s=p/(2*pi)*arcsin(c/a);
}
r=a*power(2,-10*t)*sin((t*d-s)*(2*pi)/p)+c+b;
break;
Expand All @@ -273,9 +274,9 @@ function Anim_GetValue() {
}
if(a==0||a<abs(c)){
a=c;
var s=p/4;
s=p/4;
}else{
var s=p/(2*pi)*arcsin(c/a);
s=p/(2*pi)*arcsin(c/a);
}
t-=1;
if(t<1){
Expand Down
12 changes: 5 additions & 7 deletions scripts/Item_Custom/Item_Custom.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function Item_Custom(){
{
#region Types
// Register item types here.
var itemTypes=Item_GetTypeManager();

Expand Down Expand Up @@ -35,11 +35,9 @@ function Item_Custom(){
#macro ITEM_PHONE_TML "phone_tml"
itemTypes.Register(ITEM_PHONE_TML, new CustomItem_Phone_TML());

}



{
#endregion

#region Inventory
// Register item types and inventories here.
// Don't add items to inventories! Those are done in Player_CustomInitialData.
var inventories=Item_GetInventoryManager();
Expand All @@ -51,7 +49,7 @@ function Item_Custom(){
inventories.Register("phones",new Inventory(itemTypes,8));
inventories.Register("box1",new Inventory(itemTypes,10));
inventories.Register("box2",new Inventory(itemTypes,10));
}
#endregion
}

function Item_GetInventoryItems(){
Expand Down
43 changes: 26 additions & 17 deletions tilesets/tile_ruins/tile_ruins.yy
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion undertale_engine.yyp
View file
Open in desktop

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