@v12-engine/create 0.1.0 → 0.4.0

package/starters/melee/src/melee/view/index.ts

@@ -14,19 +14,16 @@ import {
 	HUD_FILE,
 	layFiles,
 	PINGS_FILE,
-	presetBuffMarker,
 	presetFloats,
+	presetFoliage,
 	presetFx,
 	presetPings,
-	presetRallyFlag,
-	presetSpellStyles,
-	presetWeather,
+	presetView,
 	QUALITY_FILE,
 	SOUNDS_FILE,
 	stanceButtons,
-	TILE_LOOKS,
 	veterancyRank,
-	withHeroesView
+	heroesViewPack
 } from '@v12-engine/client'
 import { LOOKS_FILE } from '@v12-engine/client/looks-file'
 import looksFile from '../looks.json'
@@ -52,15 +49,18 @@ const buffColor = ({ params }: FloatInput): string => {
 
 /** How melee looks. The rules are in `../index.ts`; this part only runs on a player's screen */
 export const meleeView: GameView = layFiles(
-	{
+	// the client's ready-made looks it draws none of by itself: the rain and snow, the abilities' styles, a building's
+	// rally flag, the glow over a unit with a buff and the looks of the engine's tiles (grass, dirt, road, sand, rock,
+	// snow), under what the view says of its own
+	presetView({
 		// the languages it is played in, the setting `language` choosing one: English, and Hebrew right to left
 		languages: meleeLanguages,
 		hud: {
-			parts: [capturePanel()],
-			// the stances of the pack the rules turn on (`withStances`): a button a stance for the selected fighters; and a
-			// gate of the player's opened and shut (`withWalls`)
+			widgets: [capturePanel()],
+			// the stances of the pack the rules turn on (`stancesPack`): a button a stance for the selected fighters; and a
+			// gate of the player's opened and shut (`wallsPack`)
 			cardButtons: cardButtons(stanceButtons(), gateButtons),
-			// the capture points of the pack the rules turn on (`withCapture`): a dot each on the minimap, a bar each on the
+			// the capture points of the pack the rules turn on (`capturePack`): a dot each on the minimap, a bar each on the
 			// HUD; and the Restless' blight under them as it spreads
 			minimap: { layers: [blightMinimapLayer(), captureMinimapLayer()] },
 			// the debug panel's AI tab can draw what the computer it inspects is thinking over the ground: its squads, its threat
@@ -99,10 +99,24 @@ export const meleeView: GameView = layFiles(
 				night: 'Night: units see less far, and creeps sleep until attacked',
 				needsBlight: 'Must be built on blight',
 				needsHauntedMine: 'Acolytes gather gold at a cursed mine of yours'
+			},
+			// the ready-made floating text for every kind: damage dealt and taken, crits, healing, experience, mana, gold, levels,
+			// buffs; the damage dealt white, as made; a buff's name in its own colour (`effects`, a function: code); the others in
+			// melee's colours, outlined dark brown, as the editor's Words panel wrote them over the ready-made ones (`floats.json`)
+			// and a unit's rank of veterancy reached, its name in gold over it (`veterancyPack`'s `core.rankedUp`)
+			floats: {
+				...presetFloats(undefined, { buff: { style: { color: buffColor } } }),
+				'core.rankedUp': {
+					text: '{name}!',
+					style: { color: '#e7b94a', size: 18, background: { color: 'rgba(20, 14, 4, 0.7)', padding: 3, radius: 5 } },
+					motion: [{ pop: { from: 0.4, seconds: 0.3, ease: 'outBack' } }, { rise: 0.6, ease: 'outQuad' }],
+					offset: { y: -30 },
+					seconds: 2
+				}
 			}
 		},
-		// the HUD's half of the heroes the rules take (`withHeroes`): the hero's panel, the heroes' portraits, the shop
-		packs: [withHeroesView()],
+		// the HUD's half of the heroes the rules take (`heroesPack`): the hero's panel, the heroes' portraits, the shop
+		packs: [heroesViewPack()],
 		cinematics: {
 			// a lane of its own for its cinematics, beside the client's: everyone of a side cheers (see `cheerLane.ts`)
 			lanes: [cheerLane]
@@ -112,18 +126,27 @@ export const meleeView: GameView = layFiles(
 			// the looks of its units (`looks.ts`): what the editor's model setup wrote is laid over them (`looks.json`), and the
 			// HUD over its units the Unit HUD panel wrote (`hud.json`) over the heroes' plates
 			looks,
-			rallyFlag: presetRallyFlag(),
-			buffMarker: presetBuffMarker(),
 			// a line around what the pointer is over, a unit or a building: none on the neutral (camps, mines)
-			hover: (entity) => (entity.owner === 0 ? undefined : { color: [1, 0.85, 0.4], width: 2 })
+			hover: (entity) => (entity.owner === 0 ? undefined : { color: [1, 0.85, 0.4], width: 2 }),
+			// items on the ground: draughts in their colours, the blades and the shield as what they are, a chest for the rest
+			items: {
+				looks: {
+					healingDraught: { color: [0.85, 0.15, 0.15], size: 0.6 },
+					manaDraught: { color: [0.2, 0.35, 0.95], size: 0.6 },
+					ironSword: { model: { src: 'items/sword.glb', scale: 1 } },
+					quickDagger: { model: { src: 'gear/dagger.glb', scale: 1 } },
+					squiresBlade: { model: { src: 'items/sword_2.glb', scale: 1 } },
+					squiresShield: { model: { src: 'items/shield_round.glb', scale: 1 } }
+				}
+			}
 		},
-		scene: {
+		world: {
 			// what drawing asks of the device: the client's presets, the most pixels a preset draws and each preset's resolution
 			// and edges as the editor's Look panel wrote them over them (`quality.json`)
 			quality: {},
 			// the bushes: tall grass that sways, bends and rustles as units go through, see-through around one's own
-			// the ready-made rain and snow, and a weather of melee's own beside them: ash drifting down, for a map of burnt lands
-			weather: { ...presetWeather(), ash: { rate: 700, speed: 1.6, lifetime: 12, size: [0.1, 0.18], color: [0.32, 0.3, 0.3, 0.85] } },
+			// a weather of melee's own beside the ready-made rain and snow: ash drifting down, for a map of burnt lands
+			weather: { ash: { rate: 700, speed: 1.6, lifetime: 12, size: [0.1, 0.18], color: [0.32, 0.3, 0.3, 0.85] } },
 			// the sky and the mist with the hour, as the client has them: dark blue at night, warm at dawn and dusk
 			daylight: DAYLIGHT_COLORS,
 			// the trees, the buildings and the armies of the shared art lighter from far, as their levels are made (`npm run lod`)
@@ -162,22 +185,6 @@ export const meleeView: GameView = layFiles(
 				}
 			}
 		},
-		// the ready-made effects its buildings smoke, burn, go up and come down with, and what the editor's FX panel wrote
-		// over them (and of its own)
-		// the ready-made floating text for every kind: damage dealt and taken, crits, healing, experience, mana, gold, levels,
-		// buffs; the damage dealt white, as made; a buff's name in its own colour (`effects`, a function: code); the others in
-		// melee's colours, outlined dark brown, as the editor's Words panel wrote them over the ready-made ones (`floats.json`)
-		// and a unit's rank of veterancy reached, its name in gold over it (`withVeterancy`'s `core.rankedUp`)
-		floats: {
-			...presetFloats(undefined, { buff: { style: { color: buffColor } } }),
-			'core.rankedUp': {
-				text: '{name}!',
-				style: { color: '#e7b94a', size: 18, background: { color: 'rgba(20, 14, 4, 0.7)', padding: 3, radius: 5 } },
-				motion: [{ pop: { from: 0.4, seconds: 0.3, ease: 'outBack' } }, { rise: 0.6, ease: 'outQuad' }],
-				offset: { y: -30 },
-				seconds: 2
-			}
-		},
 		pings: {
 			// the pings of the rules (`../pings`), the ready-made ones: the six of the wheel (Ctrl and the left button) in this
 			// order, the others sent from code alone; and what the editor's Pings fold wrote over them and of the wheel
@@ -185,6 +192,8 @@ export const meleeView: GameView = layFiles(
 			kinds: presetPings([...PINGS], Object.fromEntries(OFF_WHEEL_PINGS.map((kind) => [kind, { wheel: { hidden: true } }]))),
 			wheel: {}
 		},
+		// the ready-made effects its buildings smoke, burn, go up and come down with, and what the editor's FX panel wrote
+		// over them (and of its own)
 		fx: {
 			defs: presetFx([
 				'smoke',
@@ -211,10 +220,7 @@ export const meleeView: GameView = layFiles(
 				'leaves'
 			]),
 			abilities: {
-				looks: effects,
-				// the ready-made styles of what abilities look like, a building's rally flag, the glow over a unit with a buff:
-				// the client draws none of them by itself
-				styles: presetSpellStyles()
+				looks: effects
 			}
 		},
 		ground: {
@@ -227,29 +233,27 @@ export const meleeView: GameView = layFiles(
 				// the devil's sword was made to shine: it glows past its edges, a little by day and fully at night
 				'weapons/devils_sword.glb': { glow: { day: 0.1, night: 1 } }
 			},
-			// its tiles in the client's looks of grass, dirt, road, sand, rock and snow: taken, not given
-			tiles: TILE_LOOKS,
 			// with what the editor's Terrain panel wrote of a layer's look (its own models, colours, how it shakes) over them
 			cellLayers: {
-				// the bushes: the client's tall grass, shaken as units go in, leaves flying
-				bush: foliage({ color: [0.16, 0.36, 0.1], tip: [0.5, 0.68, 0.24], height: 1.4, leaves: 'leaves' }),
+				// the bushes: the client's tall grass, shaken as units go in, leaves flying, laid down where they walk; the dry
+				// grass (style 2) as the client's ready-made one of that name
+				bush: foliage({
+					color: [0.16, 0.36, 0.1],
+					tip: [0.5, 0.68, 0.24],
+					height: 1.4,
+					leaves: 'leaves',
+					walked: { flatten: 0.5, recover: 10 },
+					styles: { 2: presetFoliage.dryGrass }
+				}),
 				// the Restless' blight: the client's, the shared art's spoiled ground and green gases rising off it
 				blight: blightLook()
 			}
 		},
-		// items on the ground: potions in their colours, the blade and the shield as what they are, a chest for the rest
-		items: {
-			healingPotion: { color: [0.85, 0.15, 0.15], size: 0.6 },
-			manaPotion: { color: [0.2, 0.35, 0.95], size: 0.6 },
-			longSword: { model: { src: 'items/sword.glb', scale: 1 } },
-			squiresBlade: { model: { src: 'items/sword_2.glb', scale: 1 } },
-			squiresShield: { model: { src: 'items/shield_round.glb', scale: 1 } }
-		},
 		input: {
 			// a hero arena game's keys for heroes (its hero panel's stats are the client's eight)
 			keys: { abilities: ['Q', 'W', 'E', 'R'], spells: ['D', 'F'], shop: 'P' }
 		}
-	},
+	}),
 	// the files the editor writes next to the code, each laid over what the code says above, in this order (`hud.json`
 	// over the looks `looks.json` made)
 	[

package/starters/melee/src/melee/view/looks.ts

@@ -1,7 +1,8 @@
-import type { AbilityLooks, EntityView, ModelDef, Nameplate, UnitHudDef, UnitLook, UnitLooks } from '@v12-engine/client'
+import type { AbilityLooks, EntityView, ModelDef, UnitHudPlate, UnitHudDef, UnitLook, UnitLooks } from '@v12-engine/client'
 import { units } from '../units'
+import { ONE_HANDED, TWO_HANDED } from './attacks'
 import { building } from './buildings'
-import { heroSpellEffects } from './heroSpellLooks'
+import { heroSpellEffects, kingdomHeroEffects } from './heroSpellLooks'
 import { undeadEffects, undeadLooks } from './undeadLooks'
 
 export const effects: AbilityLooks = {
@@ -13,24 +14,15 @@ export const effects: AbilityLooks = {
 	mirrorImage: { color: [0.45, 0.65, 1], style: 'burst', options: { count: 40, ring: 1.6, shape: 'about' } },
 	slow: { color: [0.6, 0.4, 1] },
 	arcaneBlast: { color: [0.45, 0.8, 1] },
-	holyLight: { color: [1, 0.95, 0.45] },
-	stomp: { color: [0.85, 0.7, 0.45] },
 	stunned: { color: [1, 1, 0.3] },
-	avatar: { color: [1, 0.85, 0.3] },
-	blessedSprint: { color: [1, 0.95, 0.6] },
-	flameStrike: { color: [1, 0.45, 0.1] },
-	frostBolt: { color: [0.55, 0.85, 1] },
-	cataclysm: { color: [1, 0.3, 0.1] },
 	clap: { color: [0.85, 0.7, 0.45] },
-	tornado: { color: [0.78, 0.86, 0.92], style: 'tornado' },
-	groundSmash: { color: [0.8, 0.6, 0.35], style: 'smash' },
-	lasso: { color: [0.62, 0.47, 0.27], style: 'tether', until: 'lassoed' },
-	lassoed: { color: [0.62, 0.47, 0.27] },
 	knockedUp: { color: [0.78, 0.86, 0.92] },
-	revealArea: { color: [0.55, 0.85, 1] },
-	plantWard: { color: [0.95, 0.9, 0.55] },
-	sweep: { color: [0.55, 1, 0.75], style: 'sonar' },
+	// what the default items do (`defaultItemSet`)
+	plantSightWard: { color: [0.95, 0.9, 0.55] },
+	scatterSeersDust: { color: [0.55, 1, 0.75], style: 'sonar' },
+	rallyingHorn: { color: [1, 0.85, 0.4], style: 'burst' },
 	...heroSpellEffects,
+	...kingdomHeroEffects,
 	...undeadEffects
 }
 
@@ -73,7 +65,7 @@ const TREE_MIX = FOREST.map((_, i) => String(i + 1).padStart(3, '0'))
 const GHOST = { seconds: 0.6 }
 
 /** A hero's plate: with its health's points on the bar where `points` */
-const heroPlate = (points: boolean): Nameplate => ({
+const heroPlate = (points: boolean): UnitHudPlate => ({
 	show: 'always',
 	gap: 1,
 	items: [
@@ -165,7 +157,8 @@ export const looks: UnitLooks = {
 	peasant: {
 		height: 1.5,
 		model: character('barbarian', 0.58, { hold: [hold('axe_1handed')] }),
-		parts: [
+		attacks: [ONE_HANDED],
+		shapes: [
 			{ shape: 'cylinder', size: [0.5, 0.8, 0.5], offset: [0, 0.4, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.38, 0.38, 0.38], offset: [0, 0.98, 0], color: SKIN },
 			{ shape: 'cone', size: [0.5, 0.22, 0.5], offset: [0, 1.22, 0], color: STRAW },
@@ -185,9 +178,10 @@ export const looks: UnitLooks = {
 	footman: {
 		height: 1.8,
 		model: character('knight', 0.7, { hold: [hold('sword_1handed'), hold('shield_round', 'l')] }),
+		attacks: [ONE_HANDED],
 		// armies of them: drawn as copies of one mesh, their animations baked (S41)
 		baked: true,
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [0.62, 1, 0.42], offset: [0, 0.5, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.42, 0.42, 0.42], offset: [0, 1.22, 0], color: STEEL },
 			{ shape: 'box', size: [0.1, 0.6, 0.5], offset: [-0.4, 0.65, 0.12], color: STEEL },
@@ -196,8 +190,12 @@ export const looks: UnitLooks = {
 	},
 	rifleman: {
 		height: 1.8,
-		model: character('ranger', 0.7, { hold: [hold('crossbow_2handed')], animations: { attack: 'Ranged_2H_Shoot' }, hitAt: 0.3 }),
-		parts: [
+		model: character('ranger', 0.7, {
+			hold: [hold('crossbow_2handed')],
+			animations: { attack: 'Ranged_2H_Shoot' },
+			clips: { Ranged_2H_Shoot: { marks: [{ name: 'hit', at: 0.3 }] } }
+		}),
+		shapes: [
 			{ shape: 'cylinder', size: [0.56, 0.95, 0.56], offset: [0, 0.48, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.4, 0.4, 0.4], offset: [0, 1.17, 0], color: SKIN },
 			{ shape: 'cylinder', size: [0.5, 0.12, 0.5], offset: [0, 1.36, 0], color: WOOD },
@@ -210,7 +208,7 @@ export const looks: UnitLooks = {
 		height: 2.4,
 		// its shots are rocks, thrown high
 		shot: { color: STONE, size: 0.5, arc: 0.4 },
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [1.1, 0.3, 1.7], offset: [0, 0.5, 0], color: WOOD },
 			{ shape: 'box', size: [1.2, 0.12, 0.5], offset: [0, 0.72, -0.4], color: 'team' },
 			{ shape: 'cylinder', size: [0.6, 0.16, 0.6], offset: [0.64, 0.3, 0.55], color: DARK, tilt: Math.PI / 2, turn: Math.PI / 2 },
@@ -228,7 +226,7 @@ export const looks: UnitLooks = {
 		height: 1.9,
 		altitude: 3.2,
 		shot: { color: [0.55, 0.8, 1], size: 0.3 },
-		parts: [
+		shapes: [
 			{ shape: 'sphere', size: [0.8, 0.7, 1.5], offset: [0, 0.7, 0], color: [0.72, 0.58, 0.36] },
 			{ shape: 'sphere', size: [0.5, 0.5, 0.6], offset: [0, 1.05, 0.85], color: [0.93, 0.91, 0.84] },
 			{ shape: 'cone', size: [0.2, 0.4, 0.2], offset: [0, 0.98, 1.25], color: GOLD, tilt: Math.PI / 2 },
@@ -242,7 +240,7 @@ export const looks: UnitLooks = {
 	goblinShipyard: {
 		height: 3,
 		model: building('rts/dock.glb', 3),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [3, 0.4, 3], offset: [0, 0.2, 0], color: WOOD },
 			{ shape: 'box', size: [1.6, 1.4, 1.6], offset: [-0.6, 1.1, -0.6], color: WOOD },
 			{ shape: 'pyramid', size: [1.9, 0.8, 1.9], offset: [-0.6, 2.2, -0.6], color: 'team' },
@@ -252,7 +250,7 @@ export const looks: UnitLooks = {
 	// a hull, a deck house and a sail in the side's colour: drawn of parts, there is no boat among the shared art
 	transportShip: {
 		height: 2.6,
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [1.4, 0.6, 2.8], offset: [0, 0.3, 0], color: WOOD },
 			{ shape: 'cone', size: [1.4, 0.8, 0.6], offset: [0, 0.3, 1.6], color: WOOD, tilt: Math.PI / 2 },
 			{ shape: 'box', size: [0.9, 0.6, 0.9], offset: [0, 0.9, -0.6], color: STRAW },
@@ -263,7 +261,7 @@ export const looks: UnitLooks = {
 	aviary: {
 		height: 4,
 		model: building('rts/stone_tower.glb', 2.6),
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [2.6, 1.2, 2.6], offset: [0, 0.6, 0], color: STONE },
 			{ shape: 'cylinder', size: [0.4, 2.6, 0.4], offset: [0.9, 2.2, 0.9], color: WOOD },
 			{ shape: 'cylinder', size: [0.4, 2.6, 0.4], offset: [-0.9, 2.2, 0.9], color: WOOD },
@@ -276,7 +274,7 @@ export const looks: UnitLooks = {
 	priest: {
 		height: 1.8,
 		model: character('mage', 0.7, { hold: [hold('staff')], animations: { attack: 'Ranged_Magic_Shoot' } }),
-		parts: [
+		shapes: [
 			{ shape: 'cone', size: [0.8, 1.05, 0.8], offset: [0, 0.52, 0], color: [0.93, 0.91, 0.84] },
 			{ shape: 'box', size: [0.3, 0.5, 0.3], offset: [0, 0.75, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.38, 0.38, 0.38], offset: [0, 1.2, 0], color: SKIN },
@@ -287,22 +285,25 @@ export const looks: UnitLooks = {
 	sorceress: {
 		height: 1.9,
 		model: character('mage', 0.72, { hold: [hold('wand')], animations: { attack: 'Ranged_Magic_Shoot' } }),
-		parts: [
+		shapes: [
 			{ shape: 'cone', size: [0.85, 1.05, 0.85], offset: [0, 0.52, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.38, 0.38, 0.38], offset: [0, 1.2, 0], color: SKIN },
 			{ shape: 'cone', size: [0.5, 0.55, 0.5], offset: [0, 1.6, 0], color: [0.4, 0.25, 0.6] },
 			{ shape: 'sphere', size: [0.22, 0.22, 0.22], offset: [0.4, 0.95, 0.2], color: [0.6, 0.85, 1] }
 		]
 	},
-	paladin: {
+	// ---- the Kingdom's heroes (`heroes.ts`)
+	oathbreaker: {
 		height: 2.3,
 		model: character('knight', 0.9, {
 			hold: [hold('sword_2handed')],
 			animations: { attack: 'Melee_2H_Attack_Chop', work: 'Melee_2H_Attack_Chop' },
-			// the sprint goes off without a gesture: the Paladin keeps running
-			casts: { blessedSprint: '' }
+			// the charge goes off without a gesture: he keeps running
+			casts: { oathCharge: '' }
 		}),
-		parts: [
+		// a hero's blade: a golden streak behind it
+		attacks: [{ ...TWO_HANDED, trail: { color: [1, 0.85, 0.4], width: 0.16 } }],
+		shapes: [
 			{ shape: 'box', size: [0.8, 1.25, 0.55], offset: [0, 0.62, 0], color: 'team' },
 			{ shape: 'box', size: [1.1, 0.3, 0.6], offset: [0, 1.25, 0], color: GOLD },
 			{ shape: 'sphere', size: [0.48, 0.48, 0.48], offset: [0, 1.62, 0], color: STEEL },
@@ -311,22 +312,24 @@ export const looks: UnitLooks = {
 			{ shape: 'box', size: [0.1, 1.1, 0.75], offset: [0, 0.8, -0.34], color: GOLD }
 		]
 	},
-	archmage: {
+	dawnPriest: {
 		height: 2.4,
 		model: character('mage', 0.92, { hold: [hold('staff')], animations: { attack: 'Ranged_Magic_Shoot' } }),
-		parts: [
-			{ shape: 'cone', size: [1, 1.35, 1], offset: [0, 0.67, 0], color: 'team' },
+		shot: { color: [1, 0.92, 0.55], size: 0.3 },
+		shapes: [
+			{ shape: 'cone', size: [1, 1.35, 1], offset: [0, 0.67, 0], color: [0.95, 0.92, 0.82] },
+			{ shape: 'box', size: [0.34, 0.6, 0.34], offset: [0, 0.9, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.44, 0.44, 0.44], offset: [0, 1.5, 0], color: SKIN },
 			{ shape: 'cone', size: [0.7, 0.8, 0.7], offset: [0, 1.98, 0], color: GOLD },
 			{ shape: 'box', size: [0.07, 1.9, 0.07], offset: [0.5, 0.95, 0.15], color: WOOD },
-			{ shape: 'sphere', size: [0.3, 0.3, 0.3], offset: [0.5, 1.95, 0.15], color: [0.5, 0.85, 1] }
+			{ shape: 'sphere', size: [0.3, 0.3, 0.3], offset: [0.5, 1.95, 0.15], color: [1, 0.9, 0.5] }
 		]
 	},
-	testiro: {
+	stormcaller: {
 		height: 2.6,
 		model: character('mage', 1, { hold: [hold('spellbook_open', 'l')], animations: { attack: 'Ranged_Magic_Shoot' } }),
 		shot: { color: [0.75, 0.9, 1], size: 0.26 },
-		parts: [
+		shapes: [
 			{ shape: 'cone', size: [0.95, 1.2, 0.95], offset: [0, 0.6, 0], color: 'team' },
 			{ shape: 'cylinder', size: [0.5, 0.5, 0.5], offset: [0, 1.15, 0], color: [0.78, 0.86, 0.92] },
 			{ shape: 'sphere', size: [0.42, 0.42, 0.42], offset: [0, 1.55, 0], color: SKIN },
@@ -337,11 +340,28 @@ export const looks: UnitLooks = {
 			{ shape: 'cone', size: [0.3, 0.35, 0.3], offset: [-0.45, 1.85, 0.15], color: [0.78, 0.86, 0.92] }
 		]
 	},
+	galeHunter: {
+		height: 2.3,
+		model: character('ranger', 0.9, {
+			hold: [hold('crossbow_2handed')],
+			animations: { attack: 'Ranged_2H_Shoot' },
+			clips: { Ranged_2H_Shoot: { marks: [{ name: 'hit', at: 0.3 }] } },
+			// the roll goes off without a gesture
+			casts: { tumble: '' }
+		}),
+		shot: { color: [0.85, 0.95, 0.8], size: 0.18, trail: { color: [0.8, 1, 0.85], count: 30 } },
+		shapes: [
+			{ shape: 'cylinder', size: [0.62, 1.15, 0.62], offset: [0, 0.58, 0], color: 'team' },
+			{ shape: 'sphere', size: [0.44, 0.44, 0.44], offset: [0, 1.42, 0], color: SKIN },
+			{ shape: 'cone', size: [0.55, 0.5, 0.55], offset: [0, 1.75, 0], color: [0.3, 0.45, 0.25] },
+			{ shape: 'box', size: [0.08, 0.08, 1.3], offset: [0.32, 1, 0.5], color: DARK }
+		]
+	},
 	ward: {
 		// a flag on a stick: no blood
 		blood: false,
 		height: 1.4,
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [0.06, 1.3, 0.06], offset: [0, 0.65, 0], color: WOOD },
 			{ shape: 'box', size: [0.04, 0.35, 0.5], offset: [0, 1.1, 0.25], color: 'team' }
 		]
@@ -351,7 +371,8 @@ export const looks: UnitLooks = {
 		blood: false,
 		height: 1.6,
 		model: character('skeleton_minion', 0.62, { hold: [{ src: 'skeleton-gear/blade.glb', at: 'handslot.r' }] }),
-		parts: [
+		attacks: [ONE_HANDED],
+		shapes: [
 			{ shape: 'cylinder', size: [0.5, 1, 0.5], offset: [0, 0.5, 0], color: [0.86, 0.83, 0.74] },
 			{ shape: 'sphere', size: [0.4, 0.4, 0.4], offset: [0, 1.2, 0], color: [0.86, 0.83, 0.74] }
 		]
@@ -359,7 +380,7 @@ export const looks: UnitLooks = {
 	altar: {
 		height: 3.2,
 		model: building('rts/temple_3.glb', 2.9),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.8, 0.5, 2.8], offset: [0, 0.25, 0], color: STONE },
 			{ shape: 'box', size: [2, 0.5, 2], offset: [0, 0.75, 0], color: STONE },
 			{ shape: 'cylinder', size: [0.35, 1.8, 0.35], offset: [1, 1.4, 1], color: STONE },
@@ -374,7 +395,7 @@ export const looks: UnitLooks = {
 		// straw: no blood
 		blood: false,
 		height: 2,
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [0.16, 1.1, 0.16], offset: [0, 0.55, 0], color: WOOD },
 			{ shape: 'cylinder', size: [0.7, 0.85, 0.55], offset: [0, 1.2, 0], color: [0.78, 0.66, 0.42] },
 			{ shape: 'box', size: [1.25, 0.12, 0.12], offset: [0, 1.4, 0], color: WOOD },
@@ -386,7 +407,8 @@ export const looks: UnitLooks = {
 	gnoll: {
 		height: 1.6,
 		model: character('rogue_hooded', 0.62, { hold: [hold('axe_1handed')] }),
-		parts: [
+		attacks: [ONE_HANDED],
+		shapes: [
 			{ shape: 'box', size: [0.6, 0.85, 0.5], offset: [0, 0.5, 0], color: [0.5, 0.38, 0.22], tilt: 0.25 },
 			{ shape: 'sphere', size: [0.42, 0.4, 0.5], offset: [0, 1.05, 0.15], color: [0.62, 0.48, 0.3] },
 			{ shape: 'cone', size: [0.14, 0.3, 0.14], offset: [0.14, 1.32, 0.1], color: [0.62, 0.48, 0.3] },
@@ -399,9 +421,9 @@ export const looks: UnitLooks = {
 		model: character('skeleton_rogue', 0.72, {
 			hold: [{ src: 'skeleton-gear/crossbow.glb', at: 'handslot.r' }],
 			animations: { attack: 'Ranged_2H_Shoot' },
-			hitAt: 0.3
+			clips: { Ranged_2H_Shoot: { marks: [{ name: 'hit', at: 0.3 }] } }
 		}),
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [0.55, 1.1, 0.55], offset: [0, 0.55, 0], color: [0.3, 0.5, 0.34] },
 			{ shape: 'sphere', size: [0.4, 0.42, 0.4], offset: [0, 1.3, 0], color: [0.36, 0.58, 0.4] },
 			{ shape: 'cone', size: [0.2, 0.5, 0.2], offset: [0, 1.7, -0.05], color: [0.8, 0.3, 0.2] },
@@ -416,7 +438,8 @@ export const looks: UnitLooks = {
 				{ src: 'skeleton-gear/shield_large_a.glb', at: 'handslot.l' }
 			]
 		}),
-		parts: [
+		attacks: [ONE_HANDED],
+		shapes: [
 			{ shape: 'sphere', size: [1.5, 1.6, 1.3], offset: [0, 1, 0], color: [0.62, 0.52, 0.4] },
 			{ shape: 'sphere', size: [0.7, 0.7, 0.7], offset: [0, 2.1, 0.1], color: [0.68, 0.57, 0.44] },
 			{ shape: 'box', size: [1.2, 0.35, 1], offset: [0, 0.75, 0], color: [0.35, 0.25, 0.18] },
@@ -427,7 +450,7 @@ export const looks: UnitLooks = {
 	townhall: {
 		height: 4.6,
 		model: building('rts/castle.glb', 3.9),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [3.6, 1.9, 3.6], offset: [0, 0.95, 0], color: STONE },
 			{ shape: 'pyramid', size: [4.4, 1.7, 4.4], offset: [0, 2.75, 0], color: 'team' },
 			{ shape: 'box', size: [1, 1.2, 0.2], offset: [0, 0.6, -1.76], color: WOOD },
@@ -437,7 +460,7 @@ export const looks: UnitLooks = {
 	keep: {
 		height: 5.6,
 		model: building('rts/castle_2.glb', 4),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [3.7, 2.4, 3.7], offset: [0, 1.2, 0], color: STONE },
 			{ shape: 'pyramid', size: [4.4, 1.7, 4.4], offset: [0, 3.25, 0], color: 'team' },
 			{ shape: 'box', size: [1, 1.2, 0.2], offset: [0, 0.6, -1.81], color: WOOD },
@@ -448,7 +471,7 @@ export const looks: UnitLooks = {
 	castle: {
 		height: 6.6,
 		model: building('rts/castle_fortress.glb', 4.2),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [3.8, 2.8, 3.8], offset: [0, 1.4, 0], color: STONE },
 			{ shape: 'pyramid', size: [4.4, 1.9, 4.4], offset: [0, 3.75, 0], color: 'team' },
 			{ shape: 'box', size: [1.1, 1.4, 0.2], offset: [0, 0.7, -1.86], color: WOOD },
@@ -465,7 +488,7 @@ export const looks: UnitLooks = {
 	farm: {
 		height: 2.3,
 		model: building('rts/small_farm.glb', 2.1),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [1.7, 0.9, 1.7], offset: [0, 0.45, 0], color: WOOD },
 			{ shape: 'pyramid', size: [2.1, 0.95, 2.1], offset: [0, 1.37, 0], color: STRAW },
 			{ shape: 'box', size: [0.5, 0.12, 0.5], offset: [0, 1.9, 0], color: 'team' }
@@ -474,7 +497,7 @@ export const looks: UnitLooks = {
 	barracks: {
 		height: 3.4,
 		model: building('rts/barracks.glb', 3),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.7, 1.6, 2.7], offset: [0, 0.8, 0], color: STONE },
 			{ shape: 'box', size: [2.9, 0.35, 2.9], offset: [0, 1.75, 0], color: 'team' },
 			{ shape: 'box', size: [0.5, 0.7, 0.5], offset: [1.15, 2.2, 1.15], color: STONE },
@@ -488,7 +511,7 @@ export const looks: UnitLooks = {
 		height: 4.4,
 		// its arrows leave from its top, not from its middle
 		model: building('rts/watch_tower.glb', 1.7, { points: { launch: { offset: [0, 3.6, 0] } } }),
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [1.5, 2.8, 1.5], offset: [0, 1.4, 0], color: STONE },
 			{ shape: 'cylinder', size: [1.9, 0.5, 1.9], offset: [0, 3.05, 0], color: STONE },
 			{ shape: 'cone', size: [2, 1, 2], offset: [0, 3.8, 0], color: 'team' }
@@ -506,7 +529,7 @@ export const looks: UnitLooks = {
 			tee: building('rts/stone_wall_towers.glb', 1),
 			cross: building('rts/stone_wall_towers.glb', 1)
 		},
-		parts: [{ shape: 'box', size: [1, 1.8, 0.8], offset: [0, 0.9, 0], color: STONE }]
+		shapes: [{ shape: 'box', size: [1, 1.8, 0.8], offset: [0, 0.9, 0], color: STONE }]
 	},
 	// a gate of the wall, shut or open (the arch without its door: the way through is clear)
 	stoneGate: {
@@ -516,12 +539,12 @@ export const looks: UnitLooks = {
 			shut: building('rts/castle_gate.glb', 3),
 			open: building('dungeon-kit/wall_gate.glb', 3)
 		},
-		parts: [{ shape: 'box', size: [3, 1.8, 0.6], offset: [0, 0.9, 0], color: STONE }]
+		shapes: [{ shape: 'box', size: [3, 1.8, 0.6], offset: [0, 0.9, 0], color: STONE }]
 	},
 	blacksmith: {
 		height: 3.3,
 		model: building('village/blacksmith.glb', 2.9),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.7, 1.4, 2.7], offset: [0, 0.7, 0], color: STONE },
 			{ shape: 'pyramid', size: [3.1, 1, 3.1], offset: [0, 1.9, 0], color: DARK },
 			{ shape: 'box', size: [0.6, 1.5, 0.6], offset: [-0.8, 2.2, 0.8], color: STONE },
@@ -535,7 +558,7 @@ export const looks: UnitLooks = {
 			`ruins${size}`,
 			{
 				height: 0.8,
-				parts: [
+				shapes: [
 					{ shape: 'box', size: [size * 0.9, 0.25, size * 0.9], offset: [0, 0.12, 0], color: [0.33, 0.3, 0.27] },
 					{ shape: 'box', size: [size * 0.6, 0.3, 0.25], offset: [0, 0.35, size * 0.15], color: DARK, turn: 0.4 },
 					{ shape: 'box', size: [0.25, 0.35, size * 0.5], offset: [size * 0.2, 0.4, 0], color: [0.28, 0.2, 0.12], turn: -0.3 },
@@ -547,7 +570,7 @@ export const looks: UnitLooks = {
 	tavern: {
 		height: 3.4,
 		model: building('rts/houses_2.glb', 3),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.8, 1.6, 2.6], offset: [0, 0.8, 0], color: WOOD },
 			{ shape: 'pyramid', size: [3.2, 1.2, 3], offset: [0, 2.2, 0], color: STRAW },
 			{ shape: 'box', size: [0.8, 1, 0.2], offset: [0, 0.5, -1.35], color: DARK },
@@ -557,7 +580,7 @@ export const looks: UnitLooks = {
 	alchemist: {
 		height: 3.6,
 		model: building('rts/tower_house.glb', 2.8),
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [2.6, 1.5, 2.6], offset: [0, 0.75, 0], color: [0.78, 0.74, 0.66] },
 			{ shape: 'cone', size: [3, 1.5, 3], offset: [0, 2.25, 0], color: 'team' },
 			{ shape: 'sphere', size: [0.55, 0.55, 0.55], offset: [0, 3.15, 0], color: [0.45, 0.95, 0.5] },
@@ -567,7 +590,7 @@ export const looks: UnitLooks = {
 	armory: {
 		height: 3.4,
 		model: building('rts/archery_building.glb', 2.9),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.7, 1.5, 2.7], offset: [0, 0.75, 0], color: STONE },
 			{ shape: 'pyramid', size: [3.1, 1.1, 3.1], offset: [0, 2.05, 0], color: 'team' },
 			{ shape: 'box', size: [0.9, 1.1, 0.2], offset: [0, 0.55, -1.32], color: WOOD },
@@ -582,7 +605,7 @@ export const looks: UnitLooks = {
 		looks: TREE_LOOKS,
 		mix: TREE_MIX,
 		vary: { scale: 0.25, lean: 0.07 },
-		parts: [
+		shapes: [
 			{ shape: 'cylinder', size: [0.3, 1, 0.3], offset: [0, 0.5, 0], color: [0.36, 0.25, 0.15] },
 			{ shape: 'cone', size: [1.5, 1.5, 1.5], offset: [0, 1.5, 0], color: [0.14, 0.36, 0.17] },
 			{ shape: 'cone', size: [1.1, 1.3, 1.1], offset: [0, 2.4, 0], color: [0.17, 0.42, 0.2] }
@@ -591,7 +614,7 @@ export const looks: UnitLooks = {
 	lumbermill: {
 		height: 3,
 		model: building('village/fantasy_sawmill.glb', 2.9),
-		parts: [
+		shapes: [
 			{ shape: 'box', size: [2.7, 1.3, 2.4], offset: [0, 0.65, 0], color: WOOD },
 			{ shape: 'pyramid', size: [3.1, 1.2, 2.8], offset: [0, 1.9, 0], color: 'team' },
 			{ shape: 'cylinder', size: [0.4, 2.2, 0.4], offset: [-1.1, 0.25, -1.45], color: [0.36, 0.25, 0.15], tilt: Math.PI / 2, turn: Math.PI / 2 },
@@ -607,7 +630,7 @@ export const looks: UnitLooks = {
 			{ shape: 'box', size: [0.5, 0.4, 0.45], color: [0.3, 0.28, 0.26], count: 8 },
 			{ shape: 'sphere', size: [0.3, 0.25, 0.3], color: GOLD, count: 6 }
 		],
-		parts: [
+		shapes: [
 			{ shape: 'pyramid', size: [3.9, 2.6, 3.9], offset: [0, 1.3, 0], color: [0.36, 0.33, 0.3] },
 			{ shape: 'box', size: [1.1, 1.2, 0.4], offset: [0, 0.6, -1.85], color: DARK },
 			{ shape: 'sphere', size: [0.6, 0.5, 0.6], offset: [1.4, 0.25, -1.9], color: GOLD },
@@ -639,7 +662,7 @@ for (const visual of Object.values(looks)) {
 }
 
 // the casters carry a soft light at night, at the hand that holds the staff: it moves with their clips
-for (const caster of ['priest', 'sorceress', 'archmage']) {
+for (const caster of ['priest', 'sorceress', 'dawnPriest']) {
 	const visual = looks[caster]
 	if (visual?.model)
 		visual.model = {