Merge branch 'Hide-Ability' into develop

Author: timothymtorres

code/location/tile/building/barricade.lua

@@ -160,7 +160,7 @@ function Barricade:didZombiesIntervene(player)  -- make brute zombie count as x2
   local nullfied_zombies = math.floor(human_n/num_humans_to_nullify_zombie)
   local blockade_n = zombie_n - 1 - nullfied_zombies  -- the -1 is to prevent single zombies from blocking an entrance by themselves
 
-  local integrity_state = p_tile:getIntegrityState()
+  local integrity_state = p_tile:getIntegrity()
   if integrity_state == 'ransacked' then blockade_n = blockade_n + ransack_blockade_bonus end
 
   if blockade_n <= 0 then return false end -- not high enough chance at blocking to do a roll

code/location/tile/building/machine/generator.lua

@@ -19,4 +19,23 @@ function Generator:isActive() return self.fuel > 0 end
 
 function Generator:hasOperations() return false end
 
+function Generator:activate()
+  local hidden_players = self:getPlayers(setting, 'hide')
+  if hidden_players then for player in pairs(hidden_players) do player.status_effect:remove('hide') end end
+
+  --------------------------------------------
+  -----------   M E S S A G E   --------------
+  --------------------------------------------
+   
+  local msg = 'The power to the {building} turns on.'
+  msg = msg:replace(self.building)
+
+  --------------------------------------------
+  ---------   B R O A D C A S T   ------------
+  --------------------------------------------     
+
+  local event = {'generator', hidden_players} -- maybe change event[1] to 'lightup', 'illumiinate', etc.?
+  tile:broadcastEvent(msg, event, settings)  
+end
+
 return Generator

code/location/tile/tile.lua

@@ -50,7 +50,7 @@ function Tile:countPlayers(mob_type, setting)
 
   local count = 0
   for player in pairs(players) do
-    if (mob_type == 'all' or player:isMobType(mob_type) ) and player:isStanding() then 
+    if (mob_type == 'all' or player:isMobType(mob_type) ) and player:isStanding() and not player.status_effect:isActive('hide') then 
       count = count + 1
     end
   end
@@ -75,13 +75,13 @@ function Tile:getMap() return self.map_zone end
 
 function Tile:getPos() return self.y, self.x end
 
-function Tile:getIntegrityState()
+function Tile:getIntegrity()
   if self:isBuilding() then return self.integrity:getState()
   else return 'intact'
   end
 end
 
-function Tile:getPlayers(setting) 
+function Tile:getPlayers(setting, filter) 
   local players
   if setting == 'inside' then 
     players = self.inside_players
@@ -90,11 +90,24 @@ function Tile:getPlayers(setting)
   elseif not setting then -- get all players
     players = {}
     if self.inside_players then 
-      for k,v in pairs(self.inside_players) do players[k] = v end
+      for player in pairs(self.inside_players) do players[player] = true end
     end
-    for k,v in pairs(self.outside_players) do players[k] = v end
+    for player in pairs(self.outside_players) do players[player] = true end
+  end
+
+  if filter then
+    for player in pairs(players) do
+      if not player.status_effect:isActive(filter) then players[player] = nil end
+    end
+  end
+
+  return next(players) and players or nil 
+end
+
+function Tile:isIntegrity(setting)
+  if self:isBuilding() then return self.integrity:getState() == setting 
+  else return 'intact' == setting 
   end
-  return players 
 end
 
 function Tile:isBuilding() return self.inside_players and true or false end
@@ -134,18 +147,24 @@ local function select_item(list)
 end
 
 function Tile:search(player, setting, was_flashlight_used)
-  local integrity_state = self:getIntegrityState()  
+  local integrity_state = self:getIntegrity()  
 
   local odds = self:getSearchOdds(player, setting, integrity_state, was_flashlight_used)
   local search_success = odds >= math.random()
 
   if not search_success then return false end
 
-  local tile_item_list = self.item_chance[setting] 
-  local selected_item_type = select_item(tile_item_list)
-  
-  local item = Items[selected_item_type]:new(integrity_state) 
-  return item
+  local hidden_players = self:getPlayers(setting, 'hide')
+
+  if hidden_players then
+    return next(hidden_players) -- probably should shuffle and randomly select player instead of using next()
+  else
+    local tile_item_list = self.item_chance[setting] 
+    local selected_item_type = select_item(tile_item_list)
+    
+    local item = Items[selected_item_type]:new(integrity_state) 
+    return item
+  end
 end
 
 function Tile:__tostring() return self.name..' '..self.class.name end

