From c8f0fda7be8a11d1df78ea2780166a3897e1e802 Mon Sep 17 00:00:00 2001
From: Feafly <jjcyf@foxmail.com>
Date: Mon, 7 Oct 2024 12:58:51 +0800
Subject: [PATCH] Feather Fixed (SyntaxErrors)

Fixed what Feather mistook for syntax errors.
---
 objects/battle_soul_red/Step_0.gml      |  2 +-
 objects/closed_captions/Step_0.gml      | 11 ++++---
 objects/face/Step_2.gml                 | 12 +++----
 objects/text_typer/Other_10.gml         |  4 +--
 objects/text_typer/Other_12.gml         | 20 ++++++------
 scripts/Anim_Create/Anim_Create.gml     |  6 ++--
 scripts/Anim_GetValue/Anim_GetValue.gml | 19 +++++------
 scripts/Item_Custom/Item_Custom.gml     | 12 +++----
 tilesets/tile_ruins/tile_ruins.yy       | 43 +++++++++++++++----------
 undertale_engine.yyp                    |  2 +-
 10 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/objects/battle_soul_red/Step_0.gml b/objects/battle_soul_red/Step_0.gml
index d9fab24f..99ce45f1 100644
--- a/objects/battle_soul_red/Step_0.gml
+++ b/objects/battle_soul_red/Step_0.gml
@@ -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)){
diff --git a/objects/closed_captions/Step_0.gml b/objects/closed_captions/Step_0.gml
index e4908f71..750de552 100644
--- a/objects/closed_captions/Step_0.gml
+++ b/objects/closed_captions/Step_0.gml
@@ -1,3 +1,4 @@
+var proc=0;
 //处理新增字幕队列
 while(!ds_queue_empty(_queue_text)){
 	var text=ds_queue_dequeue(_queue_text);
@@ -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){
@@ -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];
@@ -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];
@@ -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];
@@ -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];
diff --git a/objects/face/Step_2.gml b/objects/face/Step_2.gml
index b76f2b84..b03b828e 100644
--- a/objects/face/Step_2.gml
+++ b/objects/face/Step_2.gml
@@ -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;
diff --git a/objects/text_typer/Other_10.gml b/objects/text_typer/Other_10.gml
index df1b71ad..09347112 100644
--- a/objects/text_typer/Other_10.gml
+++ b/objects/text_typer/Other_10.gml
@@ -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);
diff --git a/objects/text_typer/Other_12.gml b/objects/text_typer/Other_12.gml
index e3aa87dd..833dea3f 100644
--- a/objects/text_typer/Other_12.gml
+++ b/objects/text_typer/Other_12.gml
@@ -1,5 +1,7 @@
 ///@desc Command
 var cmd=_list_cmd;
+var ARGC;
+var target;
 
 switch(cmd[|0]){
 	case "speed":
@@ -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){
@@ -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){
@@ -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){
@@ -206,7 +208,7 @@ 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];
 			}
 		}
@@ -214,7 +216,7 @@ switch(cmd[|0]){
 		
 	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];
 			}
 		}
@@ -222,7 +224,7 @@ switch(cmd[|0]){
 		
 	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];
 			}
 		}
@@ -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{
@@ -415,7 +417,7 @@ switch(cmd[|0]){
 		break;
 		
 	case "sound":
-		var target=-1;
+		target=-1;
 		if(is_real(cmd[|1])){
 			target=cmd[|1];
 		}else{
@@ -427,7 +429,7 @@ switch(cmd[|0]){
 		break;
 		
 	case "script":
-		var target=-1;
+		target=-1;
 		if(is_real(cmd[|1])){
 			target=cmd[|1];
 		}else{
diff --git a/scripts/Anim_Create/Anim_Create.gml b/scripts/Anim_Create/Anim_Create.gml
index 87c73a9b..bb826dcc 100644
--- a/scripts/Anim_Create/Anim_Create.gml
+++ b/scripts/Anim_Create/Anim_Create.gml
@@ -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)){
@@ -90,6 +90,4 @@ function Anim_Create() {
 		}
 	}
 	return inst_result;
-
-
 }
diff --git a/scripts/Anim_GetValue/Anim_GetValue.gml b/scripts/Anim_GetValue/Anim_GetValue.gml
index cb914a4d..7bd32b93 100644
--- a/scripts/Anim_GetValue/Anim_GetValue.gml
+++ b/scripts/Anim_GetValue/Anim_GetValue.gml
@@ -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;
@@ -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:
@@ -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;
@@ -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;
@@ -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){
diff --git a/scripts/Item_Custom/Item_Custom.gml b/scripts/Item_Custom/Item_Custom.gml
index b7b985f1..cd13abfd 100644
--- a/scripts/Item_Custom/Item_Custom.gml
+++ b/scripts/Item_Custom/Item_Custom.gml
@@ -1,5 +1,5 @@
 function Item_Custom(){
-	{
+	#region Types
 		// Register item types here.
 		var itemTypes=Item_GetTypeManager();
 	
@@ -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();
@@ -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(){
diff --git a/tilesets/tile_ruins/tile_ruins.yy b/tilesets/tile_ruins/tile_ruins.yy
index 6338596e..f3c52aa2 100644
--- a/tilesets/tile_ruins/tile_ruins.yy
+++ b/tilesets/tile_ruins/tile_ruins.yy
@@ -1,12 +1,36 @@
 {
-  "$GMTileSet":"",
+  "$GMTileSet":"v1",
   "%Name":"tile_ruins",
   "autoTileSets":[],
   "macroPageTiles":{
     "SerialiseHeight":27,
     "SerialiseWidth":11,
     "TileCompressedData":[
-      2,0,58,-10,0,1,53,-10,0,1,53,-10,0,1,97,-240,0,1,22,-10,0,1,60,-10,0,
+      2,
+      0,
+      58,
+      -10,
+      0,
+      1,
+      53,
+      -10,
+      0,
+      1,
+      53,
+      -10,
+      0,
+      1,
+      97,
+      -240,
+      0,
+      1,
+      22,
+      -10,
+      0,
+      1,
+      60,
+      -10,
+      0,
     ],
     "TileDataFormat":1,
   },
@@ -26,21 +50,6 @@
     "name":"Default",
     "path":"texturegroups/Default",
   },
-  "tileAnimation":{
-    "FrameData":[
-      0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,
-      37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,
-      71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,
-      104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
-      129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,
-      154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,
-      179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,
-      204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,
-      229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,
-      254,255,256,257,258,259,260,261,262,263,
-    ],
-    "SerialiseFrameCount":1,
-  },
   "tileAnimationFrames":[],
   "tileAnimationSpeed":15.0,
   "tileHeight":20,
diff --git a/undertale_engine.yyp b/undertale_engine.yyp
index d9d618bd..53645a3f 100644
--- a/undertale_engine.yyp
+++ b/undertale_engine.yyp
@@ -128,7 +128,7 @@
   "isEcma":false,
   "LibraryEmitters":[],
   "MetaData":{
-    "IDEVersion":"2024.6.2.162",
+    "IDEVersion":"2024.8.1.171",
   },
   "name":"undertale_engine",
   "resources":[