Merge branch 'master' into worktree-local-location-view
Brings in the First Loot slice. Resolved additively: - MonsterDefinition keeps both the new iconPath and master's lootTableId. - The seed keeps the four-monster pool and the local view content, and gives the two new monsters existing loot tables — the road dog shares the beast table, the charred looter the raider table. - The local location view migration moves to 1788700000000 so it orders deterministically after the loot migration, which claimed the same timestamp. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,9 +3,12 @@ import {
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
Index,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
PrimaryGeneratedColumn,
|
||||
UpdateDateColumn,
|
||||
} from 'typeorm';
|
||||
import { LootTable } from '../../loot/entities/loot-table.entity';
|
||||
|
||||
@Entity({ name: 'monster_definitions' })
|
||||
@Index('IDX_monster_definitions_key', ['key'], { unique: true })
|
||||
@@ -49,9 +52,16 @@ export class MonsterDefinition {
|
||||
@Column({ name: 'icon_path', type: 'varchar', length: 255 })
|
||||
iconPath!: string;
|
||||
|
||||
@Column({ name: 'loot_table_id', type: 'uuid', nullable: true })
|
||||
lootTableId!: string | null;
|
||||
|
||||
@CreateDateColumn({ name: 'created_at', type: 'timestamptz' })
|
||||
createdAt!: Date;
|
||||
|
||||
@UpdateDateColumn({ name: 'updated_at', type: 'timestamptz' })
|
||||
updatedAt!: Date;
|
||||
|
||||
@ManyToOne(() => LootTable, { onDelete: 'RESTRICT', nullable: true })
|
||||
@JoinColumn({ name: 'loot_table_id' })
|
||||
lootTable!: LootTable | null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user