Skip to content

Commit

Permalink
Merge pull request #311 from ORNL-AMO/issue-299
Browse files Browse the repository at this point in the history 
Issues 299 306 309
  • Loading branch information
@rhernandez-intertech
rhernandez-intertech authored Mar 28, 2024
2 parents 38c6933 + 597d2ee commit cde2903
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 39 deletions.
4 changes: 2 additions & 2 deletions src/Financing.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export function getEaaSFinancing(years: number): FinancingType {
id: 'eaas',
loanTerm: years,
description: 'Finance your energy use reduction',
detailedInfo: `0% interest. Loan term: ${years} years`
detailedInfo: `5% interest. Loan term: ${years} years`
}
}

Expand Down Expand Up @@ -207,7 +207,7 @@ export function setCapitalFundingMilestone(capitalFundingState: CapitalFundingSt
console.log('Capital Funding - earned round A, for year:', stats.currentGameYear + 1)
}
} else if (!capitalFundingState.roundB.isEarned) {
let roundBMilestonePercent = 35;
let roundBMilestonePercent = 30;
savingsMilestone = checkHasSavingsMilestone(stats, roundBMilestonePercent);
if (savingsMilestone) {
capitalFundingState.roundB.isEarned = true;
Expand Down
82 changes: 45 additions & 37 deletions src/Projects.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ Projects[Pages.processHeatingUpgrades] = new ProjectControl({
pageId: Pages.processHeatingUpgrades,
isCapitalFundsEligible: true,
baseCost: 80_000,
financedAnnualCost: 31_000,
financedTotalCost: 124_000,
financedAnnualCost: 20_000,
financedTotalCost: 80_000,
isEnergyEfficiency: true,
statsInfoAppliers: {
electricityUseKWh: absolute(-300_000),
Expand Down Expand Up @@ -144,8 +144,8 @@ Projects[Pages.hydrogenPoweredForklifts] = new ProjectControl({
baseCost: 150_000,
isEnergyEfficiency: true,
isCapitalFundsEligible: true,
financedAnnualCost: 37_500,
financedTotalCost: 150_000,
financedAnnualCost: 42_500,
financedTotalCost: 168_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -286,6 +286,13 @@ Projects[Pages.electricBoiler] = new ProjectControl({
pageId: Pages.electricBoiler,
isCapitalFundsEligible: true,
baseCost: 500_000,
financedAnnualCost: 50_000,
financedTotalCost: 500_000,
financingOptions: [
{
financingType: getGreenBondsFinancing(10),
},
],
costSavingsCarryover: 'never',
isEnergyEfficiency: true,
statsInfoAppliers: {
Expand All @@ -309,11 +316,11 @@ Projects[Pages.electricBoiler] = new ProjectControl({
Projects[Pages.solarPanelsCarPort] = new ProjectControl({
pageId: Pages.solarPanelsCarPort,
isCapitalFundsEligible: true,
baseCost: 150_000,
baseCost: 180_000,
isSinglePaymentRenewable: true,
costSavingsCarryover: 'always',
financedAnnualCost: 37_500,
financedTotalCost: 150_000,
financedAnnualCost: 50_000,
financedTotalCost: 200_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand All @@ -327,20 +334,21 @@ Projects[Pages.solarPanelsCarPort] = new ProjectControl({
statsActualAppliers: {
electricityUseKWh: absolute(-537_000),
},
statsRecapAppliers: {
financesAvailable: absolute(-30_000),
hiddenSpending: absolute(30_000),
},
recapSurprises: [{
title: 'Uh oh - Bad Asphalt!',
text: 'While assessing the land in person, the contractor found that the parking lot\'s {asphalt needs replacement}. This will require an {additional $30,000} for the carport’s installation.',
className: 'year-recap-negative-surprise',
avatar: {
icon: <TrafficConeIcon />,
backgroundColor: 'rgba(54,31,6,0.6)',
color: 'rgb(255 135 33)',
}
}],
//*keeping hidden surprise code in for now; might need in future
// statsRecapAppliers: {
// financesAvailable: absolute(-30_000),
// hiddenSpending: absolute(30_000),
// },
// recapSurprises: [{
// title: 'Uh oh - Bad Asphalt!',
// text: 'While assessing the land in person, the contractor found that the parking lot\'s {asphalt needs replacement}. This will require an {additional $30,000} for the carport’s installation.',
// className: 'year-recap-negative-surprise',
// avatar: {
// icon: <TrafficConeIcon />,
// backgroundColor: 'rgba(54,31,6,0.6)',
// color: 'rgb(255 135 33)',
// }
// }],
title: 'Small Carport Solar Installation',
shortTitle: 'Install solar panels on new facility carport. {THIS PROJECT WILL BE RENEWED ANNUALLY}.',
shortTitleRawText: 'Install solar panels on new facility carport. THIS PROJECT WILL BE RENEWED ANNUALLY.',
Expand Down Expand Up @@ -425,8 +433,8 @@ Projects[Pages.airHandingUnitUpgrades] = new ProjectControl({
pageId: Pages.airHandingUnitUpgrades,
isCapitalFundsEligible: true,
baseCost: 175_000,
financedAnnualCost: 67_000,
financedTotalCost: 268_000,
financedAnnualCost: 48_000,
financedTotalCost: 192_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -467,8 +475,8 @@ Projects[Pages.advancedEnergyMonitoring] = new ProjectControl({
pageId: Pages.advancedEnergyMonitoring,
isCapitalFundsEligible: true,
baseCost: 60_000,
financedAnnualCost: 23_000,
financedTotalCost: 92_000,
financedAnnualCost: 17_000,
financedTotalCost: 68_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -541,8 +549,8 @@ Projects[Pages.boilerControl] = new ProjectControl({
pageId: Pages.boilerControl,
isCapitalFundsEligible: true,
baseCost: 100_000,
financedAnnualCost: 38_000,
financedTotalCost: 152_000,
financedAnnualCost: 28_000,
financedTotalCost: 112_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -645,8 +653,8 @@ Projects[Pages.compressedAirSystemImprovemnt] = new ProjectControl({
pageId: Pages.compressedAirSystemImprovemnt,
isCapitalFundsEligible: true,
baseCost: 210_000,
financedAnnualCost: 81_000,
financedTotalCost: 324_000,
financedAnnualCost: 58_000,
financedTotalCost: 232_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -728,8 +736,8 @@ Projects[Pages.chilledWaterMonitoringSystem] = new ProjectControl({
pageId: Pages.chilledWaterMonitoringSystem,
isCapitalFundsEligible: true,
baseCost: 40_000,
financedAnnualCost: 15_000,
financedTotalCost: 60_000,
financedAnnualCost: 11_000,
financedTotalCost: 44_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -833,8 +841,8 @@ Projects[Pages.improveLightingSystems] = new ProjectControl({
pageId: Pages.improveLightingSystems,
isCapitalFundsEligible: true,
baseCost: 50_000,
financedAnnualCost: 19_000,
financedTotalCost: 76_000,
financedAnnualCost: 14_000,
financedTotalCost: 56_000,
financingOptions: [
{
financingType: getEaaSFinancing(4),
Expand Down Expand Up @@ -982,8 +990,8 @@ Projects[Pages.installVFDs3] = new ProjectControl({
pageId: Pages.installVFDs3,
isCapitalFundsEligible: true,
baseCost: 100_000,
financedAnnualCost: 38_000,
financedTotalCost: 152_000,
financedAnnualCost: 25_000,
financedTotalCost: 100_000,
financingOptions: [
{
financingType: getGreenBondsFinancing(4),
Expand Down Expand Up @@ -1223,7 +1231,7 @@ Projects[Pages.midSolar] = new ProjectControl({
recapDescription: 'Insert flavor text here!',
caseStudy: undefined,
energySavingsPreviewIcon: {
text: '9.3%',
text: '1.7M kg',
variant: 'text',
startIcon: <Co2Icon />,
},
Expand Down Expand Up @@ -1269,7 +1277,7 @@ Projects[Pages.largeWind] = new ProjectControl({
recapDescription: 'Insert flavor text here!',
caseStudy: undefined,
energySavingsPreviewIcon: {
text: '23%',
text: '4.3M kg',
variant: 'text',
startIcon: <Co2Icon />,
},
Expand Down

0 comments on commit cde2903

Please sign in to comment.