@randsum/daggerheart 0.18.0 → 0.21.0

package/dist/index.cjs

@@ -1,4 +1,4 @@
-var G=require("node:module");var{defineProperty:o,getOwnPropertyNames:p,getOwnPropertyDescriptor:q}=Object,g=Object.prototype.hasOwnProperty,n=(t,e,r)=>{for(let a of p(e))if(!g.call(t,a)&&a!=="default")o(t,a,{get:()=>e[a],enumerable:!0});if(r){for(let a of p(e))if(!g.call(r,a)&&a!=="default")o(r,a,{get:()=>e[a],enumerable:!0});return r}};var f=new WeakMap,B=(t)=>{var e=f.get(t),r;if(e)return e;if(e=o({},"__esModule",{value:!0}),t&&typeof t==="object"||typeof t==="function")p(t).map((a)=>!g.call(e,a)&&o(e,a,{get:()=>t[a],enumerable:!(r=q(t,a))||r.enumerable}));return f.set(t,e),e};var c=(t,e)=>{for(var r in e)o(t,r,{get:e[r],enumerable:!0,configurable:!0,set:(a)=>e[r]=()=>a})};var l={};c(l,{rollDaggerheart:()=>h});module.exports=B(l);n(l,require("@randsum/roller"),module.exports);var v={};c(v,{rollDaggerheart:()=>h});var m=require("@randsum/roller");function d(t,e){if(t===e)return"critical hope";if(t>e)return"hope";return"fear"}var R=require("@randsum/roller");function y(){return R.roll({quantity:1,sides:6}).total}function D(t,e){if(e){let r=y();if(e==="Advantage")return[t+r,r];return[t-r,-r]}return[t,void 0]}function h({modifier:t=0,rollingWith:e,amplifyHope:r=!1,amplifyFear:a=!1}={}){let b=m.roll({quantity:1,sides:r?20:12}),x=m.roll({quantity:1,sides:a?20:12}),u=b.total,s=x.total,A=u+s+t,[i,T]=D(A,e);return{result:i,baseResult:{type:d(u,s),total:i,rolls:{hope:u,advantage:T,fear:s,modifier:t}}}}
+var j=require("node:module");var{defineProperty:o,getOwnPropertyNames:p,getOwnPropertyDescriptor:q}=Object,g=Object.prototype.hasOwnProperty,l=(t,e,r)=>{for(let a of p(e))if(!g.call(t,a)&&a!=="default")o(t,a,{get:()=>e[a],enumerable:!0});if(r){for(let a of p(e))if(!g.call(r,a)&&a!=="default")o(r,a,{get:()=>e[a],enumerable:!0});return r}};var f=new WeakMap,G=(t)=>{var e=f.get(t),r;if(e)return e;if(e=o({},"__esModule",{value:!0}),t&&typeof t==="object"||typeof t==="function")p(t).map((a)=>!g.call(e,a)&&o(e,a,{get:()=>t[a],enumerable:!(r=q(t,a))||r.enumerable}));return f.set(t,e),e};var c=(t,e)=>{for(var r in e)o(t,r,{get:e[r],enumerable:!0,configurable:!0,set:(a)=>e[r]=()=>a})};var n={};c(n,{rollDaggerheart:()=>R});module.exports=G(n);l(n,require("@randsum/roller"),module.exports);var v={};c(v,{rollDaggerheart:()=>R});var i=require("@randsum/roller");function d(t,e){if(t===e)return"critical hope";if(t>e)return"hope";return"fear"}var y=require("@randsum/roller");function D(){return y.roll({quantity:1,sides:6}).total}function h(t,e){if(e){let r=D();if(e==="Advantage")return[t+r,r];return[t-r,-r]}return[t,void 0]}function R({modifier:t=0,rollingWith:e,amplifyHope:r=!1,amplifyFear:a=!1}={}){let b=i.roll({quantity:1,sides:r?20:12}),x=i.roll({quantity:1,sides:a?20:12}),u=b.total,s=x.total,A=u+s+t,[m,T]=h(A,e);return{result:m,type:d(u,s),baseResult:{total:m,rolls:{hope:u,advantage:T,fear:s,modifier:t}}}}
 
