Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #81 - Aging Not Applying #82

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Fixes #81 - Aging Not Applying #82

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49458ea
check for kegType using incorrect produce type
doodlebunnyhops Jul 10, 2024
28efba7
imporperly returned jarType, update keg/cask forumla
doodlebunnyhops Jul 30, 2024
d9af93f
use kegBasePrice to simplifiy keg/cask conditionals
doodlebunnyhops Aug 1, 2024
0bcf411
getCaskModifier responsible for age check, removed jar edits
doodlebunnyhops Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 70 additions & 29 deletions js/crops.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ var crops = {
"extraPerc": 0,
"price": 35,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"summersquash": {
Expand All @@ -49,7 +50,8 @@ var crops = {
"extraPerc": 0,
"price": 45,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"broccoli": {
Expand All @@ -73,7 +75,8 @@ var crops = {
"extraPerc": 0,
"price": 70,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"powdermelon": {
Expand All @@ -98,6 +101,7 @@ var crops = {
"price": 70,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -122,7 +126,8 @@ var crops = {
"extraPerc": 0,
"price": 150,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"grape": {
Expand All @@ -147,6 +152,7 @@ var crops = {
"price": 80,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Raisins"
}
},
Expand All @@ -172,7 +178,8 @@ var crops = {
"price": 25,
"keg": 300,
"jarType": "Pickles",
"kegType": "Pale Ale"
"kegType": "Pale Ale",
"ages": true
}
},
"pineapple": {
Expand All @@ -197,6 +204,7 @@ var crops = {
"price": 300,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand Down Expand Up @@ -244,7 +252,8 @@ var crops = {
"price": 50,
"keg": 100,
"jarType": "Pickles",
"kegType": "Tea"
"kegType": "Tea",
"ages": false
}
},
"fairyrose": {
Expand Down Expand Up @@ -356,7 +365,8 @@ var crops = {
"extraPerc": 1,
"price": 15,
"keg": 150 / 5,
"kegType": "Coffee"
"kegType": "Coffee",
"ages": false
}
},
"poppy": {
Expand Down Expand Up @@ -424,7 +434,8 @@ var crops = {
"extraPerc": 0,
"price": 35,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"greenbean": {
Expand All @@ -448,7 +459,8 @@ var crops = {
"extraPerc": 0,
"price": 40,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"cauliflower": {
Expand All @@ -472,7 +484,8 @@ var crops = {
"extraPerc": 0,
"price": 175,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"potato": {
Expand All @@ -496,7 +509,8 @@ var crops = {
"extraPerc": 0.25, // technically (0.2^1) + (0.2^2) + (0.2^3) ...
"price": 80,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"garlic": {
Expand All @@ -520,7 +534,8 @@ var crops = {
"extraPerc": 0,
"price": 60,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"taroroot": {
Expand All @@ -544,7 +559,8 @@ var crops = {
"extraPerc": 0,
"price": 100,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"kale": {
Expand All @@ -568,7 +584,8 @@ var crops = {
"extraPerc": 0,
"price": 110,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"unmilledrice": {
Expand All @@ -592,7 +609,8 @@ var crops = {
"extraPerc": 0.11,
"price": 30,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"rhubarb": {
Expand All @@ -617,6 +635,7 @@ var crops = {
"price": 220,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -642,6 +661,7 @@ var crops = {
"price": 250,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -666,7 +686,8 @@ var crops = {
"extraPerc": 0.05,
"price": 60,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"blueberry": {
Expand All @@ -691,6 +712,7 @@ var crops = {
"price": 50,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -716,6 +738,7 @@ var crops = {
"price": 40,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -741,7 +764,8 @@ var crops = {
"price": 25,
"keg": 200,
"jarType": "Pickles",
"kegType": "Beer"
"kegType": "Beer",
"ages": true
}
},
"radish": {
Expand All @@ -765,7 +789,8 @@ var crops = {
"extraPerc": 0,
"price": 90,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"redcabbage": {
Expand All @@ -789,7 +814,8 @@ var crops = {
"extraPerc": 0,
"price": 260,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"starfruit": {
Expand All @@ -814,6 +840,7 @@ var crops = {
"price": 750,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -838,7 +865,8 @@ var crops = {
"extraPerc": 0,
"price": 50,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"eggplant": {
Expand All @@ -862,7 +890,8 @@ var crops = {
"extraPerc": 0.002,
"price": 60,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"artichoke": {
Expand All @@ -886,7 +915,8 @@ var crops = {
"extraPerc": 0,
"price": 160,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"pumpkin": {
Expand All @@ -910,7 +940,8 @@ var crops = {
"extraPerc": 0,
"price": 320,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"bokchoy": {
Expand All @@ -934,7 +965,8 @@ var crops = {
"extraPerc": 0,
"price": 80,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"yam": {
Expand All @@ -958,7 +990,8 @@ var crops = {
"extraPerc": 0,
"price": 160,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"cranberries": {
Expand All @@ -983,6 +1016,7 @@ var crops = {
"price": 75,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -1007,7 +1041,8 @@ var crops = {
"extraPerc": 0,
"price": 100,
"jarType": "Pickles",
"kegType": "Juice"
"kegType": "Juice",
"ages": false
}
},
"ancientfruit": {
Expand All @@ -1032,6 +1067,7 @@ var crops = {
"price": 550,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -1057,6 +1093,7 @@ var crops = {
"price": 75,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand All @@ -1082,6 +1119,7 @@ var crops = {
"price": 120,
"jarType": "Jelly",
"kegType": "Wine",
"ages": true,
"dehydratorType": "Dried Fruit"
}
},
Expand Down Expand Up @@ -1131,7 +1169,8 @@ var crops = {
// (Spice Berry + Grape + Sweet Pea) / 3
"price": (80 + 80 + 50) / 3,
"jarType": "Jelly",
"kegType": "Wine"
"kegType": "Wine",
"ages": true
},
"isWildseed": true
},
Expand All @@ -1157,7 +1196,8 @@ var crops = {
// (Blackberry + Common Mushroom + Hazelnut + Wild Plum) / 4
"price": (20 + 40 + 90 + 80) / 4,
"jarType": "Jelly",
"kegType": "Wine"
"kegType": "Wine",
"ages": true
},
"isWildseed": true
},
Expand All @@ -1183,7 +1223,8 @@ var crops = {
// (Crocus + Crystal Fruit + Snow Yam + Winter Root) / 4
"price": (60 + 150 + 100 + 70) / 4,
"jarType": "Jelly",
"kegType": "Wine"
"kegType": "Wine",
"ages": true
},
"isWildseed": true
}
Expand Down
Loading