Skip to content

Commit 860e2f7

Browse files
committed
Cleaning up class names
1 parent ed64dc4 commit 860e2f7

14 files changed

+86
-21
lines changed

Assets/_Project/Prefabs/Player/TrailingMonsterParticles.prefab renamed to Assets/_Project/Prefabs/Player/Monster.prefab

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Prefabs/Player/TrailingMonsterParticles.prefab.meta renamed to Assets/_Project/Prefabs/Player/Monster.prefab.meta

File renamed without changes.

Assets/_Project/Prefabs/Player/Notinuse.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Prefabs/Player/TrailingMonsterSprite.prefab renamed to Assets/_Project/Prefabs/Player/Notinuse/MonsterFrameAnim.prefab

File renamed without changes.

Assets/_Project/Prefabs/Player/TrailingMonsterSprite.prefab.meta renamed to Assets/_Project/Prefabs/Player/Notinuse/MonsterFrameAnim.prefab.meta

File renamed without changes.

Assets/_Project/Prefabs/Player/PlayerPrefab.prefab

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Scenes/tally-viz-master.unity

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Scripts/Players/MonsterAddSpritesParticleAnim.cs renamed to Assets/_Project/Scripts/Players/Monster.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Adds sprites for PARTICLE animation
88
*/
99

10-
public class MonsterAddSpritesParticleAnim : MonoBehaviour {
10+
public class Monster : MonoBehaviour {
1111

1212

1313
// temp sprites for assigning monsters

Assets/_Project/Scripts/Players/MonsterAddSpritesParticleAnim.cs.meta renamed to Assets/_Project/Scripts/Players/Monster.cs.meta

File renamed without changes.

Assets/_Project/Scripts/Players/MonsterController.cs

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,45 @@ void Start ()
3232

3333

3434
// Adds a monster to the circle
35-
public void AddMonster ()
35+
public void AddMonster (int _mid = -1)
3636
{
3737
// if at max monsters
3838
if (monsters.Count >= 8) return;
3939

40-
// get a random mid from those in the game
41-
int mid = MonsterIndex.Instance.gameMids [(int)Random.Range (0, MonsterIndex.Instance.gameMids.Length)];
40+
if (_mid < 1) {
41+
// get a random mid from those in the game
42+
_mid = MonsterIndex.Instance.gameMids [(int)Random.Range (0, MonsterIndex.Instance.gameMids.Length)];
43+
}
44+
4245

4346
// Create new monster and make it a child of the next available spawn point
4447
GameObject monsterObj;
4548
monsterObj = Instantiate (monsterPrefab, spawnPoints [monsters.Count]);
4649

4750
// call Init() on monster to get data / display animation
48-
monsterObj.GetComponent<MonsterAddSpritesParticleAnim> ().Init (mid);
51+
monsterObj.GetComponent<Monster> ().Init (_mid);
52+
53+
// rename
54+
monsterObj.name = "m" + _mid.ToString ();
4955

5056
// add to list
5157
monsters.Add (monsterObj.transform);
5258
}
5359

5460
// Removes a monster from the circle
55-
public void RemoveMonster (int mid = -1)
61+
public void RemoveMonster (int _mid = -1)
5662
{
57-
if (mid < 1) return;
63+
if (_mid < 1 || monsters.Count < 1) return;
64+
65+
for (int i = 0; i < monsters.Count; i++) {
66+
if (monsters [i].name == "m" + _mid) {
67+
// remove from game
68+
Destroy (monsters [i]);
69+
// remove from list
70+
monsters.RemoveAt (i);
71+
break;
72+
}
73+
}
5874
}
5975

6076

0 commit comments

Comments
 (0)