Commit graph

559 commits

Author SHA1 Message Date
e9adbd3c3b Merge remote-tracking branch 'origin/master' into 037-actor-type-creature 2021-01-18 19:12:46 +01:00
7e4c5059ca address code review comments 2021-01-18 19:11:13 +01:00
fc144aa3f6 Apply 1 suggestion(s) to 1 file(s) 2021-01-18 19:03:08 +01:00
4c902500c9 unit values only displayed if given 2021-01-16 23:47:05 +01:00
1bc8fcab65 using label for currency types 2021-01-16 17:59:56 +01:00
25755385c0 Add accessibility. 2021-01-16 15:16:40 +01:00
03287b3b98 modify ui 2021-01-16 14:59:54 +01:00
319c40c4a7 Make side properties a bit better readable. 2021-01-16 00:11:00 +01:00
5c74da883b Make basic properties more responsive (grid draft) 2021-01-15 23:49:41 +01:00
b06396c141 Review comments:
- Error prefix on localization key
 - Different name for Roll dialog title
 - Remove obsolete todos
 - Add some defaults to make args optional
 - Change return types of promises and term generators
2021-01-15 20:46:26 +01:00
358aab023f add explicit return in _onDrop 2021-01-15 17:43:27 +01:00
6028f70da7 remove unused type 2021-01-15 17:42:10 +01:00
ebc9b95758 Fix tests. 2021-01-13 20:12:37 +01:00
04bfe61f3f Update localization, add docs. 2021-01-13 18:56:19 +01:00
7ada67b7c3 Merge master 2021-01-13 18:32:47 +01:00
d6ddad67cc Implement localization (en only). 2021-01-13 18:02:22 +01:00
fec4280bec fix typo 2021-01-13 17:43:20 +01:00
9ea353101f rename talents tab to talents-abilities 2021-01-13 17:23:06 +01:00
e36f30a787 Add special abilities to creature sheet 2021-01-13 17:20:25 +01:00
2d809c955b Make cancellable withour exception 2021-01-13 17:11:07 +01:00
864a65fed2 Merge remote-tracking branch 'origin/master' into 037-actor-type-creature 2021-01-11 00:56:26 +01:00
c422635d66 add special creature ability as item type 2021-01-11 00:55:49 +01:00
4196257fd5 add author siggi 2021-01-10 21:51:47 +01:00
61098b31d6 spell add default category 2021-01-10 21:18:33 +01:00
9bea9c63cd add spell category none 2021-01-10 21:04:18 +01:00
516c04c8de First proper parsing without much "nice-ity". 2021-01-10 21:03:11 +01:00
c10ab44ea9 modifications 2021-01-10 20:40:26 +01:00
46ec9b0ac8 currency add 2021-01-10 19:33:55 +01:00
45e7400e82 add currency and basic display 2021-01-10 19:32:10 +01:00
a19a996d1d Display (only!) selection options to the user. 2021-01-10 16:40:11 +01:00
fc6cf2ef74 Merge branch 'master' into 037-actor-type-creature 2021-01-10 02:37:43 +01:00
0568afc32b Add localization of actor and item type labels 2021-01-10 02:35:48 +01:00
17d0213e62 add basic creature sheet 2021-01-10 02:05:30 +01:00
Max Tharr
6db1d48033 Add initiative formula 2021-01-10 01:51:11 +01:00
d416c14cbd Merge branch 'master' into 037-actor-type-creature 2021-01-10 00:41:20 +01:00
0eb447d279 added German localization for spells
- added missing German localizations
- fixed some localizations
- renamed targetedSpell -> targetedSpellcasting for consistency
2021-01-10 00:30:51 +01:00
18a4e2005a added German translation for spell stuff 2021-01-10 00:05:29 +01:00
c1f77e1a66 Merge branch 'master' into 015-spells 2021-01-09 23:44:48 +01:00
884327b156 added spell tab and sorted tabs 2021-01-09 23:39:35 +01:00
c94ff4a67a Rudimentary docs. 2021-01-09 23:21:57 +01:00
27c0ddbca1 Make factory usable from Macros.
This does not yet include any modal interface.
2021-01-09 23:14:50 +01:00
bc6930675c localize creature parts of config 2021-01-09 22:55:38 +01:00
b01e0417ee add doc strings to new config objects 2021-01-09 22:54:44 +01:00
6820ce7c00 Add creature actor to config, i18n, template.json, types 2021-01-09 22:51:46 +01:00
ed095dcc84 fix actor sheet 2021-01-09 22:30:26 +01:00
349a767de6 Merge remote-tracking branch 'origin/master' into 41-german-translation 2021-01-09 21:54:00 +01:00
54e334cff5 apply review suggestions 2021-01-09 21:41:41 +01:00
57906a42a8 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:22 +01:00
c225cae087 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:10 +01:00
2af3e6106b Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:34:02 +01:00
e2b7b390a8 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:33:48 +01:00
92d7d2b8bf Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:33:38 +01:00
510e46d96a Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:32:20 +01:00
df7c7efa50 Apply 1 suggestion(s) to 1 file(s) 2021-01-09 21:32:01 +01:00
2f6b89a0e1 use shorter storage location 2021-01-09 20:43:05 +01:00
188eb6c1d2 add german translation 2021-01-09 20:36:34 +01:00
8856c30165 move technical stuff to before_script 2021-01-09 19:01:22 +01:00
7d04ad2309 added spell sheet; reverted side-prop style change 2021-01-09 18:26:17 +01:00
4de9d42ee3 added spell cooldownDuration and more localization 2021-01-09 18:25:30 +01:00
a303296828 description and body templ accept partial-block 2021-01-09 18:23:25 +01:00
4b203375dd wip: create german translation 2021-01-09 16:14:25 +01:00
090aeab75f added type definitions and translations for spells 2021-01-09 14:26:48 +01:00
dc2d099565 implemented dynamic headers of item lists 2021-01-09 01:11:55 +01:00
9d58388c5f Merge branch 'master' into 022-languages 2021-01-09 00:05:36 +01:00
737a644ecd added alphabet item
- added to database and localization definitions
- added sheet
- added to talents & abilities tab
- removed languages & alphabets from actor properties
2021-01-08 23:54:41 +01:00
42868e4a83 Fix review comments. 2021-01-08 23:46:28 +01:00
25119fd9e3 Add very simple docs. 2021-01-08 23:41:23 +01:00
1011b85067 moved redundant item sheet header into partial 2021-01-08 23:32:35 +01:00
a5e240ab75 Localize Error Messages. 2021-01-08 23:31:42 +01:00
f8e1f32439 added language item
- added to database and localization definitions
- added sheet
- added to talents overview
2021-01-08 23:23:53 +01:00
22f53e5420 Allow multiple dice and error check. 2021-01-08 23:18:01 +01:00
9addb66a50 removed redundant field racialAbilities from actor 2021-01-08 22:34:34 +01:00
3dca6a5ae4 Implement CTN as modifier. 2021-01-08 21:07:15 +01:00
c89278992f Merge remote-tracking branch 'origin/master' into 008-chatRollInterface 2021-01-08 18:32:36 +01:00
2a03ed273f Merge remote-tracking branch 'origin/master' into 024-not-possible-to-manage-active-effects-on-owned-items 2021-01-08 00:00:11 +01:00
16ea39f81d remove redundant effect classes 2021-01-07 23:59:50 +01:00
52cc441cbc Merge branch 'master' into 021-add-racial-abilities 2021-01-07 22:04:54 +01:00
149096e985 add racial abilites as item type 2021-01-07 20:20:40 +01:00
b361d2da04 make hit points usable in resource bar 2021-01-07 12:47:38 +01:00
7685efa8a6 localize warning 2021-01-07 12:04:25 +01:00
714efeb4ab prevent error when trying to manage active effects on an owned item 2021-01-07 11:55:54 +01:00
18a475dd8f fix height of editor in item sheets 2021-01-07 04:12:20 +01:00
14ffff1985 Fix tests. 2021-01-07 02:33:22 +01:00
1422f28760 Get basic features to work. 2021-01-07 02:26:09 +01:00
b582b44f20 Merge branch 'master' into 014_track_talents 2021-01-07 00:00:36 +01:00
1f6d8b7980 cleanup 2021-01-06 23:51:08 +01:00
c885d2d405 Implement a custom DS4 "dice" class.
Includes exploding and crit dice modifier, but not tested yet,
as some required types are still missing.
2021-01-06 19:15:56 +01:00
9feaa5216d Make roll executor fir for modifier-approach. 2021-01-06 18:27:22 +01:00
5bd43125f9 Merge branch 'master' into 014_track_talents 2021-01-06 16:34:48 +01:00
177de1a486 extracted item control buttons to own templates
- removed code duplication of inline button templates
  for item and talent overview
