diff --git a/Test_CYOA/Assembly-CSharp.csproj b/Test_CYOA/Assembly-CSharp.csproj
index fd10cf9c..e6bae045 100644
--- a/Test_CYOA/Assembly-CSharp.csproj
+++ b/Test_CYOA/Assembly-CSharp.csproj
@@ -51,18 +51,12 @@
-
- C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll
-
C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
-
- C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll
-
C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll
diff --git a/Test_CYOA/Assets/CYO_Layout.unity b/Test_CYOA/Assets/CYO_Layout.unity
index 40f801de..ac224332 100644
Binary files a/Test_CYOA/Assets/CYO_Layout.unity and b/Test_CYOA/Assets/CYO_Layout.unity differ
diff --git a/Test_CYOA/Assets/Materials/CYO_XP.jpg b/Test_CYOA/Assets/Materials/CYO_XP.jpg
new file mode 100644
index 00000000..5a9b4a54
Binary files /dev/null and b/Test_CYOA/Assets/Materials/CYO_XP.jpg differ
diff --git a/Test_CYOA/Assets/Materials/CYO_XP.jpg.meta b/Test_CYOA/Assets/Materials/CYO_XP.jpg.meta
new file mode 100644
index 00000000..6ea55141
--- /dev/null
+++ b/Test_CYOA/Assets/Materials/CYO_XP.jpg.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 2c3ed818d51f9004a95b726b7e336964
+timeCreated: 1444112799
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 2
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ linearTexture: 0
+ correctGamma: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: .25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 0
+ cubemapConvolution: 0
+ cubemapConvolutionSteps: 8
+ cubemapConvolutionExponent: 1.5
+ seamlessCubemap: 0
+ textureFormat: -1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: -1
+ nPOTScale: 1
+ lightmap: 0
+ rGBM: 0
+ compressionQuality: 50
+ allowsAlphaSplitting: 0
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: .5, y: .5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaIsTransparency: 0
+ textureType: -1
+ buildTargetSettings: []
+ spriteSheet:
+ sprites: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat
new file mode 100644
index 00000000..e78e1fd7
Binary files /dev/null and b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat differ
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat.meta b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat.meta
new file mode 100644
index 00000000..a4fa4dcd
--- /dev/null
+++ b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45dd86d0e6597e046a3784238f7e6fe2
+timeCreated: 1444112852
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Test_CYOA/Assets/Scripts/Combat.cs b/Test_CYOA/Assets/Scripts/Combat.cs
index 1b65b63d..28c0d97c 100644
--- a/Test_CYOA/Assets/Scripts/Combat.cs
+++ b/Test_CYOA/Assets/Scripts/Combat.cs
@@ -26,6 +26,11 @@ public class Combat : MonoBehaviour {
public int enemy1HP = 75;
public int enemy2HP = 100;
+ //Collectables
+ public GameObject healthPickup;
+ public GameObject xpCube;
+ public GameObject gunPickup;
+
@@ -41,11 +46,92 @@ public class Combat : MonoBehaviour {
void Update()
{
ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-
+ //Combat
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "Enemy1")
+ {
+ hpValue = hpValue - damageEnemy;
+ enemy1HP = enemy1HP - damage;
+ Debug.Log("attack registered");
+ }
+
+ }
+ }
+ if(enemy1HP <= 0)
+ {
+ Destroy(enemy1);
+
+ }
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "Enemy2")
+ {
+ hpValue = hpValue - damageEnemy;
+ enemy2HP = enemy2HP - damage;
+ Debug.Log("attack registered");
+ }
+
+ }
+ }
+ if (enemy2HP <= 0)
+ {
+ Destroy(enemy2);
+ }
+ //Level Up
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "XPCube")
+ {
+ Destroy(xpCube);
+ xp = 1; }
+
+ }
+ }
+ if(xp > 0)
+ {
+ damageEnemy = 12;
+ }
+
+
+
+ //HP Pickup
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "HealthKit")
+ {
+ Destroy(healthPickup);
+ hpValue = hpValue + 30;
+ }
+
+ }
+ }
+
+ //Mega Gun
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "MegaGun")
+ {
+ Destroy(gunPickup);
+ damage = 100;
+ }
+
+ }
+ }
//HP Display
hpText.text = "health: " + hpValue;
diff --git a/Test_CYOA/Assets/Scripts/Combat.cs.meta b/Test_CYOA/Assets/Scripts/Combat.cs.meta
index cf7da0ff..74b76f96 100644
--- a/Test_CYOA/Assets/Scripts/Combat.cs.meta
+++ b/Test_CYOA/Assets/Scripts/Combat.cs.meta
@@ -1,10 +1,12 @@
fileFormatVersion: 2
guid: e89b08af6b41f2f428ba26892718a73d
-timeCreated: 1444106399
+timeCreated: 1444111173
licenseType: Free
MonoImporter:
serializedVersion: 2
- defaultReferences: []
+ defaultReferences:
+ - enemy1: {instanceID: 0}
+ - enemy2: {instanceID: 0}
executionOrder: 0
icon: {instanceID: 0}
userData:
diff --git a/Test_CYOA/Assets/Scripts/LeftyRighty.cs b/Test_CYOA/Assets/Scripts/LeftyRighty.cs
index df65cfdc..610cd950 100644
--- a/Test_CYOA/Assets/Scripts/LeftyRighty.cs
+++ b/Test_CYOA/Assets/Scripts/LeftyRighty.cs
@@ -24,14 +24,12 @@ public class LeftyRighty : MonoBehaviour {
STFU = true;
yAngle = yAngle + 30;
gameObject.transform.localEulerAngles = new Vector3(0, yAngle, 0);
- Debug.Log ("right");
}
if (Input.GetKeyDown(KeyCode.LeftArrow))
{
STFU = true;
yAngle = yAngle - 30;
gameObject.transform.localEulerAngles = new Vector3(0, yAngle , 0);
- Debug.Log("left");
}
}
diff --git a/Test_CYOA/Assets/Scripts/Puzzle_231.cs b/Test_CYOA/Assets/Scripts/Puzzle_231.cs
index 8c203677..480e5ea6 100644
--- a/Test_CYOA/Assets/Scripts/Puzzle_231.cs
+++ b/Test_CYOA/Assets/Scripts/Puzzle_231.cs
@@ -109,7 +109,6 @@ public class Puzzle_231 : MonoBehaviour {
if (total == 3)
{
- Debug.Log("Puzzle Complete!");
Destroy(button1);
Destroy(button2);
Destroy(button3);
diff --git a/Test_CYOA/Assets/Scripts/WorldUpdates.cs b/Test_CYOA/Assets/Scripts/WorldUpdates.cs
index 19012a58..5ca094d6 100644
--- a/Test_CYOA/Assets/Scripts/WorldUpdates.cs
+++ b/Test_CYOA/Assets/Scripts/WorldUpdates.cs
@@ -14,7 +14,8 @@ public class WorldUpdates : MonoBehaviour
public RaycastHit hit;
//Assets, all of them
-
+ public GameObject enemy1;
+ public GameObject enemy2;
//Initialize Game
void Awake ()
@@ -29,7 +30,6 @@ public class WorldUpdates : MonoBehaviour
}
-
void Update()
{
ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@@ -140,7 +140,7 @@ public class WorldUpdates : MonoBehaviour
{
if (hit.transform.name == "PlayerPos10")
{
- updateField = "update: moved";
+ updateField = "could this be the end?";
}
}
@@ -176,7 +176,7 @@ public class WorldUpdates : MonoBehaviour
{
if (hit.transform.name == "HealthKit")
{
- updateField = "update: healt restored to full!";
+ updateField = "update: health restored!";
}
}
@@ -279,6 +279,21 @@ public class WorldUpdates : MonoBehaviour
}
+ //Level up
+ if (Physics.Raycast(ray, out hit))
+ {
+ if (Input.GetKeyDown(KeyCode.Mouse0))
+ {
+ if (hit.transform.name == "XPCube")
+ {
+ updateField = "level up! your durability has increased.";
+ }
+
+ }
+ }
+
+
+
//Text - Update Field -- Keep Last
updates.text = updateField;
diff --git a/Test_CYOA/Assets/WorldAssets.meta b/Test_CYOA/Assets/WorldAssets.meta
new file mode 100644
index 00000000..2d595055
--- /dev/null
+++ b/Test_CYOA/Assets/WorldAssets.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 668bb59cd49a7cd4688d0d7307381946
+folderAsset: yes
+timeCreated: 1444110907
+licenseType: Free
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy1.prefab b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab
new file mode 100644
index 00000000..d003b432
Binary files /dev/null and b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab differ
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy1.prefab.meta b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab.meta
new file mode 100644
index 00000000..a4032f98
--- /dev/null
+++ b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5e433defd08610a46ac0f36f1de0119a
+timeCreated: 1444110911
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy2.prefab b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab
new file mode 100644
index 00000000..5a23fd0c
Binary files /dev/null and b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab differ
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy2.prefab.meta b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab.meta
new file mode 100644
index 00000000..766ec23a
--- /dev/null
+++ b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 56ecf65543a85284c8c5ef7c823fdc01
+timeCreated: 1444110913
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Test_CYOA/Library/CurrentLayout.dwlt b/Test_CYOA/Library/CurrentLayout.dwlt
index fabd2790..e585360d 100644
Binary files a/Test_CYOA/Library/CurrentLayout.dwlt and b/Test_CYOA/Library/CurrentLayout.dwlt differ
diff --git a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
index a80c145c..3854aeff 100644
Binary files a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ
diff --git a/Test_CYOA/Library/assetDatabase3 b/Test_CYOA/Library/assetDatabase3
index fd9f5f59..47ef41e7 100644
Binary files a/Test_CYOA/Library/assetDatabase3 and b/Test_CYOA/Library/assetDatabase3 differ
diff --git a/Test_CYOA/Library/expandedItems b/Test_CYOA/Library/expandedItems
index ea8ae326..f6e758c8 100644
Binary files a/Test_CYOA/Library/expandedItems and b/Test_CYOA/Library/expandedItems differ
diff --git a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000
index f53bafca..cff37029 100644
Binary files a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 and b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 differ
diff --git a/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964 b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964
new file mode 100644
index 00000000..ee882d4c
Binary files /dev/null and b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964 differ
diff --git a/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964.info b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964.info
new file mode 100644
index 00000000..0aabd2e8
Binary files /dev/null and b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964.info differ
diff --git a/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2 b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2
new file mode 100644
index 00000000..61278048
Binary files /dev/null and b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2 differ
diff --git a/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2.info b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2.info
new file mode 100644
index 00000000..afb8dfeb
Binary files /dev/null and b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2.info differ
diff --git a/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01 b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01
new file mode 100644
index 00000000..6a7f8a31
Binary files /dev/null and b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01 differ
diff --git a/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01.info b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01.info
new file mode 100644
index 00000000..ae94ed5c
Binary files /dev/null and b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01.info differ
diff --git a/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a
new file mode 100644
index 00000000..0f991b90
Binary files /dev/null and b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a differ
diff --git a/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a.info b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a.info
new file mode 100644
index 00000000..56fde94e
Binary files /dev/null and b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a.info differ
diff --git a/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946 b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946
new file mode 100644
index 00000000..c4f13484
Binary files /dev/null and b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946 differ
diff --git a/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946.info b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946.info
new file mode 100644
index 00000000..f109d2e0
Binary files /dev/null and b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946.info differ
diff --git a/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6 b/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6
index 31cda6db..91d22dae 100644
Binary files a/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6 and b/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6 differ
diff --git a/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e b/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e
index acdcad17..f95df1fe 100644
Binary files a/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e and b/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e differ
diff --git a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64
index d630a236..bf2de17a 100644
Binary files a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 and b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 differ
diff --git a/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d b/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d
index 9c9a969a..79e0c7ed 100644
Binary files a/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d and b/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d differ
diff --git a/Test_CYOA/Test_CYOA.sln b/Test_CYOA/Test_CYOA.sln
index 5d3db300..dc43121e 100644
--- a/Test_CYOA/Test_CYOA.sln
+++ b/Test_CYOA/Test_CYOA.sln
@@ -17,7 +17,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
+ GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1