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
2b613ec2
Commit
2b613ec2
authored
Mar 30, 2017
by
Benjamin Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Base Enemy(Took Debug off) And added Fall Off Ledge bool for Charge Enemy
parent
f4ef43de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
Assets/Scripts/Enemy/BaseEnemy.cs
Assets/Scripts/Enemy/BaseEnemy.cs
+10
-2
Assets/Scripts/Enemy/EnemyCharge.cs
Assets/Scripts/Enemy/EnemyCharge.cs
+12
-5
No files found.
Assets/Scripts/Enemy/BaseEnemy.cs
View file @
2b613ec2
...
...
@@ -35,8 +35,6 @@ public class BaseEnemy : MonoBehaviour {
{
RaycastHit2D
hitSide
=
Physics2D
.
Raycast
(
collisionPos
,
dir
,
.
1f
);
RaycastHit2D
hitDown
=
Physics2D
.
Raycast
(
collisionPos
,
-
transform
.
up
,
.
1f
);
Debug
.
DrawRay
(
collisionPos
,
dir
,
Color
.
red
);
Debug
.
DrawRay
(
collisionPos
,
-
transform
.
up
,
Color
.
green
);
if
(
hitDown
.
collider
!=
null
&&
hitSide
.
collider
==
null
)
{
...
...
@@ -44,4 +42,14 @@ public class BaseEnemy : MonoBehaviour {
}
return
false
;
}
protected
bool
CheckCollisionCharge
(
Vector2
dir
,
Vector3
collisionPos
)
{
RaycastHit2D
hitSide
=
Physics2D
.
Raycast
(
collisionPos
,
dir
,
.
1f
);
if
(
hitSide
.
collider
==
null
)
{
return
true
;
}
return
false
;
}
}
Assets/Scripts/Enemy/EnemyCharge.cs
View file @
2b613ec2
...
...
@@ -8,6 +8,7 @@ public class EnemyCharge : BaseEnemy
public
float
ChargeSpeed
;
public
bool
Charging
=
false
;
public
LayerMask
lm
;
public
bool
FallOffLedge
=
false
;
void
FixedUpdate
()
{
...
...
@@ -31,11 +32,17 @@ public class EnemyCharge : BaseEnemy
}
if
(
Charging
)
{
//Will move forward quickly when Charging is True
if
(!
CheckCollision
(
fwd
,
sr
.
flipX
?
leftCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
Charging
=
false
;
return
;
{
//Will stop or keep going based on FallOffLedge bool
if
(!
FallOffLedge
)
{
if
(!
CheckCollision
(
fwd
,
sr
.
flipX
?
leftCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
Charging
=
false
;
return
;
}
}
else
{
if
(!
CheckCollisionCharge
(
fwd
,
sr
.
flipX
?
leftCollisionPos
.
position
:
rightCollisionPos
.
position
))
{
Charging
=
false
;
return
;
}
}
Move
(
fwd
);
speed
=
ChargeSpeed
;
...
...
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