Skip to content

Commit

Permalink
chore: Remove deepMerge function
Browse files Browse the repository at this point in the history
  • Loading branch information
spuxx1701 committed May 23, 2024
1 parent 61b0d18 commit ed612ea
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 80 deletions.
37 changes: 0 additions & 37 deletions lib/_internal/deep-merge.test.ts

This file was deleted.

40 changes: 0 additions & 40 deletions lib/_internal/deep-merge.ts

This file was deleted.

3 changes: 1 addition & 2 deletions lib/game-objects/character/origin/origin.blueprint-mocks.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import type { Blueprint } from '@/base/game-object';
import type { CharacterOrigin } from './origin.go';
import type { CharacterOriginName } from './origin.registry';

export const characterOriginMocks: Blueprint<CharacterOrigin>[] = [
{
name: 'character.origin.vulcan' as unknown as CharacterOriginName,
name: 'character.origin.earth-urban',
suitableTraits: ['character.trait.academic-education', 'character.trait.arrogance'],
primaryAttributeBonuses: { 'character.primary-attribute.cleverness': 1 },
fixedSkillBonuses: {
Expand Down
5 changes: 5 additions & 0 deletions lib/game-objects/character/trait/locales/de.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
character:
origin:
trait:
academic-education: Akademische Ausbildung
arrogance: Arroganz
4 changes: 3 additions & 1 deletion lib/locales/de.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { deepMerge } from '@/_internal/deep-merge';
import characterOrigin from '@/game-objects/character/origin/locales/de.yaml';
import characterPreset from '@/game-objects/character/preset/locales/de.yaml';
import primaryAttribute from '@/game-objects/character/primary-attribute/locales/de.yaml';
import secondaryAttribute from '@/game-objects/character/secondary-attribute/locales/de.yaml';
import trait from '@/game-objects/character/trait/locales/de.yaml';
import { deepMerge } from '@spuxx/browser-utils';

export const de: Record<string, unknown> = deepMerge(
characterOrigin,
characterPreset,
primaryAttribute,
secondaryAttribute,
trait,
);
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
},
"devDependencies": {
"@modyfi/vite-plugin-yaml": "^1.1.0",
"@spuxx/browser-utils": "^0.3.0",
"@types/node": "^20.12.10",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.0.0",
Expand Down
15 changes: 15 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ed612ea

Please sign in to comment.