qol changes

now notifies the player if their inventory is full, slightly tweaked spawn rates with torches, notifies player when they unlock a new character, fixed maul one shotting devil
jeff-j-chen · Sep 27, 2021 · 3a3fdbd · 3a3fdbd
1 parent ffad897
commit 3a3fdbd
Show file tree

Hide file tree

Showing 77 changed files with 1,263 additions and 1,053 deletions.
diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity
@@ -3385,7 +3385,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 500, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1301635789
 MonoBehaviour:

diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs
@@ -269,8 +269,8 @@ public void Use() {
     /// </summary>
     private void UseCommon() {
         if (Save.game.enemyIsDead || scripts.enemy.enemyName.text is "Tombstone" or "Merchant") {
-            if (itemName is "steak" or "cheese" or "retry" or "arrow") {
-                // only allow those 4 items to be used if the enemy is dead, otherwise its a waste
+            if (itemName is "steak" or "cheese" or "retry" or "arrow" || itemName == "potion" && modifier == "life") {
+                // only these specific items can be used at a merchant/tombstone, otherwise it doesn't make sense or is a waste
                 StartCoroutine(UseCommonCoro());
             }
         }

diff --git a/Assets/Scripts/ItemManager.cs b/Assets/Scripts/ItemManager.cs
@@ -4,6 +4,7 @@
 using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.TextCore.Text;
 public class ItemManager : MonoBehaviour {
     [SerializeField] public TextMeshProUGUI lootText;
     [SerializeField] public TextMeshProUGUI itemDesc;
@@ -309,9 +310,8 @@ public void GiveStarterItems() {
             switch (Save.game.curCharNum) {
                 // new game, so give the base weapons
                 case 0: {
-                    // CreateWeaponWithStats("sword", "harsh", 2, 2, 1, 2);
                     CreateWeaponWithStats("sword", "harsh", 2, 2, 1, 2);
-                    // CreateWeaponWithStats("sword", "administrative", 10, 10, 10, 10);
+                    // CreateWeaponWithStats("maul", "administrative", 10, 10, 10, 10);
                     MoveToInventory(0, true, false, false);
                     CreateItem("steak");
                     MoveToInventory(0, true, false, false);
@@ -503,7 +503,8 @@ public GameObject CreateItem(string itemName, string modifier, int negativeOffse
     private void SetItemStatsImmediately(GameObject instantiatedItem) {
         // this needs to be done here rather than in Item.Start() or Awake() because the timing will be off and errors will be thrown
         if (instantiatedItem.GetComponent<Item>().itemName == "necklet") {
-            instantiatedItem.GetComponent<Item>().modifier = neckletTypes[Random.Range(0, 5)];
+            int rand = Random.Range(0, 5);
+            instantiatedItem.GetComponent<Item>().modifier = neckletTypes[rand];
         }
         else if (instantiatedItem.GetComponent<Item>().itemName == "scroll") {
             instantiatedItem.GetComponent<Item>().modifier = scrollTypes[Random.Range(0, scrollTypes.Length)];
@@ -714,6 +715,9 @@ public void MoveToInventory(int index, bool starter=false, bool playAudio=true,
                     // attempt to select the next item of where it was
                 }
             }
+            else {
+                scripts.turnManager.SetStatusText("you can't carry any more");
+            }
         }
         else {
             Destroy(floorItems[index]);
@@ -758,7 +762,7 @@ public void SpawnItems() {
                 int torchCount = (from item in scripts.player.inventory where item.GetComponent<Item>().itemName == "torch" select item).Count();
                 if (PlayerHasWeapon("sword") && PlayerHasLegendary()) { torchCount++; }
                 // count the number of torches, legendary sword helps find loot
-                int spawnCount = Mathf.Clamp(torchCount + scripts.levelManager.level + 1 + Random.Range(-2, 1), 0, 6);
+                int spawnCount = Mathf.Clamp(Random.Range(1, torchCount+1) + scripts.levelManager.level + 1 + Random.Range(-2, 1), 0, 6);
                 // create a spawn count, only 5 items can be spawned
                 CreateRandomWeapon();
                 // create a random weapon at index 0

diff --git a/Assets/Scripts/ItemManager.cs.meta b/Assets/Scripts/ItemManager.cs.meta
diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs
@@ -160,18 +160,20 @@ private IEnumerator NextLevelCoroutine(bool isLich=false) {
             if (level == 4 && sub == 1) {
                 if (debugGlitchCoro != null) { StopCoroutine(debugGlitchCoro); }
                 // going to next level after having defeated devil
-                if (Save.game.curCharNum != 3) { 
-                    // give player the next character, as long as they aren't on the last one\
+                if (Save.game.curCharNum != 3 && !Save.persistent.unlockedChars[Save.game.curCharNum + 1]) { 
+                    // unlock the next character and let them know if it has not yet been unlocked
+                    StartCoroutine(IndicateUnlock());
                     Save.persistent.unlockedChars[Save.game.curCharNum + 1] = true;
                     Save.persistent.successfulRuns++;
                     Save.SavePersistent();
                 }
-                print("notify the player they unlocked a new character to play here!");
+                else {
+                    Initiate.Fade("Credits", Color.black, 2.5f);
+                }
                 Save.game = new GameData();
                 if (scripts.tutorial == null) { Save.SaveGame(); }
                 // for some reason file.delete doesn't want to work here
-                Initiate.Fade("Credits", Color.black, 2.5f);
-                // load credits scene
+                yield break;
             }
             scripts.turnManager.ClearVariablesAfterRound();
             // remove variables before going to next level
@@ -351,6 +353,24 @@ private char T() {
         return thinCharacters[UnityEngine.Random.Range(0, thinCharacters.Length)];
     }
 
+    private IEnumerator IndicateUnlock() {
+        // fade in the black box, let the player know that they unlocked a new character, then go to credits
+        Color tempColor = boxSR.color;
+        tempColor.a = 0f;
+        boxSR.color = tempColor;
+        for (int i = 0; i < 15; i++) {
+            yield return scripts.delays[0.033f];
+            tempColor.a += 1f/15f;
+            boxSR.color = tempColor;
+        }
+        loadingCircle.transform.position = onScreen;
+        levelTransText.text = "New character unlocked!";
+        yield return scripts.delays[2f];
+        levelTransText.text = "";
+        loadingCircle.transform.position = offScreen;
+        Initiate.Fade("Credits", Color.black, 4f);
+    }
+
     /// <summary>
     /// Create the glitchy effect that the text has when going to 4-1 (Devil).
     /// </summary>

diff --git a/Assets/Scripts/StatSummoner.cs.meta b/Assets/Scripts/StatSummoner.cs.meta
diff --git a/Assets/Scripts/TurnManager.cs b/Assets/Scripts/TurnManager.cs
@@ -212,8 +212,8 @@ public void SetTargetOf(string playerOrEnemy) {
                             if (scripts.enemy.woundList.Contains(targetArr[scripts.player.targetIndex])) { scripts.player.target.text = "*" + targetArr[scripts.player.targetIndex]; }
                             // add an asterisks if already injured
                             else {
-                                if (targetArr[scripts.player.targetIndex] == "face") {
-                                    // can't aim at the devil's face, so notify player
+                                if (targetArr[scripts.player.targetIndex] == "face" && !Save.game.enemyIsDead) {
+                                    // can't aim at the devil's face if hes alive, so notify player
                                     scripts.turnManager.SetStatusText("you cannot aim at his face");
                                     scripts.player.targetIndex--;
                                 }
@@ -951,7 +951,7 @@ private bool PlayerAttacks() {
                         if (scripts.itemManager.PlayerHasWeapon("maul")) {}
                         // don't say anything for maul (we want it to show that it is an instant kill)
                         else if (scripts.enemy.spawnNum == 0) {}
-                        // don't say anything for cloaked devil (shattering his cloak handlded later on)
+                        // don't say anything for cloaked devil (shattering his cloak handled later on)
                         else {
                             SetStatusText($"you hit {scripts.enemy.enemyName.text.ToLower()}, damaging {scripts.player.target.text}!");
                         }
@@ -986,7 +986,10 @@ private bool PlayerAttacks() {
                         // make the text change
                         RecalculateMaxFor("enemy");
                         // recalculate max
-                        return ApplyInjuriesDuringMove(scripts.player.target.text, "enemy");
+                        if (scripts.enemy.spawnNum != 0) {
+                            // cloaked devil is unaffected by all wounds
+                            return ApplyInjuriesDuringMove(scripts.player.target.text, "enemy");
+                        }
                         // return if the enemy dies and at the same time apply wounds instantly
 
                     }

diff --git a/Library/ArtifactDB b/Library/ArtifactDB
diff --git a/Library/ArtifactDB-lock b/Library/ArtifactDB-lock
diff --git a/...facts/58/5869c23f424490da85cb4002dac8cfd3 → ...facts/02/029ab84e310a1509fe4c39d87f7ad913 b/...facts/58/5869c23f424490da85cb4002dac8cfd3 → ...facts/02/029ab84e310a1509fe4c39d87f7ad913
diff --git a/Library/Artifacts/04/04dddf1a37294c615415bac4ba686692 b/Library/Artifacts/04/04dddf1a37294c615415bac4ba686692
diff --git a/Library/Artifacts/05/0543de193973c83ecf3529c784eae5d2 b/Library/Artifacts/05/0543de193973c83ecf3529c784eae5d2
diff --git a/Library/Artifacts/12/123731f34f1ad4c71f4917eb4b5c19ef b/Library/Artifacts/12/123731f34f1ad4c71f4917eb4b5c19ef
diff --git a/...facts/1c/1cc27f33a3a63844c9f5a543d10d0caf → ...facts/15/150548508db6d76221ea5702a9457b32 b/...facts/1c/1cc27f33a3a63844c9f5a543d10d0caf → ...facts/15/150548508db6d76221ea5702a9457b32
diff --git a/Library/Artifacts/19/19848ace3349561b78cba991002b4609 b/Library/Artifacts/19/19848ace3349561b78cba991002b4609
diff --git a/Library/Artifacts/1c/1c8f5caa01f1ce53d422b8af166764b8 b/Library/Artifacts/1c/1c8f5caa01f1ce53d422b8af166764b8
diff --git a/...facts/75/759ca8883749e591eb95e33078dc9f3d → ...facts/34/34b62e363777486543e4de029949c0f6 b/...facts/75/759ca8883749e591eb95e33078dc9f3d → ...facts/34/34b62e363777486543e4de029949c0f6
diff --git a/Library/Artifacts/3d/3d8dfc7b6ff5867612a08b3347f718e4 b/Library/Artifacts/3d/3d8dfc7b6ff5867612a08b3347f718e4
diff --git a/Library/Artifacts/49/4935745f399d09da9c63a48bb6d2cc5c b/Library/Artifacts/49/4935745f399d09da9c63a48bb6d2cc5c
diff --git a/Library/Artifacts/55/55ba33a06daca189b477050607b20160 b/Library/Artifacts/55/55ba33a06daca189b477050607b20160
diff --git a/Library/Artifacts/57/57dac2158028b779c04c9686cf73018f b/Library/Artifacts/57/57dac2158028b779c04c9686cf73018f
diff --git a/...facts/1d/1d91c1fcdcc0721cd6770c21e8e2d03b → ...facts/60/6013d6f501133c31e65087f43868ab39 b/...facts/1d/1d91c1fcdcc0721cd6770c21e8e2d03b → ...facts/60/6013d6f501133c31e65087f43868ab39
diff --git a/Library/Artifacts/68/687ed41f80664f412b94c49809ecb43b b/Library/Artifacts/68/687ed41f80664f412b94c49809ecb43b
diff --git a/Library/Artifacts/6f/6fcd814b2d008a500d28b07d4260c298 b/Library/Artifacts/6f/6fcd814b2d008a500d28b07d4260c298
diff --git a/Library/Artifacts/73/731f2b746d5e1cd051b3bdf51dee2347 b/Library/Artifacts/73/731f2b746d5e1cd051b3bdf51dee2347
diff --git a/Library/Artifacts/74/7488395fdf2679920f77e315b751d74f b/Library/Artifacts/74/7488395fdf2679920f77e315b751d74f
diff --git a/Library/Artifacts/77/779c0a4ba08b578a27f732aba6e5f231 b/Library/Artifacts/77/779c0a4ba08b578a27f732aba6e5f231
diff --git a/Library/Artifacts/79/799c9de576d0643d344779d1f4827680 b/Library/Artifacts/79/799c9de576d0643d344779d1f4827680
diff --git a/Library/Artifacts/83/83afe92ddc4eb6bd2b7e7da3448286ad b/Library/Artifacts/83/83afe92ddc4eb6bd2b7e7da3448286ad
diff --git a/Library/Artifacts/86/862b375fc6f54494a7ef8abccfd738f5 b/Library/Artifacts/86/862b375fc6f54494a7ef8abccfd738f5
diff --git a/Library/Artifacts/8b/8b91f7e02947c620fd7f38f0f6f41e94 b/Library/Artifacts/8b/8b91f7e02947c620fd7f38f0f6f41e94
diff --git a/...facts/48/48dc05bfff9b74dd8740f82222455033 → ...facts/92/9243eb2b6ec1106446e41c68c66c4bab b/...facts/48/48dc05bfff9b74dd8740f82222455033 → ...facts/92/9243eb2b6ec1106446e41c68c66c4bab
diff --git a/...facts/61/616dcc46daa19bde3dca41ca179a2cd8 → ...facts/9c/9c8c7fbc39a029995b0566fd35d86ac0 b/...facts/61/616dcc46daa19bde3dca41ca179a2cd8 → ...facts/9c/9c8c7fbc39a029995b0566fd35d86ac0
diff --git a/...facts/27/27861ed86c155cbf4b6897955d433829 → ...facts/9c/9cac3d6ac5fb4cdb1b37fe46bf1ffd04 b/...facts/27/27861ed86c155cbf4b6897955d433829 → ...facts/9c/9cac3d6ac5fb4cdb1b37fe46bf1ffd04
diff --git a/Library/Artifacts/ac/acd6d186c4c854b6b0be9c45ee4e2d7c b/Library/Artifacts/ac/acd6d186c4c854b6b0be9c45ee4e2d7c
diff --git a/Library/Artifacts/b7/b7d8c453ed10d0082c090598719c231e b/Library/Artifacts/b7/b7d8c453ed10d0082c090598719c231e
diff --git a/...facts/28/2826cc7b13febd3721323a315e744462 → ...facts/bd/bdb1c65cda804c0874746fb6b2b5ad2c b/...facts/28/2826cc7b13febd3721323a315e744462 → ...facts/bd/bdb1c65cda804c0874746fb6b2b5ad2c
diff --git a/Library/Artifacts/c3/c331160d7de82ca63cfa74a8225bf80f b/Library/Artifacts/c3/c331160d7de82ca63cfa74a8225bf80f
diff --git a/...facts/13/13569079d9537b4995197c021a6c295f → ...facts/cc/ccde6efcc37fcf3eeb048410f03e0645 b/...facts/13/13569079d9537b4995197c021a6c295f → ...facts/cc/ccde6efcc37fcf3eeb048410f03e0645
diff --git a/...facts/88/88627bbc1207f3dcf088a4bc14b900de → ...facts/da/da915aee6faf50564b3f9fc19b7ba03c b/...facts/88/88627bbc1207f3dcf088a4bc14b900de → ...facts/da/da915aee6faf50564b3f9fc19b7ba03c
diff --git a/Library/Artifacts/e2/e290a074ea0631dda661a7bd04065bb1 b/Library/Artifacts/e2/e290a074ea0631dda661a7bd04065bb1
diff --git a/Library/Artifacts/e6/e6554cc95bdcc230e783e6006302edb8 b/Library/Artifacts/e6/e6554cc95bdcc230e783e6006302edb8
diff --git a/Library/Artifacts/e7/e71b4f38b08a1441bfabd82d89c0db2f b/Library/Artifacts/e7/e71b4f38b08a1441bfabd82d89c0db2f
diff --git a/Library/Bee/2400b0aE.dag b/Library/Bee/2400b0aE.dag
diff --git a/Library/Bee/2400b0aE.dag_fsmtime b/Library/Bee/2400b0aE.dag_fsmtime
diff --git a/Library/Bee/TundraBuildState.state b/Library/Bee/TundraBuildState.state
diff --git a/Library/Bee/TundraBuildState.state.map b/Library/Bee/TundraBuildState.state.map
diff --git a/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.dll b/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.dll
diff --git a/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.pdb b/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.pdb
diff --git a/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.ref.dll b/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.ref.dll