Skip to content

Commit 4873002

Browse files
D8HD8H
committed
Move some event about death animation in the player model behavior.
1 parent a4cddc3 commit 4873002

File tree

1 file changed

+182
-153
lines changed

1 file changed

+182
-153
lines changed

‎examples/3d-bomberman/3d-bomberman.json‎

Lines changed: 182 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -3421,7 +3421,7 @@
34213421
"textG": 0,
34223422
"textR": 0
34233423
},
3424-
"comment": "...or by chain reaction"
3424+
"comment": "...or by chain reaction."
34253425
},
34263426
{
34273427
"type": "BuiltinCommonInstructions::Standard",
@@ -3652,143 +3652,17 @@
36523652
]
36533653
}
36543654
],
3655-
"actions": [],
3656-
"events": [
3657-
{
3658-
"type": "BuiltinCommonInstructions::Standard",
3659-
"conditions": [
3660-
{
3661-
"type": {
3662-
"value": "VarObjet"
3663-
},
3664-
"parameters": [
3665-
"Explosion",
3666-
"DirectionX",
3667-
"=",
3668-
"0"
3669-
]
3670-
},
3671-
{
3672-
"type": {
3673-
"value": "VarObjet"
3674-
},
3675-
"parameters": [
3676-
"Explosion",
3677-
"DirectionY",
3678-
"=",
3679-
"0"
3680-
]
3681-
}
3682-
],
3683-
"actions": [],
3684-
"events": [
3685-
{
3686-
"type": "BuiltinCommonInstructions::Standard",
3687-
"conditions": [
3688-
{
3689-
"type": {
3690-
"value": "BuiltinCommonInstructions::CompareNumbers"
3691-
},
3692-
"parameters": [
3693-
"abs(Player.CenterX() - Explosion.CenterX())",
3694-
">",
3695-
"abs(Player.CenterY() - Explosion.CenterY())"
3696-
]
3697-
}
3698-
],
3699-
"actions": [
3700-
{
3701-
"type": {
3702-
"value": "Player::PlayerModel::PlayDeathAnimation"
3703-
},
3704-
"parameters": [
3705-
"PlayerModel",
3706-
"PlayerModel",
3707-
"sign(Player.CenterX() - Explosion.CenterX())",
3708-
"0",
3709-
""
3710-
]
3711-
}
3712-
]
3713-
},
3714-
{
3715-
"type": "BuiltinCommonInstructions::Standard",
3716-
"conditions": [
3717-
{
3718-
"type": {
3719-
"value": "BuiltinCommonInstructions::CompareNumbers"
3720-
},
3721-
"parameters": [
3722-
"abs(Player.CenterX() - Explosion.CenterX())",
3723-
"<",
3724-
"abs(Player.CenterY() - Explosion.CenterY())"
3725-
]
3726-
}
3727-
],
3728-
"actions": [
3729-
{
3730-
"type": {
3731-
"value": "Player::PlayerModel::PlayDeathAnimation"
3732-
},
3733-
"parameters": [
3734-
"PlayerModel",
3735-
"PlayerModel",
3736-
"0",
3737-
"sign(Player.CenterY() - Explosion.CenterY())",
3738-
""
3739-
]
3740-
}
3741-
]
3742-
}
3743-
]
3744-
},
3655+
"actions": [
37453656
{
3746-
"type": "BuiltinCommonInstructions::Standard",
3747-
"conditions": [
3748-
{
3749-
"type": {
3750-
"value": "BuiltinCommonInstructions::Or"
3751-
},
3752-
"parameters": [],
3753-
"subInstructions": [
3754-
{
3755-
"type": {
3756-
"value": "VarObjet"
3757-
},
3758-
"parameters": [
3759-
"Explosion",
3760-
"DirectionX",
3761-
"!=",
3762-
"0"
3763-
]
3764-
},
3765-
{
3766-
"type": {
3767-
"value": "VarObjet"
3768-
},
3769-
"parameters": [
3770-
"Explosion",
3771-
"DirectionY",
3772-
"!=",
3773-
"0"
3774-
]
3775-
}
3776-
]
3777-
}
3778-
],
3779-
"actions": [
3780-
{
3781-
"type": {
3782-
"value": "Player::PlayerModel::PlayDeathAnimation"
3783-
},
3784-
"parameters": [
3785-
"PlayerModel",
3786-
"PlayerModel",
3787-
"Explosion.Variable(DirectionX)",
3788-
"Explosion.Variable(DirectionY)",
3789-
""
3790-
]
3791-
}
3657+
"type": {
3658+
"value": "Player::PlayerModel::PlayDeathAnimationFromExplosion"
3659+
},
3660+
"parameters": [
3661+
"PlayerModel",
3662+
"PlayerModel",
3663+
"Explosion",
3664+
"Player",
3665+
""
37923666
]
37933667
}
37943668
]
@@ -4117,22 +3991,6 @@
41173991
]
41183992
}
41193993
]
4120-
},
4121-
{
4122-
"disabled": true,
4123-
"type": "BuiltinCommonInstructions::Standard",
4124-
"conditions": [],
4125-
"actions": [
4126-
{
4127-
"type": {
4128-
"value": "ChangeTimeScale"
4129-
},
4130-
"parameters": [
4131-
"",
4132-
"0.1"
4133-
]
4134-
}
4135-
]
41363994
}
41373995
]
41383996
},
@@ -33282,10 +33140,181 @@
3328233140
],
3328333141
"objectGroups": []
3328433142
},
33143+
{
33144+
"fullName": "Play death animation from explosion",
33145+
"functionType": "Action",
33146+
"name": "PlayDeathAnimationFromExplosion",
33147+
"sentence": "Play death animation of _PARAM0_ according to _PARAM2_ and _PARAM3_",
33148+
"events": [
33149+
{
33150+
"type": "BuiltinCommonInstructions::Standard",
33151+
"conditions": [
33152+
{
33153+
"type": {
33154+
"value": "VarObjet"
33155+
},
33156+
"parameters": [
33157+
"Explosion",
33158+
"DirectionX",
33159+
"=",
33160+
"0"
33161+
]
33162+
},
33163+
{
33164+
"type": {
33165+
"value": "VarObjet"
33166+
},
33167+
"parameters": [
33168+
"Explosion",
33169+
"DirectionY",
33170+
"=",
33171+
"0"
33172+
]
33173+
}
33174+
],
33175+
"actions": [],
33176+
"events": [
33177+
{
33178+
"type": "BuiltinCommonInstructions::Standard",
33179+
"conditions": [
33180+
{
33181+
"type": {
33182+
"value": "BuiltinCommonInstructions::CompareNumbers"
33183+
},
33184+
"parameters": [
33185+
"abs(Player.CenterX() - Explosion.CenterX())",
33186+
">",
33187+
"abs(Player.CenterY() - Explosion.CenterY())"
33188+
]
33189+
}
33190+
],
33191+
"actions": [
33192+
{
33193+
"type": {
33194+
"value": "Player::PlayerModel::PlayDeathAnimation"
33195+
},
33196+
"parameters": [
33197+
"Object",
33198+
"Behavior",
33199+
"sign(Object.CenterX() - Explosion.CenterX())",
33200+
"0",
33201+
""
33202+
]
33203+
}
33204+
]
33205+
},
33206+
{
33207+
"type": "BuiltinCommonInstructions::Standard",
33208+
"conditions": [
33209+
{
33210+
"type": {
33211+
"value": "BuiltinCommonInstructions::CompareNumbers"
33212+
},
33213+
"parameters": [
33214+
"abs(Player.CenterX() - Explosion.CenterX())",
33215+
"<",
33216+
"abs(Player.CenterY() - Explosion.CenterY())"
33217+
]
33218+
}
33219+
],
33220+
"actions": [
33221+
{
33222+
"type": {
33223+
"value": "Player::PlayerModel::PlayDeathAnimation"
33224+
},
33225+
"parameters": [
33226+
"Object",
33227+
"Behavior",
33228+
"0",
33229+
"sign(Player.CenterY() - Explosion.CenterY())",
33230+
""
33231+
]
33232+
}
33233+
]
33234+
}
33235+
]
33236+
},
33237+
{
33238+
"type": "BuiltinCommonInstructions::Standard",
33239+
"conditions": [
33240+
{
33241+
"type": {
33242+
"value": "BuiltinCommonInstructions::Or"
33243+
},
33244+
"parameters": [],
33245+
"subInstructions": [
33246+
{
33247+
"type": {
33248+
"value": "VarObjet"
33249+
},
33250+
"parameters": [
33251+
"Explosion",
33252+
"DirectionX",
33253+
"!=",
33254+
"0"
33255+
]
33256+
},
33257+
{
33258+
"type": {
33259+
"value": "VarObjet"
33260+
},
33261+
"parameters": [
33262+
"Explosion",
33263+
"DirectionY",
33264+
"!=",
33265+
"0"
33266+
]
33267+
}
33268+
]
33269+
}
33270+
],
33271+
"actions": [
33272+
{
33273+
"type": {
33274+
"value": "Player::PlayerModel::PlayDeathAnimation"
33275+
},
33276+
"parameters": [
33277+
"Object",
33278+
"Behavior",
33279+
"Explosion.Variable(DirectionX)",
33280+
"Explosion.Variable(DirectionY)",
33281+
""
33282+
]
33283+
}
33284+
]
33285+
}
33286+
],
33287+
"parameters": [
33288+
{
33289+
"description": "Object",
33290+
"name": "Object",
33291+
"supplementaryInformation": "Scene3D::Model3DObject",
33292+
"type": "object"
33293+
},
33294+
{
33295+
"description": "Behavior",
33296+
"name": "Behavior",
33297+
"supplementaryInformation": "Player::PlayerModel",
33298+
"type": "behavior"
33299+
},
33300+
{
33301+
"description": "Explosion",
33302+
"name": "Explosion",
33303+
"type": "objectList"
33304+
},
33305+
{
33306+
"description": "Player",
33307+
"name": "Player",
33308+
"type": "objectList"
33309+
}
33310+
],
33311+
"objectGroups": []
33312+
},
3328533313
{
3328633314
"fullName": "Play death animation",
3328733315
"functionType": "Action",
3328833316
"name": "PlayDeathAnimation",
33317+
"private": true,
3328933318
"sentence": "Play death animation of _PARAM0_ toward _PARAM2_ ; _PARAM3_",
3329033319
"events": [
3329133320
{

0 commit comments

Comments
 (0)