Skip to content

Commit

Permalink
More fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Delfos1 committed Sep 10, 2023
1 parent 758b178 commit 375ec8e
Show file tree
Hide file tree
Showing 30 changed files with 276 additions and 152 deletions.
8 changes: 4 additions & 4 deletions Pulse/Pulse.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
{"name":"64 stght","order":3,"path":"folders/Examples/Sprites/64 stght.yy",},
{"name":"Extensions","order":6,"path":"folders/Extensions.yy",},
{"name":"Fonts","order":4,"path":"folders/Fonts.yy",},
{"name":"Particle Shapes","order":19,"path":"folders/Particle Shapes.yy",},
{"name":"Paths","order":2,"path":"folders/Paths.yy",},
{"name":"Pulse","order":8,"path":"folders/Pulse.yy",},
{"name":"Scripts","order":3,"path":"folders/Scripts.yy",},
Expand All @@ -25,7 +26,6 @@
{"name":"Pulse_License","order":5,"path":"scripts/Pulse_License/Pulse_License.yy",},
{"name":"Room_Path","order":1,"path":"rooms/Room_Path/Room_Path.yy",},
{"name":"_64_strght__00017","order":17,"path":"sprites/_64_strght__00017/_64_strght__00017.yy",},
{"name":"flame_01","order":18,"path":"sprites/flame_01/flame_01.yy",},
{"name":"Room_Path_SmartSmoke","order":2,"path":"rooms/Room_Path_SmartSmoke/Room_Path_SmartSmoke.yy",},
{"name":"_64_strght__00033","order":33,"path":"sprites/_64_strght__00033/_64_strght__00033.yy",},
{"name":"anim_curves","order":8,"path":"scripts/anim_curves/anim_curves.yy",},
Expand All @@ -44,19 +44,18 @@
{"name":"o_smoke_Dir","order":4,"path":"objects/o_smoke_Dir/o_smoke_Dir.yy",},
{"name":"experiment_01","order":16,"path":"objects/experiment_01/experiment_01.yy",},
{"name":"_64_strght__00018","order":18,"path":"sprites/_64_strght__00018/_64_strght__00018.yy",},
{"name":"snow","order":16,"path":"objects/snow/snow.yy",},
{"name":"snow","order":17,"path":"objects/snow/snow.yy",},
{"name":"_64_strght__00013","order":13,"path":"sprites/_64_strght__00013/_64_strght__00013.yy",},
{"name":"Macaw","order":2,"path":"scripts/Macaw/Macaw.yy",},
{"name":"_64_strght__00012","order":12,"path":"sprites/_64_strght__00012/_64_strght__00012.yy",},
{"name":"fire","order":17,"path":"objects/fire/fire.yy",},
{"name":"fire","order":18,"path":"objects/fire/fire.yy",},
{"name":"_64_strght__00032","order":32,"path":"sprites/_64_strght__00032/_64_strght__00032.yy",},
{"name":"_64_strght__00027","order":27,"path":"sprites/_64_strght__00027/_64_strght__00027.yy",},
{"name":"Sprite2","order":9,"path":"sprites/Sprite2/Sprite2.yy",},
{"name":"shd_Blob2","order":12,"path":"shaders/shd_Blob2/shd_Blob2.yy",},
{"name":"_64_strght__00031","order":31,"path":"sprites/_64_strght__00031/_64_strght__00031.yy",},
{"name":"Path3","order":10,"path":"paths/Path3/Path3.yy",},
{"name":"_64_strght__00022","order":22,"path":"sprites/_64_strght__00022/_64_strght__00022.yy",},
{"name":"Scr_Gaussian","order":6,"path":"scripts/Scr_Gaussian/Scr_Gaussian.yy",},
{"name":"_64_strght__00019","order":19,"path":"sprites/_64_strght__00019/_64_strght__00019.yy",},
{"name":"_64_strght__00011","order":11,"path":"sprites/_64_strght__00011/_64_strght__00011.yy",},
{"name":"_64_strght__00024","order":24,"path":"sprites/_64_strght__00024/_64_strght__00024.yy",},
Expand All @@ -67,6 +66,7 @@
{"name":"_64_strght__00001","order":1,"path":"sprites/_64_strght__00001/_64_strght__00001.yy",},
{"name":"_64_strght__00026","order":26,"path":"sprites/_64_strght__00026/_64_strght__00026.yy",},
{"name":"Sprite3","order":8,"path":"sprites/Sprite3/Sprite3.yy",},
{"name":"pt_snow_cartoon","order":1,"path":"sprites/pt_snow_cartoon/pt_snow_cartoon.yy",},
{"name":"o_particle_example","order":5,"path":"objects/o_particle_example/o_particle_example.yy",},
{"name":"_64_strght__00009","order":9,"path":"sprites/_64_strght__00009/_64_strght__00009.yy",},
{"name":"_64_strght__00029","order":29,"path":"sprites/_64_strght__00029/_64_strght__00029.yy",},
Expand Down
6 changes: 4 additions & 2 deletions Pulse/Pulse.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Pulse/objects/Object12/Create_0.gml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
particle = pulse_make_particle("particle")
system = pulse_make_system("sys")
particle.set_life(200,200).set_speed(3,3,0).set_direction(0,0,0).set_size(1,1,0)
particle.set_life(200,200).set_speed(3,3,0).set_direction(0,0,0).set_size([1,0.5],[3,1],0.01,0)

