From f97deccb0254be50461eafa0f84dcd05cbc8ff00 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 3 Apr 2024 19:12:48 +0900 Subject: [PATCH] Add pick and pow CBS --- src/ts/parser.ts | 24 +++++++++++++++++++++++- src/ts/util.ts | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 6387af96..b5970cb4 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -9,7 +9,7 @@ import { get } from 'svelte/store'; import css from '@adobe/css-tools' import { selectedCharID } from './stores'; import { calcString } from './process/infunctions'; -import { findCharacterbyId } from './util'; +import { findCharacterbyId, sfc32, uuidtoNumber } from './util'; import { getInlayImage } from './process/files/image'; import { autoMarkNew } from './plugins/automark'; import { getModuleLorebooks } from './process/modules'; @@ -779,6 +779,9 @@ const matcher = (p1:string,matcherArg:matcherArg) => { return !isNaN(Number(v)) || v === '.' }).join('') } + case 'pow':{ + return Math.pow(Number(arra[1]), Number(arra[2])).toString() + } } } if(p1.startsWith('random')){ @@ -798,6 +801,25 @@ const matcher = (p1:string,matcherArg:matcherArg) => { return arr[randomIndex] } } + if(p1.startsWith('pick')){ + const selchar = db.characters[get(selectedCharID)] + const rand = sfc32(uuidtoNumber(selchar.chaId), chatID, uuidtoNumber(selchar.chaId), chatID) + if(p1.startsWith('random::')){ + const randomIndex = Math.floor(rand() * (arra.length - 1)) + 1 + if(matcherArg.tokenizeAccurate){ + return arra[0] + } + return arra[randomIndex] + } + else{ + const arr = p1.split(/\:|\,/g) + const randomIndex = Math.floor(rand() * (arr.length - 1)) + 1 + if(matcherArg.tokenizeAccurate){ + return arra[0] + } + return arr[randomIndex] + } + } if(p1.startsWith('roll')){ const arr = p1.split(/\:|\ /g) let ina = arr.at(-1) diff --git a/src/ts/util.ts b/src/ts/util.ts index 469ebb64..cfede7b7 100644 --- a/src/ts/util.ts +++ b/src/ts/util.ts @@ -442,4 +442,25 @@ export function blobToUint8Array(data:Blob){ }) } -export const languageCodes = ["af","ak","am","an","ar","as","ay","az","be","bg","bh","bm","bn","br","bs","ca","co","cs","cy","da","de","dv","ee","el","en","eo","es","et","eu","fa","fi","fo","fr","fy","ga","gd","gl","gn","gu","ha","he","hi","hr","ht","hu","hy","ia","id","ig","is","it","iu","ja","jv","ka","kk","km","kn","ko","ku","ky","la","lb","lg","ln","lo","lt","lv","mg","mi","mk","ml","mn","mr","ms","mt","my","nb","ne","nl","nn","no","ny","oc","om","or","pa","pl","ps","pt","qu","rm","ro","ru","rw","sa","sd","si","sk","sl","sm","sn","so","sq","sr","st","su","sv","sw","ta","te","tg","th","ti","tk","tl","tn","to","tr","ts","tt","tw","ug","uk","ur","uz","vi","wa","wo","xh","yi","yo","zh","zu"] \ No newline at end of file +export const languageCodes = ["af","ak","am","an","ar","as","ay","az","be","bg","bh","bm","bn","br","bs","ca","co","cs","cy","da","de","dv","ee","el","en","eo","es","et","eu","fa","fi","fo","fr","fy","ga","gd","gl","gn","gu","ha","he","hi","hr","ht","hu","hy","ia","id","ig","is","it","iu","ja","jv","ka","kk","km","kn","ko","ku","ky","la","lb","lg","ln","lo","lt","lv","mg","mi","mk","ml","mn","mr","ms","mt","my","nb","ne","nl","nn","no","ny","oc","om","or","pa","pl","ps","pt","qu","rm","ro","ru","rw","sa","sd","si","sk","sl","sm","sn","so","sq","sr","st","su","sv","sw","ta","te","tg","th","ti","tk","tl","tn","to","tr","ts","tt","tw","ug","uk","ur","uz","vi","wa","wo","xh","yi","yo","zh","zu"] + +export function sfc32(a:number, b:number, c:number, d:number) { + return function() { + a |= 0; b |= 0; c |= 0; d |= 0; + let t = (a + b | 0) + d | 0; + d = d + 1 | 0; + a = b ^ b >>> 9; + b = c + (c << 3) | 0; + c = (c << 21 | c >>> 11); + c = c + t | 0; + return (t >>> 0) / 4294967296; + } +} + +export function uuidtoNumber(uuid:string){ + let result = 0 + for(let i=0;i