From 32c2382e067cfbe723e74e717c8632363515e3db Mon Sep 17 00:00:00 2001 From: Lorenzo Balugani Date: Sat, 27 Apr 2019 17:18:44 +0200 Subject: [PATCH] Add a massive mess Bunch of unfinished code --- .vscode/settings.json | 56 +++++++++++++++++++++++++++ Assets/Animations.meta | 8 ---- Assets/Animators.meta | 8 ---- Assets/Assets.meta | 8 ---- Assets/PhysMats.meta | 8 ---- Assets/Scripts/Consumabile.cs | 32 +++++++++++++++ Assets/Scripts/Consumabile.cs.meta | 11 ++++++ Assets/Scripts/Map.cs.meta | 6 ++- Assets/Scripts/Mostro.cs | 62 ++++++++++++++++++++++++++++++ Assets/Scripts/Mostro.cs.meta | 11 ++++++ Assets/Scripts/Object.cs | 20 ++++++++++ Assets/Scripts/Object.cs.meta | 11 ++++++ Assets/Scripts/Player.cs | 16 ++++---- Assets/Sounds.meta | 8 ---- 14 files changed, 216 insertions(+), 49 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 Assets/Animations.meta delete mode 100644 Assets/Animators.meta delete mode 100644 Assets/Assets.meta delete mode 100644 Assets/PhysMats.meta create mode 100644 Assets/Scripts/Consumabile.cs create mode 100644 Assets/Scripts/Consumabile.cs.meta create mode 100644 Assets/Scripts/Mostro.cs create mode 100644 Assets/Scripts/Mostro.cs.meta create mode 100644 Assets/Scripts/Object.cs create mode 100644 Assets/Scripts/Object.cs.meta delete mode 100644 Assets/Sounds.meta diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..4edd970 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitignore":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/Animations.meta b/Assets/Animations.meta deleted file mode 100644 index b2a79e2..0000000 --- a/Assets/Animations.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ef3d86d84c224344a94715cdfa9fe32c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animators.meta b/Assets/Animators.meta deleted file mode 100644 index 7ff80b8..0000000 --- a/Assets/Animators.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 043f304edcc831c4ea9fcf0e1a2e520d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Assets.meta b/Assets/Assets.meta deleted file mode 100644 index 4eba494..0000000 --- a/Assets/Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0460346d99d385241a6d87bbd10aceb8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PhysMats.meta b/Assets/PhysMats.meta deleted file mode 100644 index bc5b1b2..0000000 --- a/Assets/PhysMats.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e823a56cb429e4b49becdc740fba66b9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Consumabile.cs b/Assets/Scripts/Consumabile.cs new file mode 100644 index 0000000..aecdeda --- /dev/null +++ b/Assets/Scripts/Consumabile.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Consumabile : Object +{ + // Start is called before the first frame update + public enum Tipo {Cura, Danno}; + public GameObject player; + public Player player; + public int valore; + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + void use(){ + if (Tipo == Tipo.Cura){ + player.hp += valore; + if (player.hp >= player.maxhp) player.hp = player.maxhp; + } + if (Tipo == Tipo.Danno){ + player.hp -= valore; + } + } +} diff --git a/Assets/Scripts/Consumabile.cs.meta b/Assets/Scripts/Consumabile.cs.meta new file mode 100644 index 0000000..26b1684 --- /dev/null +++ b/Assets/Scripts/Consumabile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: db5a27c0009da214088bb4a3c08b76db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Map.cs.meta b/Assets/Scripts/Map.cs.meta index 659896b..2695166 100644 --- a/Assets/Scripts/Map.cs.meta +++ b/Assets/Scripts/Map.cs.meta @@ -3,7 +3,11 @@ guid: 052bc569472779a429bfc51246f723d4 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - wallSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - roomSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - corridorSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - tilePrefab: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/Scripts/Mostro.cs b/Assets/Scripts/Mostro.cs new file mode 100644 index 0000000..467af32 --- /dev/null +++ b/Assets/Scripts/Mostro.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Mostro : MonoBehaviour +{ + public string nome; + public Sprite sprite; + public int hpmax, hp, exp; + public bool is_undead; + public enum speed {slow, standard, fast}; + private bool player_spotted; + public Map map; + // Start is called before the first frame update + void Start() + { + map = gameObjectMappa.GetComponent(); + player_spotted = false; + } + + // Update is called once per frame + void Update() + { + if (!player_spotted){ + roam(); + } + //Da mettere il pathfinding per quando trova il personaggio + } + void roam(){ + while (true) + { + int direction = Random.Range(1, 5); + if (direction==1 && is_valid_movement("left")){ + transform.Translate(Vector3.left); + break; + } + else if (direction==2 && is_valid_movement("right")){ + transform.Translate(Vector3.right); + break; + } + else if (direction==3 && is_valid_movement("up")){ + transform.Translate(Vector3.up); + break; + } + else if (is_valid_movement("down")){ + transform.Translate(Vector3.up); + break; + } + } + } + bool is_valid_movement(string direction) + { + Tile tile; + int posX = (int) transform.position.x; + int posY = (int) transform.position.y; + if (direction == "left") tile = map.GetTile(posX - 1, posY); + else if (direction == "right") tile = map.GetTile(posX + 1, posY); + else if (direction == "up") tile = map.GetTile(posX, posY + 1); + else tile = map.GetTile(posX, posY - 1); + return tile.walkable; + } +} diff --git a/Assets/Scripts/Mostro.cs.meta b/Assets/Scripts/Mostro.cs.meta new file mode 100644 index 0000000..31bb5e3 --- /dev/null +++ b/Assets/Scripts/Mostro.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d484827da1a4f984c837dbfb9f970bdd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Object.cs b/Assets/Scripts/Object.cs new file mode 100644 index 0000000..e01fcdb --- /dev/null +++ b/Assets/Scripts/Object.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Object : MonoBehaviour +{ + public string nome; + public int costo; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Object.cs.meta b/Assets/Scripts/Object.cs.meta new file mode 100644 index 0000000..ec349c0 --- /dev/null +++ b/Assets/Scripts/Object.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 49be0f8468bff6249b7befdf02bc8ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 1f2e98b..96900b0 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -4,8 +4,7 @@ using UnityEngine; public class Player : MonoBehaviour { - private int exp, level, hp; - public GameObject player; + private int exp, level, hp, maxhp; public int startingHp; public Map map; //TODO: Aggiungi gli oggetti in inventario @@ -26,27 +25,28 @@ public class Player : MonoBehaviour { if (Input.GetKey(KeyCode.A)) { - if (is_valid_movement("left")) player.transform.Translate(Vector3.left); + if (is_valid_movement("left")) transform.Translate(Vector3.left); } if (Input.GetKey(KeyCode.D)) { - if (is_valid_movement("right")) player.transform.Translate(Vector3.right); + if (is_valid_movement("right")) transform.Translate(Vector3.right); } if (Input.GetKey(KeyCode.W)) { - if (is_valid_movement("up")) player.transform.Translate(Vector3.up); + if (is_valid_movement("up")) transform.Translate(Vector3.up); } if (Input.GetKey(KeyCode.S)) { - if (is_valid_movement("down")) player.transform.Translate(Vector3.down); + if (is_valid_movement("down")) transform.Translate(Vector3.down); } + // Qui c'è da aggiungere la condizione per il controllo degli hp } bool is_valid_movement(string direction) { Tile tile; - int posX = (int) player.transform.position.x; - int posY = (int) player.transform.position.y; + int posX = (int) transform.position.x; + int posY = (int) transform.position.y; if (direction == "left") tile = map.GetTile(posX - 1, posY); else if (direction == "right") tile = map.GetTile(posX + 1, posY); else if (direction == "up") tile = map.GetTile(posX, posY + 1); diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta deleted file mode 100644 index 5fd147f..0000000 --- a/Assets/Sounds.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19c0d85909aede34bb371863f187b9e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: