added paste in ip join

LDinos · Oct 14, 2020 · c7081e8 · c7081e8
1 parent 912de28
commit c7081e8
Show file tree

Hide file tree

Showing 21 changed files with 399 additions and 8 deletions.
diff --git a/NESTRIS.yyp b/NESTRIS.yyp
diff --git a/fonts/fnt_default/fnt_default.png b/fonts/fnt_default/fnt_default.png
diff --git a/fonts/fnt_default/fnt_default.yy b/fonts/fnt_default/fnt_default.yy
diff --git a/objects/obj_joinip/Draw_0.gml b/objects/obj_joinip/Draw_0.gml
@@ -1,4 +1,4 @@
 draw_set_font(fnt_numbers)
 draw_set_halign(fa_center)
 draw_set_valign(fa_middle)
-draw_text(room_width/2,room_height/2,"IP\n"+str)
+draw_text(room_width/2,room_height/2,"IP\n"+str + "\n\nRMB to paste")
diff --git a/objects/obj_joinip/Step_0.gml b/objects/obj_joinip/Step_0.gml
@@ -1,4 +1,8 @@
-if keyboard_check_pressed(vk_anykey)
+if mouse_check_button_pressed(mb_right)
+{
+	str = clipboard_get_text()
+}
+else if keyboard_check_pressed(vk_anykey)
 {
 	if (keyboard_lastkey == vk_backspace)
 	{

diff --git a/objects/obj_line_clear/Alarm_0.gml b/objects/obj_line_clear/Alarm_0.gml
@@ -20,5 +20,5 @@ else
 	instance_destroy(instance_position(x+GRID*loops-16,y,obj_block))
 	instance_destroy(instance_position(x-GRID*loops+16,y,obj_block))
 	loops++
-	alarm[0] = 4
+	alarm[0] = 5
 }
diff --git a/objects/obj_line_clear/Create_0.gml b/objects/obj_line_clear/Create_0.gml
@@ -4,7 +4,7 @@ xoffset = GRID
 //show_message(x)
 //show_message(y)
 loops = 1;
-alarm[0] = 4
+alarm[0] = 5
 var piece_list = ds_list_create()
 collision_rectangle_list(obj_board.x+8,y,obj_board.x+8 + GRID*9, obj_board.y-GRID*4,obj_block,false,true,piece_list,false)
 for(var i = 0; i < ds_list_size(piece_list); i++) {with(piece_list[| i]) {move_down++}}

diff --git a/objects/obj_piece/Create_0.gml b/objects/obj_piece/Create_0.gml
@@ -7,7 +7,6 @@ y += sprite_yoffset //center me on the grid
 
 
 if (sprite_index == spr_piece_i) x-=32 //if I am I piece, put me in the real center (other pieces arent really in center)
-ghost_x = x
 ghost_y = y
 make_ghost_piece()
 das_cooldown = 0 //cooldown before the held button makes the piece move again

diff --git a/objects/obj_ver/Draw_0.gml b/objects/obj_ver/Draw_0.gml
@@ -0,0 +1,5 @@
+/// @description Insert description here
+// You can write your code in this editor
+draw_set_halign(fa_right)
+draw_set_font(fnt_default)
+draw_text(room_width,8,global.version)
diff --git a/objects/obj_ver/obj_ver.yy b/objects/obj_ver/obj_ver.yy
diff --git a/objects/obj_white/Alarm_0.gml b/objects/obj_white/Alarm_0.gml
@@ -0,0 +1,4 @@
+///@description Unflash
+image_alpha = 0
+if (flash != max_flashes) alarm[1] = frames_per_flash 
+else instance_destroy()
diff --git a/objects/obj_white/Alarm_1.gml b/objects/obj_white/Alarm_1.gml
@@ -0,0 +1,4 @@
+///description Flash
+flash++
+image_alpha = 0
+alarm[0] = frames_per_flash
diff --git a/objects/obj_white/Create_0.gml b/objects/obj_white/Create_0.gml
@@ -0,0 +1,6 @@
+image_xscale = room_width
+image_yscale = room_height
+flash = 1
+max_flashes = 4
+frames_per_flash = 2
+alarm[0] = frames_per_flash 
diff --git a/objects/obj_white/obj_white.yy b/objects/obj_white/obj_white.yy
diff --git a/rooms/rm_menu/RoomCreationCode.gml b/rooms/rm_menu/RoomCreationCode.gml
@@ -1,4 +1,5 @@
 score = 0
+global.version = "0.8"
 global.score2 = 0
 global.line_clears = 0
 global.line_clears2 = 0
@@ -12,7 +13,7 @@ global.tetrises = 0
 global.tetrises2 = 0
 global.line_drought = 0; //number of turns a line piece hasn't appeared
 global.line_drought2 = 0; //number of turns a line piece hasn't appeared
-
+if !instance_exists(obj_ver) instance_create_depth(0,0,-10,obj_ver)
 
 ini_open("controls.ini")
 	global.KEY_ROT_LEFT = ini_read_real("Controls","KEY_ROT_LEFT",90)