Skip to content

Commit

Permalink
Bugfixes
Browse files Browse the repository at this point in the history
-Fixed bug where event message said GPS was used when GPS wasn't in
inventory
-Fixed bug where when tile API was changed from tile:getStatus to
tile:getState  (forgot to update this line of code)
  • Loading branch information
timothymtorres committed Jul 11, 2017
1 parent 0f1cc35 commit 561ed0b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/player/action/list.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ local action_list = {
exit = {name='exit', cost=1},
},
basic = {
respawn = {cost= 10, modifier={resurrection = -5},},
respawn = {cost= 10, modifier={hivemind = -5},},
attack = {cost= 1},
speak = {cost= 1},
feed = {cost= 1},
Expand Down
6 changes: 3 additions & 3 deletions code/player/action/outcome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ function Outcome.move(player, dir)
map[dir_y][dir_x]:insert(player)
end

player:updatePos(dir_y, dir_x)
return {dir, GPS_usage}
player:updatePos(dir_y, dir_x)
return {GPS_usage}
end

local ARMOR_DAMAGE_MOD = 2.5
Expand Down Expand Up @@ -137,7 +137,7 @@ function Outcome.search(player)
local item, flashlight

local player_has_flashlight, inv_ID = player.inventory:search('flashlight')
local player_inside_powered_building = p_tile:getStatus() == 'powered' and player:isStaged('inside')
local player_inside_powered_building = p_tile:getState() == 'powered' and player:isStaged('inside')

if player_has_flashlight and not player_inside_powered_building then -- flashlight gives no search bonus if player inside powered building
item = p_tile:search(player, player:getStage(), player_has_flashlight)
Expand Down

0 comments on commit 561ed0b

Please sign in to comment.