reverted act 2 layout in main, and fixed empty room, this is 0.91

DarkD04 · Nov 8, 2024 · 32b6267 · 32b6267
1 parent 62e7b61
commit 32b6267
Show file tree

Hide file tree

Showing 11 changed files with 513 additions and 1,983 deletions.
diff --git a/Harmony Framework Plus.resource_order b/Harmony Framework Plus.resource_order
@@ -34,7 +34,6 @@
     {"name":"Paths","order":3,"path":"folders/Paths.yy",},
     {"name":"Rooms","order":8,"path":"folders/Rooms.yy",},
     {"name":"Stages","order":5,"path":"folders/Rooms/Stages.yy",},
-    {"name":"Bridge Zone","order":1,"path":"folders/Rooms/Stages/Bridge Zone.yy",},
     {"name":"Scripts","order":4,"path":"folders/Scripts.yy",},
     {"name":"Debug Scripts","order":29,"path":"folders/Scripts/Engine Scripts/Debug Scripts.yy",},
     {"name":"Math Scripts","order":27,"path":"folders/Scripts/Engine Scripts/Math Scripts.yy",},
@@ -199,7 +198,7 @@
     {"name":"par_solid","order":3,"path":"objects/par_solid/par_solid.yy",},
     {"name":"rm_arboreal_agate2","order":1,"path":"rooms/rm_arboreal_agate2/rm_arboreal_agate2.yy",},
     {"name":"rm_empty_zone","order":2,"path":"rooms/rm_empty_zone/rm_empty_zone.yy",},
-    {"name":"rm_init_1","order":6,"path":"rooms/rm_init_1/rm_init_1.yy",},
+    {"name":"rm_splash_screen","order":6,"path":"rooms/rm_splash_screen/rm_splash_screen.yy",},
     {"name":"rm_stage_select","order":7,"path":"rooms/rm_stage_select/rm_stage_select.yy",},
     {"name":"add_background","order":5,"path":"scripts/add_background/add_background.yy",},
     {"name":"alpha_dither","order":10,"path":"scripts/alpha_dither/alpha_dither.yy",},

diff --git a/Harmony Framework Plus.yyp b/Harmony Framework Plus.yyp
diff --git a/objects/obj_level/Create_0.gml b/objects/obj_level/Create_0.gml
@@ -9,8 +9,6 @@
 
 	//Set stage music and loop points
 	stage_music = noone;
-	loop_start = 0.00;
-	loop_end = 0.00;
 
 	//Set level name
 	stage_name = "EMPTY LEVEL";

diff --git a/rooms/rm_arboreal_agate2/RoomCreationCode.gml b/rooms/rm_arboreal_agate2/RoomCreationCode.gml
@@ -16,5 +16,5 @@
 		animal = [A_FLICKY, A_CUCKY, A_RICKY];
 
 		//Next level
-		next_level = room;
+		next_level = rm_stage_select;
 	}
diff --git a/rooms/rm_arboreal_agate2/rm_arboreal_agate2.yy b/rooms/rm_arboreal_agate2/rm_arboreal_agate2.yy
diff --git a/rooms/rm_bridge/InstanceCreationCode_inst_518A7076.gml b/rooms/rm_bridge/InstanceCreationCode_inst_518A7076.gml
diff --git a/rooms/rm_bridge/RoomCreationCode.gml b/rooms/rm_bridge/RoomCreationCode.gml