From 22af655678c0234c713b600ab089720625818e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= Date: Sat, 24 Aug 2019 19:23:36 +0300 Subject: [PATCH] Renamed Ammo to Bomb --- Assets/Animations/{Ammo.meta => Bomb.meta} | 0 Assets/Animations/{Ammo => Bomb}/Bomb.anim | 0 Assets/Animations/{Ammo => Bomb}/Bomb.anim.meta | 0 Assets/Animations/{Ammo => Bomb}/Bomb.controller | 0 Assets/Animations/{Ammo => Bomb}/Bomb.controller.meta | 0 Assets/Animations/{Ammo => Bomb}/Explosion.anim | 0 Assets/Animations/{Ammo => Bomb}/Explosion.anim.meta | 0 Assets/Animations/{Ammo => Bomb}/Explosion.controller | 0 Assets/Animations/{Ammo => Bomb}/Explosion.controller.meta | 0 Assets/Scripts/src/{Ammo.meta => Bomb.meta} | 0 Assets/Scripts/src/{Ammo => Bomb}/BombCameraShake.cs | 2 +- Assets/Scripts/src/{Ammo => Bomb}/BombCameraShake.cs.meta | 0 Assets/Scripts/src/{Ammo => Bomb}/BombController.cs | 2 +- Assets/Scripts/src/{Ammo => Bomb}/BombController.cs.meta | 0 Assets/Scripts/src/{Ammo => Bomb}/BombExplosion.cs | 3 +-- Assets/Scripts/src/{Ammo => Bomb}/BombExplosion.cs.meta | 0 Assets/Scripts/src/Helpers/PrefabAtlas.cs | 2 +- Assets/Scripts/src/Player/PlayerController.cs | 3 +-- 18 files changed, 5 insertions(+), 7 deletions(-) rename Assets/Animations/{Ammo.meta => Bomb.meta} (100%) rename Assets/Animations/{Ammo => Bomb}/Bomb.anim (100%) rename Assets/Animations/{Ammo => Bomb}/Bomb.anim.meta (100%) rename Assets/Animations/{Ammo => Bomb}/Bomb.controller (100%) rename Assets/Animations/{Ammo => Bomb}/Bomb.controller.meta (100%) rename Assets/Animations/{Ammo => Bomb}/Explosion.anim (100%) rename Assets/Animations/{Ammo => Bomb}/Explosion.anim.meta (100%) rename Assets/Animations/{Ammo => Bomb}/Explosion.controller (100%) rename Assets/Animations/{Ammo => Bomb}/Explosion.controller.meta (100%) rename Assets/Scripts/src/{Ammo.meta => Bomb.meta} (100%) rename Assets/Scripts/src/{Ammo => Bomb}/BombCameraShake.cs (96%) rename Assets/Scripts/src/{Ammo => Bomb}/BombCameraShake.cs.meta (100%) rename Assets/Scripts/src/{Ammo => Bomb}/BombController.cs (99%) rename Assets/Scripts/src/{Ammo => Bomb}/BombController.cs.meta (100%) rename Assets/Scripts/src/{Ammo => Bomb}/BombExplosion.cs (88%) rename Assets/Scripts/src/{Ammo => Bomb}/BombExplosion.cs.meta (100%) diff --git a/Assets/Animations/Ammo.meta b/Assets/Animations/Bomb.meta similarity index 100% rename from Assets/Animations/Ammo.meta rename to Assets/Animations/Bomb.meta diff --git a/Assets/Animations/Ammo/Bomb.anim b/Assets/Animations/Bomb/Bomb.anim similarity index 100% rename from Assets/Animations/Ammo/Bomb.anim rename to Assets/Animations/Bomb/Bomb.anim diff --git a/Assets/Animations/Ammo/Bomb.anim.meta b/Assets/Animations/Bomb/Bomb.anim.meta similarity index 100% rename from Assets/Animations/Ammo/Bomb.anim.meta rename to Assets/Animations/Bomb/Bomb.anim.meta diff --git a/Assets/Animations/Ammo/Bomb.controller b/Assets/Animations/Bomb/Bomb.controller similarity index 100% rename from Assets/Animations/Ammo/Bomb.controller rename to Assets/Animations/Bomb/Bomb.controller diff --git a/Assets/Animations/Ammo/Bomb.controller.meta b/Assets/Animations/Bomb/Bomb.controller.meta similarity index 100% rename from Assets/Animations/Ammo/Bomb.controller.meta rename to Assets/Animations/Bomb/Bomb.controller.meta diff --git a/Assets/Animations/Ammo/Explosion.anim b/Assets/Animations/Bomb/Explosion.anim similarity index 100% rename from Assets/Animations/Ammo/Explosion.anim rename to Assets/Animations/Bomb/Explosion.anim diff --git a/Assets/Animations/Ammo/Explosion.anim.meta b/Assets/Animations/Bomb/Explosion.anim.meta similarity index 100% rename from Assets/Animations/Ammo/Explosion.anim.meta rename to Assets/Animations/Bomb/Explosion.anim.meta diff --git a/Assets/Animations/Ammo/Explosion.controller b/Assets/Animations/Bomb/Explosion.controller similarity index 100% rename from Assets/Animations/Ammo/Explosion.controller rename to Assets/Animations/Bomb/Explosion.controller diff --git a/Assets/Animations/Ammo/Explosion.controller.meta b/Assets/Animations/Bomb/Explosion.controller.meta similarity index 100% rename from Assets/Animations/Ammo/Explosion.controller.meta rename to Assets/Animations/Bomb/Explosion.controller.meta diff --git a/Assets/Scripts/src/Ammo.meta b/Assets/Scripts/src/Bomb.meta similarity index 100% rename from Assets/Scripts/src/Ammo.meta rename to Assets/Scripts/src/Bomb.meta diff --git a/Assets/Scripts/src/Ammo/BombCameraShake.cs b/Assets/Scripts/src/Bomb/BombCameraShake.cs similarity index 96% rename from Assets/Scripts/src/Ammo/BombCameraShake.cs rename to Assets/Scripts/src/Bomb/BombCameraShake.cs index 79e3a51..25025cd 100644 --- a/Assets/Scripts/src/Ammo/BombCameraShake.cs +++ b/Assets/Scripts/src/Bomb/BombCameraShake.cs @@ -4,7 +4,7 @@ using src.Base; using src.Managers; using UnityEngine; -namespace src.Ammo +namespace src.Bomb { public class BombCameraShake : GameplayComponent { diff --git a/Assets/Scripts/src/Ammo/BombCameraShake.cs.meta b/Assets/Scripts/src/Bomb/BombCameraShake.cs.meta similarity index 100% rename from Assets/Scripts/src/Ammo/BombCameraShake.cs.meta rename to Assets/Scripts/src/Bomb/BombCameraShake.cs.meta diff --git a/Assets/Scripts/src/Ammo/BombController.cs b/Assets/Scripts/src/Bomb/BombController.cs similarity index 99% rename from Assets/Scripts/src/Ammo/BombController.cs rename to Assets/Scripts/src/Bomb/BombController.cs index 2dec22b..3229bac 100644 --- a/Assets/Scripts/src/Ammo/BombController.cs +++ b/Assets/Scripts/src/Bomb/BombController.cs @@ -4,7 +4,7 @@ using src.Helpers; using src.Managers; using UnityEngine; -namespace src.Ammo +namespace src.Bomb { public class BombController : GameplayComponent, IExplosable { diff --git a/Assets/Scripts/src/Ammo/BombController.cs.meta b/Assets/Scripts/src/Bomb/BombController.cs.meta similarity index 100% rename from Assets/Scripts/src/Ammo/BombController.cs.meta rename to Assets/Scripts/src/Bomb/BombController.cs.meta diff --git a/Assets/Scripts/src/Ammo/BombExplosion.cs b/Assets/Scripts/src/Bomb/BombExplosion.cs similarity index 88% rename from Assets/Scripts/src/Ammo/BombExplosion.cs rename to Assets/Scripts/src/Bomb/BombExplosion.cs index f4d0f8d..395aaa1 100644 --- a/Assets/Scripts/src/Ammo/BombExplosion.cs +++ b/Assets/Scripts/src/Bomb/BombExplosion.cs @@ -1,8 +1,7 @@ using src.Base; -using src.Helpers; using src.Managers; -namespace src.Ammo +namespace src.Bomb { public class BombExplosion : GameplayComponent { diff --git a/Assets/Scripts/src/Ammo/BombExplosion.cs.meta b/Assets/Scripts/src/Bomb/BombExplosion.cs.meta similarity index 100% rename from Assets/Scripts/src/Ammo/BombExplosion.cs.meta rename to Assets/Scripts/src/Bomb/BombExplosion.cs.meta diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index 9aa7a7c..64ad272 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -27,7 +27,7 @@ namespace src.Helpers Resources.Load("Items/GoldenBombUpgrade"); /* Items */ - public static readonly GameObject PlayerBomb = + public static readonly GameObject Bomb = Resources.Load("Items/Bomb"); public static readonly GameObject BombExplosion = Resources.Load("Items/BombExplosion"); diff --git a/Assets/Scripts/src/Player/PlayerController.cs b/Assets/Scripts/src/Player/PlayerController.cs index ce6e9a4..83ec1fd 100644 --- a/Assets/Scripts/src/Player/PlayerController.cs +++ b/Assets/Scripts/src/Player/PlayerController.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel; -using src.Ammo; using src.Base; using src.Helpers; using src.Managers; @@ -151,7 +150,7 @@ namespace src.Player var newPosition = new Vector2(absX, absY); if (!_bombsUtil.CanPlaceBomb(newPosition)) return; - Instantiate(PrefabAtlas.PlayerBomb, newPosition, Quaternion.identity); + Instantiate(PrefabAtlas.Bomb, newPosition, Quaternion.identity); _bombsUtil.RegisterBomb(newPosition); }