jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Overhauled computations to allow for toggles :'( that sucked

Browse Source
This commit is contained in:
Thaum Rystra
2020-05-16 22:03:21 +02:00
parent 7024adecaf
commit 5c0a2a4d6c
30 changed files with 468 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/imports/api/properties/Actions.js
View File

@@ -1,6 +1,5 @@
import SimpleSchema from 'simpl-schema';
import ResourcesSchema from '/imports/api/properties/subSchemas/ResourcesSchema.js'
import ResultsSchema from '/imports/api/properties/subSchemas/ResultsSchema.js';
/*
* Actions are things a character can do
@@ -41,10 +40,6 @@ let ActionSchema = new SimpleSchema({
'tags.$': {
type: String,
},
results: {
type: ResultsSchema,
defaultValue: {},
},
resources: {
type: ResourcesSchema,
defaultValue: {},

27
app/imports/api/properties/Adjustments.js Normal file
View File

@@ -0,0 +1,27 @@
import SimpleSchema from 'simpl-schema';
const AdjustmentSchema = new SimpleSchema({
// The roll that determines how much to change the attribute
adjustment: {
type: String,
optional: true,
defaultValue: '1',
},
// Who this adjustment applies to
target: {
type: String,
defaultValue: 'every',
allowedValues: [
'self', // the character who took the action
'each', // rolled once for `each` target
'every', // rolled once and applied to `every` target
],
},
// The stat this rolls applies to
stat: {
type: String,
optional: true,
},
});
export { AdjustmentSchema };

43
app/imports/api/properties/Buffs.js
View File

@@ -1,6 +1,4 @@
import SimpleSchema from 'simpl-schema';
import { Random } from 'meteor/random';
import { StoredEffectSchema } from '/imports/api/properties/Effects.js';
let BuffSchema = new SimpleSchema({
name: {
@@ -15,20 +13,12 @@ let BuffSchema = new SimpleSchema({
type: String,
optional: true,
},
});
// The effects in the stored buff need to be resolved to a number before being
// placed on other characters, if they are applied to self, they can remain as
// calculations, provided they don't contain any rolls
let StoredBuffSchema = new SimpleSchema({
effects: {
type: Array,
defaultValue: [],
},
'effects.$': {
type: StoredEffectSchema,
},
target: {
applied: {
type: Boolean,
defaultValue: false,
index: 1,
},
target: {
type: String,
allowedValues: [
'self', // the character who took the buff
@@ -37,21 +27,14 @@ let StoredBuffSchema = new SimpleSchema({
],
defaultValue: 'every',
},
}).extend(BuffSchema);
let StoredBuffWithIdSchema = new SimpleSchema({
_id: {
type: String,
regEx: SimpleSchema.RegEx.Id,
autoValue(){
if (!this.isSet){
return Random.id();
}
},
},
}).extend(StoredBuffSchema);
});
let AppliedBuffSchema = new SimpleSchema({
applied: {
type: Boolean,
defaultValue: true,
index: 1,
},
durationSpent: {
type: Number,
optional: true,
@@ -73,4 +56,4 @@ let AppliedBuffSchema = new SimpleSchema({
},
}).extend(BuffSchema);
export { AppliedBuffSchema, StoredBuffSchema, StoredBuffWithIdSchema };
export { AppliedBuffSchema, BuffSchema };

12
app/imports/api/properties/subSchemas/DamageSchema.js → app/imports/api/properties/Damages.js
View File

@@ -1,22 +1,14 @@
import SimpleSchema from 'simpl-schema';
import { Random } from 'meteor/random';
import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
const DamageSchema = new SimpleSchema({
_id: {
type: String,
regEx: SimpleSchema.RegEx.Id,
autoValue(){
if (!this.isSet) return Random.id();
}
},
// The roll that determines how much to damage the attribute
damage: {
type: String,
optional: true,
defaultValue: '1d8 + strength.modifier',
},
// Who this adjustment applies to
// Who this damage applies to
target: {
type: String,
defaultValue: 'every',
@@ -33,4 +25,4 @@ const DamageSchema = new SimpleSchema({
},
});
export default DamageSchema;
export { DamageSchema };

13
app/imports/api/properties/Effects.js
View File

@@ -1,5 +1,4 @@
import SimpleSchema from 'simpl-schema';
import { Random } from 'meteor/random';
/*
* Effects are reason-value attached to skills and abilities
@@ -42,16 +41,6 @@ let EffectSchema = new SimpleSchema({
},
});
const StoredEffectSchema = new SimpleSchema({
_id: {
type: String,
regEx: SimpleSchema.RegEx.Id,
autoValue(){
if (!this.isSet) return Random.id();
}
},
}).extend(EffectSchema);
const ComputedOnlyEffectSchema = new SimpleSchema({
// The computed result of the effect
result: {
@@ -64,4 +53,4 @@ const ComputedEffectSchema = new SimpleSchema()
.extend(ComputedOnlyEffectSchema)
.extend(EffectSchema);
export { EffectSchema, StoredEffectSchema, ComputedEffectSchema, ComputedOnlyEffectSchema };
export { EffectSchema, ComputedEffectSchema, ComputedOnlyEffectSchema };

15
app/imports/api/properties/Results.js Normal file
View File

@@ -0,0 +1,15 @@
import SimpleSchema from 'simpl-schema';
const ResultSchema = new SimpleSchema({
name: {
type: String,
optional: true,
},
// Expression of whether or not to apply the children
comparison: {
type: String,
optional: true,
},
});
export { ResultSchema };

8
app/imports/api/properties/Rolls.js
View File

@@ -1,5 +1,4 @@
import SimpleSchema from 'simpl-schema';
import RollResultsSchema from '/imports/api/properties/subSchemas/RollResultsSchema.js'
/**
* Rolls are children to actions or other rolls, they are triggered with 0 or
@@ -34,13 +33,6 @@ let RollSchema = new SimpleSchema({
'tags.$': {
type: String,
},
rollResults: {
type: Array,
defaultValue: [],
},
'rollResults.$': {
type: RollResultsSchema,
},
});
export { RollSchema };

13
app/imports/api/properties/SavingThrows.js
View File

@@ -1,5 +1,4 @@
import SimpleSchema from 'simpl-schema';
import ResultsSchema from '/imports/api/properties/subSchemas/ResultsSchema.js';
// These are the rolls made when saves are called for
// For the saving throw bonus or proficiency, see ./Skills.js
@@ -8,18 +7,10 @@ let SavingThrowSchema = new SimpleSchema ({
type: String,
optional: true,
},
// The variable name of ability the saving throw relies on
ability: {
// The variable name of ability the save to roll
stat: {
type: String,
optional: true,
},
passResults: {
type: ResultsSchema,
defaultValue: {},
},
failResults: {
type: ResultsSchema,
defaultValue: {},
},
});

36
app/imports/api/properties/Toggles.js Normal file
View File

@@ -0,0 +1,36 @@
import SimpleSchema from 'simpl-schema';
const ToggleSchema = new SimpleSchema({
name: {
type: String,
optional: true,
},
disabled: {
type: Boolean,
optional: true,
},
enabled: {
type: Boolean,
optional: true,
},
// if neither disabled or enabled, the condition will be run to determine
// if the children of the toggle should be active
condition: {
type: String,
optional: true,
},
});
const ComputedOnlyToggleSchema = new SimpleSchema({
// The computed result of the effect
toggleResult: {
type: SimpleSchema.oneOf(Number, String, Boolean),
optional: true,
},
});
const ComputedToggleSchema = new SimpleSchema()
.extend(ComputedOnlyToggleSchema)
.extend(ToggleSchema);
export { ToggleSchema, ComputedOnlyToggleSchema, ComputedToggleSchema };

8
app/imports/api/properties/computedPropertySchemasIndex.js
View File

@@ -1,9 +1,11 @@
import SimpleSchema from 'simpl-schema';
import { ActionSchema } from '/imports/api/properties/Actions.js';
import { AdjustmentSchema } from '/imports/api/properties/Adjustments.js';
import { AttackSchema } from '/imports/api/properties/Attacks.js';
import { ComputedAttributeSchema } from '/imports/api/properties/Attributes.js';
import { AppliedBuffSchema } from '/imports/api/properties/Buffs.js';
import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
import { DamageSchema } from '/imports/api/properties/Damages.js';
import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
import { ComputedEffectSchema } from '/imports/api/properties/Effects.js';
import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
@@ -11,21 +13,25 @@ import { FeatureSchema } from '/imports/api/properties/Features.js';
import { FolderSchema } from '/imports/api/properties/Folders.js';
import { NoteSchema } from '/imports/api/properties/Notes.js';
import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
import { ResultSchema } from '/imports/api/properties/Results.js';
import { RollSchema } from '/imports/api/properties/Rolls.js';
import { SavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
import { ComputedSkillSchema } from '/imports/api/properties/Skills.js';
import { SlotSchema } from '/imports/api/properties/Slots.js';
import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
import { SpellSchema } from '/imports/api/properties/Spells.js';
import { ToggleSchema } from '/imports/api/properties/Toggles.js';
import { ContainerSchema } from '/imports/api/properties/Containers.js';
import { ItemSchema } from '/imports/api/properties/Items.js';
const propertySchemasIndex = {
action: ActionSchema,
adjustment: AdjustmentSchema,
attack: AttackSchema,
attribute: ComputedAttributeSchema,
buff: AppliedBuffSchema,
classLevel: ClassLevelSchema,
damage: DamageSchema,
damageMultiplier: DamageMultiplierSchema,
effect: ComputedEffectSchema,
experience: ExperienceSchema,
@@ -33,12 +39,14 @@ const propertySchemasIndex = {
folder: FolderSchema,
note: NoteSchema,
proficiency: ProficiencySchema,
result: ResultSchema,
roll: RollSchema,
savingThrow: SavingThrowSchema,
skill: ComputedSkillSchema,
slot: SlotSchema,
spellList: SpellListSchema,
spell: SpellSchema,
toggle: ToggleSchema,
container: ContainerSchema,
item: ItemSchema,
any: new SimpleSchema({}),

8
app/imports/api/properties/propertySchemasIndex.js
View File

@@ -1,9 +1,11 @@
import SimpleSchema from 'simpl-schema';
import { ActionSchema } from '/imports/api/properties/Actions.js';
import { AdjustmentSchema } from '/imports/api/properties/Adjustments.js';
import { AttackSchema } from '/imports/api/properties/Attacks.js';
import { AttributeSchema } from '/imports/api/properties/Attributes.js';
import { StoredBuffSchema } from '/imports/api/properties/Buffs.js';
import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
import { DamageSchema } from '/imports/api/properties/Damages.js';
import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
import { EffectSchema } from '/imports/api/properties/Effects.js';
import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
@@ -11,21 +13,25 @@ import { FeatureSchema } from '/imports/api/properties/Features.js';
import { FolderSchema } from '/imports/api/properties/Folders.js';
import { NoteSchema } from '/imports/api/properties/Notes.js';
import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
import { ResultSchema } from '/imports/api/properties/Results.js';
import { RollSchema } from '/imports/api/properties/Rolls.js';
import { SavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
import { SkillSchema } from '/imports/api/properties/Skills.js';
import { SlotSchema } from '/imports/api/properties/Slots.js';
import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
import { SpellSchema } from '/imports/api/properties/Spells.js';
import { ToggleSchema } from '/imports/api/properties/Toggles.js';
import { ContainerSchema } from '/imports/api/properties/Containers.js';
import { ItemSchema } from '/imports/api/properties/Items.js';
const propertySchemasIndex = {
action: ActionSchema,
adjustment: AdjustmentSchema,
attack: AttackSchema,
attribute: AttributeSchema,
buff: StoredBuffSchema,
classLevel: ClassLevelSchema,
damage: DamageSchema,
damageMultiplier: DamageMultiplierSchema,
effect: EffectSchema,
experience: ExperienceSchema,
@@ -33,12 +39,14 @@ const propertySchemasIndex = {
folder: FolderSchema,
note: NoteSchema,
proficiency: ProficiencySchema,
result: ResultSchema,
roll: RollSchema,
savingThrow: SavingThrowSchema,
skill: SkillSchema,
slot: SlotSchema,
spellList: SpellListSchema,
spell: SpellSchema,
toggle: ToggleSchema,
container: ContainerSchema,
item: ItemSchema,
any: new SimpleSchema({}),

36
app/imports/api/properties/subSchemas/ResultsSchema.js
View File

@@ -1,36 +0,0 @@
import SimpleSchema from 'simpl-schema';
import AdjustmentSchema from '/imports/api/properties/subSchemas/AdjustmentSchema.js';
import DamageSchema from '/imports/api/properties/subSchemas/DamageSchema.js';
import { StoredBuffWithIdSchema } from '/imports/api/properties/Buffs.js';
let ResultsSchema = new SimpleSchema({
// Adjustments applied when taking this action
// Ideally, if these adjustments can't be made, the action should be unusable
adjustments: {
type: Array,
defaultValue: [],
},
'adjustments.$': {
type: AdjustmentSchema,
},
// Damage is done to hitpoints or hitpoint-like stats
// has a damage type, can be mitigated by resistances, etc.
damages: {
type: Array,
defaultValue: [],
},
'damages.$': {
type: DamageSchema,
},
// Buffs applied when taking this action
buffs: {
type: Array,
defaultValue: [],
},
'buffs.$': {
type: StoredBuffWithIdSchema,
},
});
export default ResultsSchema;