2021-01-06 16:29:02 +01:00
e6b51c66a6 removed code duplication of item body from talent
- added  isPhysical boolean to getData output of item-sheet.ts
- added isPhysical checks for displays of physical-only information
  in templates
2021-01-06 16:10:56 +01:00
5bdfdd410b replace basic-property-* css classes by selectors 2021-01-06 15:30:20 +01:00
874692ed5c moved basic talent properties in talent-sheet head
- a little bit better gridding of side-properties
  (still needs a rewrite)
- common SCSS mixin for input field marking
2021-01-06 15:25:55 +01:00
daeb9fc703 Merge branch 'master' into 003-add-character-profile 2021-01-06 14:33:46 +01:00
3ba5efb8a7 fixed wrong positioning of effects tab content 2021-01-06 14:19:18 +01:00
fb711bc024 unified keys for localizations for headings
- keys now start with 'DS4.Heading'
- removed unused DS4.DescriptionAbbr
2021-01-06 12:02:40 +01:00
98f31d9e8c renamed talent property from talentRank to rank 2021-01-06 11:52:11 +01:00
17b5eee902 Apply 1 suggestion(s) to 1 file(s) 2021-01-06 11:36:06 +01:00
c98c64de1e Apply 1 suggestion(s) to 1 file(s) 2021-01-06 11:35:56 +01:00
637b70c5d2 added invalidity hints to item side-properties
- added :invalid definition to side-properties CSS
-  defined common color for invalidity
- now using disabled input for automatically calculated properties
2021-01-06 11:39:39 +01:00
6d02f1623a reference a version tag in the download url 2021-01-06 01:30:21 +01:00
150a0ea487 added talents overview and sheet
- added talents item type:
  - added scss
  - added to template.json (Item.types, Item.talent)
   - added to config.ts itemTypes
   - added type definition
