Merge branch 'main' into dudantas/fix-achievements

opentibiabr · Feb 20, 2024 · eaada45 · eaada45
2 parents 3ce32f5 + af88e2b
commit eaada45
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/data-otservbr-global/scripts/quests/threatened_dreams/event-raven_herb_bush.lua b/data-otservbr-global/scripts/quests/threatened_dreams/event-raven_herb_bush.lua
@@ -5,7 +5,7 @@ local config = {
 	pos = Position(33497, 32196, 7),
 	herbId = 5953,
 	herbWeight = 1,
-	storage = ThreatenedDreams.Mission03.RavenHerbTimer,
+	storage = Storage.Quest.U11_40.ThreatenedDreams.Mission03.RavenHerbTimer,
 }
 
 local createRavenHerb = GlobalEvent("createRavenHerb")
@@ -55,5 +55,5 @@ function ravenHerb.onUse(player, item, fromPosition, target, toPosition, isHotke
 	return true
 end
 
-ravenHerb:aid(ThreatenedDreams.Mission03.RavenHerbTimer)
+ravenHerb:id(25783)
 ravenHerb:register()
diff --git a/data-otservbr-global/scripts/world_changes/spawns_npc_by_time.lua b/data-otservbr-global/scripts/world_changes/spawns_npc_by_time.lua
@@ -6,7 +6,7 @@ local npcSpawns = {
 
 local spawnsNpcByTime = GlobalEvent("SpawnsNpcByTime")
 
-function spawnsByTimeEvent.onPeriodChange(period)
+function spawnsNpcByTime.onPeriodChange(period)
 	for _, npcSpawn in ipairs(npcSpawns) do
 		if npcSpawn.spawnPeriod == period then
 			local spawnNpc = Game.createNpc(npcSpawn.name, npcSpawn.position)

diff --git a/data/libs/core/global_storage.lua b/data/libs/core/global_storage.lua
@@ -25,6 +25,6 @@ Global = {
 	Storage = {
 		FamiliarSummonEvent10 = 30054,
 		FamiliarSummonEvent60 = 30055,
-		CobraFlask = 30055,
+		CobraFlask = 30056,
 	},
 }