diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index acbc0ac..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/First Project/Assets/DnDBattle.unity b/First Project/Assets/DnDBattle.unity index 3213885..6799df6 100644 Binary files a/First Project/Assets/DnDBattle.unity and b/First Project/Assets/DnDBattle.unity differ diff --git a/First Project/Assets/Scripts/DNDFight.cs b/First Project/Assets/Scripts/DNDFight.cs index 752335f..ccbdca1 100644 --- a/First Project/Assets/Scripts/DNDFight.cs +++ b/First Project/Assets/Scripts/DNDFight.cs @@ -3,6 +3,7 @@ using System.Collections; using UnityEngine.UI; public class DNDFight : MonoBehaviour { + public Text log; public Text pName; public Text pHitPoints; public Text pDMG; @@ -16,13 +17,14 @@ public class DNDFight : MonoBehaviour { public int pHitPointsInt; public int pDMGLow; public int pDMGHigh; - public float pAccf; + public int pAccf; public string eNameStr; public int eHitPointsInt; public int eDMGLow; public int eDMGHigh; - public float eAccf; + public int eAccf; + // Use this for initializations void Start () { @@ -35,6 +37,7 @@ public class DNDFight : MonoBehaviour { eHitPoints = eHitPoints.GetComponent (); eDMG = eDMG.GetComponent (); eAcc = eAcc.GetComponent (); + log = log.GetComponent (); } @@ -44,14 +47,79 @@ public class DNDFight : MonoBehaviour { pName.text = pNameStr; pHitPoints.text = "HP: " + pHitPointsInt.ToString (); pDMG.text = pDMGLow.ToString () + " - " + pDMGHigh.ToString (); - pAcc.text = "Accuracy: " + pAccf.ToString (); + pAcc.text = "Accuracy: " + pAccf.ToString () + " %"; eName.text = eNameStr; eHitPoints.text = "HP: " + eHitPointsInt.ToString (); eDMG.text = eDMGLow.ToString () + " - " + eDMGHigh.ToString (); - eAcc.text = "Accuracy: " + eAccf.ToString (); + eAcc.text = "Accuracy: " + eAccf.ToString () + " %"; + } + + public void Roll () { + pNameStr = "PLAYER 1"; + pHitPointsInt = getRandomInt (4.0f, 24.0f); + int pdmg1 = getRandomInt (4.0f, 24.0f); + int pdmg2 = getRandomInt (4.0f, 24.0f); + pDMGHigh = Mathf.Max (pdmg1, pdmg2); + pDMGLow = Mathf.Min (pdmg1, pdmg2); + pAccf = getRandomInt(0.0f, 100.0f); + + eNameStr = "Enemy 1"; + eHitPointsInt = getRandomInt (4.0f, 24.0f); + int edmg1 = getRandomInt (4.0f, 24.0f); + int edmg2 = getRandomInt (4.0f, 24.0f); + eDMGHigh = Mathf.Max (edmg1, edmg2); + eDMGLow = Mathf.Min (edmg1, edmg2); + eAccf = getRandomInt(0.0f, 100.0f); + } + public void Fight () { + string final = playerAttackEnemy () + enemyAttackPlayer (); + log.text = final; + } + + string playerAttackEnemy () { + string result = ""; + if (getRandomInt (0.0f, 100.0f) < pAccf) { + result += "Hit! " + pNameStr + " hit " + eNameStr + " for "; + int dmg = getRandomInt ((float)pDMGLow, (float)pDMGHigh); + eHitPointsInt = eHitPointsInt - dmg; + result += dmg.ToString () + " damage. \n"; + + if (eHitPointsInt <= 0) { + result += "Dead! " + eNameStr + " has died! \n"; + + } + + } else { + result += "Miss! " + pNameStr + " missed " + eNameStr + "! \n"; + } + return result; } + string enemyAttackPlayer () { + string result = ""; + if (getRandomInt (0.0f, 100.0f) < pAccf) { + result += "Hit! " + eNameStr + " hit " + pNameStr + " for "; + int dmg = getRandomInt ((float)eDMGLow, (float)eDMGHigh); + pHitPointsInt = pHitPointsInt - dmg; + result += dmg.ToString () + " damage. \n"; + if (pHitPointsInt <= 0) { + result += "Dead! " + pNameStr + " has died! \n"; + + } + + } else { + result += "Miss! " + eNameStr + " missed " + pNameStr + "! \n"; + } + return result; + } + + + + + int getRandomInt(float i, float j) { + return Mathf.RoundToInt(Random.Range (i, j)); + } // Update is called once per frame void Update () { set (); diff --git a/First Project/Library/CurrentLayout.dwlt b/First Project/Library/CurrentLayout.dwlt index c6aac68..6f3c53f 100644 Binary files a/First Project/Library/CurrentLayout.dwlt and b/First Project/Library/CurrentLayout.dwlt differ diff --git a/First Project/Library/LastSceneManagerSetup.txt b/First Project/Library/LastSceneManagerSetup.txt index f01aa21..a47fe98 100644 --- a/First Project/Library/LastSceneManagerSetup.txt +++ b/First Project/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scene/DnDCombat.unity +- path: Assets/DnDBattle.unity isLoaded: 1 isActive: 1 diff --git a/First Project/Library/ProjectSettings.asset b/First Project/Library/ProjectSettings.asset index b0da325..44e5ace 100644 Binary files a/First Project/Library/ProjectSettings.asset and b/First Project/Library/ProjectSettings.asset differ diff --git a/First Project/Library/assetDatabase3 b/First Project/Library/assetDatabase3 index 3b85583..dc42fb7 100644 Binary files a/First Project/Library/assetDatabase3 and b/First Project/Library/assetDatabase3 differ diff --git a/First Project/Library/expandedItems b/First Project/Library/expandedItems index 48bdfe7..45a5095 100644 Binary files a/First Project/Library/expandedItems and b/First Project/Library/expandedItems differ diff --git a/First Project/Library/metadata/00/00000000000000004000000000000000 b/First Project/Library/metadata/00/00000000000000004000000000000000 index 4bc8ab7..703815a 100644 Binary files a/First Project/Library/metadata/00/00000000000000004000000000000000 and b/First Project/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/First Project/Library/metadata/00/00000000000000006100000000000000 b/First Project/Library/metadata/00/00000000000000006100000000000000 index 15c4c4f..e9d0ee1 100644 Binary files a/First Project/Library/metadata/00/00000000000000006100000000000000 and b/First Project/Library/metadata/00/00000000000000006100000000000000 differ diff --git a/First Project/Library/metadata/00/00000000000000008100000000000000 b/First Project/Library/metadata/00/00000000000000008100000000000000 index e6b88b0..8f8a009 100644 Binary files a/First Project/Library/metadata/00/00000000000000008100000000000000 and b/First Project/Library/metadata/00/00000000000000008100000000000000 differ diff --git a/First Project/Library/metadata/00/0000000000000000a100000000000000 b/First Project/Library/metadata/00/0000000000000000a100000000000000 index b7986eb..2c8837c 100644 Binary files a/First Project/Library/metadata/00/0000000000000000a100000000000000 and b/First Project/Library/metadata/00/0000000000000000a100000000000000 differ diff --git a/First Project/ProjectSettings/ProjectSettings.asset b/First Project/ProjectSettings/ProjectSettings.asset index b0da325..44e5ace 100644 Binary files a/First Project/ProjectSettings/ProjectSettings.asset and b/First Project/ProjectSettings/ProjectSettings.asset differ diff --git a/First Project/ProjectSettings/UnityConnectSettings.asset b/First Project/ProjectSettings/UnityConnectSettings.asset index 577697e..33272e8 100644 Binary files a/First Project/ProjectSettings/UnityConnectSettings.asset and b/First Project/ProjectSettings/UnityConnectSettings.asset differ diff --git a/First Project/Temp/__Backupscenes/0.backup b/First Project/Temp/__Backupscenes/0.backup index 3ef5fd9..4668cf7 100644 Binary files a/First Project/Temp/__Backupscenes/0.backup and b/First Project/Temp/__Backupscenes/0.backup differ