code/player/human/action/advanced.lua

@@ -12,33 +12,62 @@ function search.activate(player)
   local player_has_flashlight, inv_ID = player.inventory:search('flashlight')
   local player_inside_unpowered_building = not p_tile:isPowered() and player:isStaged('inside')
 
-  local item = p_tile:search(player, player:getStage(), player_has_flashlight)
-  
+  local discovery = p_tile:search(player, player:getStage(), player_has_flashlight)
+
   if player_has_flashlight and player_inside_unpowered_building then -- flashlight is only used when building has no power
     flashlight_was_used = true
     local flashlight = player.inventory:lookup(inv_ID)
     if flashlight:failDurabilityCheck(player) then flashlight:updateCondition(-1, player, inv_ID) end
   end
-  
+
+  local item, hidden_player
+
+  if discovery and discovery.class.name == 'Item' then item = discovery
+  elseif discovery then hidden_player = discovery
+  end
+
   if item then player.inventory:insert(item) end
-  
+  if hidden_player then hidden_player.status_effect:remove('hide') end
+
   --------------------------------------------
   -----------   M E S S A G E   --------------
   --------------------------------------------
 
-  local msg = 'You search {with_flashlight} and find {item}.'
+  local self_msg = 'You search {with_flashlight} and find {discovery}.'
   local names = {
     with_flashlight = flashlight_was_used and 'with a flashlight' or '',
-    item = item and 'a '..tostring(item) or 'nothing', 
+    discovery = discovery and 'a '..tostring(discovery) or 'nothing',
+    player = player,
+    hidden_player = hidden_player, 
   }
-  msg = msg:replace(names)
+  self_msg = self_msg:replace(names)
 
+  local public_msg, hidden_player_msg
+
+  if hidden_player then
+    public_msg = '{player} searches and finds {hidden_player}.'
+    hidden_player_msg = 'You are discovered by {player}!'
+    public_msg = public_msg:replace(names)
+    hidden_player_msg = hidden_player_msg:replace(names)
+  end
   --------------------------------------------
   ---------   B R O A D C A S T   ------------
   --------------------------------------------     
 
-  local event = {'search', player, item, flashlight_was_used}   
-  player.log:insert(msg, event)
+  local event = {'search', player, discovery, flashlight_was_used}  
+
+  if hidden_player then
+    local settings = {stage=player:getStage(), exclude={}}
+    settings.exclude[player], settings.exclude[hidden_player] = true, true  
+    
+    player.log:insert(self_msg, event)
+    hidden_player.log:insert(hidden_player_msg, event)
+    
+    local tile = player:getTile()
+    tile:broadcastEvent(public_msg, event, settings)    
+  else 
+    player.log:insert(self_msg, event)
+  end
 end
 
 -------------------------------------------------------------------

code/player/human/skill_list.lua