- added localizations
- added talent overview tab to actor sheet
- made total rank calculated upon data preparation
  by adding a prepareData method to DS4Item
2021-01-06 01:24:37 +01:00
2e3718a409 Merge branch 'master' into 003-add-character-profile 2021-01-06 01:17:37 +01:00
74be1d4e13 put release artifacts in ds4 directory 2021-01-06 00:59:22 +01:00
9de78b4940 small style fixes 2021-01-06 00:02:30 +01:00
f2f40a8e89 make some input fiels accept only number 2021-01-04 22:12:19 +01:00
6ba1032a12 Merge remote-tracking branch 'origin/master' into 003-add-character-profile 2021-01-04 21:52:26 +01:00
f8deca4cd4 add culture and save space with base infos and progression infos 2021-01-04 21:51:58 +01:00
1af51b3917 Merge remote-tracking branch 'origin/master' into 013-rollLibRefinements 2021-01-04 21:21:54 +01:00
e2a42aee4b Add docs, type clarifications. 2021-01-04 21:21:06 +01:00
520aab8b72 cleanup profile 2021-01-04 20:33:37 +01:00
2cb0411288 Add basic form of editable profile fields to profile tab 2021-01-04 20:33:37 +01:00
98ce35f831 Add dummy profile tab to character sheet 2021-01-04 20:33:35 +01:00
c91b8956f6 add data for profile info 2021-01-04 20:32:56 +01:00
9fba2d1385 Merge remote-tracking branch 'origin/master' into simplify-core-values 2021-01-04 20:29:09 +01:00
0db345c7de extract 26px line height for inputs to variable 2021-01-04 20:28:33 +01:00
fc88ce6c52 Rename Test to check, etc., restructure calculation code. 2021-01-04 19:38:26 +01:00
7cb6080808 extract and simplify combat values to own component 2021-01-04 01:11:05 +01:00
6a12ba3938 extract and simplify attributes and traits 2021-01-04 00:55:44 +01:00
61beda7734 added number conversion in HTML value retrieval
Changes:
- number input fields now return numbers
- range elements removed since they are untested

