Merge branch 'fix-build' into 'master'
Fix build See merge request dungeonslayers/ds4!173
This commit is contained in:
commit
0c8f1e8bda
2 changed files with 18 additions and 8 deletions
|
@ -6,7 +6,7 @@
|
|||
image: node:lts
|
||||
|
||||
stages:
|
||||
- test
|
||||
- check
|
||||
- build
|
||||
- prepare-release
|
||||
- release
|
||||
|
@ -17,7 +17,7 @@ cache: &global_cache
|
|||
- .yarn/cache
|
||||
|
||||
lint:
|
||||
stage: test
|
||||
stage: check
|
||||
before_script:
|
||||
- yarn install --immutable
|
||||
script:
|
||||
|
@ -25,8 +25,17 @@ lint:
|
|||
cache:
|
||||
<<: *global_cache
|
||||
|
||||
typecheck:
|
||||
stage: check
|
||||
before_script:
|
||||
- yarn install --immutable
|
||||
script:
|
||||
- yarn typecheck
|
||||
cache:
|
||||
<<: *global_cache
|
||||
|
||||
test:
|
||||
stage: test
|
||||
stage: check
|
||||
before_script:
|
||||
- yarn install --immutable
|
||||
script:
|
||||
|
@ -40,7 +49,7 @@ test:
|
|||
- junit.xml
|
||||
|
||||
reuse:
|
||||
stage: test
|
||||
stage: check
|
||||
image:
|
||||
name: fsfe/reuse:latest
|
||||
entrypoint: [""]
|
||||
|
|
|
@ -19,21 +19,22 @@ export function calculateSpellPrice(data: DS4SpellDataSourceData): number | null
|
|||
function calculateSpellPriceFactor(temporalData: UnitData<TemporalUnit>): number {
|
||||
let days: number;
|
||||
if (Number.isNumeric(temporalData.value)) {
|
||||
const value = Number.fromString(temporalData.value);
|
||||
switch (temporalData.unit) {
|
||||
case "days": {
|
||||
days = temporalData.value;
|
||||
days = value;
|
||||
break;
|
||||
}
|
||||
case "hours": {
|
||||
days = temporalData.value / hoursPerDay;
|
||||
days = value / hoursPerDay;
|
||||
break;
|
||||
}
|
||||
case "minutes": {
|
||||
days = temporalData.value / (hoursPerDay * minutesPerHour);
|
||||
days = value / (hoursPerDay * minutesPerHour);
|
||||
break;
|
||||
}
|
||||
case "rounds": {
|
||||
days = (temporalData.value * secondsPerRound) / (hoursPerDay * minutesPerHour * secondsPerMinute);
|
||||
days = (value * secondsPerRound) / (hoursPerDay * minutesPerHour * secondsPerMinute);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue