Skip to content

Commit

Permalink
Merge pull request #249 from overbound/feature/27-leaves
Browse files Browse the repository at this point in the history 
Added wind animation to RRZ Past
  • Loading branch information
@AlexKhayrullin
AlexKhayrullin authored Feb 15, 2022
2 parents 7ff7298 + c1151d9 commit 1e6cc95
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 0 deletions.
2 changes: 2 additions & 0 deletions SonicTimeTwisted.gmx/SonicTimeTwisted.project.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5212,6 +5212,8 @@
<object>objects\objRRBreakableColumn</object>
<object>objects\objRRWallRun</object>
<object>objects\objSwing</object>
<object>objects\objRRWind</object>
<object>objects\objRRLeaf</object>
</objects>
<objects name="Scene Objects">
<objects name="Cutscene">
Expand Down
98 changes: 98 additions & 0 deletions SonicTimeTwisted.gmx/objects/objRRLeaf.object.gmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>sprVVLeaf</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>objSceneObject</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<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>event_inherited();
image_angle = random(360);
gravity = 0;
alarm[0] = 40;
is_wind = true;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="2" enumb="0">
<action>
<libid>1</libid>
<id>203</id>
<kind>0</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>1</exetype>
<functionname>action_kill_object</functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
</action>
</event>
<event eventtype="3" enumb="0">
<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>visible = !visible;
if (is_wind) {
hspeed = 16;
} else {
if (hspeed &gt; 0) {
hspeed -= 0.25;
}
vspeed += 0.25;
}
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>
127 changes: 127 additions & 0 deletions SonicTimeTwisted.gmx/objects/objRRWind.object.gmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>&lt;undefined&gt;</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>objSceneObject</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<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>event_inherited();
ticks = 0;
interval = 25;
alarm[0] = 20;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="1" enumb="0">
<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>with(objRRLeaf) {
is_wind = false;
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="2" enumb="0">
<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>instance_create(view_xview[0]-24, view_yview[0] - 24 + round(random(view_hview[0] + 48)), objRRLeaf);
alarm[0] = 20;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="3" enumb="2">
<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>ticks = (ticks + 1) mod interval;
if (ticks &gt; 0) exit;
if not audio_is_playing(sndFireBlow)
{
play_sfx(sndFireBlow, 4);
}
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>
3 changes: 3 additions & 0 deletions SonicTimeTwisted.gmx/scripts/player_reaction_floating_right.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ jump_action = false;
rolling_jump = true;
landed = false;
terrain_id = noone;
if (!instance_exists(objRRWind)) {
instance_create(0, 0, objRRWind);
}
return true;
3 changes: 3 additions & 0 deletions SonicTimeTwisted.gmx/scripts/player_reaction_floating_stop.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ if state == player_state_floating || state == player_state_glide || state == pla
camera.top=0;
camera.bottom=room_height;
xspeed=max(abs(xspeed),4);
with (objRRWind) {
instance_destroy();
}
return false;

0 comments on commit 1e6cc95

Please sign in to comment.