DiamondCreeper75
/
spaceinator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CommitLog |

This commit is contained in:
SilicaAndPina 2020-08-10 10:13:19 +12:00
parent a5240df77c
commit bd80cf385a
4 changed files with 166 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Configs/Default.config.gmx
View File

@ -418,7 +418,7 @@
<option_ps4_scale>0</option_ps4_scale>
<option_ps4_texture_page>2048</option_ps4_texture_page>
<option_psvita_build_version>0</option_psvita_build_version>
<option_psvita_fronttouch>0</option_psvita_fronttouch>
<option_psvita_fronttouch>-1</option_psvita_fronttouch>
<option_psvita_interpolate>-1</option_psvita_interpolate>
<option_psvita_major_version>1</option_psvita_major_version>
<option_psvita_minor_version>0</option_psvita_minor_version>
@ -427,7 +427,7 @@
<option_psvita_nptitlesecret>Memo1</option_psvita_nptitlesecret>
<option_psvita_package_id></option_psvita_package_id>
<option_psvita_passcode></option_psvita_passcode>
<option_psvita_reartouch>0</option_psvita_reartouch>
<option_psvita_reartouch>-1</option_psvita_reartouch>
<option_psvita_revision_version>0</option_psvita_revision_version>
<option_psvita_scale>0</option_psvita_scale>
<option_psvita_texture_page>2048</option_psvita_texture_page>
@ -672,10 +672,10 @@
<option_xbone_require_xbox_live>True</option_xbone_require_xbox_live>
<option_xbone_revision_version>0</option_xbone_revision_version>
<option_xbone_scale>-1</option_xbone_scale>
<option_xbone_service_config_id></option_xbone_service_config_id>
<option_xbone_service_config_id>1234ABCD-1234-1234-1234-123456789ABC</option_xbone_service_config_id>
<option_xbone_splash_screen_colour>#FFFFFF</option_xbone_splash_screen_colour>
<option_xbone_texture_page>1024</option_xbone_texture_page>
<option_xbone_title_id></option_xbone_title_id>
<option_xbone_title_id>1234ABCD</option_xbone_title_id>
</Options>
<ConfigConstants/>
</Config>

87
objects/obj_chunk.object.gmx
View File

