Updated to OTCv8 3.1 rev 112

modules/game_prey/prey.lua

@@ -1,7 +1,10 @@
 -- sponsored by kivera-global.com
+-- remade by Vithrax#5814
 
 local preyWindow
 local preyButton
+local preyTracker
+local preyTrackerButton
 local msgWindow
 local bankGold = 0
 local inventoryGold = 0
@@ -42,22 +45,13 @@ function timeleftTranslation(timeleft, forPreyTimeleft) -- in seconds
     if forPreyTimeleft then
       return tr("infinite bonus")
     end
-    return tr("Available now")
+    return tr("Free")
   end
-  local minutes = math.ceil(timeleft / 60)
-  local hours = math.floor(minutes / 60)
-  minutes = minutes - hours * 60
-  if hours > 0 then
-    if forPreyTimeleft then
-      return "" .. hours .. "h " .. minutes .. "m"    
-    end
-    return tr("Available in") .. " " .. hours .. "h " .. minutes .. "m"
-  end   
-  if forPreyTimeleft then
-    return "" .. minutes .. "m"
-  end
-  return tr("Available in") .. " " .. minutes .. "m"
-end
+  local hours = string.format("%02.f", math.floor(timeleft/3600))
+  local mins = string.format("%02.f", math.floor(timeleft/60 - (hours*60)))
+  return hours .. ":" .. mins
+end
+  
 function init()
   connect(g_game, {
     onGameStart = check,
@@ -74,9 +68,48 @@ function init()
 
   preyWindow = g_ui.displayUI('prey')
   preyWindow:hide()
+  preyTracker = g_ui.createWidget('PreyTracker', modules.game_interface.getRightPanel())
+  preyTracker:setup()
+  preyTracker:setContentMaximumHeight(100)
+  preyTracker:setContentMinimumHeight(47)
+  preyTracker:hide()
   if g_game.isOnline() then
     check()
   end
+  setUnsupportedSettings()
+end
+
+local descriptionTable = {
+  ["shopPermButton"] = "Go to the Store to purchase the Permanent Prey Slot. Once you have completed the purchase, you can activate a prey here, no matter if your character is on a free or a Premium account.",
+  ["shopTempButton"] = "You can activate this prey whenever your account has Premium Status.",
+  ["preyWindow"] = "",
+  ["noBonusIcon"] = "This prey is not available for your character yet.\nCheck the large blue button(s) to learn how to unlock this prey slot",
+  ["selectPrey"] = "Click here to get a bonus with a higher value. The bonus for your prey will be selected randomly from one of the following: damage boost, damage reduction, bonus XP, improved loot. Your prey will be active for 2 hours hunting time again. Your prey creature will stay the same.",
+  ["pickSpecificPrey"] = "Available only for protocols 12+",
+  ["rerollButton"] = "If you like to select another prey crature, click here to get a new list with 9 creatures to choose from.\nThe newly selected prey will be active for 2 hours hunting time again.",
+  ["preyCandidate"] = "Select a new prey creature for the next 2 hours hunting time.",
+  ["choosePreyButton"] = "Click on this button to confirm selected monsters as your prey creature for the next 2 hours hunting time."
+}
+
+function onHover(widget)
+  if type(widget) == "string" then
+    return preyWindow.description:setText(descriptionTable[widget])
+  elseif type(widget) == "number" then
+    local slot = "slot" .. (widget + 1)
+    local tracker = preyTracker.contentsPanel[slot]
+    local desc = tracker.time:getTooltip()
+    desc = desc:sub(1,desc:len()-46)
+    return preyWindow.description:setText(desc)
+  end
+  if widget:isVisible() then
+    local id = widget:getId()
+    local desc = descriptionTable[id]
+    if desc then
+      preyWindow.description:setText(desc)
+    else
+      print(id)
+    end
+  end
 end
 
 function terminate()
@@ -96,17 +129,39 @@ function terminate()
   if preyButton then
     preyButton:destroy()
   end
+  if preyTrackerButton then
+    preyTrackerButton:destroy()
+  end
   preyWindow:destroy()
+  preyTracker:destroy()
   if msgWindow then
     msgWindow:destroy()
     msgWindow = nil
   end
 end
 
+function setUnsupportedSettings()
+  local t = {"slot1", "slot2", "slot3"}
+  for i, slot in pairs(t) do
+    local panel = preyWindow[slot]
+    for j, state in pairs({panel.active, panel.inactive}) do
+      state.select.price.text:setText("-------")
+    end
+    panel.active.autoRerollPrice.text:setText("-")
+    panel.active.lockPreyPrice.text:setText("-")
+    panel.active.choose.price.text:setText(1)
+    panel.active.autoReroll.autoRerollCheck:disable()
+    panel.active.lockPrey.lockPreyCheck:disable()
+  end
+end
+
 function check()
   if g_game.getFeature(GamePrey) then
     if not preyButton then
-    if not preyButton then
+      preyButton = modules.client_topmenu.addRightGameToggleButton('preyButton', tr('Prey Dialog'), '/images/topbuttons/prey_window', toggle)
+    end
+    if not preyTrackerButton then
+      preyTrackerButton = modules.client_topmenu.addRightGameToggleButton("preyTrackerButton", tr('Prey Tracker'), '/images/topbuttons/prey', toggleTracker)
     end
   elseif preyButton then
     preyButton:destroy()
@@ -114,6 +169,14 @@ function check()
   end
 end
 
+function toggleTracker()
+  if preyTracker:isVisible() then
+    preyTracker:hide()
+  else
+    preyTracker:show()
+  end
+end
+
 function hide()
   preyWindow:hide()
   if msgWindow then
@@ -141,144 +204,315 @@ end
 
 function onPreyFreeRolls(slot, timeleft)
   local prey = preyWindow["slot" .. (slot + 1)]
+  local percent = (timeleft / 2 * 60 * 60) * 100
+  local desc = timeleftTranslation(timeleft * 60)
   if not prey then return end
-  if not prey then return end
-  if prey.state ~= "active" and prey.state ~= "selection" then
+  for i, panel in pairs({prey.active, prey.inactive}) do
+    local progressBar = panel.reroll.button.time
+    local price = panel.reroll.button.price.text
+    progressBar:setPercent(percent)
+    progressBar:setText(desc)
+    if timeleft == 0 then
+      price:setText("Free")
+    end
   end
-  end
 end
 
+local regex = [[Duration: ([^m]+)]]
 function onPreyTimeLeft(slot, timeleft)
-function onPreyTimeLeft(slot, timeleft)
-  local prey = preyWindow["slot" .. (slot + 1)]
-  if not prey then return end
-  if prey.state ~= "active" then
+  -- tracker
+  local percent = (timeleft / 2 * 60 * 60) * 100
+  slot = "slot" .. (slot + 1)
+  local tracker = preyTracker.contentsPanel[slot]
+  tracker.time:setPercent(percent)
+  local text = tracker.time:getTooltip()
+  local re = regexMatch(text, regex)
+  local oldTime = re[1][2]
+  local newTime = timeleftTranslation(timeleft, true)
+  newTime = newTime:sub(1,newTime:len()-1)
+  text = text:gsub(oldTime, newTime)
+  for i, element in pairs({tracker.creatureName, tracker.creature, tracker.preyType, tracker.time}) do
+    element:setTooltip(text)
+    element.onClick = function()
+      show()
+    end
   end
-  end
+  -- main window
+  local prey = preyWindow[slot]
+  if not prey then return end
+  local progressbar = prey.active.creatureAndBonus.creature.timeLeft
+  local desc = timeleftTranslation(timeleft * 60)
+  progressbar:setPercent(percent)
+  progressbar:setText(desc)
 end
 
 function onPreyPrice(price)
   rerollPrice = price
-  rerollPrice = price
+  local t = {"slot1", "slot2", "slot3"}
+  for i, slot in pairs(t) do
+    local panel = preyWindow[slot]
+    for j, state in pairs({panel.active, panel.inactive}) do
+      local price = state.reroll.price.text
+      local progressBar = state.reroll.button.time
+      if progressBar:getText() ~= "Free" then
+        price:setText(comma_value(rerollPrice))
+      else
+        price:setText("0")
+        progressBar:setPercent(0)
+      end
+    end
+  end
+end
+
+function setTimeUntilFreeReroll(slot, timeUntilFreeReroll) -- minutes
+  local prey = preyWindow["slot"..(slot + 1)]
+  if not prey then return end
+  local percent = (timeUntilFreeReroll / (20 * 60)) * 100
+  local desc = timeleftTranslation(timeUntilFreeReroll * 60)
+  for i, panel in pairs({prey.active, prey.inactive}) do
+    local reroll = panel.reroll.button.time
+    reroll:setPercent(percent)
+    reroll:setText(desc)
+    local price = panel.reroll.price.text
+    if timeUntilFreeReroll > 0 then
+      price:setText(comma_value(rerollPrice))
+    else
+      price:setText("Free")
+    end
+  end
 end
 
 function onPreyLocked(slot, unlockState, timeUntilFreeReroll)
-function onPreyLocked(slot, unlockState, timeUntilFreeReroll)
+  -- tracker
+  slot = "slot" .. (slot + 1)
+  local tracker = preyTracker.contentsPanel[slot]
+  if tracker then
+    tracker:hide()
+    preyTracker:setContentMaximumHeight(preyTracker:getHeight()-20)
+  end
+  -- main window
+  local prey = preyWindow[slot]
   if not prey then return end
-  if not prey then return end
-  prey.state = "locked"
-  prey.title:setText(tr("Prey Locked"))
-  prey.list:hide()
-  prey.listScrollbar:hide()
-  prey.creature:hide()
-  prey.description:hide()
-  prey.bonuses:hide()
-  prey.button:hide()
-  prey.bottomLabel:show()
-  if unlockState == 0 then
-    prey.bottomLabel:setText(tr("You need to have premium account and buy this prey slot in the game store."))
-  elseif unlockState == 1 then
-    prey.bottomLabel:setText(tr("You need to buy this prey slot in the game store."))
-  else
-    prey.bottomLabel:setText(tr("You can't unlock it."))
-    prey.bottomButton:hide()
-  end
-  if (unlockState == 0 or unlockState == 1) and modules.game_shop then
-    prey.bottomButton:setText("Open game store")
-    prey.bottomButton.onClick = function() hide() modules.game_shop.show() end
-    prey.bottomButton:show()
+  prey.title:setText("Locked")
+  prey.inactive:hide()
+  prey.active:hide()
+  prey.locked:show()
 end
 
 function onPreyInactive(slot, timeUntilFreeReroll)
-function onPreyInactive(slot, timeUntilFreeReroll)
-  local prey = preyWindow["slot" .. (slot + 1)]
-  if not prey then return end
-  prey.state = "inactive"
-  prey.title:setText(tr("Prey Inactive"))
-  prey.list:hide()
-  prey.listScrollbar:hide()
-  prey.creature:hide()
-  prey.description:hide()
-  prey.bonuses:hide()
-  prey.button:hide()
-  prey.bottomLabel:hide()
-  
-  prey.bottomLabel:setText(tr("Free list reroll")..": \n" .. timeleftTranslation(timeUntilFreeReroll * 60)) 
-  prey.bottomLabel:show()
-  if timeUntilFreeReroll > 0 then
-    prey.bottomButton:setText(tr("Buy list reroll"))
-  else
+  -- tracker
+  local tracker = preyTracker.contentsPanel["slot"..(slot + 1)]
+  if tracker then
+    tracker.creature:hide()
+    tracker.noCreature:show()
+    tracker.creatureName:setText("Inactive")
+    tracker.time:setPercent(0)
+    tracker.preyType:setImageSource("/images/game/prey/prey_no_bonus")
+    for i, element in pairs({tracker.creatureName, tracker.creature, tracker.preyType, tracker.time}) do
+      element:setTooltip("Inactive Prey. \n\nClick in this window to open the prey dialog.")
+      element.onClick = function()
+        show()
+      end
+    end
   end
-  end
-  prey.bottomButton:show()
+  -- main window
+  setTimeUntilFreeReroll(slot, timeUntilFreeReroll)
+  local prey = preyWindow["slot"..(slot + 1)]
+  if not prey then return end
+  prey.active:hide()
+  prey.locked:hide()
+  prey.inactive:show()
+  local rerollButton = prey.inactive.reroll.button.rerollButton
+  rerollButton:setImageSource("/images/game/prey/prey_reroll_blocked")
+  rerollButton:disable()
+  rerollButton.onClick = function()
     g_game.preyAction(slot, PREY_ACTION_LISTREROLL, 0)
-    g_game.preyAction(slot, PREY_ACTION_LISTREROLL, 0)
+  end
+end
+
+function setBonusGradeStars(slot, grade)
+  local prey = preyWindow["slot"..(slot + 1)]
+  local gradePanel = prey.active.creatureAndBonus.bonus.grade
+
+  gradePanel:destroyChildren()
+  for i=1,10 do
+    if i <= grade then
+      local widget = g_ui.createWidget("Star", gradePanel)
+      widget.onHoverChange = function(widget,hovered)
+        onHover(slot)
+      end
+    else
+      local widget = g_ui.createWidget("NoStar", gradePanel)
+      widget.onHoverChange = function(widget,hovered)
+        onHover(slot)
+      end
+    end
+  end
+end
+
+function getBigIconPath(bonusType)
+  local path = "/images/game/prey/"
+  if bonusType == PREY_BONUS_DAMAGE_BOOST then
+    return path.."prey_bigdamage"
+  elseif bonusType == PREY_BONUS_DAMAGE_REDUCTION then
+    return path.."prey_bigdefense"
+  elseif bonusType == PREY_BONUS_XP_BONUS then
+    return path.."prey_bigxp"
+  elseif bonusType == PREY_BONUS_IMPROVED_LOOT then
+    return path.."prey_bigloot"
+  end
+end
+
+function getSmallIconPath(bonusType)
+  local path = "/images/game/prey/"
+  if bonusType == PREY_BONUS_DAMAGE_BOOST then
+    return path.."prey_damage"
+  elseif bonusType == PREY_BONUS_DAMAGE_REDUCTION then
+    return path.."prey_defense"
+  elseif bonusType == PREY_BONUS_XP_BONUS then
+    return path.."prey_xp"
+  elseif bonusType == PREY_BONUS_IMPROVED_LOOT then
+    return path.."prey_loot"
+  end
+end
+
+function getBonusDescription(bonusType)
+  if bonusType == PREY_BONUS_DAMAGE_BOOST then
+    return "Damage Boost"
+  elseif bonusType == PREY_BONUS_DAMAGE_REDUCTION then
+    return "Damage Reduction"
+  elseif bonusType == PREY_BONUS_XP_BONUS then
+    return "XP Bonus"
+  elseif bonusType == PREY_BONUS_IMPROVED_LOOT then
+    return "Improved Loot"
+  end
+end
+
+function getTooltipBonusDescription(bonusType, bonusValue)
+  if bonusType == PREY_BONUS_DAMAGE_BOOST then
+    return "You deal +"..bonusValue.."% extra damage against your prey creature."
+  elseif bonusType == PREY_BONUS_DAMAGE_REDUCTION then
+    return "You take "..bonusValue.."% less damage from your prey creature."
+  elseif bonusType == PREY_BONUS_XP_BONUS then
+    return "Killing your prey creature rewards +"..bonusValue.."% extra XP."
+  elseif bonusType == PREY_BONUS_IMPROVED_LOOT then
+    return "Your creature has a +"..bonusValue.."% chance to drop additional loot."
+  end
+end
+
+function capitalFormatStr(str)
+  local formatted = ""
+  str = string.split(str, " ")
+  for i, word in ipairs(str) do
+    formatted = formatted .. " " .. (string.gsub(word, "^%l", string.upper))
+  end
+  return formatted:trim()
+end
+
+function onItemBoxChecked(widget)
+
+  for i, slot in pairs({"slot1", "slot2", "slot3"}) do
+    local list = preyWindow[slot].inactive.list:getChildren()
+    if table.find(list, widget) then
+      for i, child in pairs(list) do
+        if child ~= widget then
+          child:setChecked(false)
+        end
+      end
+    end
+  end
+  widget:setChecked(true)
 end
 
 function onPreyActive(slot, currentHolderName, currentHolderOutfit, bonusType, bonusValue, bonusGrade, timeLeft, timeUntilFreeReroll)
-function onPreyActive(slot, currentHolderName, currentHolderOutfit, bonusType, bonusValue, bonusGrade, timeLeft, timeUntilFreeReroll)
-  local prey = preyWindow["slot" .. (slot + 1)]
-  if not prey then return end
-  prey.state = "active"
-  prey.title:setText(currentHolderName)
-  prey.list:hide()
-  prey.listScrollbar:hide()
-  prey.creature:show()
-  prey.creature:setOutfit(currentHolderOutfit)
-  prey.description:setText(tr("Time left") .. ": " .. timeleftTranslation(timeLeft, true))
-  prey.description:show()
-  prey.bonuses:setText(bonusDescription(bonusType, bonusValue, bonusGrade))
-  prey.bonuses:show()
-  prey.button:setText(tr("Bonus reroll"))
-  prey.button:show()
-  prey.bottomLabel:setText(tr("Free list reroll")..": \n" .. timeleftTranslation(timeUntilFreeReroll * 60)) 
-  prey.bottomLabel:show()
-  if timeUntilFreeReroll > 0 then
-    prey.bottomButton:setText(tr("Buy list reroll"))
-  else
+  local tracker = preyTracker.contentsPanel["slot"..(slot + 1)]
+  currentHolderName = capitalFormatStr(currentHolderName)
+  local percent = (timeLeft / 2 * 60 * 60)*100
+  if tracker then
+    tracker.creature:show()
+    tracker.noCreature:hide()
+    tracker.creatureName:setText(currentHolderName)
+    tracker.creature:setOutfit(currentHolderOutfit)
+    tracker.preyType:setImageSource(getSmallIconPath(bonusType))
+    tracker.time:setPercent(percent)
+    for i, element in pairs({tracker.creatureName, tracker.creature, tracker.preyType, tracker.time}) do
+      element:setTooltip("Creature: "..currentHolderName .. "\nDuration: ".. timeleftTranslation(timeLeft, true) .."\nValue: " ..bonusGrade.."/10".."\nType: " .. getBonusDescription(bonusType) ..  "\n"..getTooltipBonusDescription(bonusType,bonusValue).."\n\nClick in this window to open the prey dialog.")
+      element.onClick = function()
+        show()
+      end
+    end
   end
-  end
-  prey.bottomButton:show()
-  
-  prey.button.onClick = function()
-    if bonusRerolls == 0 then
-      return showMessage(tr("Error"), tr("You don't have any bonus rerolls.\nYou can buy them in ingame store."))
+  local prey = preyWindow["slot" .. (slot + 1)]  
+  if not prey then return end
+  prey.inactive:hide()
+  prey.locked:hide()
+  prey.active:show()
+  prey.title:setText(currentHolderName)
+  local creatureAndBonus = prey.active.creatureAndBonus
+  creatureAndBonus.creature:setOutfit(currentHolderOutfit)
+  setTimeUntilFreeReroll(slot, timeUntilFreeReroll)
+  creatureAndBonus.bonus.icon:setImageSource(getBigIconPath(bonusType))
+  creatureAndBonus.bonus.icon.onHoverChange = function(widget, hovered)
+    onHover(slot)
+  end
+  setBonusGradeStars(slot, bonusGrade)
+  creatureAndBonus.timeLeft:setPercent(percent)
+  creatureAndBonus.timeLeft:setText(timeleftTranslation(timeLeft, true))
+  -- bonus reroll
+  prey.active.choose.selectPrey.onClick = function()
     g_game.preyAction(slot, PREY_ACTION_BONUSREROLL, 0)
   end
-  end
-
+  -- creature reroll
+  prey.active.reroll.button.rerollButton.onClick = function()
     g_game.preyAction(slot, PREY_ACTION_LISTREROLL, 0)
   end
 end
 
 function onPreySelection(slot, bonusType, bonusValue, bonusGrade, names, outfits, timeUntilFreeReroll)
-function onPreySelection(slot, bonusType, bonusValue, bonusGrade, names, outfits, timeUntilFreeReroll)
-  local prey = preyWindow["slot" .. (slot + 1)]
-  if not prey then return end
-  prey.state = "selection"
-  prey.title:setText(tr("Select monster"))
-  prey.list:show()
-  prey.listScrollbar:show()
-  prey.creature:hide()
-  prey.description:hide()
-  prey.bonuses:hide()
-  prey.button:setText(tr("Select"))
-  prey.button:show()
-  prey.bottomLabel:setText("Free list reroll: \n" .. timeleftTranslation(timeUntilFreeReroll * 60)) 
-  prey.bottomLabel:show()
-  prey.bottomButton:hide()
-  prey.list:destroyChildren()
-  for i, name in ipairs(names) do
-    local label = g_ui.createWidget("PreySelectionLabel", prey.list)
-    label:setText(name)  
-    label.creature:setOutfit(outfits[i])
-  end
-  prey.button.onClick = function()
-    local child = prey.list:getFocusedChild()
-    if not child then 
+  -- tracker
+  local tracker = preyTracker.contentsPanel["slot"..(slot + 1)]
+  if tracker then
+    tracker.creature:hide()
+    tracker.noCreature:show()
+    tracker.creatureName:setText("Inactive")
+    tracker.time:setPercent(0)
+    tracker.preyType:setImageSource("/images/game/prey/prey_no_bonus")
+    for i, element in pairs({tracker.creatureName, tracker.creature, tracker.preyType, tracker.time}) do
+      element:setTooltip("Inactive Prey. \n\nClick in this window to open the prey dialog.")
+      element.onClick = function()
+        show()
+      end
     end
-    end
-    local index = prey.list:getChildIndex(child)
+  end
+  -- main window
+  local prey = preyWindow["slot" .. (slot + 1)]
+  setTimeUntilFreeReroll(slot, timeUntilFreeReroll)
+  if not prey then return end
+  prey.active:hide()
+  prey.locked:hide()
+  prey.inactive:show()
+  prey.title:setText(tr("Select monster"))
+  local rerollButton = prey.inactive.reroll.button.rerollButton
+  rerollButton:setImageSource("/images/game/prey/prey_reroll_blocked")
+  rerollButton:disable()
+  local list = prey.inactive.list
+  list:destroyChildren()
+  for i, name in ipairs(names) do
+    local box = g_ui.createWidget("PreyCreatureBox", list)
+    name = capitalFormatStr(name)
+    box:setTooltip(name)
+    box.creature:setOutfit(outfits[i])
+    box.onHoverChange = function(widget, hovered)
+      onHover("preyCandidate")
+    end
+  end
+  prey.inactive.choose.choosePreyButton.onClick = function()
+    for i, child in pairs(list:getChildren()) do
+      if child:isChecked() then
+        return g_game.preyAction(slot, PREY_ACTION_MONSTERSELECTION, i - 1)
+      end
+    end
+    return showMessage(tr("Error"), tr("Select monster to proceed."))
   end
 end
 
@@ -289,11 +523,11 @@ function onResourceBalance(type, balance)
     inventoryGold = balance
   elseif type == 10 then -- bonus rerolls
     bonusRerolls = balance
-    bonusRerolls = balance
+    preyWindow.wildCards:setText(balance)
   end
   
   if type == 0 or type == 1 then
-  if type == 0 or type == 1 then
+    preyWindow.gold:setText(comma_value(bankGold + inventoryGold))
   end
 end
 

modules/game_prey/prey.otmod

@@ -1,7 +1,7 @@
 Module
   name: game_prey
-  description: Preys, sponsored by kivera-global.com
-  author: otclient.ovh & kivera-global.com
+  description: Preys, sponsored by kivera-global.com, remade by Vithrax#5814
+  author: otclient.ovh & kivera-global.com & Vithrax#5814
   website: http://otclient.ovh
   sandboxed: true
   scripts: [ prey ]

modules/game_prey/prey.otui

@@ -1,199 +1,695 @@
-PreySelectionLabel < Label
-  font: verdana-11px-monochrome
-  background-color: alpha
-  text-offset: 34 0
-  margin-right: 5
-  text-align: center
-  text-wrap: true
-  focusable: true
-  height: 34
+LockedPreyPanel < Panel
+  size: 195 312
 
-  $focus:
-    background-color: #00000055
-    color: #ffffff
-    
-  UICreature
-    id: creature
-    size: 32 32
+  NoCreaturePanel
+    id: noCreature
     anchors.top: parent.top
     anchors.left: parent.left
-    margin-top: 1
-    
-PreySlot < Panel
-  width: 190
-  height: 280
-  border: 1 black
+
+  UIButton
+    id: perm
+    anchors.top: prev.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 64
+    background-color: #1c4161
+    margin-top: 3
+    @onClick: modules.game_shop.show()
+
+    UIWidget
+      id: shopPermButton
+      anchors.horizontalCenter: parent.horizontalCenter
+      anchors.verticalCenter: parent.verticalCenter
+      image-source: /images/game/prey/prey_perm_test
+      size: 195 67
+      image-clip: 0 0 204 67
+      @onClick: modules.game_shop.show()
+      @onHoverChange: modules.game_prey.onHover(self)
+
+      $pressed:
+        image-clip: 0 67 204 67
+        
+
+  UIButton
+    id: temp
+    anchors.top: prev.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 64
+    background-color: #1c4161
+    margin-top: 7
+    @onClick: modules.game_shop.show()
+
+    UIWidget
+      id: shopTempButton
+      anchors.horizontalCenter: parent.horizontalCenter
+      anchors.verticalCenter: parent.verticalCenter
+      image-source: /images/game/prey/prey_temp_test
+      size: 195 67
+      image-clip: 0 0 204 67
+      @onClick: modules.game_shop.show()
+      @onHoverChange: modules.game_prey.onHover(self)
+
+      $pressed:
+        image-clip: 0 67 204 67
+
+Star < UIWidget
+  size: 9 10
+  image-source: /images/game/prey/prey_star
+
+NoStar < UIWidget
+  size: 9 10
+  image-source: /images/game/prey/prey_nostar
+
+NoCreaturePanel < Panel
+  size: 195 152
+
+  FlatPanel
+    size: 124 124
+    anchors.top: parent.top
+    anchors.left: parent.left
+    image-source: /images/ui/panel_flat
+    image-border: 1  
+
+    UIWidget
+      phantom: true
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.horizontalCenter: parent.horizontalCenter
+      image-source: /images/game/prey/prey_biginactive
+
+  FlatPanel
+    id: bonus
+    anchors.top: parent.top
+    anchors.left: prev.right
+    margin-left: 10
+    anchors.bottom: prev.bottom
+    anchors.right: parent.right
+
+    UIWidget
+      id: noBonusIcon
+      anchors.top: parent.top
+      anchors.horizontalCenter: parent.horizontalCenter
+      image-source: /images/game/prey/prey_bignobonus
+      margin-top: 3
+      @onHoverChange: modules.game_prey.onHover(self)
+
+    HorizontalSeparator
+      anchors.top: prev.bottom
+      margin-top: 2
+      anchors.left: parent.left
+      anchors.right: parent.right
+      margin-left: 10
+      margin-right: 10
+
+    Panel
+      id: grade
+      anchors.top: prev.bottom
+      margin-top: 3
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.bottom: parent.bottom
+      padding-left: 5
+      layout:
+        type: grid
+        cell-size: 9 10
+        cell-spacing: 2
+        num-columns: 5
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)      
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+      NoStar
+        id: noBonusIcon
+        @onHoverChange: modules.game_prey.onHover(self)
+
+  UIWidget
+    anchors.top: prev.bottom
+    margin-top: 5
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 20
+    background-color: #262626
+    border: 1 black 
+    id: noBonusIcon
+    @onHoverChange: modules.game_prey.onHover(self)
+
+ActivePreyPanel < Panel
+  size: 195 312
+
+  CreatureAndBonus
+    id: creatureAndBonus
+    anchors.left: parent.left
+    anchors.top: parent.top
+    margin-top: 20 
+
+  BonusReroll
+    id: choose
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+  
+  SelectPreyCreature
+    id: select
+    anchors.verticalCenter: prev.verticalCenter
+    anchors.right: prev.left
+    margin-right: 2
+
+  RerollButton
+    id: reroll
+    anchors.verticalCenter: prev.verticalCenter
+    anchors.right: prev.left
+    margin-right: 2
+
+  FlatPanel
+    id: autoReroll
+    size: 160 20
+    anchors.top: prev.bottom
+    margin-top: 5
+    anchors.left: parent.left 
+
+    CheckBox
+      id: autoRerollCheck
+      margin-top: 2
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.left: parent.left
+      image-source: /images/ui/panel_flat
+      image-border: 1
+      size: 155 15
+      font: verdana-11px-rounded
+      text: Automatic Bonus Rer...
+      margin-left: 5
+
+  CardLabel
+    id: autoRerollPrice
+    anchors.top: prev.top
+    anchors.left: prev.right
+    margin-left: 2
+    anchors.bottom: prev.bottom
+    anchors.right: parent.right
+
+  FlatPanel
+    id: lockPrey
+    size: 160 20
+    anchors.top: prev.bottom
+    margin-top: 5
+    anchors.left: parent.left 
+
+    CheckBox
+      id: lockPreyCheck
+      margin-top: 2
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.left: parent.left
+      image-source: /images/ui/panel_flat
+      image-border: 1
+      size: 155 15
+      font: verdana-11px-rounded
+      text: Lock Prey
+      margin-left: 5
+
+  CardLabel
+    id: lockPreyPrice
+    anchors.top: prev.top
+    anchors.left: prev.right
+    margin-left: 2
+    anchors.bottom: prev.bottom
+    anchors.right: parent.right
+
+CreatureAndBonus < Panel
+  size: 195 152
+
+  UICreature
+    id: creature
+    phantom: true
+    anchors.top: parent.top
+    anchors.left: parent.left
+    size: 124 124
+    image-source: /images/ui/panel_flat
+    image-border: 1
+    padding: 5
+
+  FlatPanel
+    id: bonus
+    anchors.top: parent.top
+    anchors.left: prev.right
+    margin-left: 10
+    anchors.bottom: prev.bottom
+    anchors.right: parent.right
+
+    UIWidget
+      id: icon
+      anchors.top: parent.top
+      anchors.horizontalCenter: parent.horizontalCenter
+      image-source: /images/game/prey/prey_bignobonus
+      margin-top: 3
+
+    HorizontalSeparator
+      anchors.top: prev.bottom
+      margin-top: 2
+      anchors.left: parent.left
+      anchors.right: parent.right
+      margin-left: 10
+      margin-right: 10
+
+    Panel
+      id: grade
+      anchors.top: prev.bottom
+      margin-top: 3
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.bottom: parent.bottom
+      padding-left: 5
+      layout:
+        type: grid
+        cell-size: 9 10
+        cell-spacing: 2
+        num-columns: 5
+
+  ProgressBar
+    id: timeLeft
+    anchors.top: prev.bottom
+    margin-top: 5
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 20
+    background-color: #C28400   
+
+BonusReroll < FlatPanel
+  padding: 2
+  size: 55 92
+
+  UIButton
+    id: selectPrey
+    anchors.top: parent.top
+    margin-top: 5
+    anchors.horizontalCenter: parent.horizontalCenter
+    image-source: /images/game/prey/prey_bonus_reroll
+    size: 40 55
+    image-clip: 1 0 35 52
+    @onHoverChange: modules.game_prey.onHover(self)
+
+    $pressed:
+      image-clip: 0 52 37 54
+
+  CardLabel
+    id: price
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 21
+    margin-top: 2
+
+InactivePreyPanel < Panel
+  size: 195 312
+
+  ChoosePrey
+    id: choose
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+  
+  SelectPreyCreature
+    id: select
+    anchors.bottom: parent.bottom
+    anchors.right: prev.left
+    margin-right: 2
+
+  RerollButton
+    id: reroll
+    anchors.bottom: parent.bottom
+    anchors.right: prev.left
+    margin-right: 2
+
+
+  FlatPanel
+    id: list
+    anchors.top: parent.top
+    anchors.horizontalCenter: parent.horizontalCenter
+    margin-top: 20
+    padding-left: 4
+    padding-top: 4
+    size: 195 195
+    layout:
+      type: grid
+      cell-size: 60 60
+      cell-spacing: 3
+      num-columns: 3
+
+ChoosePrey < FlatPanel
+  size: 55 92
+  padding: 10
+
+  UIButton
+    id: choosePreyButton
+    anchors.fill: parent
+    margin-bottom: 17
+    margin-top: 17
+    margin-left: 3
+    image-source: /images/game/prey/prey_choose
+    image-clip: 1 0 44 35
+    @onHoverChange: modules.game_prey.onHover(self)    
+
+    $pressed:
+      image-clip: 0 35 45 37
+
+SelectPreyCreature < FlatPanel
+  padding: 2
+  size: 70 92
+
+  UIButton
+    id: pickSpecificPrey
+    anchors.top: parent.top
+    anchors.horizontalCenter: parent.horizontalCenter
+    size: 66 66
+    image-source: /images/game/prey/prey_select_blocked
+    @onHoverChange: modules.game_prey.onHover(self)
+
+  CardLabel
+    id: price
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 2
+
+RerollButton < FlatPanel
+  padding: 2
+  size: 70 92
+  
+  FlatPanel
+    id: button
+    size: 66 66
+    padding: 2
+    anchors.top: parent.top
+    anchors.horizontalCenter: parent.horizontalCenter
+
+    ProgressBar
+      id: time
+      anchors.bottom: parent.bottom
+      anchors.left: parent.left
+      anchors.right: parent.right
+      height: 15
+      text-align: center
+      background-color: #C28400
+
+    UIButton
+      id: rerollButton
+      anchors.top: parent.top
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.bottom: prev.top
+      image-source: /images/game/prey/prey_reroll
+      image-clip: 1 0 58 45
+      @onHoverChange: modules.game_prey.onHover(self)
+
+      $pressed:
+        image-clip: 0 46 60 47
+
+
+  GoldLabel
+    id: price
+    anchors.top: prev.bottom
+    margin-top: 2
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+  
+CardLabel < FlatPanel
+  padding: 5
+
+  UIWidget
+    id: cards
+    anchors.right: parent.right
+    anchors.verticalCenter: parent.verticalCenter
+    image-source: /images/game/prey/prey_wildcard
+    tooltip: Prey Wildcards
+
+  UIWidget
+    id: text
+    anchors.right: prev.left
+    margin-right: 5
+    anchors.left: parent.left
+    anchors.verticalCenter: parent.verticalCenter
+    text-align: right
+
+GoldLabel < FlatPanel
   padding: 5
   
+  UIWidget
+    id: gold
+    anchors.right: parent.right
+    anchors.verticalCenter: parent.verticalCenter
+    image-source: /images/game/prey/prey_gold
+    tooltip: Gold Coins
+
+  UIWidget
+    id: text
+    anchors.right: prev.left
+    margin-right: 5
+    anchors.left: parent.left
+    anchors.verticalCenter: parent.verticalCenter
+    text-align: right
+
+PreyCreatureBox < UICheckBox
+  border-width: 1
+  border-color: #ffffff
+  padding: 3
+  @onClick: modules.game_prey.onItemBoxChecked(self)
+
+  UICreature
+    id: creature
+    phantom: true
+    anchors.fill: parent
+    image-color: #ffffffff
+    margin-top: 3
+
+  $checked on:
+    border-color: #ffffff
+
+  $!checked:
+    border-color: alpha
+
+  $!on:
+    image-color: #ffffff88
+    color: #aaaaaa88
+
+SlotPanel < Panel
+  size: 210 320
+  image-source: /images/ui/window
+  image-border: 25
+  padding-top: 2
+  padding-bottom: 6
+  padding-left: 8
+  padding-right: 8
+
   Label
     id: title
     anchors.top: parent.top
-    anchors.left: parent.left 
-    anchors.right: parent.right
-    text-align: center
-    !text: tr("Prey Inactive")
-
-  TextList
-    id: list
-    anchors.top: parent.top
     anchors.left: parent.left
     anchors.right: parent.right
-    margin-top: 15
-    margin-right: 10
-    vertical-scrollbar: listScrollbar
-    height: 150
-    visible: false
-    focusable: false
-    
-  VerticalScrollBar
-    id: listScrollbar
-    anchors.top: prev.top
-    anchors.bottom: prev.bottom
-    anchors.right: parent.right
-    pixels-scroll: true
-    visible: false    
-    step: 10
-    
-  UICreature
-    id: creature
+    text-align: center
+
+  InactivePreyPanel
+    id: inactive  
+    anchors.top: parent.top
+    anchors.horizontalCenter: parent.horizontalCenter
+
+  ActivePreyPanel
+    id: active
     anchors.top: parent.top
     anchors.horizontalCenter: parent.horizontalCenter
-    margin-top: 40
-    height: 64
-    width: 64
     visible: false
 
-  Label
-    id: description
-    margin-top: 30
-    margin-left: 5
-    margin-right: 5
-    anchors.top: prev.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    text-auto-resize: true
-    text-align: center
-    text-wrap: true
-    visible: false
-  
-  Label
-    id: bonuses
-    margin-top: 5
-    margin-left: 5
-    margin-right: 5
-    anchors.top: prev.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    text-auto-resize: true
-    text-align: center
-    text-wrap: true
+  LockedPreyPanel
+    id: locked
+    margin-top: 20
+    anchors.top: parent.top
+    anchors.horizontalCenter: parent.horizontalCenter
     visible: false
 
-  Button
-    id: button
-    margin-top: 5
-    anchors.top: prev.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    margin-left: 10
-    margin-right: 10
-    visible: false    
-
-  Label
-    id: bottomLabel
-    margin-left: 5
-    margin-right: 5
-    margin-bottom: 5
-    anchors.bottom: next.top
-    anchors.left: parent.left
-    anchors.right: parent.right
-    text-auto-resize: true
-    text-align: center
-    text-wrap: true
-    visible: false    
-
-  Button
-    id: bottomButton
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    margin-left: 10
-    margin-right: 10
-    text: 11
-    visible: false    
-    
-    $hidden:
-      height: 0
-      
-    $!hidden:
-      height: 22
-    
 MainWindow
   id: preyWindow
   !text: tr('Preys')
-  size: 600 405
-  background-color: #AAAAAA
+  size: 688 520
   @onEscape: modules.game_prey.hide()
-  
-  PreySlot
+  padding: 20
+  @onHoverChange: modules.game_prey.onHover(self)
+
+  SlotPanel
     id: slot1
     anchors.left: parent.left
     anchors.top: parent.top
+    margin-top: 10
 
-  PreySlot
+  SlotPanel
     id: slot2
+    anchors.verticalCenter: prev.verticalCenter
     anchors.left: prev.right
-    anchors.top: prev.top
+    margin-left: 10
 
-  PreySlot
+  SlotPanel
     id: slot3
+    anchors.verticalCenter: prev.verticalCenter
     anchors.left: prev.right
-    anchors.top: prev.top
-    
-  HorizontalSeparator
-    id: mainSeparator
-    anchors.top: slot3.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    margin-top: 5
-    
-  Label
-    id: rerollPrice
-    anchors.top: mainSeparator.bottom
-    anchors.left: parent.left
-    margin-top: 5
-    width: 190
-    height: 30
-    text-align: center
+    margin-left: 10
 
-  Label
-    id: balance
-    anchors.top: mainSeparator.bottom
-    anchors.left: prev.right
-    margin-top: 5
-    width: 190
-    height: 30
-    text-align: center
+  FlatLabel
+    id: description
+    anchors.left: slot1.left
+    anchors.top: slot1.bottom
+    anchors.right: slot3.right
+    anchors.bottom: bottomSep.top
+    margin-bottom: 10
+    margin-top: 10
+    text-wrap: true
 
-  Label
-    id: bonusRerolls
-    anchors.top: mainSeparator.bottom
-    anchors.left: prev.right
-    margin-top: 5
-    width: 190
-    height: 30
-    text-align: center
-    
   HorizontalSeparator
-    anchors.bottom: buttonCancel.top
+    id: bottomSep
     anchors.left: parent.left
-    anchors.right: parent.right
-    margin-bottom: 5
+    anchors.right: parent.right 
+    anchors.bottom: closeButton.top
+    margin-bottom: 10
 
   Button
-    id: buttonCancel
-    !text: tr('Close')
-    width: 64
+    id: closeButton
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-    @onClick: modules.game_prey.hide()
+    size: 45 21
+    text: Close
+    font: cipsoftFont
+    @onClick: modules.game_prey.hide()
+
+  GoldLabel
+    id: gold
+    anchors.left: bottomSep.left
+    anchors.verticalCenter: closeButton.verticalCenter
+    size: 105 20
+
+  CardLabel
+    id: wildCards
+    anchors.left: prev.right
+    margin-left: 10
+    anchors.verticalCenter: closeButton.verticalCenter
+    size: 55 20
+
+  UIButton
+    id: openStore
+    anchors.left: prev.right
+    margin-left: 10
+    size: 20 20
+    anchors.verticalCenter: closeButton.verticalCenter
+    tooltip: Go to the Store to get more Prey Wildcards!
+    image-source: /images/topbuttons/shop
+    image-clip: 0 0 20 20
+    background-color: #17354e
+    @onClick: modules.game_shop.show()
+
+    $pressed:
+      image-clip: 0 20 20 20
+
+PreyCreature < Panel
+  height: 22
+  margin-top: 3
+
+  UICreature
+    id: creature
+    anchors.top: parent.top
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    size: 20 20
+
+  UIWidget
+    id: noCreature
+    anchors.top: parent.top
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    size: 20 20
+    image-source: /images/game/prey/prey_inactive
+
+  UIWidget
+    id: preyType
+    anchors.left: prev.right
+    margin-left: 5
+    anchors.verticalCenter: prev.verticalCenter
+    size: 15 15
+
+  UIWidget
+    id: creatureName
+    anchors.left: prev.right
+    margin-left: 5
+    anchors.top: parent.top
+    anchors.bottom: prev.bottom
+    margin-bottom: 7
+    anchors.right: parent.right
+    text: Inactive
+    font: verdana-11px-rounded
+    text-align: left     
+
+  ProgressBar
+    id: time
+    anchors.left: prev.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    margin-bottom: 2
+    height: 6
+    background-color: #C28400
+    phantom: false    
+
+PreyTracker < MiniWindow
+  id: preyTracker
+  !text: tr('Preys')
+  height: 95
+  icon: /images/topbuttons/prey
+
+  MiniWindowContents
+    padding-left: 5
+    padding-right: 5
+    padding-top: 5
+    layout: verticalBox
+
+    Label
+      !text: tr('Prey Creatures')
+      font: verdana-11px-rounded   
+
+    HorizontalSeparator
+      margin-top: 1
+
+    PreyCreature
+      id: slot1
+      margin-top: 5
+
+    PreyCreature
+      id: slot2
+
+    PreyCreature
+      id: slot3