Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Birb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gadig
Birb
Commits
51b09c33
Commit
51b09c33
authored
Apr 06, 2017
by
Benjamin Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed ChargeEnemy to turn around when hitting a wall/ledge
parent
55b66cd3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
11 deletions
+25
-11
Assets/Scripts/Enemy/EnemyCharge.cs
Assets/Scripts/Enemy/EnemyCharge.cs
+25
-11
No files found.
Assets/Scripts/Enemy/EnemyCharge.cs
View file @
51b09c33
...
...
@@ -10,14 +10,17 @@ public class EnemyCharge : BaseEnemy
public
LayerMask
lm
;
public
bool
FallOffLedge
=
false
;
void
Fixed
Update
()
void
Update
()
{
Vector2
fwd
;
if
(!
sr
.
flipX
)
{
if
(
transform
.
localScale
.
x
<
0
)
{
// Raycast to check if player is in front with layermask to prevent it from detecting itself
fwd
=
transform
.
TransformDirection
(
Vector2
.
right
);
}
else
{
fwd
=
transform
.
TransformDirection
(
Vector2
.
left
);
fwd
=
Vector2
.
left
;
}
else
{
fwd
=
Vector2
.
right
;
}
RaycastHit2D
hit
;
Debug
.
DrawRay
(
transform
.
position
,
fwd
);
...
...
@@ -33,14 +36,25 @@ public class EnemyCharge : BaseEnemy
if
(
Charging
)
{
//Will stop or keep going based on FallOffLedge bool
if
(!
FallOffLedge
)
{
if
(!
CheckCollision
(
fwd
,
sr
.
flipX
?
leftCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
Charging
=
false
;
if
(!
FallOffLedge
)
{
if
(!
CheckCollision
(
fwd
,
transform
.
localScale
.
x
<
0
?
rightCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
//Charging = false;
Vector2
facing
=
transform
.
localScale
;
facing
.
x
*=
-
1
;
transform
.
localScale
=
facing
;
return
;
}
}
else
{
if
(!
CheckCollisionCharge
(
fwd
,
sr
.
flipX
?
leftCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
Charging
=
false
;
}
else
{
if
(!
CheckCollisionCharge
(
fwd
,
transform
.
localScale
.
x
<
0
?
rightCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
//Charging = false;
Vector2
facing
=
transform
.
localScale
;
facing
.
x
*=
-
1
;
transform
.
localScale
=
facing
;
return
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment