Fix several bugs, but a big one crashed the server

1 files changed, 8 insertions, 4 deletions

diff --git a/npc/001-7/homunculus.txt b/npc/001-7/homunculus.txt
index 0feaffd3d..e68891b0b 100644
--- a/npc/001-7/homunculus.txt
+++ b/npc/001-7/homunculus.txt
@@ -179,10 +179,10 @@ OnInit:
         close;
     }
     mesn strcharinfo(0);
-    mesc l("You carefully pick a @@. It looks delicious, but you probably will need it later.", getitemlink(Manapple));
+    mesc l("You carefully pick a @@. It looks delicious, but you probably will need it later.", getitemlink(RedApple));
     if (!(.@q & .hcID)) {
-        inventoryplace Manapple, 1;
-        getitem Manapple, 1;
+        inventoryplace RedApple, 1;
+        getitem RedApple, 1;
         setq2 FrostiaQuest_Homunculus, .@q|.hcID;
     }
     close;
@@ -200,7 +200,11 @@ OnInit:
         close;
     }
     // I hope this is right
-    if ((.@q & 60) < 4) {
+    if (!
+        (.@q & 4) &&
+        (.@q & 8) &&
+        (.@q & 16) &&
+        (.@q & 32) ) {
         mesn strcharinfo(0);
         mesc l("I better not disturb the hut owner.");
         close;