From aaff749236d16a6b64f5f56bf1fd2e334a4fb61f Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Thu, 10 Sep 2020 12:30:19 +1200 Subject: [PATCH] Add more crafitng --- Spaceinator.project.gmx | 1 + objects/obj_crafting.object.gmx | 29 +++- objects/obj_crafting_final.object.gmx | 191 ++++++++++++++++++++++++++ sprites/images/spr_broken_ship_0.png | Bin 346 -> 287 bytes 4 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 objects/obj_crafting_final.object.gmx diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx index 4e16ce3..1ca6c04 100644 --- a/Spaceinator.project.gmx +++ b/Spaceinator.project.gmx @@ -63,6 +63,7 @@ objects\obj_gameover_overlay objects\obj_inventory objects\obj_crafting + objects\obj_crafting_final objects\obj_hotbar diff --git a/objects/obj_crafting.object.gmx b/objects/obj_crafting.object.gmx index 7e7bc14..4ee9948 100644 --- a/objects/obj_crafting.object.gmx +++ b/objects/obj_crafting.object.gmx @@ -30,6 +30,31 @@ move_slot = false; selected_item = 0; selected_total = 0; + +crafting_final_object = instance_create(0,0,obj_crafting_final); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + instance_destroy(crafting_final_object); @@ -52,8 +77,8 @@ selected_total = 0; 1 - x = view_xview[0]+view_wview[0]/2 - (424/2); -y = view_yview[0]+view_hview[0]/2 - (254/2) - 200; + x = view_xview[0]+view_wview[0]/2 - (424/2) + 90; +y = view_yview[0]+view_hview[0]/2 - (254/2) - 150; var i = 0; diff --git a/objects/obj_crafting_final.object.gmx b/objects/obj_crafting_final.object.gmx new file mode 100644 index 0000000..6c09629 --- /dev/null +++ b/objects/obj_crafting_final.object.gmx @@ -0,0 +1,191 @@ + + + spr_final + 0 + -1 + -4400 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + selected_slot = 0; + +move_slot = false; +selected_item = 0; +selected_total = 0; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + x = view_xview[0]+view_wview[0]/2 - (424/2) + 240; +y = view_yview[0]+view_hview[0]/2 - (254/2) - 115; + + +var i = 0; +if((mouse_x >= x && mouse_x <= x+51) && (mouse_y >= y && mouse_y <= y+52)) +{ + for(yy = 8; yy < (5*44); yy+=45) + { + for(xx = 6; xx < (9*45); xx+=45+1) + { + if((mouse_x >= x+xx && mouse_x <= x+xx+45) && (mouse_y >= y+yy && mouse_y <= y+yy+45)) + { + selected_slot = i; + } + i++; + } + } + +} + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + if(!move_slot) +{ + selected_item = obj_inv_controller.inventory[selected_slot]; + if(selected_item == 0) + return false; + selected_total = obj_inv_controller.inventoryCount[selected_slot]; + obj_inv_controller.inventory[selected_slot] = 0; + obj_inv_controller.inventoryCount[selected_slot] = 0; + move_slot = true; +} +else +{ + if(obj_inv_controller.inventory[selected_slot] == 0) + { + + obj_inv_controller.inventory[selected_slot] = selected_item; + obj_inv_controller.inventoryCount[selected_slot] = selected_total; + + move_slot = false; + selected_item = 0; + + } +} + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_self(); +var xx = 6; +var yy = 8; +var i = 0; +for(yy = 8; yy < (5*44); yy+=45) +{ + for(xx = 6; xx < (9*45); xx+=45+1) + { + if(i == selected_slot) + { + draw_set_color(make_colour_rgb(100,100,100)); + draw_rectangle(x+xx,y+yy,x+xx+45,y+yy+44,false) + } + + draw_sprite(spr_blocks,obj_inv_controller.inventory[i],x+xx+6,y+yy+7); + var count = obj_inv_controller.inventoryCount[i]; + + var xoffset = string_width(string(count)) + if(count > 1) + { + draw_set_color(c_white); + draw_text(x+xx+45-xoffset,y+yy+30,string(count)); + } + i++ + } +} + +if(selected_item != 0) +{ + draw_sprite(spr_blocks,selected_item,mouse_x-(TILE_SIZE/2),mouse_y-(TILE_SIZE/2)); +} + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/sprites/images/spr_broken_ship_0.png b/sprites/images/spr_broken_ship_0.png index 5cb114aba4d54a6cb6998c262ff8163107fb82ea..cf562e127ff9fa28b60293a5fa787133f2d59ab3 100644 GIT binary patch delta 271 zcmV+q0r39X0-pkq8Gi-<0047(dh`GQ0Om$vW_D&w9qj<9# zN(vn@F&BSihUsUO7lkdriY&Zy`_$r;^8nuO9>5-e#X|@eUO?I5HWl0N>X3IIJ5>Y}5IKYj=K%F6i+=zK0#9M=0(BzUOM}Qa zZ%#)z8LS6r5E6hv+5mZ*M*&*Ln2Vc>{{^5;Gl2AXOaO(mU_9XE3`l;*5kmn2q6!{1 zhLsVluM+@0|E!)x%J$Lvq&V~e@Jy%kT?^p*+D%PDHLkV1h{WbZGzp delta 330 zcmbQwbc<<%WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKP}k zkZy2rXaE8Rh64uvZeYE*2||H(U{{#NZs#Il$9oKd-pII6b*R@zMyeD-w!;v!<9s-%K-p^yv>sitK@QyggAz#-& zNxKXt99q1jqOQr2h2dl=!(+SWJ00w|-922*t#Vzq=Vrr=Ox`u&9h@ilE;w)Nl;n7L zmG_?b)KZ2ssk{u0J9Ts;uB!`76-;nTW%<}FH}Us;X@Q