Charms

data/events/events.xml

@@ -45,5 +45,5 @@
 
  <!-- Monster methods -->
  <event class="Monster" method="onDropLoot" enabled="1" />
- <event class="Monster" method="onSpawn" enabled="0" />
+ <event class="Monster" method="onSpawn" enabled="1" />
 </events>

data/lib/core/player.lua

@@ -523,6 +523,11 @@ function Player.addBestiaryKills(self, raceId)
  break
  end
  end
+
+ if kills < bestiaryInfo.mastery and newKills >= bestiaryInfo.mastery then
+ self:addCharmPoints(bestiaryInfo.charmPoints)
+ end
+
  return self:setBestiaryKills(raceId, newKills)
 end
 
@@ -737,3 +742,51 @@ function Player.disableLoginMusic(self)
  msg:delete()
  return true
 end
+
+local charmStatus = {
+ UNLOCKED = 1,
+ LOCKED = 0,
+}
+
+function Player.isCharmUnlocked(self, charmId)
+ if (self:getStorageValue(PlayerStorageKeys.charmsUnlocked + charmId) or 0) == charmStatus.UNLOCKED then
+ return charmStatus.UNLOCKED
+ end
+ return charmStatus.LOCKED
+end
+
+function Player.addCharmPoints(self, value)
+ local points = self:getCharmPoints() or 0
+ return self:setStorageValue(PlayerStorageKeys.charmPoints, points + value)
+end
+
+function Player.removeCharmPoints(self, value)
+ local points = self:getCharmPoints() or 0
+
+ if points < value then
+ return false
+ end
+ return self:setStorageValue(PlayerStorageKeys.charmPoints, points - value)
+end
+
+function Player.unlockCharm(self, charmId)
+ self:setStorageValue(PlayerStorageKeys.charmsUnlocked + charmId, charmStatus.UNLOCKED)
+end
+
+function Player.removeCharm(self, charmId)
+ self:setStorageValue(PlayerStorageKeys.charmsUnlocked + charmId, charmStatus.LOCKED)
+end
+
+function Player.setCharmMonster(self, charmId, raceId)
+ if self:isCharmUnlocked(charmId) == charmStatus.LOCKED then
+ return false
+ end
+ return self:setStorageValue(PlayerStorageKeys.charmsMonster + charmId, raceId)
+end
+
+function Player.getCharmPoints(self)
+ return math.max(0, self:getStorageValue(PlayerStorageKeys.charmPoints) or 0)
+end
+function Player.getCharmMonster(self, charmId)
+ return math.max(0, self:getStorageValue(PlayerStorageKeys.charmsMonster + charmId) or 0)
+end

data/lib/core/storages.lua

@@ -41,6 +41,9 @@ PlayerStorageKeys = {
  achievementsCounter = 20000,
  achievementsBase = 300000,
 
- -- Bestiary:
+ -- Bestiary: 400000 - 410101
  bestiaryKillsBase = 400000,
+ charmPoints = 410000,
+ charmsMonster = 410001,
+ charmsUnlocked = 410101,
 }

data/scripts/network/bestiary_classes.lua

@@ -12,6 +12,11 @@ end
 local handler = PacketHandler(0xE1)
 
 function handler.onReceive(player)
+ sendCharmData(player)
+ player:sendResourceBalance(RESOURCE_BANK_BALANCE, player:getBankBalance())
+ player:sendResourceBalance(RESOURCE_GOLD_EQUIPPED, player:getMoney())
+ player:sendResourceBalance(RESOURCE_CHARM_POINTS, player:getCharmPoints())
+
  local bestiaryClasses = Game.getBestiary()
  local msg = NetworkMessage()
  msg:addByte(0xD5)