Skip to content

Commit

Permalink
Implemented Cannon Turret completely
Browse files Browse the repository at this point in the history
+ Cannon Turret successfully implemented
+ Added the 'firing_sequence' animation for shooting.
+ Successfully implemented particle effects and soundFX.
+ Added all the crafting recipes related to the cannon.
+ Added new loot table for when removing the turret
+ Added "Turret Remover" to remove turrets instead of killing them.
+ Added item texture for Turret Remover
* Fixed all animation bugs
+ Fixed animatiuon timing
* Updated lang file to display new item name
* Updated crafting recipe for cannon turret to include a shortcut
* Updated turret's animation so that the base will snap to the grid
* Updated turret's particle effects to better match the animation
* Optimized animation controller for the turret.
- Removed residual files

NOTE: The turret remover was an impulse decision. The projectile the cannon is using is still the fireball (large). The cannonball will be added tomorrow.
  • Loading branch information
Virus5600 committed Dec 14, 2020
1 parent eb9d883 commit 9136390
Show file tree
Hide file tree
Showing 48 changed files with 4,301 additions and 2,204 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,16 @@
}
}
}
},
"6ca119ab_cd37_44b2_aeeb_0ce10468c3f5": {
"format_version": "1.10.0",
"animation_controllers": {
"controller.animation.bridge_custom_item_behavior": {
"states": {
"default": {}
}
}
}
}
}
},
Expand Down Expand Up @@ -196,6 +206,33 @@
"BP/items/cannon_turret/cannon_head.json": {
"data": {}
},
"BP/items/turret_remover.json": {
"data": {}
},
"BP/loot_tables/cannon_turret/cannon_turret.drop.json": {
"data": {}
},
"BP/recipes/turret_remover.json": {
"data": {}
},
"BP/recipes/cannon_turret/cannon_base.json": {
"data": {}
},
"BP/recipes/cannon_turret/cannon_stand.json": {
"data": {}
},
"BP/recipes/cannon_turret/unfinished_cannon_head.json": {
"data": {}
},
"BP/recipes/cannon_turret/cannon_head.json": {
"data": {}
},
"BP/recipes/cannon_turret/cannon_turret.json": {
"data": {}
},
"BP/recipes/cannon_turret/cannon_turret.shortcut.json": {
"data": {}
},
"RP/animation_controllers/cannon_turret.animation_controller.json": {
"data": {}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
},
"BP/entities/cannon_turret.json": {
"events": [
"targetAcquired",
"targetLost"
"removeTurret"
],
"bridge_core_tags": [],
"identifiers": [
Expand Down Expand Up @@ -96,6 +95,12 @@
"defensive:cannon_head"
],
"custom_commands": []
},
"BP/items/turret_remover.json": {
"identifiers": [
"defensive:turret_remover"
],
"custom_commands": []
}
},
"recipe": {
Expand Down Expand Up @@ -123,6 +128,41 @@
"tags": [
"crafting_table"
]
},
"BP/recipes/turret_remover.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/cannon_base.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/cannon_stand.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/unfinished_cannon_head.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/cannon_head.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/cannon_turret.json": {
"tags": [
"crafting_table"
]
},
"BP/recipes/cannon_turret/cannon_turret.shortcut.json": {
"tags": [
"crafting_table"
]
}
},
"client_entity": {
Expand All @@ -136,10 +176,11 @@
],
"animation_references": [
"setup",
"shoot",
"look_at_target",
"death",
"firing_sequence"
"fuse",
"shoot",
"firing_sequence",
"death"
],
"sound_references": [],
"texture_references": [
Expand Down Expand Up @@ -167,9 +208,11 @@
"rp_animation": {
"RP/animations/cannon_turret.animation.json": {
"ids": [
"animation.cannon_turret.setup",
"animation.cannon_turret.look_at_target",
"animation.cannon_turret.fuse",
"animation.cannon_turret.shoot",
"animation.cannon_turret.idle",
"animation.cannon_turret.destroyed"
"animation.cannon_turret.death"
]
}
},
Expand All @@ -195,7 +238,7 @@
"rp_animation_controller": {
"RP/animation_controllers/cannon_turret.animation_controller.json": {
"ids": [
"controller.animation.firing_sequence"
"controller.animation.cannon_turret.firing_sequence"
]
}
},
Expand Down
Loading

0 comments on commit 9136390

Please sign in to comment.