-//# debugId=949E2C3D2A0ABF9264756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvaW5kZXgudHMiLCAiLi4vc3JjL3JvbGxEYWdnZXJoZWFydC9jYWxjdWxhdGVUeXBlLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvYWR2YW50YWdlRGllLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvY2FsY3VsYXRlVG90YWwudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0ICogZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuZXhwb3J0ICogZnJvbSAnLi9yb2xsRGFnZ2VyaGVhcnQnXG5leHBvcnQgdHlwZSAqIGZyb20gJy4vdHlwZXMnXG4iLAogICAgImltcG9ydCB7IHR5cGUgQmFzZUdhbWVSb2xsUmVzdWx0LCByb2xsIGFzIGNvcmVSb2xsIH0gZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydFJvbGxBcmd1bWVudCwgRGFnZ2VyaGVhcnRSb2xsUmVzdWx0IH0gZnJvbSAnLi4vdHlwZXMnXG5pbXBvcnQgeyBjYWxjdWxhdGVUeXBlIH0gZnJvbSAnLi9jYWxjdWxhdGVUeXBlJ1xuaW1wb3J0IHsgY2FsY3VsYXRlVG90YWwgfSBmcm9tICcuL2NhbGN1bGF0ZVRvdGFsJ1xuXG5leHBvcnQgZnVuY3Rpb24gcm9sbERhZ2dlcmhlYXJ0KHtcbiAgbW9kaWZpZXIgPSAwLFxuICByb2xsaW5nV2l0aCxcbiAgYW1wbGlmeUhvcGUgPSBmYWxzZSxcbiAgYW1wbGlmeUZlYXIgPSBmYWxzZVxufTogRGFnZ2VyaGVhcnRSb2xsQXJndW1lbnQgPSB7fSk6IEJhc2VHYW1lUm9sbFJlc3VsdDxcbiAgbnVtYmVyLFxuICBEYWdnZXJoZWFydFJvbGxSZXN1bHRcbj4ge1xuICBjb25zdCBob3BlUmVzdWx0ID0gY29yZVJvbGwoe1xuICAgIHF1YW50aXR5OiAxLFxuICAgIHNpZGVzOiBhbXBsaWZ5SG9wZSA/IDIwIDogMTJcbiAgfSlcbiAgY29uc3QgZmVhclJlc3VsdCA9IGNvcmVSb2xsKHtcbiAgICBxdWFudGl0eTogMSxcbiAgICBzaWRlczogYW1wbGlmeUZlYXIgPyAyMCA6IDEyXG4gIH0pXG4gIGNvbnN0IGhvcGUgPSBob3BlUmVzdWx0LnRvdGFsXG4gIGNvbnN0IGZlYXIgPSBmZWFyUmVzdWx0LnRvdGFsXG4gIGNvbnN0IHRvdGFsID0gaG9wZSArIGZlYXIgKyBtb2RpZmllclxuXG4gIGNvbnN0IFt0b3RhbFdpdGhBZHZhbnRhZ2UsIGFkdmFudGFnZV0gPSBjYWxjdWxhdGVUb3RhbCh0b3RhbCwgcm9sbGluZ1dpdGgpXG5cbiAgcmV0dXJuIHtcbiAgICByZXN1bHQ6IHRvdGFsV2l0aEFkdmFudGFnZSxcbiAgICBiYXNlUmVzdWx0OiB7XG4gICAgICB0eXBlOiBjYWxjdWxhdGVUeXBlKGhvcGUsIGZlYXIpLFxuICAgICAgdG90YWw6IHRvdGFsV2l0aEFkdmFudGFnZSxcbiAgICAgIHJvbGxzOiB7XG4gICAgICAgIGhvcGUsXG4gICAgICAgIGFkdmFudGFnZSxcbiAgICAgICAgZmVhcixcbiAgICAgICAgbW9kaWZpZXJcbiAgICAgIH1cbiAgICB9XG4gIH1cbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydFJvbGxSZXN1bHRUeXBlIH0gZnJvbSAnLi4vdHlwZXMnXG5cbmV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVUeXBlKFxuICBob3BlOiBudW1iZXIsXG4gIGZlYXI6IG51bWJlclxuKTogRGFnZ2VyaGVhcnRSb2xsUmVzdWx0VHlwZSB7XG4gIGlmIChob3BlID09PSBmZWFyKSB7XG4gICAgcmV0dXJuICdjcml0aWNhbCBob3BlJ1xuICB9XG4gIGlmIChob3BlID4gZmVhcikge1xuICAgIHJldHVybiAnaG9wZSdcbiAgfVxuICByZXR1cm4gJ2ZlYXInXG59XG4iLAogICAgImltcG9ydCB7IHJvbGwgfSBmcm9tICdAcmFuZHN1bS9yb2xsZXInXG5cbmV4cG9ydCBmdW5jdGlvbiBhZHZhbnRhZ2VEaWUoKTogbnVtYmVyIHtcbiAgcmV0dXJuIHJvbGwoe1xuICAgIHF1YW50aXR5OiAxLFxuICAgIHNpZGVzOiA2XG4gIH0pLnRvdGFsXG59XG4iLAogICAgImltcG9ydCB0eXBlIHsgRGFnZ2VyaGVhcnRBZHZhbnRhZ2VEaXNhZHZhbnRhZ2UgfSBmcm9tICcuLi90eXBlcydcbmltcG9ydCB7IGFkdmFudGFnZURpZSB9IGZyb20gJy4vYWR2YW50YWdlRGllJ1xuXG5leHBvcnQgZnVuY3Rpb24gY2FsY3VsYXRlVG90YWwoXG4gIHRvdGFsOiBudW1iZXIsXG4gIHJvbGxpbmdXaXRoOiBEYWdnZXJoZWFydEFkdmFudGFnZURpc2FkdmFudGFnZSB8IHVuZGVmaW5lZFxuKTogW251bWJlciwgbnVtYmVyIHwgdW5kZWZpbmVkXSB7XG4gIGlmIChyb2xsaW5nV2l0aCkge1xuICAgIGNvbnN0IGFkdmFudGFnZSA9IGFkdmFudGFnZURpZSgpXG4gICAgaWYgKHJvbGxpbmdXaXRoID09PSAnQWR2YW50YWdlJykge1xuICAgICAgcmV0dXJuIFt0b3RhbCArIGFkdmFudGFnZSwgYWR2YW50YWdlXVxuICAgIH1cbiAgICByZXR1cm4gW3RvdGFsIC0gYWR2YW50YWdlLCAtYWR2YW50YWdlXVxuICB9XG4gIHJldHVybiBbdG90YWwsIHVuZGVmaW5lZF1cbn1cbiIKICBdLAogICJtYXBwaW5ncyI6ICJ1dUJBQUEscUZDQTBELElBQTFELDZCQ0VPLFNBQVMsQ0FBYSxDQUMzQixFQUNBLEVBQzJCLENBQzNCLEdBQUksSUFBUyxFQUNYLE1BQU8sZ0JBRVQsR0FBSSxFQUFPLEVBQ1QsTUFBTyxPQUVULE1BQU8sT0NaWSxJQUFyQiw2QkFFTyxTQUFTLENBQVksRUFBVyxDQUNyQyxPQUFPLE9BQUssQ0FDVixTQUFVLEVBQ1YsTUFBTyxDQUNULENBQUMsRUFBRSxNQ0hFLFNBQVMsQ0FBYyxDQUM1QixFQUNBLEVBQzhCLENBQzlCLEdBQUksRUFBYSxDQUNmLElBQU0sRUFBWSxFQUFhLEVBQy9CLEdBQUksSUFBZ0IsWUFDbEIsTUFBTyxDQUFDLEVBQVEsRUFBVyxDQUFTLEVBRXRDLE1BQU8sQ0FBQyxFQUFRLEdBQVksQ0FBUyxFQUV2QyxNQUFPLENBQUMsRUFBTyxNQUFTLEVIVG5CLFNBQVMsQ0FBZSxFQUM3QixXQUFXLEVBQ1gsY0FDQSxjQUFjLEdBQ2QsY0FBYyxJQUNhLENBQUMsRUFHNUIsQ0FDQSxJQUFNLEVBQWEsT0FBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQWEsT0FBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQU8sRUFBVyxNQUNsQixFQUFPLEVBQVcsTUFDbEIsRUFBUSxFQUFPLEVBQU8sR0FFckIsRUFBb0IsR0FBYSxFQUFlLEVBQU8sQ0FBVyxFQUV6RSxNQUFPLENBQ0wsT0FBUSxFQUNSLFdBQVksQ0FDVixLQUFNLEVBQWMsRUFBTSxDQUFJLEVBQzlCLE1BQU8sRUFDUCxNQUFPLENBQ0wsT0FDQSxZQUNBLE9BQ0EsVUFDRixDQUNGLENBQ0YiLAogICJkZWJ1Z0lkIjogIjk0OUUyQzNEMkEwQUJGOTI2NDc1NkUyMTY0NzU2RTIxIiwKICAibmFtZXMiOiBbXQp9
+//# debugId=505704F7645CF96E64756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvaW5kZXgudHMiLCAiLi4vc3JjL3JvbGxEYWdnZXJoZWFydC9jYWxjdWxhdGVUeXBlLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvYWR2YW50YWdlRGllLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvY2FsY3VsYXRlVG90YWwudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0ICogZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuZXhwb3J0ICogZnJvbSAnLi9yb2xsRGFnZ2VyaGVhcnQnXG5leHBvcnQgdHlwZSAqIGZyb20gJy4vdHlwZXMnXG4iLAogICAgImltcG9ydCB7IHJvbGwgYXMgY29yZVJvbGwgfSBmcm9tICdAcmFuZHN1bS9yb2xsZXInXG5pbXBvcnQgdHlwZSB7IERhZ2dlcmhlYXJ0R2FtZVJlc3VsdCwgRGFnZ2VyaGVhcnRSb2xsQXJndW1lbnQgfSBmcm9tICcuLi90eXBlcydcbmltcG9ydCB7IGNhbGN1bGF0ZVR5cGUgfSBmcm9tICcuL2NhbGN1bGF0ZVR5cGUnXG5pbXBvcnQgeyBjYWxjdWxhdGVUb3RhbCB9IGZyb20gJy4vY2FsY3VsYXRlVG90YWwnXG5cbmV4cG9ydCBmdW5jdGlvbiByb2xsRGFnZ2VyaGVhcnQoe1xuICBtb2RpZmllciA9IDAsXG4gIHJvbGxpbmdXaXRoLFxuICBhbXBsaWZ5SG9wZSA9IGZhbHNlLFxuICBhbXBsaWZ5RmVhciA9IGZhbHNlXG59OiBEYWdnZXJoZWFydFJvbGxBcmd1bWVudCA9IHt9KTogRGFnZ2VyaGVhcnRHYW1lUmVzdWx0IHtcbiAgY29uc3QgaG9wZVJlc3VsdCA9IGNvcmVSb2xsKHtcbiAgICBxdWFudGl0eTogMSxcbiAgICBzaWRlczogYW1wbGlmeUhvcGUgPyAyMCA6IDEyXG4gIH0pXG4gIGNvbnN0IGZlYXJSZXN1bHQgPSBjb3JlUm9sbCh7XG4gICAgcXVhbnRpdHk6IDEsXG4gICAgc2lkZXM6IGFtcGxpZnlGZWFyID8gMjAgOiAxMlxuICB9KVxuICBjb25zdCBob3BlID0gaG9wZVJlc3VsdC50b3RhbFxuICBjb25zdCBmZWFyID0gZmVhclJlc3VsdC50b3RhbFxuICBjb25zdCB0b3RhbCA9IGhvcGUgKyBmZWFyICsgbW9kaWZpZXJcblxuICBjb25zdCBbdG90YWxXaXRoQWR2YW50YWdlLCBhZHZhbnRhZ2VdID0gY2FsY3VsYXRlVG90YWwodG90YWwsIHJvbGxpbmdXaXRoKVxuXG4gIHJldHVybiB7XG4gICAgcmVzdWx0OiB0b3RhbFdpdGhBZHZhbnRhZ2UsXG4gICAgdHlwZTogY2FsY3VsYXRlVHlwZShob3BlLCBmZWFyKSxcbiAgICBiYXNlUmVzdWx0OiB7XG4gICAgICB0b3RhbDogdG90YWxXaXRoQWR2YW50YWdlLFxuICAgICAgcm9sbHM6IHtcbiAgICAgICAgaG9wZSxcbiAgICAgICAgYWR2YW50YWdlLFxuICAgICAgICBmZWFyLFxuICAgICAgICBtb2RpZmllclxuICAgICAgfVxuICAgIH1cbiAgfVxufVxuIiwKICAgICJpbXBvcnQgdHlwZSB7IERhZ2dlcmhlYXJ0Um9sbFJlc3VsdFR5cGUgfSBmcm9tICcuLi90eXBlcydcblxuZXhwb3J0IGZ1bmN0aW9uIGNhbGN1bGF0ZVR5cGUoXG4gIGhvcGU6IG51bWJlcixcbiAgZmVhcjogbnVtYmVyXG4pOiBEYWdnZXJoZWFydFJvbGxSZXN1bHRUeXBlIHtcbiAgaWYgKGhvcGUgPT09IGZlYXIpIHtcbiAgICByZXR1cm4gJ2NyaXRpY2FsIGhvcGUnXG4gIH1cbiAgaWYgKGhvcGUgPiBmZWFyKSB7XG4gICAgcmV0dXJuICdob3BlJ1xuICB9XG4gIHJldHVybiAnZmVhcidcbn1cbiIsCiAgICAiaW1wb3J0IHsgcm9sbCB9IGZyb20gJ0ByYW5kc3VtL3JvbGxlcidcblxuZXhwb3J0IGZ1bmN0aW9uIGFkdmFudGFnZURpZSgpOiBudW1iZXIge1xuICByZXR1cm4gcm9sbCh7XG4gICAgcXVhbnRpdHk6IDEsXG4gICAgc2lkZXM6IDZcbiAgfSkudG90YWxcbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydEFkdmFudGFnZURpc2FkdmFudGFnZSB9IGZyb20gJy4uL3R5cGVzJ1xuaW1wb3J0IHsgYWR2YW50YWdlRGllIH0gZnJvbSAnLi9hZHZhbnRhZ2VEaWUnXG5cbmV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVUb3RhbChcbiAgdG90YWw6IG51bWJlcixcbiAgcm9sbGluZ1dpdGg6IERhZ2dlcmhlYXJ0QWR2YW50YWdlRGlzYWR2YW50YWdlIHwgdW5kZWZpbmVkXG4pOiBbbnVtYmVyLCBudW1iZXIgfCB1bmRlZmluZWRdIHtcbiAgaWYgKHJvbGxpbmdXaXRoKSB7XG4gICAgY29uc3QgYWR2YW50YWdlID0gYWR2YW50YWdlRGllKClcbiAgICBpZiAocm9sbGluZ1dpdGggPT09ICdBZHZhbnRhZ2UnKSB7XG4gICAgICByZXR1cm4gW3RvdGFsICsgYWR2YW50YWdlLCBhZHZhbnRhZ2VdXG4gICAgfVxuICAgIHJldHVybiBbdG90YWwgLSBhZHZhbnRhZ2UsIC1hZHZhbnRhZ2VdXG4gIH1cbiAgcmV0dXJuIFt0b3RhbCwgdW5kZWZpbmVkXVxufVxuIgogIF0sCiAgIm1hcHBpbmdzIjogInV1QkFBQSxxRkNBaUMsSUFBakMsNkJDRU8sU0FBUyxDQUFhLENBQzNCLEVBQ0EsRUFDMkIsQ0FDM0IsR0FBSSxJQUFTLEVBQ1gsTUFBTyxnQkFFVCxHQUFJLEVBQU8sRUFDVCxNQUFPLE9BRVQsTUFBTyxPQ1pZLElBQXJCLDZCQUVPLFNBQVMsQ0FBWSxFQUFXLENBQ3JDLE9BQU8sT0FBSyxDQUNWLFNBQVUsRUFDVixNQUFPLENBQ1QsQ0FBQyxFQUFFLE1DSEUsU0FBUyxDQUFjLENBQzVCLEVBQ0EsRUFDOEIsQ0FDOUIsR0FBSSxFQUFhLENBQ2YsSUFBTSxFQUFZLEVBQWEsRUFDL0IsR0FBSSxJQUFnQixZQUNsQixNQUFPLENBQUMsRUFBUSxFQUFXLENBQVMsRUFFdEMsTUFBTyxDQUFDLEVBQVEsR0FBWSxDQUFTLEVBRXZDLE1BQU8sQ0FBQyxFQUFPLE1BQVMsRUhUbkIsU0FBUyxDQUFlLEVBQzdCLFdBQVcsRUFDWCxjQUNBLGNBQWMsR0FDZCxjQUFjLElBQ2EsQ0FBQyxFQUEwQixDQUN0RCxJQUFNLEVBQWEsT0FBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQWEsT0FBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQU8sRUFBVyxNQUNsQixFQUFPLEVBQVcsTUFDbEIsRUFBUSxFQUFPLEVBQU8sR0FFckIsRUFBb0IsR0FBYSxFQUFlLEVBQU8sQ0FBVyxFQUV6RSxNQUFPLENBQ0wsT0FBUSxFQUNSLEtBQU0sRUFBYyxFQUFNLENBQUksRUFDOUIsV0FBWSxDQUNWLE1BQU8sRUFDUCxNQUFPLENBQ0wsT0FDQSxZQUNBLE9BQ0EsVUFDRixDQUNGLENBQ0YiLAogICJkZWJ1Z0lkIjogIjUwNTcwNEY3NjQ1Q0Y5NkU2NDc1NkUyMTY0NzU2RTIxIiwKICAibmFtZXMiOiBbXQp9