@ -80,19 +80,51 @@ for(var xx = 0; xx &lt; CHUNK_SIZE*TILE_SIZE; xx+= TILE_SIZE)
<arguments>
<argument>
<kind>1</kind>
<string>var chunk_total_size = CHUNK_SIZE * TILE_SIZE
if(distance_to_object(obj_player) &gt; chunk_total_size*3)
<string>///Place blocks
if(mouse_check_button_pressed(mb_right) || gamepad_button_check_pressed(0,gp_shoulderl))
{
event_user(0);
if(obj_inv_controller.is_open)
{
return 0;
}
var selected_item = obj_inv_controller.inventory[obj_hotbar.selected_slot];
if(selected_item != 0)
{
var selX = round(mouse_x/TILE_SIZE)*TILE_SIZE;
var selY = round(mouse_y/TILE_SIZE)*TILE_SIZE;
selX -= TILE_SIZE / 2;
selY -= TILE_SIZE / 2;
var objid = instance_position(selX,selY,obj_placed_item)
if(objid != noone)
{
show_debug_message(string(objid)+", "+string(objid.object_index));
return 0;
}
objid = instance_position(selX,selY,obj_player)
if(objid != noone)
{
show_debug_message(string(objid)+", "+string(objid.object_index));
return 0;
}
var inst = instance_create(selX,selY,obj_placed_item);
use_item_in_inventory(obj_hotbar.selected_slot);
var chunkid = id;
with(inst){
inst.ITEM_ID = selected_item;
inst.CHUNK_CONTAINED = chunkid;
}
ds_list_add(instance_list, inst);
}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="6" enumb="5">
<action>
<libid>1</libid>
<id>603</id>
@ -109,43 +141,12 @@ if(distance_to_object(obj_player) &gt; chunk_total_size*3)
<arguments>
<argument>
<kind>1</kind>
<string>///Place items
if(obj_inv_controller.is_open)
<string>var chunk_total_size = CHUNK_SIZE * TILE_SIZE
if(distance_to_object(obj_player) &gt; chunk_total_size*3)
{
return 0;
}
var selected_item = obj_inv_controller.inventory[obj_hotbar.selected_slot];
if(selected_item != 0)
{
var selX = round(mouse_x/TILE_SIZE)*TILE_SIZE;
var selY = round(mouse_y/TILE_SIZE)*TILE_SIZE;
selX -= TILE_SIZE / 2;
selY -= TILE_SIZE / 2;
var objid = instance_position(selX,selY,obj_placed_item)
if(objid != noone)
{
show_debug_message(string(objid)+", "+string(objid.object_index));
return 0;
}
objid = instance_position(selX,selY,obj_player)
if(objid != noone)
{
show_debug_message(string(objid)+", "+string(objid.object_index));
return 0;
}
var inst = instance_create(selX,selY,obj_placed_item);
use_item_in_inventory(obj_hotbar.selected_slot);
var chunkid = id;
with(inst){
inst.ITEM_ID = selected_item;
inst.CHUNK_CONTAINED = chunkid;
}
ds_list_add(instance_list, inst);
event_user(0);
}
</string>
</argument>

55
objects/obj_inv_controller.object.gmx
View File

@ -35,7 +35,7 @@ inv_obj = 0;
</arguments>
</action>
</event>
<event eventtype="9" enumb="69">
<event eventtype="3" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
@ -52,42 +52,29 @@ inv_obj = 0;
<arguments>
<argument>
<kind>1</kind>
<string>if(!is_open)
<string>/// Do Controller Stuff
var xx = view_xview[0]+view_wview[0]/2 - (424/2);
var yy = view_yview[0]+view_hview[0]/2 - (254/2);
if(keyboard_check_pressed(ord("E")) || gamepad_button_check_pressed(0,gp_face4))
{
inv_obj = instance_create(0,0,obj_inventory);
is_open = true;
if(!is_open)
{
inv_obj = instance_create(xx,yy,obj_inventory);
is_open = true;
}
else
{
instance_destroy(inv_obj);
is_open = false;
}
}
else
if(keyboard_check_pressed(vk_escape) || gamepad_button_check_pressed(0,gp_face2))
{
instance_destroy(inv_obj);
is_open = false;
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="9" enumb="27">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(is_open)
{
instance_destroy(inv_obj);
is_open = false;
if(is_open)
{
instance_destroy(inv_obj);
is_open = false;
}
}
</string>
</argument>

285
objects/obj_player.object.gmx
View File

@ -161,6 +161,103 @@ if(invuln_counter != invuln_counter_max)
<kind>1</kind>
<string>///pull_towards_black_holes();
pull_towards_black_holes();
</string>
</argument>
</arguments>
</action>
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Do Controller Stuff
if(keyboard_check(ord("A")) || gamepad_button_check(0,gp_padl))
{
if(dead == true)
{
return 0;
}
image_angle += 5;
}
if(keyboard_check(ord("D")) || gamepad_button_check(0,gp_padr))
{
if(dead == true)
{
return 0;
}
image_angle -= 5;
}
if(keyboard_check_pressed(ord("W")) || gamepad_button_check_pressed(0,gp_padu))
{
if(dead == true)
{
return 0;
}
is_moving = true;
audio_play_sound(snd_engine,1,true);
image_index = ship_type+1;
}
if(keyboard_check(ord("W")) || gamepad_button_check(0,gp_padu))
{
if(dead == true || speed &lt; 0)
{
return 0;
}
direction = image_angle
speed += 5
}
if(keyboard_check_released(ord("W")) || gamepad_button_check_released(0,gp_padu))
{
if(dead == true)
{
return 0;
}
is_moving = false;
audio_stop_sound(snd_engine)
image_index = ship_type;
}
if((mouse_check_button_pressed(mb_left) &amp;&amp; os_type != os_psvita) || gamepad_button_check_pressed(0,gp_shoulderr))
{
if(dead == true)
{
return 0;
}
if(obj_inv_controller.is_open)
{
return 0;
}
if(energy &gt;= 20)
{
var new_bullet = instance_create(x,y,obj_bullet);
audio_play_sound(snd_shoot,2,false);
new_bullet.image_angle = image_angle;
new_bullet.direction = image_angle;
new_bullet.speed = speed + 5;
energy -= 20;
}
}
</string>
</argument>
</arguments>
@ -273,134 +370,6 @@ speed = -20;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="5" enumb="87">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true || speed &lt; 0)
{
return 0;
}
direction = image_angle
speed += 5
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="5" enumb="68">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true)
{
return 0;
}
image_angle -= 5;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="5" enumb="65">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true)
{
return 0;
}
image_angle += 5;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="6" enumb="53">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true)
{
return 0;
}
if(obj_inv_controller.is_open)
{
return 0;
}
if(energy &gt;= 20)
{
var new_bullet = instance_create(x,y,obj_bullet);
audio_play_sound(snd_shoot,2,false);
new_bullet.image_angle = image_angle;
new_bullet.direction = image_angle;
new_bullet.speed = speed + 5;
energy -= 20;
}
</string>
</argument>
</arguments>
@ -462,66 +431,6 @@ instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),
ship_type +=2;
image_index = ship_type;
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="9" enumb="87">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true)
{
return 0;
}
is_moving = true;
audio_play_sound(snd_engine,1,true);
image_index = ship_type+1;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="10" enumb="87">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if(dead == true)
{
return 0;
}
is_moving = false;
audio_stop_sound(snd_engine)
image_index = ship_type;
</string>
</argument>
</arguments>