OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

support pea chia cape in infinite closet

Browse source
This commit is contained in:
Emi Matchu 2012-09-29 12:40:55 -05:00
parent eb0ad25c93
commit ddec043209
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/item.rb
View file

@ -12,7 +12,8 @@ class Item < ActiveRecord::Base
NCRarities = [0, 500] NCRarities = [0, 500]
PAINTBRUSH_SET_DESCRIPTION = 'This item is part of a deluxe paint brush set!' PAINTBRUSH_SET_DESCRIPTION = 'This item is part of a deluxe paint brush set!'
SPECIAL_COLOR_DESCRIPTION_REGEX = /This item is only wearable by Neopets painted ([a-zA-Z]+)\./ SPECIAL_COLOR_DESCRIPTION_REGEX =
/This item is only wearable by Neopets painted ([a-zA-Z]+)\.|WARNING: This [a-zA-Z]+ can be worn by ([a-zA-Z]+) [a-zA-Z]+ ONLY!/
SPECIAL_PAINTBRUSH_COLORS_PATH = Rails.root.join('config', 'colors_with_unique_bodies.txt') SPECIAL_PAINTBRUSH_COLORS_PATH = Rails.root.join('config', 'colors_with_unique_bodies.txt')
SPECIAL_PAINTBRUSH_COLORS = File.read(SPECIAL_PAINTBRUSH_COLORS_PATH).split("\n").map { |name| Color.find_by_name(name) } SPECIAL_PAINTBRUSH_COLORS = File.read(SPECIAL_PAINTBRUSH_COLORS_PATH).split("\n").map { |name| Color.find_by_name(name) }
@ -102,7 +103,8 @@ class Item < ActiveRecord::Base
match = description.match(SPECIAL_COLOR_DESCRIPTION_REGEX) match = description.match(SPECIAL_COLOR_DESCRIPTION_REGEX)
if match if match
return Color.find_by_name(match[1].downcase) color = match[1] || match[2]
return Color.find_by_name(color.downcase)
end end
end end
public public

1
config/basic_type_hashes.yml
View file

@ -54,6 +54,7 @@ chia:
yellow: oqs3kzmf yellow: oqs3kzmf
baby: kvm8jr9k baby: kvm8jr9k
mutant: mnf38rsr mutant: mnf38rsr
pea: mn53trx7
chomby: chomby:
blue: h3qctoxg blue: h3qctoxg
green: 552mzx7r green: 552mzx7r