Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2019
Unity
Baba is mutated
Commits
07f85039
Commit
07f85039
authored
Sep 21, 2019
by
Sebastian Woelfel
Browse files
super
parent
aeacf84c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Scripts/PlayerTileMovement.cs
View file @
07f85039
...
...
@@ -90,11 +90,11 @@ public class PlayerTileMovement : MonoBehaviour
playerNextToMetallicBox
=
false
;
}
if
(
boxNextToPlayer
!=
null
)
{
playerNextToMetallicBox
=
boxNextToPlayer
&&
boxNextToPlayer
.
GetComponent
<
BoxType
>().
bType
==
BoxType
.
Boxtype
.
Stahl
;
}
//
if (boxNextToPlayer != null)
//
{
//
playerNextToMetallicBox =
//
boxNextToPlayer && boxNextToPlayer.GetComponent<BoxType>().bType == BoxType.Boxtype.Stahl;
//
}
}
private
IEnumerator
ActionCooldown
(
float
cooldown
)
...
...
@@ -168,12 +168,17 @@ public class PlayerTileMovement : MonoBehaviour
}
}
if
(
playerNextToMetallicBox
&&
onElectric
)
if
(
onElectric
)
{
bool
boxLeftSteel
=
boxLeftToPlayer
&&
boxLeftToPlayer
.
collider
.
GetComponent
<
BoxType
>().
bType
==
BoxType
.
Boxtype
.
Stahl
;
bool
boxRightSteel
=
boxRightToPlayer
&&
boxRightToPlayer
.
collider
.
GetComponent
<
BoxType
>().
bType
==
BoxType
.
Boxtype
.
Stahl
;
bool
boxDownSteel
=
boxDownToPlayer
&&
boxDownToPlayer
.
collider
.
GetComponent
<
BoxType
>().
bType
==
BoxType
.
Boxtype
.
Stahl
;
bool
boxUpSteel
=
boxUpToPlayer
&&
boxUpToPlayer
.
collider
.
GetComponent
<
BoxType
>().
bType
==
BoxType
.
Boxtype
.
Stahl
;
if
(
GetCell
(
wallMap
,
new
Vector2
(
transform
.
position
.
x
,
transform
.
position
.
y
)
+
moveDir
)
==
null
)
{
if
(
boxLeftToPlayer
&&
moveDir
.
x
>
0
)
if
(
boxLeftToPlayer
&&
moveDir
.
x
>
0
&&
boxLeftSteel
)
{
if
(
boxRightToPlayer
&&
GetCell
(
wallMap
,
new
Vector2
(
boxRightToPlayer
.
transform
.
position
.
x
,
...
...
@@ -193,7 +198,7 @@ public class PlayerTileMovement : MonoBehaviour
}
}
if
(
boxRightToPlayer
&&
moveDir
.
x
<
0
)
if
(
boxRightToPlayer
&&
moveDir
.
x
<
0
&&
boxRightSteel
)
{
if
(
boxLeftToPlayer
&&
GetCell
(
wallMap
,
new
Vector2
(
boxLeftToPlayer
.
transform
.
position
.
x
,
...
...
@@ -213,7 +218,7 @@ public class PlayerTileMovement : MonoBehaviour
}
}
if
(
boxUpToPlayer
&&
moveDir
.
y
<
0
)
if
(
boxUpToPlayer
&&
moveDir
.
y
<
0
&&
boxUpSteel
)
{
if
(
boxDownToPlayer
&&
GetCell
(
wallMap
,
new
Vector2
(
boxDownToPlayer
.
transform
.
position
.
x
,
...
...
@@ -233,7 +238,7 @@ public class PlayerTileMovement : MonoBehaviour
}
}
if
(
boxDownToPlayer
&&
moveDir
.
y
>
0
)
if
(
boxDownToPlayer
&&
moveDir
.
y
>
0
&&
boxDownSteel
)
{
if
(
boxUpToPlayer
&&
GetCell
(
wallMap
,
new
Vector2
(
boxUpToPlayer
.
transform
.
position
.
x
,
...
...
Write
Preview
Supports
Markdown
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