Skip to content

Commit

Permalink
Merge pull request #21 from TML233/enhancement/trigger
Browse files Browse the repository at this point in the history
Trigger Leave Event
  • Loading branch information
TML233 committed Apr 17, 2019
2 parents 2a5d505 + d7e17be commit b5e9c1b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 40 deletions.
4 changes: 2 additions & 2 deletions objects/trigger/Create_0.gml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
user_char=-1;
multiple=false;
_triggered=false;
_triggered=false;
_collided_previous=false;
6 changes: 1 addition & 5 deletions objects/trigger/Other_10.gml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
///@desc Trigger
if(_triggered){
exit;
}else{
_triggered=true;
}
_triggered=true;
1 change: 1 addition & 0 deletions objects/trigger/Other_11.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
///@desc Leave
48 changes: 15 additions & 33 deletions objects/trigger/Step_0.gml
Original file line number Diff line number Diff line change
@@ -1,37 +1,19 @@
if(!_triggered){
var user=user_char;
if(user>=-1){
var result=false;
if(instance_exists(char)){
with(char){
if(char_id==user||user==-1){
result=place_meeting(x,y,other);
if(result){
break;
}
}
var user=user_char;
var result=false;
if(instance_exists(char)){
with(char){
if(char_id==user||user==-1){
result=place_meeting(x,y,other);
if(result){
break;
}
}
if(result){
event_user(0);
}
}
}else if(multiple){
var user=user_char;
if(user>=-1){
var result=false;
if(instance_exists(char)){
with(char){
if(char_id==user||user==-1){
result=place_meeting(x,y,other);
if(result){
break;
}
}
}
}
if(!result){
_triggered=false;
}
}
}
if(!_triggered&&result){
event_user(0);
_collided_previous=true;
}else if(_triggered&&_collided_previous&&!result){
event_user(1);
_collided_previous=false;
}
10 changes: 10 additions & 0 deletions objects/trigger/trigger.yy

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

0 comments on commit b5e9c1b

Please sign in to comment.