package/dist/index.d.cts

@@ -9,7 +9,6 @@ interface DaggerheartRollArgument {
 }
 type DaggerheartRollResultType = "hope" | "fear" | "critical hope";
 interface DaggerheartRollResult {
-	type: DaggerheartRollResultType;
 	total: number;
 	rolls: {
 		hope: number
@@ -18,11 +17,8 @@ interface DaggerheartRollResult {
 		advantage: number | undefined
 	};
 }
-interface DaggerheartMeetOrBeatResult {
-	result: DaggerheartRollResult;
-	success: boolean;
-	target: number;
-	description: string;
+interface DaggerheartGameResult extends BaseGameRollResult<number, DaggerheartRollResult> {
+	type: DaggerheartRollResultType;
 }
-declare function rollDaggerheart({ modifier, rollingWith, amplifyHope, amplifyFear }?: DaggerheartRollArgument): BaseGameRollResult<number, DaggerheartRollResult>;
-export { rollDaggerheart, DaggerheartRollResultType, DaggerheartRollResult, DaggerheartRollArgument, DaggerheartMeetOrBeatResult, DaggerheartAdvantageDisadvantage };
+declare function rollDaggerheart({ modifier, rollingWith, amplifyHope, amplifyFear }?: DaggerheartRollArgument): DaggerheartGameResult;
+export { rollDaggerheart, DaggerheartRollResultType, DaggerheartRollResult, DaggerheartRollArgument, DaggerheartGameResult, DaggerheartAdvantageDisadvantage };

package/dist/index.d.ts

@@ -9,7 +9,6 @@ interface DaggerheartRollArgument {
 }
 type DaggerheartRollResultType = "hope" | "fear" | "critical hope";
 interface DaggerheartRollResult {
-	type: DaggerheartRollResultType;
 	total: number;
 	rolls: {
 		hope: number
@@ -18,11 +17,8 @@ interface DaggerheartRollResult {
 		advantage: number | undefined
 	};
 }
-interface DaggerheartMeetOrBeatResult {
-	result: DaggerheartRollResult;
-	success: boolean;
-	target: number;
-	description: string;
+interface DaggerheartGameResult extends BaseGameRollResult<number, DaggerheartRollResult> {
+	type: DaggerheartRollResultType;
 }
-declare function rollDaggerheart({ modifier, rollingWith, amplifyHope, amplifyFear }?: DaggerheartRollArgument): BaseGameRollResult<number, DaggerheartRollResult>;
-export { rollDaggerheart, DaggerheartRollResultType, DaggerheartRollResult, DaggerheartRollArgument, DaggerheartMeetOrBeatResult, DaggerheartAdvantageDisadvantage };
+declare function rollDaggerheart({ modifier, rollingWith, amplifyHope, amplifyFear }?: DaggerheartRollArgument): DaggerheartGameResult;
+export { rollDaggerheart, DaggerheartRollResultType, DaggerheartRollResult, DaggerheartRollArgument, DaggerheartGameResult, DaggerheartAdvantageDisadvantage };

package/dist/index.js

@@ -1,4 +1,4 @@
-export*from"@randsum/roller";import{roll as p}from"@randsum/roller";function n(e,t){if(e===t)return"critical hope";if(e>t)return"hope";return"fear"}import{roll as d}from"@randsum/roller";function u(){return d({quantity:1,sides:6}).total}function s(e,t){if(t){let r=u();if(t==="Advantage")return[e+r,r];return[e-r,-r]}return[e,void 0]}function T({modifier:e=0,rollingWith:t,amplifyHope:r=!1,amplifyFear:g=!1}={}){let m=p({quantity:1,sides:r?20:12}),i=p({quantity:1,sides:g?20:12}),a=m.total,o=i.total,f=a+o+e,[l,c]=s(f,t);return{result:l,baseResult:{type:n(a,o),total:l,rolls:{hope:a,advantage:c,fear:o,modifier:e}}}}export{T as rollDaggerheart};
+export*from"@randsum/roller";import{roll as p}from"@randsum/roller";function l(e,t){if(e===t)return"critical hope";if(e>t)return"hope";return"fear"}import{roll as d}from"@randsum/roller";function u(){return d({quantity:1,sides:6}).total}function s(e,t){if(t){let r=u();if(t==="Advantage")return[e+r,r];return[e-r,-r]}return[e,void 0]}function T({modifier:e=0,rollingWith:t,amplifyHope:r=!1,amplifyFear:g=!1}={}){let i=p({quantity:1,sides:r?20:12}),m=p({quantity:1,sides:g?20:12}),a=i.total,o=m.total,f=a+o+e,[n,c]=s(f,t);return{result:n,type:l(a,o),baseResult:{total:n,rolls:{hope:a,advantage:c,fear:o,modifier:e}}}}export{T as rollDaggerheart};
 
-//# debugId=AC52333205ED0C6E64756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvaW5kZXgudHMiLCAiLi4vc3JjL3JvbGxEYWdnZXJoZWFydC9jYWxjdWxhdGVUeXBlLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvYWR2YW50YWdlRGllLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvY2FsY3VsYXRlVG90YWwudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0ICogZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuZXhwb3J0ICogZnJvbSAnLi9yb2xsRGFnZ2VyaGVhcnQnXG5leHBvcnQgdHlwZSAqIGZyb20gJy4vdHlwZXMnXG4iLAogICAgImltcG9ydCB7IHR5cGUgQmFzZUdhbWVSb2xsUmVzdWx0LCByb2xsIGFzIGNvcmVSb2xsIH0gZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydFJvbGxBcmd1bWVudCwgRGFnZ2VyaGVhcnRSb2xsUmVzdWx0IH0gZnJvbSAnLi4vdHlwZXMnXG5pbXBvcnQgeyBjYWxjdWxhdGVUeXBlIH0gZnJvbSAnLi9jYWxjdWxhdGVUeXBlJ1xuaW1wb3J0IHsgY2FsY3VsYXRlVG90YWwgfSBmcm9tICcuL2NhbGN1bGF0ZVRvdGFsJ1xuXG5leHBvcnQgZnVuY3Rpb24gcm9sbERhZ2dlcmhlYXJ0KHtcbiAgbW9kaWZpZXIgPSAwLFxuICByb2xsaW5nV2l0aCxcbiAgYW1wbGlmeUhvcGUgPSBmYWxzZSxcbiAgYW1wbGlmeUZlYXIgPSBmYWxzZVxufTogRGFnZ2VyaGVhcnRSb2xsQXJndW1lbnQgPSB7fSk6IEJhc2VHYW1lUm9sbFJlc3VsdDxcbiAgbnVtYmVyLFxuICBEYWdnZXJoZWFydFJvbGxSZXN1bHRcbj4ge1xuICBjb25zdCBob3BlUmVzdWx0ID0gY29yZVJvbGwoe1xuICAgIHF1YW50aXR5OiAxLFxuICAgIHNpZGVzOiBhbXBsaWZ5SG9wZSA/IDIwIDogMTJcbiAgfSlcbiAgY29uc3QgZmVhclJlc3VsdCA9IGNvcmVSb2xsKHtcbiAgICBxdWFudGl0eTogMSxcbiAgICBzaWRlczogYW1wbGlmeUZlYXIgPyAyMCA6IDEyXG4gIH0pXG4gIGNvbnN0IGhvcGUgPSBob3BlUmVzdWx0LnRvdGFsXG4gIGNvbnN0IGZlYXIgPSBmZWFyUmVzdWx0LnRvdGFsXG4gIGNvbnN0IHRvdGFsID0gaG9wZSArIGZlYXIgKyBtb2RpZmllclxuXG4gIGNvbnN0IFt0b3RhbFdpdGhBZHZhbnRhZ2UsIGFkdmFudGFnZV0gPSBjYWxjdWxhdGVUb3RhbCh0b3RhbCwgcm9sbGluZ1dpdGgpXG5cbiAgcmV0dXJuIHtcbiAgICByZXN1bHQ6IHRvdGFsV2l0aEFkdmFudGFnZSxcbiAgICBiYXNlUmVzdWx0OiB7XG4gICAgICB0eXBlOiBjYWxjdWxhdGVUeXBlKGhvcGUsIGZlYXIpLFxuICAgICAgdG90YWw6IHRvdGFsV2l0aEFkdmFudGFnZSxcbiAgICAgIHJvbGxzOiB7XG4gICAgICAgIGhvcGUsXG4gICAgICAgIGFkdmFudGFnZSxcbiAgICAgICAgZmVhcixcbiAgICAgICAgbW9kaWZpZXJcbiAgICAgIH1cbiAgICB9XG4gIH1cbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydFJvbGxSZXN1bHRUeXBlIH0gZnJvbSAnLi4vdHlwZXMnXG5cbmV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVUeXBlKFxuICBob3BlOiBudW1iZXIsXG4gIGZlYXI6IG51bWJlclxuKTogRGFnZ2VyaGVhcnRSb2xsUmVzdWx0VHlwZSB7XG4gIGlmIChob3BlID09PSBmZWFyKSB7XG4gICAgcmV0dXJuICdjcml0aWNhbCBob3BlJ1xuICB9XG4gIGlmIChob3BlID4gZmVhcikge1xuICAgIHJldHVybiAnaG9wZSdcbiAgfVxuICByZXR1cm4gJ2ZlYXInXG59XG4iLAogICAgImltcG9ydCB7IHJvbGwgfSBmcm9tICdAcmFuZHN1bS9yb2xsZXInXG5cbmV4cG9ydCBmdW5jdGlvbiBhZHZhbnRhZ2VEaWUoKTogbnVtYmVyIHtcbiAgcmV0dXJuIHJvbGwoe1xuICAgIHF1YW50aXR5OiAxLFxuICAgIHNpZGVzOiA2XG4gIH0pLnRvdGFsXG59XG4iLAogICAgImltcG9ydCB0eXBlIHsgRGFnZ2VyaGVhcnRBZHZhbnRhZ2VEaXNhZHZhbnRhZ2UgfSBmcm9tICcuLi90eXBlcydcbmltcG9ydCB7IGFkdmFudGFnZURpZSB9IGZyb20gJy4vYWR2YW50YWdlRGllJ1xuXG5leHBvcnQgZnVuY3Rpb24gY2FsY3VsYXRlVG90YWwoXG4gIHRvdGFsOiBudW1iZXIsXG4gIHJvbGxpbmdXaXRoOiBEYWdnZXJoZWFydEFkdmFudGFnZURpc2FkdmFudGFnZSB8IHVuZGVmaW5lZFxuKTogW251bWJlciwgbnVtYmVyIHwgdW5kZWZpbmVkXSB7XG4gIGlmIChyb2xsaW5nV2l0aCkge1xuICAgIGNvbnN0IGFkdmFudGFnZSA9IGFkdmFudGFnZURpZSgpXG4gICAgaWYgKHJvbGxpbmdXaXRoID09PSAnQWR2YW50YWdlJykge1xuICAgICAgcmV0dXJuIFt0b3RhbCArIGFkdmFudGFnZSwgYWR2YW50YWdlXVxuICAgIH1cbiAgICByZXR1cm4gW3RvdGFsIC0gYWR2YW50YWdlLCAtYWR2YW50YWdlXVxuICB9XG4gIHJldHVybiBbdG90YWwsIHVuZGVmaW5lZF1cbn1cbiIKICBdLAogICJtYXBwaW5ncyI6ICJBQUFBLDZCQ0FBLGVBQWtDLHdCQ0UzQixTQUFTLENBQWEsQ0FDM0IsRUFDQSxFQUMyQixDQUMzQixHQUFJLElBQVMsRUFDWCxNQUFPLGdCQUVULEdBQUksRUFBTyxFQUNULE1BQU8sT0FFVCxNQUFPLE9DWlQsZUFBUyx3QkFFRixTQUFTLENBQVksRUFBVyxDQUNyQyxPQUFPLEVBQUssQ0FDVixTQUFVLEVBQ1YsTUFBTyxDQUNULENBQUMsRUFBRSxNQ0hFLFNBQVMsQ0FBYyxDQUM1QixFQUNBLEVBQzhCLENBQzlCLEdBQUksRUFBYSxDQUNmLElBQU0sRUFBWSxFQUFhLEVBQy9CLEdBQUksSUFBZ0IsWUFDbEIsTUFBTyxDQUFDLEVBQVEsRUFBVyxDQUFTLEVBRXRDLE1BQU8sQ0FBQyxFQUFRLEdBQVksQ0FBUyxFQUV2QyxNQUFPLENBQUMsRUFBTyxNQUFTLEVIVG5CLFNBQVMsQ0FBZSxFQUM3QixXQUFXLEVBQ1gsY0FDQSxjQUFjLEdBQ2QsY0FBYyxJQUNhLENBQUMsRUFHNUIsQ0FDQSxJQUFNLEVBQWEsRUFBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQWEsRUFBUyxDQUMxQixTQUFVLEVBQ1YsTUFBTyxFQUFjLEdBQUssRUFDNUIsQ0FBQyxFQUNLLEVBQU8sRUFBVyxNQUNsQixFQUFPLEVBQVcsTUFDbEIsRUFBUSxFQUFPLEVBQU8sR0FFckIsRUFBb0IsR0FBYSxFQUFlLEVBQU8sQ0FBVyxFQUV6RSxNQUFPLENBQ0wsT0FBUSxFQUNSLFdBQVksQ0FDVixLQUFNLEVBQWMsRUFBTSxDQUFJLEVBQzlCLE1BQU8sRUFDUCxNQUFPLENBQ0wsT0FDQSxZQUNBLE9BQ0EsVUFDRixDQUNGLENBQ0YiLAogICJkZWJ1Z0lkIjogIkFDNTIzMzMyMDVFRDBDNkU2NDc1NkUyMTY0NzU2RTIxIiwKICAibmFtZXMiOiBbXQp9
+//# debugId=1E63335480767BE464756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvaW5kZXgudHMiLCAiLi4vc3JjL3JvbGxEYWdnZXJoZWFydC9jYWxjdWxhdGVUeXBlLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvYWR2YW50YWdlRGllLnRzIiwgIi4uL3NyYy9yb2xsRGFnZ2VyaGVhcnQvY2FsY3VsYXRlVG90YWwudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0ICogZnJvbSAnQHJhbmRzdW0vcm9sbGVyJ1xuZXhwb3J0ICogZnJvbSAnLi9yb2xsRGFnZ2VyaGVhcnQnXG5leHBvcnQgdHlwZSAqIGZyb20gJy4vdHlwZXMnXG4iLAogICAgImltcG9ydCB7IHJvbGwgYXMgY29yZVJvbGwgfSBmcm9tICdAcmFuZHN1bS9yb2xsZXInXG5pbXBvcnQgdHlwZSB7IERhZ2dlcmhlYXJ0R2FtZVJlc3VsdCwgRGFnZ2VyaGVhcnRSb2xsQXJndW1lbnQgfSBmcm9tICcuLi90eXBlcydcbmltcG9ydCB7IGNhbGN1bGF0ZVR5cGUgfSBmcm9tICcuL2NhbGN1bGF0ZVR5cGUnXG5pbXBvcnQgeyBjYWxjdWxhdGVUb3RhbCB9IGZyb20gJy4vY2FsY3VsYXRlVG90YWwnXG5cbmV4cG9ydCBmdW5jdGlvbiByb2xsRGFnZ2VyaGVhcnQoe1xuICBtb2RpZmllciA9IDAsXG4gIHJvbGxpbmdXaXRoLFxuICBhbXBsaWZ5SG9wZSA9IGZhbHNlLFxuICBhbXBsaWZ5RmVhciA9IGZhbHNlXG59OiBEYWdnZXJoZWFydFJvbGxBcmd1bWVudCA9IHt9KTogRGFnZ2VyaGVhcnRHYW1lUmVzdWx0IHtcbiAgY29uc3QgaG9wZVJlc3VsdCA9IGNvcmVSb2xsKHtcbiAgICBxdWFudGl0eTogMSxcbiAgICBzaWRlczogYW1wbGlmeUhvcGUgPyAyMCA6IDEyXG4gIH0pXG4gIGNvbnN0IGZlYXJSZXN1bHQgPSBjb3JlUm9sbCh7XG4gICAgcXVhbnRpdHk6IDEsXG4gICAgc2lkZXM6IGFtcGxpZnlGZWFyID8gMjAgOiAxMlxuICB9KVxuICBjb25zdCBob3BlID0gaG9wZVJlc3VsdC50b3RhbFxuICBjb25zdCBmZWFyID0gZmVhclJlc3VsdC50b3RhbFxuICBjb25zdCB0b3RhbCA9IGhvcGUgKyBmZWFyICsgbW9kaWZpZXJcblxuICBjb25zdCBbdG90YWxXaXRoQWR2YW50YWdlLCBhZHZhbnRhZ2VdID0gY2FsY3VsYXRlVG90YWwodG90YWwsIHJvbGxpbmdXaXRoKVxuXG4gIHJldHVybiB7XG4gICAgcmVzdWx0OiB0b3RhbFdpdGhBZHZhbnRhZ2UsXG4gICAgdHlwZTogY2FsY3VsYXRlVHlwZShob3BlLCBmZWFyKSxcbiAgICBiYXNlUmVzdWx0OiB7XG4gICAgICB0b3RhbDogdG90YWxXaXRoQWR2YW50YWdlLFxuICAgICAgcm9sbHM6IHtcbiAgICAgICAgaG9wZSxcbiAgICAgICAgYWR2YW50YWdlLFxuICAgICAgICBmZWFyLFxuICAgICAgICBtb2RpZmllclxuICAgICAgfVxuICAgIH1cbiAgfVxufVxuIiwKICAgICJpbXBvcnQgdHlwZSB7IERhZ2dlcmhlYXJ0Um9sbFJlc3VsdFR5cGUgfSBmcm9tICcuLi90eXBlcydcblxuZXhwb3J0IGZ1bmN0aW9uIGNhbGN1bGF0ZVR5cGUoXG4gIGhvcGU6IG51bWJlcixcbiAgZmVhcjogbnVtYmVyXG4pOiBEYWdnZXJoZWFydFJvbGxSZXN1bHRUeXBlIHtcbiAgaWYgKGhvcGUgPT09IGZlYXIpIHtcbiAgICByZXR1cm4gJ2NyaXRpY2FsIGhvcGUnXG4gIH1cbiAgaWYgKGhvcGUgPiBmZWFyKSB7XG4gICAgcmV0dXJuICdob3BlJ1xuICB9XG4gIHJldHVybiAnZmVhcidcbn1cbiIsCiAgICAiaW1wb3J0IHsgcm9sbCB9IGZyb20gJ0ByYW5kc3VtL3JvbGxlcidcblxuZXhwb3J0IGZ1bmN0aW9uIGFkdmFudGFnZURpZSgpOiBudW1iZXIge1xuICByZXR1cm4gcm9sbCh7XG4gICAgcXVhbnRpdHk6IDEsXG4gICAgc2lkZXM6IDZcbiAgfSkudG90YWxcbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBEYWdnZXJoZWFydEFkdmFudGFnZURpc2FkdmFudGFnZSB9IGZyb20gJy4uL3R5cGVzJ1xuaW1wb3J0IHsgYWR2YW50YWdlRGllIH0gZnJvbSAnLi9hZHZhbnRhZ2VEaWUnXG5cbmV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVUb3RhbChcbiAgdG90YWw6IG51bWJlcixcbiAgcm9sbGluZ1dpdGg6IERhZ2dlcmhlYXJ0QWR2YW50YWdlRGlzYWR2YW50YWdlIHwgdW5kZWZpbmVkXG4pOiBbbnVtYmVyLCBudW1iZXIgfCB1bmRlZmluZWRdIHtcbiAgaWYgKHJvbGxpbmdXaXRoKSB7XG4gICAgY29uc3QgYWR2YW50YWdlID0gYWR2YW50YWdlRGllKClcbiAgICBpZiAocm9sbGluZ1dpdGggPT09ICdBZHZhbnRhZ2UnKSB7XG4gICAgICByZXR1cm4gW3RvdGFsICsgYWR2YW50YWdlLCBhZHZhbnRhZ2VdXG4gICAgfVxuICAgIHJldHVybiBbdG90YWwgLSBhZHZhbnRhZ2UsIC1hZHZhbnRhZ2VdXG4gIH1cbiAgcmV0dXJuIFt0b3RhbCwgdW5kZWZpbmVkXVxufVxuIgogIF0sCiAgIm1hcHBpbmdzIjogIkFBQUEsNkJDQUEsZUFBUyx3QkNFRixTQUFTLENBQWEsQ0FDM0IsRUFDQSxFQUMyQixDQUMzQixHQUFJLElBQVMsRUFDWCxNQUFPLGdCQUVULEdBQUksRUFBTyxFQUNULE1BQU8sT0FFVCxNQUFPLE9DWlQsZUFBUyx3QkFFRixTQUFTLENBQVksRUFBVyxDQUNyQyxPQUFPLEVBQUssQ0FDVixTQUFVLEVBQ1YsTUFBTyxDQUNULENBQUMsRUFBRSxNQ0hFLFNBQVMsQ0FBYyxDQUM1QixFQUNBLEVBQzhCLENBQzlCLEdBQUksRUFBYSxDQUNmLElBQU0sRUFBWSxFQUFhLEVBQy9CLEdBQUksSUFBZ0IsWUFDbEIsTUFBTyxDQUFDLEVBQVEsRUFBVyxDQUFTLEVBRXRDLE1BQU8sQ0FBQyxFQUFRLEdBQVksQ0FBUyxFQUV2QyxNQUFPLENBQUMsRUFBTyxNQUFTLEVIVG5CLFNBQVMsQ0FBZSxFQUM3QixXQUFXLEVBQ1gsY0FDQSxjQUFjLEdBQ2QsY0FBYyxJQUNhLENBQUMsRUFBMEIsQ0FDdEQsSUFBTSxFQUFhLEVBQVMsQ0FDMUIsU0FBVSxFQUNWLE1BQU8sRUFBYyxHQUFLLEVBQzVCLENBQUMsRUFDSyxFQUFhLEVBQVMsQ0FDMUIsU0FBVSxFQUNWLE1BQU8sRUFBYyxHQUFLLEVBQzVCLENBQUMsRUFDSyxFQUFPLEVBQVcsTUFDbEIsRUFBTyxFQUFXLE1BQ2xCLEVBQVEsRUFBTyxFQUFPLEdBRXJCLEVBQW9CLEdBQWEsRUFBZSxFQUFPLENBQVcsRUFFekUsTUFBTyxDQUNMLE9BQVEsRUFDUixLQUFNLEVBQWMsRUFBTSxDQUFJLEVBQzlCLFdBQVksQ0FDVixNQUFPLEVBQ1AsTUFBTyxDQUNMLE9BQ0EsWUFDQSxPQUNBLFVBQ0YsQ0FDRixDQUNGIiwKICAiZGVidWdJZCI6ICIxRTYzMzM1NDgwNzY3QkU0NjQ3NTZFMjE2NDc1NkUyMSIsCiAgIm5hbWVzIjogW10KfQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@randsum/daggerheart",
-  "version": "0.18.0",
+  "version": "0.21.0",
   "description": "A flexible, type-safe dice roller for building Daggerheart-compatible applications",
   "private": false,
   "author": {
@@ -28,7 +28,7 @@
   "sideEffects": false,
   "type": "module",
   "dependencies": {
-    "@randsum/roller": "~0.18.0"
+    "@randsum/roller": "~0.21.0"
   },
   "exports": {
     ".": {

package/src/rollDaggerheart/index.ts

@@ -1,5 +1,5 @@
-import { type BaseGameRollResult, roll as coreRoll } from '@randsum/roller'
-import type { DaggerheartRollArgument, DaggerheartRollResult } from '../types'
+import { roll as coreRoll } from '@randsum/roller'
+import type { DaggerheartGameResult, DaggerheartRollArgument } from '../types'
 import { calculateType } from './calculateType'
 import { calculateTotal } from './calculateTotal'
 
@@ -8,10 +8,7 @@ export function rollDaggerheart({
   rollingWith,
   amplifyHope = false,
   amplifyFear = false
-}: DaggerheartRollArgument = {}): BaseGameRollResult<
-  number,
-  DaggerheartRollResult
-> {
+}: DaggerheartRollArgument = {}): DaggerheartGameResult {
   const hopeResult = coreRoll({
     quantity: 1,
     sides: amplifyHope ? 20 : 12
@@ -28,8 +25,8 @@ export function rollDaggerheart({
 
   return {
     result: totalWithAdvantage,
+    type: calculateType(hope, fear),
     baseResult: {
-      type: calculateType(hope, fear),
       total: totalWithAdvantage,
       rolls: {
         hope,

package/src/types.ts

@@ -1,3 +1,5 @@
+import type { BaseGameRollResult } from '@randsum/roller'
+
 export type DaggerheartAdvantageDisadvantage = 'Advantage' | 'Disadvantage'
 export interface DaggerheartRollArgument {
   modifier?: number
@@ -9,7 +11,6 @@ export interface DaggerheartRollArgument {
 export type DaggerheartRollResultType = 'hope' | 'fear' | 'critical hope'
 
 export interface DaggerheartRollResult {
-  type: DaggerheartRollResultType
   total: number
   rolls: {
     hope: number
@@ -19,9 +20,7 @@ export interface DaggerheartRollResult {
   }
 }
 
-export interface DaggerheartMeetOrBeatResult {
-  result: DaggerheartRollResult
-  success: boolean
-  target: number
-  description: string
+export interface DaggerheartGameResult
+  extends BaseGameRollResult<number, DaggerheartRollResult> {
+  type: DaggerheartRollResultType
 }