fix picker bug And More

Skirlez · Jul 3, 2024 · 9b2281d · 9b2281d
1 parent 1d8553b
commit 9b2281d
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 21 deletions.
diff --git a/objects/obj_ev_display/Create_0.gml b/objects/obj_ev_display/Create_0.gml
@@ -142,7 +142,7 @@ function handle_click(tile_i, tile_j) {
 					audio_play_sound(pick_sound, 10, false, 1.2)
 
 				global.selected_thing = thing_placeable
-				switch_held_tile(final_state)
+				switch_held_tile(new tile_with_state(final_state.tile, struct_copy(final_state.properties)))
 				global.mouse_held = false;
 
 

diff --git a/objects/obj_ev_editor/Create_0.gml b/objects/obj_ev_editor/Create_0.gml
@@ -4,7 +4,7 @@
 
 randomize()
 global.latest_lvl_format = 2;
-global.ev_version = "0.89";
+global.ev_version = "0.90";
 
 global.compiled_for_merge = (asset_get_index("obj_game") != -1)
 
@@ -1465,3 +1465,4 @@ global.death_count = 0
 
 global.turn_frames = 0
 global.death_frames = -1
+
diff --git a/objects/obj_ev_editor/Draw_0.gml b/objects/obj_ev_editor/Draw_0.gml
@@ -107,6 +107,6 @@ else if (room == global.startup_room) {
 	draw_set_font(global.ev_font)
 	draw_set_halign(fa_center)
 	draw_set_valign(fa_middle)
-	draw_text_transformed(112, 72, "Communicating with server...", 1, 1, 0)
+	draw_text_transformed(112, 72, $"Communicating with server...\nTasks left: {startup_actions_count}", 1, 1, 0)
 }
 
diff --git a/objects/obj_ev_placeable_drag/Draw_0.gml b/objects/obj_ev_placeable_drag/Draw_0.gml
@@ -1,11 +1,10 @@
-if (global.tile_mode) {
-	var tile = global.editor_instance.tiles_list[tile_ind]
+
+var tile = global.editor_instance.current_list[object_ind]
+if (tile == global.editor_instance.object_player)
+	sprite_index = ev_get_stranger_down_sprite(global.stranger)
+else
 	sprite_index = tile.spr_ind
-}
-else {
-	var object = global.editor_instance.objects_list[object_ind]
-	sprite_index = object.spr_ind
-}
+
 
 if selected {
 	var alpha = (dsin(global.editor_time * 4) / 5) + 0.75

diff --git a/objects/obj_ev_upload_window/Create_0.gml b/objects/obj_ev_upload_window/Create_0.gml
@@ -27,6 +27,7 @@ function can_upload_level(level) {
 
 
 are_you_sure_upload_text = "This" + ((irandom($7fffffffffffffff) == 40) ? " stupid " : " ") + "level is not uploaded.\nDo you want to upload it?"
+are_you_sure_delete_text = "Are you sure you want to\n delete this level? It will\nnot be deleted locally."
 doing_the_thing_text = "Doing the thing..."
 verifying_text = "Verifying upload..."
 done_text = "Done!\nThe thing you tried doing\nwas successful!"

diff --git a/scripts/ev_level_management/ev_level_management.gml b/scripts/ev_level_management/ev_level_management.gml
@@ -260,15 +260,7 @@ function import_process_tiles(tile_string, level, height, failsafe_tile, version
 	}
 }
 
-function save_level(lvl)
-{
-	var file = file_text_open_write(global.levels_directory + lvl.save_name + "." + "vsl")
-	if (file == -1)
-		return;
-	var str = export_level(lvl)
-	file_text_write_string(file, str)
-	file_text_close(file)
-}
+
 /*
 function consider_multiplier(str, pointer, previous_string) {
 	if string_copy(str, pointer, 1) != MULTIPLIER_CHAR

diff --git a/scripts/ev_save/ev_save.gml b/scripts/ev_save/ev_save.gml
@@ -5,6 +5,7 @@ function ev_save(){
 	ini_write_string("options", "brand", global.author.brand)
 	ini_write_string("options", "server_ip", global.server_ip)
 	ini_write_string("options", "stranger", global.stranger)
+
 	ini_write_string("options", "memory", global.memory_style)
 	ini_write_string("options", "wings", global.wings_style)
 	ini_write_string("options", "blade", global.blade_style)
@@ -33,3 +34,13 @@ function ev_update_vars() {
 
 }
 
+function save_level(lvl)
+{
+	var file = file_text_open_write(global.levels_directory + lvl.save_name + "." + "vsl")
+	if (file == -1)
+		return;
+	var str = export_level(lvl)
+	file_text_write_string(file, str)
+	file_text_close(file)
+}
+
diff --git a/scripts/ev_tile_with_state/ev_tile_with_state.gml b/scripts/ev_tile_with_state/ev_tile_with_state.gml
@@ -16,3 +16,22 @@ function struct_copy(SS) {
 	return(SS_new);
 }
 
+function struct_deep_copy(struct) {
+    var arr = variable_struct_get_names(struct);
+
+    var new_struct = {};
+    for (var i = 0; i < array_length(arr); i++) {
+        var field = arr[i];
+        var value = struct[$ field];
+        if is_struct(value)
+            new_struct[$ field] = struct_deep_copy(value);
+        else if is_array(value)
+            new_struct[$ field] = copy_array(value)
+        else {
+
+
+            new_struct[$ field] = value
+		}
+    }
+    return new_struct;
+}
diff --git a/void-stranger-endless-void.resource_order b/void-stranger-endless-void.resource_order
@@ -1,10 +1,10 @@
 {
   "FolderOrderSettings": [
+    {"name":"Unused","order":49,"path":"folders/Objects/Unused.yy",},
     {"name":"Bee","order":3,"path":"folders/Sprites/Bee.yy",},
     {"name":"Items","order":43,"path":"folders/Sprites/Items.yy",},
     {"name":"TilesetSprites","order":1,"path":"folders/Sprites/TilesetSprites.yy",},
     {"name":"Void Stranger Sprites","order":2,"path":"folders/Sprites/Void Stranger Sprites.yy",},
-    {"name":"Unused","order":49,"path":"folders/Objects/Unused.yy",},
   ],
   "ResourceOrderSettings": [
     {"name":"obj_ev_executing_button","order":5,"path":"objects/obj_ev_executing_button/obj_ev_executing_button.yy",},

diff --git a/void-stranger-endless-void.yyp b/void-stranger-endless-void.yyp