Additions:
- added min and step specifiers to input fields associated to
  item number properties
- added a color hint for invalidity of
  item number input fields in actor sheet
2021-01-03 23:27:51 +01:00
ec404624c7 fixed type of HTML property name in _onItemChange 2021-01-03 22:40:01 +01:00
944907deb7 moved input el value retrieval to helper func 2021-01-03 22:26:36 +01:00
e2e9bca5fd fixed _onItem... handle param types in docstrings 2021-01-03 21:54:42 +01:00
d9eef7592f fixed some issues with the flexbox approach
- had to remove border, padding, and margin from input boxes
- centered images
- fixed y-overflow of description and images by restricting height
2021-01-03 21:50:16 +01:00
4e60687b2b unified class specifier in HTML elements
- now all class=... is always first
- flex attributes are first in class specifier
- marked armor type image as item-image class
2021-01-03 21:24:32 +01:00
fb780ae4c2 Merge branch 'master' into equip-items-in-character-sheet
now using cleaned up template
2021-01-03 21:14:11 +01:00
0721555c91 Merge branch 'adjust-licensing' into 'master'
adjust licensing

See merge request dungeonslayers/ds4!13
2021-01-03 16:54:36 +01:00
cc9a133ebe extract path to official assets in scss variable 2021-01-03 16:52:51 +01:00
c26e4bab9f Changes as per review.
Missing:
 - Open discussion on "test value" renames
 - docs
 - open discussion on last-die-handling
2021-01-03 15:08:38 +01:00
c9b41e2d3f renamed item list templates
More precise names for:
- item overview list template for actor sheet
- inline templates in item overview list template
2021-01-03 00:08:21 +01:00
aaa10d7469 Add slaying dice behaviour. 2021-01-02 16:40:30 +01:00
55beeb92c9 Implement swapping edge case, restructure sources. 2021-01-02 16:12:16 +01:00
00f7e30b41 Fix option parsing for rolls. 2021-01-02 13:54:59 +01:00
75301b2c56 Bound to fail: Add slaying dice options and tests, no impl. 2021-01-02 13:16:08 +01:00
6fe95d10db refactored items list to use handlebars partials
Additions:
 - added flexnowrap CSS class -> no strange wrapping of item lines

Changes:
- reduced most of the non-maintainable HTML-code repitition
- made item list entries as flat as possible
2021-01-02 01:01:41 +01:00
f52a491f73 swapped owner and equipped in item desc 2021-01-01 21:24:13 +01:00
0e282b4c6e some minor improvements to side-properties style
- checkboxes now properly left-aligned
- adaptive width of side-properties: take minimum width now
- side properties are aligned now in any case (each is a grid)
2021-01-01 21:21:22 +01:00
d8423ce364 data binding for owned item properties
Additions:
- now also text, number, and range input fields of owned items can
  be bound to HTML (input) elements of the char sheet

Changes:
- moved prototype handle for checkboxes to own function
- replaced some static HTML elements in item list with input fields
- item-num-val HTML elements (e.g. item quantity) now have a max-width
2021-01-01 19:26:52 +01:00
5d83e26e81 Merge branch 'master' into equip-items-in-character-sheet 2020-12-31 16:52:20 +01:00
80e6fd26ae Apply 1 suggestion(s) to 1 file(s) 2020-12-31 16:35:41 +01:00
c2c0b63b9c Merge branch 'master' into 012_equipped_flag 2020-12-31 15:07:11 +01:00
fec7a2a735 fix typo 2020-12-31 12:22:15 +01:00
62e96641b9 remove unnecessary imports 2020-12-31 12:21:24 +01:00
61213d399e use getOwnedItem instead of getEmbeddedEntity 2020-12-31 12:20:32 +01:00
6fac2c597f make equip icon for items clickable in item list in character sheet 2020-12-31 12:10:59 +01:00
960b5a950a adjust licensing 2020-12-31 05:02:38 +01:00
6b18e720a1 Additional tests and features as per Request. 2020-12-31 02:27:21 +01:00
bf39f35504 Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-31 01:36:00 +01:00
9cd430a229 improve scss of character values 2020-12-31 01:33:59 +01:00
445febf478 localized "not owned" hint 2020-12-31 01:18:50 +01:00
29d34daa9a added equipped and owner to item sheet
Additions:
- added equipped checkbox to item sheet
- added item owner to item properties list
- added some translations
- added some TODOs