acc=0
acc=0
2 changes: 1 addition & 1 deletion Pulse/objects/Object12/KeyPress_32.gml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
part_particles_create(system.index,x,y,particle._index,1)
part_particles_create(system.index,x,y,particle.index,1)
3 changes: 2 additions & 1 deletion Pulse/objects/Object12/KeyPress_49.gml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
particle.scale_time(.5)
//particle.scale_time(.5)
part_type_size_x(particle.index,1, 3,0,0)
3 changes: 2 additions & 1 deletion Pulse/objects/Object12/KeyPress_50.gml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
particle.scale_time(1.5)
//particle.scale_time(1.5)
part_type_size_y(particle.index,0.5,4,0,0)
4 changes: 2 additions & 2 deletions Pulse/objects/Object12/KeyPress_51.gml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
particle.scale_space(.5)

//particle.scale_space(.5)
part_type_size(particle.index,.5,.5,0,0)

5 changes: 4 additions & 1 deletion Pulse/objects/Object12/KeyPress_52.gml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
particle.scale_space(1.5)
//particle.scale_space(1.5)
part_type_size_x(particle.index,1,1,0,0)
part_type_size_y(particle.index,1,1,0,0)
part_type_size(particle.index,1,1,0,0)
2 changes: 0 additions & 2 deletions Pulse/objects/Object12/Mouse_60.gml
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
acc += 0.1
particle.set_gravity(acc*.1,270)
2 changes: 0 additions & 2 deletions Pulse/objects/Object12/Mouse_61.gml
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
acc -= 0.1
particle.set_gravity(acc*.1,270)
2 changes: 1 addition & 1 deletion Pulse/objects/Test_Me/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ sys.set_radius(0,200)//.set_mask(0,.5)
sys.force_to_edge=PULSE_TO_EDGE.FOCAL_LIFE
//sys.set_line(x+200,y-50)

system.treshold=200
system.threshold=200
4 changes: 2 additions & 2 deletions Pulse/objects/fire/fire.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Pulse/objects/snow/Create_0.gml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
particle = pulse_make_particle("snow")
system = pulse_make_system("sys")

/*
particle.set_life(900,900).set_speed(.75,1.15,-.0002).set_direction(0,0,0)
.set_size(.3,.5,-0.0005).set_shape(pt_shape_snow).set_orient(0,359,0.2,0,false)
.set_color(c_white,c_aqua).set_alpha(.9,.7,0)
*/

particle.set_life(700,900).set_speed(.70,1.10,-.0002).set_direction(0,0,0)
.set_size(.3,.4,-0.0001).set_sprite(pt_snow_cartoon).set_orient(0,359,0.2,0,false)
.set_color(c_white,c_aqua).set_alpha(.9,.7,0)


emit = new pulse_local_emitter(system,"snow")
emit.form_line(room_width,0).set_direction_range(180,180)//(160,200)
emit.form_line(room_width+100,0).set_direction_range(180,180)
emit.force_to_edge=PULSE_TO_EDGE.NONE

/*
force = new pulse_force(300,300,90,PULSE_FORCE.DIRECTION,1,.4)
force.set_range_directional(-1,0,100,650)
emit.add_local_force(force)*/


t = 0;
increment = 1; //degrees
amplitude = .0025; //acceleration
_sign = 1

repeat(768)
repeat(particle.life[1])
{
event_perform(ev_step,ev_step_normal)
//part_system_update(system.index)
system.update_system()
}
7 changes: 6 additions & 1 deletion Pulse/objects/snow/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@ shift = _sign * amplitude * dsin(t);

particle.set_gravity(shift,25)

emit.pulse(1,0,0)
var _random = irandom_range(0,1)

if _random == 0
{
emit.pulse(1,-50,-50)
}
4 changes: 2 additions & 2 deletions Pulse/objects/snow/snow.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Pulse/options/android/options_android.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pulse/particles/PS_Fire/PS_Fire.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pulse/particles/ParticleSystem1/ParticleSystem1.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 375ec8e

Please sign in to comment.