GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-31 01:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from Zarkonnen/laser_rifle_fix

Browse Source 
Laser rifles are now listed as weapons, fixing issue #37.
This commit is contained in:
Michael Townsend
2013-07-15 08:40:29 -07:00
parent 77cac86076 25f1fff6a1
commit d296ea4db9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/room.js
+8
View File
@@ -423,6 +423,12 @@ var Room = {
} }
}, },
MiscItems: {
'laser rifle': {
type: 'weapon'
}
},
name: "Room", name: "Room",
init: function(options) { init: function(options) {
this.options = $.extend( this.options = $.extend(
@@ -733,6 +739,8 @@ var Room = {
type = Room.Craftables[k].type; type = Room.Craftables[k].type;
} else if(Room.TradeGoods[k]) { } else if(Room.TradeGoods[k]) {
type = Room.TradeGoods[k].type; type = Room.TradeGoods[k].type;
} else if (Room.MiscItems[k]) {
type = Room.MiscItems[k].type;
} }
var location; var location;