Changes:
- item properties owner, equipped, quantity, storageLocation
  are only shown if item is owned by an actor
- moved item properties price and availability
  to details tab
- shortened ItemEquipped translation
- added item.actor and item.isOwned property values
  to data returned from DS4ItemSheet.getData
  (properties aren't accessible in Handlebars)
2020-12-31 01:17:52 +01:00
b569e5488e Add test for multiple rolls with min/max modifiers 2020-12-31 00:52:59 +01:00
c315742412 Add tests for standard mutli dice rolls. 2020-12-31 00:47:31 +01:00
0d2af1ae00 Add combat values to character sheet 2020-12-31 00:32:17 +01:00
dcf60ef59e Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-30 23:57:00 +01:00
b3c89b4d32 Add missing cases for test <20. 2020-12-30 23:03:08 +01:00
2e7197a0a2 add auto formatting for .scss and .json files 2020-12-30 23:00:06 +01:00
71a82e94a7 Merge remote-tracking branch 'origin/master' into 007-rollsLib 2020-12-30 22:20:51 +01:00
8d274ed830 Ruhu, Cleanups! 2020-12-30 21:50:12 +01:00
b56d58dd52 Apply 1 suggestion(s) to 1 file(s) 2020-12-30 21:34:12 +01:00
8acd081384 Apply 1 suggestion(s) to 1 file(s) 2020-12-30 21:34:09 +01:00
e0b65ca061 Make tests and implementation interact. 2020-12-30 21:28:22 +01:00
fd5bad3c3e add attributes and traits to character sheet 2020-12-30 19:39:16 +01:00
7800f0af8f Add recommendet plugins, fix lint stuff. 2020-12-30 17:50:01 +01:00
5d5c7efce0 add original icons with transparency 2020-12-30 15:28:22 +01:00
0002493379 fix typo 2020-12-30 15:03:24 +01:00
e7219ab81e add base info to character sheet 2020-12-30 15:02:21 +01:00
59fb033db8 adjust character data to consist of basic character data 2020-12-30 15:01:17 +01:00
d45917c414 remove unnecessary comment 2020-12-30 14:46:08 +01:00
94430ab899 removed border from item icons 2020-12-30 01:06:21 +01:00
9da168afa6 abbr for armor type&material in item overview
Additions:
- further abbreviations included in localization

Changes:
- now not full armor type / material expression displayed in char sheet,
  but only an abbreviation with tooltip
- description now smaller for weapon and armor
2020-12-30 01:03:06 +01:00
0b93f5ff9e replaced attack type str with icons in char sheet 2020-12-30 00:01:41 +01:00
1ed54dccff replaced " by ' in HBS localize arguments 2020-12-29 23:58:45 +01:00
f2724a13a1 Merge branch 'master' into 004_equipment_tracking 2020-12-29 23:09:16 +01:00
767e46b490 removed whitespace 2020-12-29 23:03:11 +01:00
911b044edb changed Action to UserInteraction in localization 2020-12-29 23:01:25 +01:00
e1248f937b added tooltips for abbr in item list heads 2020-12-29 22:36:27 +01:00
3b92242eb7 added equipment list to char sheet 2020-12-29 22:02:43 +01:00
4f5e6a5ebc centering of num item values in char sheet
Changes:
- number values of items in the items overview of a char sheet
  are now horizontally centered
- description content is now vertically correctly aligned
2020-12-29 22:01:58 +01:00
3184de0e7a added trinket list to char sheet 2020-12-29 21:28:36 +01:00
b71f229e16 proper formatting for items list titles 2020-12-29 21:27:21 +01:00
d39194c4fa added shield list in char sheet 2020-12-29 20:37:30 +01:00
4e37991b0f made char sheet body scrollable 2020-12-29 20:36:54 +01:00
99d2f92b41 added armor list to items tab in char sheet
Additions:
- added armor list to items tab in char sheet
- added localization
- added CSS class for flex 0.5
2020-12-29 19:07:20 +01:00
48d8d6e44d proper localization of item vals in char sheet
Additions:
- added TODOs
- added armor item list to char sheet
- proper overflow handling in tabs (now: scrollable)

Changes:
- proper localization of item values
- "Description" not abbreviated anymore
- cleaned up getData() of ActorSheet (data now truly const)
2020-12-29 19:06:17 +01:00
2ae005f432 added localization to weapon overview 2020-12-29 16:29:44 +01:00
3ebd8cd177 Merge branch 'master' into 004_equipment_tracking 2020-12-29 16:14:51 +01:00
2ac6d3a919 working weapons section in char sheet
Additions:
- re-added getData() method of actor sheet for sorted items
- added an item-description CSS class for handling of overflow
- added a 1.5 CSS flex box

Changes:
- restricted previous sample items section to only weapons
  (to be re-used for other item types)

Fixes:
- fixed input types in weapon sheet
2020-12-29 01:44:54 +01:00
082cd03b71 improve effects type checking 2020-12-29 00:33:43 +01:00
10869a9648 fixed typo 2020-12-28 21:50:45 +01:00
e0d8e42812 changed availability options to include "unset"
Additions:
- item availability "unset" (with localization)

Changes:
- item availability "none" -> "nowhere"

Fixes:
- fixed wrong default item availability in template.json
2020-12-28 21:44:47 +01:00
2fc7fb13c8 renamed actor-sheet from .html to correct .hbs 2020-12-28 20:41:39 +01:00
47c45ee87d moved items tab of char sheet into partial 2020-12-28 20:38:02 +01:00
123c56a572 added storageLocation to item type definition 2020-12-28 20:01:58 +01:00
110a523268 Merge branch 'master' into 005_item_editing 2020-12-28 19:55:47 +01:00
5a002b4cb4 Re-add todo. 2020-12-28 19:30:38 +01:00
e7df21426b removed code duplication in item templates
Item templates now all use a common body.
2020-12-28 18:58:01 +01:00
9cf248754c added "Effects" and "Details" tab to all items
Additions:
- partials for effects and details tab with navigation
- loading of partials in main ds4.ts
- add localization

Changes:
- empty "Details" tabs replaced by inclusion of partial
- "Details" tab now displays default message
- Previous "Details" tab of Trinket replaced by "Effects" tab
2020-12-28 18:49:55 +01:00
1ef66a2023 Create types for items. 2020-12-28 18:24:13 +01:00
7986e91ab7 added storageLocation property to items
Additions:
- added storageLocation property to classes
- added storageLocation field to template
- added localization

Changes:
- changed default values for item string properties to "-"

Fixes:
- fixed CSS side-property flex properties
  such that new text field is properly shown
- fixed for="..." setting for item's data.price label
2020-12-28 17:54:33 +01:00
a84df2d80b Fix class name on jquery. 2020-12-28 17:44:30 +01:00
4d00d8a481 Fix typo in event handler. 2020-12-28 17:38:52 +01:00
9385917edd Update to new data bindings, everythings an interface now. 2020-12-28 17:34:40 +01:00
d9440b27a6 Type-ify Actor. 2020-12-28 15:51:00 +01:00
7a4cb7110b Make DS Ascii Art raw. 2020-12-28 12:46:39 +01:00
2ba687eb14 add eslint and prettier 2020-12-23 18:23:26 +01:00
4f6a9b7e73 format files 2020-12-23 17:14:02 +01:00
bd4c5308bf remove .js extension from imports 2020-12-23 17:05:12 +01:00
d163fd27fe switch to using TypeScript 2020-12-23 16:52:20 +01:00