Fix item issues with pictograph, powder keg, and Zora mask. (#31)

* Fix item issues with pictograph, powder keg, and Zora mask. * Temp Fix seahorse to not get in repeatable locations. * Version bump
Z3DR · Jan 27, 2024 · a064cb1 · a064cb1
1 parent d2e113e
commit a064cb1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Z3DR b/Z3DR
diff --git a/source/include/version.hpp b/source/include/version.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
-#define RANDOMIZER_VERSION "v1.1"
+#define RANDOMIZER_VERSION "v1.1.1"
 #define COMMIT_NUMBER "develop"
diff --git a/source/item_list.cpp b/source/item_list.cpp
@@ -111,7 +111,7 @@ void ItemTable_Init() {    //repeatable denotes that an item in a vanilla playth
     itemTable[BOTTLE_WITH_ZORA_EGG]              = Item(false,     true,           &HasBottle,                   Text{"Bottle with Zora Egg",            "Bottle with Zora Egg",                             "Bottle with Zora Egg",},                            BOTTLE_WITH_ZORA_EGG,         (u32)GetItemID::GI_BOTTLE_ZORA_EGG,           ITEMTYPE_ITEM);
     itemTable[BOTTLE_WITH_MUSHROOM]              = Item(false,     true,           &HasBottle,                   Text{"Bottle with Mushroom",            "Bottle with Mushroom",                             "Bottle with Mushroom",},                            BOTTLE_WITH_MUSHROOM,         (u32)GetItemID::GI_BOTTLE_MAGIC_MUSHROOM,     ITEMTYPE_ITEM);
     itemTable[ZORA_EGG]							 = Item(false,     true,           &ZoraEgg,                     Text{"Zora Egg", 					     "Oeuf de Zora",						             "Huevo de Zora"},							          ZORA_EGG,			    	    (u32)GetItemID::GI_BOTTLE_ZORA_EGG,           ITEMTYPE_ITEM);
-	itemTable[SEAHORSE]							 = Item(false,     true,           &Seahorse,                    Text{"Seahorse",						 "Hippocampe",						                 "Caballo de mar"},							          SEAHORSE,				        (u32)GetItemID::GI_BOTTLE_SEAHORSE,           ITEMTYPE_ITEM);
+	itemTable[SEAHORSE]							 = Item(true,     true,           &Seahorse,                    Text{"Seahorse",						 "Hippocampe",						                 "Caballo de mar"},							          SEAHORSE,				        (u32)GetItemID::GI_BOTTLE_SEAHORSE,           ITEMTYPE_ITEM);
 
     //Upgrades
     itemTable[RAZOR_SWORD]                       = Item(true,      false,          &RazorSword,                  Text{"Razor Sword",				       "Lame Rasoir",					                   "Espada Afilada" },                                RAZOR_SWORD,          (u32)GetItemID::GI_RAZOR_SWORD,     ITEMTYPE_ITEM );
+2 −2		code/include/game/actor.h
+1 −1		code/include/rnd/savefile.h
+2 −2		code/mm.ld
+19 −8		code/source/rnd/item_override.cpp
+4 −3		code/source/rnd/savefile.cpp