@@ -3,61 +3,61 @@ local fillSkillList = require('code.player.fillSkillList')
 local skill_list = {
   flag = {
     -- Classes 
-    military =             1,
-    research =             2,
-    engineering =          4,  
+    military =             2^0,
+    research =             2^1,
+    engineering =          2^2,  
 
     -- General
-    hp_bonus =             1,  -- hp_bonus MUST remain flag 1 b/c it's used for both zombies & humans on the bitflag 1 slot
-    cutting =              2,
-    swinging =             4,
-    martial_arts =         8,
-    martial_arts_adv =    16,
-    ranged =              32,
-    roof_travel =         64,
-    melee =              128,
-    ip_bonus =           256,
-    looting =            512,
-    diagnosis =         1024,
-    graffiti =          2048,
+    hp_bonus =             2^0,  -- hp_bonus MUST remain flag 1 b/c it's used for both zombies & humans on the bitflag 1 slot
+    cutting =              2^1,
+    swinging =             2^2,
+    martial_arts =         2^3,
+    martial_arts_adv =     2^4,
+    ranged =               2^5,
+    roof_travel =          2^6,
+    melee =                2^7,
+    ip_bonus =             2^8,
+    looting =              2^9,
+    diagnosis =            2^10,
+    graffiti =             2^11,
 
     -- Military
-    ranged_adv =           1,
-    guns =                 2,
-    light_guns =           4,
-    heavy_guns =           8,
-    archery =             16,
-    archery_adv =         32,
-    melee_adv =           64,
-    smacking =           128,
-    chopping =           256,
-    slicing =            512,
-    smashing =          1024,
-    explosives =        2048,
+    ranged_adv =           2^0,
+    guns =                 2^1,
+    light_guns =           2^2,
+    heavy_guns =           2^3,
+    archery =              2^4,
+    archery_adv =          2^5,
+    melee_adv =            2^6,
+    smacking =             2^7,
+    chopping =             2^8,
+    slicing =              2^9,
+    smashing =             2^10,
+    explosives =           2^11,
 
     -- Research
-    healing =              1,
-    major_healing =        2,
-    minor_healing =        4,
-    diagnosis_adv =        8,
-    gadgets =             16,
-    scanner =             32,
-    syringe =             64,
-    syringe_adv =        128,
-    terminal =           256,
-    terminal_adv =       512,
+    healing =              2^0,
+    major_healing =        2^1,
+    minor_healing =        2^2,
+    diagnosis_adv =        2^3,
+    gadgets =              2^4,
+    scanner =              2^5,
+    syringe =              2^6,
+    syringe_adv =          2^7,
+    terminal =             2^8,
+    terminal_adv =         2^9,
 
     -- Engineering
-    repair =              1,
-    repair_adv =          2,
-    barricade =            4,
-    barricade_adv =        8,
-    reinforce =           16,
-    renovate =            32,
-    tech =                64,
-    power_tech =         128,
-    radio_tech =         256,
-    computer_tech =      512,
+    repair =               2^0,
+    repair_adv =           2^1,
+    barricade =            2^2,
+    barricade_adv =        2^3,
+    reinforce =            2^4,
+    renovate =             2^5,
+    tech =                 2^6,
+    power_tech =           2^7,
+    radio_tech =           2^8,
+    computer_tech =        2^9,
   },
   order = {
     category = {'classes', 'general', 'military', 'research', 'engineering'},

code/player/skills.lua

@@ -57,9 +57,9 @@ end
 function Skills:buy(player, skill)
   local xp = player:getStat('xp')
 
-  local class = self.list.isClass(skill)  
+  local class = self.list:isClass(skill)  
   local cost = (class and self:getCost('classes') ) or self:getCost('skills')  
-  local required_flags = self.list.getRequiredFlags(skill)
+  local required_flags = self.list:getRequiredFlags(skill)
 print('[skills:buy]', 'player.xp='..xp, 'skill['..skill..'] cost='..cost)  
 --print('required_flags = ', required_flags)  
 
@@ -83,7 +83,7 @@ function Skills:checkFlag(category, flag) return
 function Skills:check(skill) return self:checkFlag(self.list:getCategory(skill), self.list.flag[skill]) end
 
 function Skills:add(skill) 
-  local category = self.list.getCategory(skill)
+  local category = self.list:getCategory(skill)
   self.flags[category] = bor(self.flags[category], self.list.flag[skill]) 
 end
 

code/player/status_effect/status_effect.lua

@@ -25,7 +25,7 @@ function StatusEffect:elapse(ap)
   local mob_type = self.player:getMobType()
   for _, Effect in ipairs(StatusEffect[mob_type]) do
   	local effect = string.lower(Effect.name)    -- lowercase the class name
-    if self[effect] then self[effect]:elapse(player, ap) end
+    if self[effect] and self[effect].elapse then self[effect]:elapse(player, ap) end
   end
 end
 

code/player/zombie/ability/abilities.lua

@@ -1,4 +1,4 @@
-local drag_prey, groan, gesture, armor, ransack, mark_prey, track, acid = unpack(require('code.player.zombie.ability.generic'))
+local drag_prey, groan, gesture, armor, ransack, mark_prey, track, hide, acid = unpack(require('code.player.zombie.ability.generic'))
 
 local abilities = {
   -- GENERAL
@@ -8,7 +8,7 @@ local abilities = {
   -- HIVE
   acid, ransack,
   -- HUNTER
-  track, mark_prey,
+  track, mark_prey, hide,
 }
 
 for _, ability in ipairs(abilities) do