slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove quick actions/weapons clean up inventory

Browse Source
This commit is contained in:
Mark
2016-01-17 14:48:14 +01:00
parent ec70a10a36
commit 6106b84ae4
13 changed files with 27 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
D&D_5e_Shaped/D&D_5e.css
+1 -1
View File
File diff suppressed because one or more lines are too long
D&D_5e_Shaped/D&D_5e.html
+1 -1
View File
File diff suppressed because one or more lines are too long
D&D_5e_Shaped/precompiled/D&D_5e.scss
+2 -8
View File
@@ -487,7 +487,6 @@ $padMar: (
background-color: transparent;
}
.sheet-quick-attacks,
.sheet-quick-class-resources,
.sheet-quick-class-actions {
input,
@@ -503,8 +502,7 @@ $padMar: (
}
}
.sheet-section-core,
.sheet-quick-attacks {
.sheet-section-core {
button {
padding: 1px 3px;
&.repcontrol_add,
@@ -1164,7 +1162,7 @@ div[class*="sheet-toggle-"] {
}
@include tab-toggle('page-core', 32px, 'padding');
@include tab-toggle('page-attacks', 57px, 'padding');
@include tab-toggle('page-attacks', 49px, 'padding');
@include tab-toggle('page-actions', 96px, 'padding');
@include tab-toggle('page-spells', 39px, 'padding');
@include tab-toggle('page-class', 37px, 'padding');
@@ -1182,7 +1180,6 @@ div[class*="sheet-toggle-"] {
@include tab-toggle('reactions', 57px, 'padding');
@include tab-toggle('multiattack', 60px, 'padding');
@include tab-toggle('actions', 42px, 'padding');
@include tab-toggle('quick-attacks', 33 + 8px, 'padding');
$toggle-inventory-width: 24.3%;
@include tab-toggle('inventory-1', $toggle-inventory-width, 'noPadding');
@@ -1587,7 +1584,6 @@ input.sheet-toggle-legendary-actions:not(:checked) ~ div.sheet-toggle-legendary-
input.sheet-toggle-reactions:not(:checked) ~ div.sheet-toggle-reactions,
input.sheet-toggle-multiattack:not(:checked) ~ div.sheet-toggle-multiattack,
input.sheet-toggle-actions:not(:checked) ~ div.sheet-toggle-actions,
input.sheet-toggle-quick-attacks:not(:checked) ~ div.sheet-toggle-quick-attacks,
input.sheet-toggle-emote:not(:checked) ~ div.sheet-toggle-emote,
input.sheet-toggle-attack:not(:checked) ~ div div.sheet-toggle-attack,
input.sheet-toggle-reach:not(:checked) ~ div div.sheet-toggle-reach,
@@ -1743,7 +1739,6 @@ div[class^="sheet-toggle-class-action-"] {
input,
span {
&.sheet-toggle-quick-attacks,
&[class^="sheet-toggle-inventory-"],
&[class^="sheet-toggle-class-action-"],
&[class^="sheet-toggle-spells-page-"],
@@ -1761,7 +1756,6 @@ span {
}
span {
&.sheet-toggle-quick-attacks,
&[class^="sheet-toggle-inventory-"],
&[class^="sheet-toggle-class-action-"],
&[class^="sheet-toggle-spells-page-"],
D&D_5e_Shaped/precompiled/components/quick_weapons/actions.html
-34
View File
@@ -1,34 +0,0 @@
<div class="shaped-row sub-header">
<div class="col-41 center small-label sub-header">
<span class="en">Actions</span>
<span class="de">Aktionen</span>
<span class="fr">Actions</span>
<span class="ru">Действия</span>
</div>
<div class="col-07 center small-label sub-header">
<span class="en">Hit</span>
<span class="de">Tref.</span>
<span class="fr">Atq</span>
<span class="ru">Атака</span>
</div>
<div class="col-20 center small-label sub-header">
<span class="en">Dmg</span>
<span class="de">Scha.</span>
<span class="fr">Dmg</span>
<span class="ru">Урон</span>
</div>
<div class="col-10 center small-label sub-header">
<span class="en">Reach</span>
<span class="de">Reichw.</span>
<span class="fr">Allon.</span>
<span class="ru">Длина</span>
</div>
<div class="col-19 center small-label sub-header">
<span class="en">Range</span>
<span class="de">Reichw.</span>
<span class="fr">Portée</span>
<span class="ru">Дальность</span>
</div>
</div>
<!-- inject:quickActions:html -->
<!-- endinject -->
D&D_5e_Shaped/precompiled/components/quick_weapons/actions_template.html
-21
View File
@@ -1,21 +0,0 @@
<div class="shaped-row">
<div class="col-41 vert-middle pad-r-sm">
<input class="pseudo-disabled" type="text" name="attr_repeating_actions_{{num}}_name">
</div>
<div class="col-07 vert-middle pad-r-sm">
<input class="center pseudo-disabled no-spin" type="number" name="attr_repeating_actions_{{num}}_tohit" value="0">
</div>
<div class="col-20 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_actions_{{num}}_dmg" value="0">
</div>
<div class="col-10 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_actions_{{num}}_reach">
</div>
<div class="col-15 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_actions_{{num}}_range">
</div>
<div class="col-07 vert-middle">
<button type="roll" name="roll_repeating_actions_{{num}}_action"
value="@{output_option} &{template:5eDefault} {{action=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_actions_{{num}}_name}}} {{action_type=@{repeating_actions_{{num}}_type}}} @{repeating_actions_{{num}}_toggle_emote} @{repeating_actions_{{num}}_toggle_attack} @{repeating_actions_{{num}}_toggle_crit} @{repeating_actions_{{num}}_toggle_details} @{repeating_actions_{{num}}_toggle_reach} @{repeating_actions_{{num}}_toggle_range} @{repeating_actions_{{num}}_toggle_target} @{repeating_actions_{{num}}_toggle_damage} @{repeating_actions_{{num}}_toggle_alt_damage} @{repeating_actions_{{num}}_toggle_second_damage} @{repeating_actions_{{num}}_toggle_save} @{repeating_actions_{{num}}_toggle_save_damage} @{repeating_actions_{{num}}_toggle_effects} @{repeating_actions_{{num}}_toggle_recharge} @{hide_gm_info}"></button>
</div>
</div>
D&D_5e_Shaped/precompiled/components/quick_weapons/melee.html
-31
View File
@@ -1,31 +0,0 @@
<div class="shaped-row sub-header">
<div class="col-39 center small-label sub-header">
<span class="en">Melee</span>
<span class="de">Nahkampf</span>
<span class="fr">Mêlée</span>
<span class="ru">Рукопашн</span>
</div>
<div class="col-07 center small-label sub-header">
<span class="en">Hit</span>
<span class="de">Tref.</span>
<span class="fr">Atq</span>
<span class="ru">Атака</span>
</div>
<div class="col-12 center small-label sub-header">
<span class="en">Dmg</span>
<span class="de">Scha.</span>
<span class="fr">Dmg</span>
<span class="ru">Урон</span>
</div>
<div class="col-07 center small-label sub-header">
<span>+</span>
</div>
<div class="col-10 center small-label sub-header">
<span class="en">Reach</span>
<span class="de">Reichw.</span>
<span class="fr">Allonge</span>
<span class="ru">Длина</span>
</div>
</div>
<!-- inject:quickMelee:html -->
<!-- endinject -->
D&D_5e_Shaped/precompiled/components/quick_weapons/melee_template.html
-23
View File
@@ -1,23 +0,0 @@
<div class="shaped-row">
<div class="col-39 vert-middle pad-r-sm">
<input class="pseudo-disabled" type="text" name="attr_repeating_attacks_melee_{{num}}_name">
</div>
<div class="col-07 vert-middle pad-r-sm">
<input class="center pseudo-disabled no-spin" type="number" name="attr_repeating_attacks_melee_{{num}}_to_hit" value="@{repeating_attacks_melee_{{num}}_proficient} + @{repeating_attacks_melee_{{num}}_attack_stat} + (@{repeating_attacks_melee_{{num}}_attack_bonus} * @{repeating_attacks_melee_{{num}}_toggle_bonuses})" disabled>
</div>
<div class="col-12 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_attacks_melee_{{num}}_dmg" value="0">
</div>
<div class="col-07 vert-middle pad-r-sm">
<input class="center" type="number" name="attr_repeating_attacks_melee_{{num}}_dmg_total" value="@{repeating_attacks_melee_{{num}}_dmg_stat} + (@{repeating_attacks_melee_{{num}}_dmg_bonus} * @{repeating_attacks_melee_{{num}}_toggle_bonuses})" disabled>
</div>
<div class="col-10 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_attacks_melee_{{num}}_reach">
</div>
<div class="col-05"></div>
<div class="col-13"></div>
<div class="col-07 vert-middle">
<button type="roll" name="roll_repeating_attacks_melee_{{num}}_weapon"
value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_attacks_melee_{{num}}_name}}} {{action=1}} {{action_type=Melee}} @{classactionmeleeweapon} @{repeating_attacks_melee_{{num}}_toggle_emote} @{repeating_attacks_melee_{{num}}_toggle_attack} @{repeating_attacks_melee_{{num}}_toggle_crit} @{repeating_attacks_melee_{{num}}_toggle_reach} @{repeating_attacks_melee_{{num}}_toggle_range} @{repeating_attacks_melee_{{num}}_toggle_ammo} @{repeating_attacks_melee_{{num}}_toggle_damage} @{repeating_attacks_melee_{{num}}_toggle_alt_damage} @{repeating_attacks_melee_{{num}}_toggle_second_damage}">
</div>
</div>
D&D_5e_Shaped/precompiled/components/quick_weapons/ranged.html
-37
View File
@@ -1,37 +0,0 @@
<div class="shaped-row sub-header">
<div class="col-39 center small-label sub-header">
<span class="en">Ranged</span>
<span class="de">Fernkampf</span>
<span class="fr">Tir</span>
<span class="ru">Дистанц</span>
</div>
<div class="col-07 center small-label sub-header">
<span class="en">Hit</span>
<span class="de">Tref.</span>
<span class="fr">Atq</span>
<span class="ru">Атака</span>
</div>
<div class="col-12 center small-label sub-header">
<span class="en">Dmg</span>
<span class="de">Scha.</span>
<span class="fr">Dmg</span>
<span class="ru">Урон</span>
</div>
<div class="col-07 center small-label sub-header">
<span>+</span>
</div>
<div class="col-15 center small-label sub-header">
<span class="en">Range</span>
<span class="de">Reichw.</span>
<span class="fr">Portée</span>
<span class="ru">Дальность</span>
</div>
<div class="col-15 center small-label sub-header">
<span class="en">Ammo</span>
<span class="de">Mun.</span>
<span class="fr">Mun</span>
<span class="ru">Боепр</span>
</div>
</div>
<!-- inject:quickRanged:html -->
<!-- endinject -->
D&D_5e_Shaped/precompiled/components/quick_weapons/ranged_template.html
-24
View File
@@ -1,24 +0,0 @@
<div class="shaped-row">
<div class="col-39 vert-middle pad-r-sm">
<input class="pseudo-disabled" type="text" name="attr_repeating_attacks_ranged_{{num}}_name">
</div>
<div class="col-07 vert-middle pad-r-sm">
<input class="center pseudo-disabled no-spin" type="number" name="attr_repeating_attacks_ranged_{{num}}_to_hit" value="@{repeating_attacks_ranged_{{num}}_proficient} + @{repeating_attacks_ranged_{{num}}_attack_stat} + (@{repeating_attacks_ranged_{{num}}_attack_bonus} * @{repeating_attacks_ranged_{{num}}_toggle_bonuses})" disabled>
</div>
<div class="col-12 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_attacks_ranged_{{num}}_dmg" value="0">
</div>
<div class="col-07 vert-middle pad-r-sm">
<input class="center" type="number" name="attr_repeating_attacks_ranged_{{num}}_dmg_total" value="@{repeating_attacks_ranged_{{num}}_dmg_stat} + (@{repeating_attacks_ranged_{{num}}_dmg_bonus} * @{repeating_attacks_ranged_{{num}}_toggle_bonuses})" disabled>
</div>
<div class="col-15 vert-middle pad-r-sm">
<input class="center pseudo-disabled" type="text" name="attr_repeating_attacks_ranged_{{num}}_range">
</div>
<div class="col-13 vert-middle">
<input class="center" type="number" name="attr_repeating_attacks_ranged_{{num}}_ammo" min="0" value="1">
</div>
<div class="col-07 vert-middle">
<button type="roll" name="roll_repeating_attacks_ranged_{{num}}_weapon"
value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_attacks_ranged_{{num}}_name}}} {{action=1}} {{action_type=Ranged}} @{classactionrangedweapon} @{repeating_attacks_ranged_{{num}}_toggle_emote} @{repeating_attacks_ranged_{{num}}_toggle_attack} @{repeating_attacks_ranged_{{num}}_toggle_crit} @{repeating_attacks_ranged_{{num}}_toggle_range} @{repeating_attacks_ranged_{{num}}_toggle_ammo} @{repeating_attacks_ranged_{{num}}_toggle_damage} @{repeating_attacks_ranged_{{num}}_toggle_alt_damage} @{repeating_attacks_ranged_{{num}}_toggle_second_damage}">
</div>
</div>
D&D_5e_Shaped/precompiled/gulpfile.js
-12
View File
@@ -340,24 +340,12 @@ gulp.task('preCompile', function () {
return actionsCompile(file, legendaryActionCount, 'legendary_', 'Legendary');
}
}))
.pipe(inject(gulp.src(['./components/quick_attacks/actions_template.html']), {
starttag: '<!-- inject:quickActions:{{ext}} -->',
transform: function (filePath, file) {
return duplicate(file, actionCount);
}
}))
.pipe(inject(gulp.src(['./components/actions/actions.html']), {
starttag: '<!-- inject:actions:{{ext}} -->',
transform: function (filePath, file) {
return actionsCompile(file, actionCount, '', 'Action');
}
}))
.pipe(inject(gulp.src(['./components/quick_attacks/melee_template.html']), {
starttag: '<!-- inject:quickMelee:{{ext}} -->',
transform: function (filePath, file) {
return duplicate(file, weaponCount);
}
}))
.pipe(inject(gulp.src(['./components/attacks/attacks.html']), {
starttag: '<!-- inject:attacks:{{ext}} -->',
transform: function (filePath, file) {
D&D_5e_Shaped/precompiled/pages/core.html
-20
View File
@@ -1063,26 +1063,6 @@
</div>
</div>
<div class="col-32 pad-l-sm">
<div class="quick-attacks wrap-box pc mar-b-smd" title="Quick Attacks">
//= include ../components/quick_attacks/melee.html
<div class="mar-t-t"></div>
//= include ../components/quick_attacks/ranged.html
<div class="wrap-box-title center">
<span class="en">Quick Attacks</span>
<span class="de">Schnell Angriffe</span>
<span class="fr">Raccourcis d'Attaque</span>
<span class="ru">Быстрая атака</span>
</div>
</div>
<div class="quick-attacks wrap-box npc mar-b-smd" title="Quick Actions">
//= include ../components/quick_attacks/actions.html
<div class="wrap-box-title center">
<span class="en">Quick Actions</span>
<span class="de">Schnell Aktionen</span>
<span class="fr">Raccourcis d'Action</span>
<span class="ru">Быстрое действие</span>
</div>
</div>
<div class="resistances-immunities wrap-box center mar-b-smd">
<div>
<textarea name="attr_damage_vulnerability"></textarea>
D&D_5e_Shaped/precompiled/pages/inventory.html
+20 -21
View File
@@ -1,6 +1,6 @@
<div class="section-inventory pc">
<div class="shaped-row">
<div class="col-70 center pad-r-md">
<div class="col-70 pad-r-md">
<div class="wrap-box">
<div class="shaped-row sub-header">
<div class="col-05 center small-label vert-bottom">{{'WORN' | translate}}</div>
@@ -68,32 +68,31 @@
</div>
</fieldset>
<div class="shaped-row pad-b-md">
<div class="col-08 center pad-r-md">
<div class="shaped-row center pad-t-md pad-b-md">
<div class="col-10 center pad-r-md">
<input type="number" name="attr_AC_armor_calc" value="(@{repeating_armor_0_worn} + @{repeating_armor_1_worn} + @{repeating_armor_2_worn} + @{repeating_armor_3_worn} + @{repeating_armor_4_worn} + (@{global_ac_bonus}))" disabled>
<div class="small-label">{{'AC_ARMORED' | translate}}</div>
</div>
<div class="col-08 center pad-r-md">
<div class="col-10 center pad-r-md">
<input type="number" name="attr_AC_no_armor_calc" value="(10 + @{dexterity_mod} + @{unarmored_class_bonus} + @{repeating_armor_0_unarmored} + @{repeating_armor_1_unarmored} + @{repeating_armor_2_unarmored} + @{repeating_armor_3_unarmored} + @{repeating_armor_4_unarmored} + (@{global_ac_bonus}))" disabled>
<div class="small-label">{{'AC_UNARMORED' | translate}}</div>
</div>
<div class="col-08 center vert-middle">
<select ng-model="inventory.data.ac.abilityBonus" class="skills-attribute-selector" ng-options="abilityName as ability.SHORT_NAME_CAPITAL | translate for (abilityName, ability) in inventory.data.abilities">
<div class="col-10 center vert-middle">
<select name="attr_AC_ability_bonus">
<option value="">&#8212;</option>
</select>
<div class="small-label">{{'ABILITY_BONUS' | translate}}</div>
</div>
<div class="col-08 center">
<div class="col-10 center">
<input class="center" type="text" name="attr_global_ac_bonus" value="0">
<div class="small-label">{{'AC_BONUS' | translate}}</div>
</div>
<div class="col-08 center bold">
<div class="col-10 center bold">
<input type="number" name="attr_pc_AC" value="((@{AC_armor_calc} + @{AC_no_armor_calc} + abs(@{AC_armor_calc} - @{AC_no_armor_calc})) / 2)" disabled>
<input class="form-control" type="number" class="" ng-model="inventory.data.ac.total" disabled>
<div class="small-label">{{'AC' | translate}}</div>
</div>
@@ -103,40 +102,40 @@
</div>
<div class="col-10 center pad-r-md">
<div class="wrap-box mar-b-sm" ng-repeat="(coinName, coinValue) in inventory.data.coinage">
<div class="shaped-row center-xs middle-xs">
<div class="col-30 small-label">{{'COINS_CP' | translate}}</div>
<div class="wrap-box mar-b-sm">
<div class="shaped-row center">
<div class="col-30 small-label vert-middle">{{'COINS_CP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_cp" value="0" min="0" step="1">
</div>
</div>
<div class="shaped-row center-xs middle-xs">
<div class="col-30 small-label">{{'COINS_SP' | translate}}</div>
<div class="shaped-row center">
<div class="col-30 small-label vert-middle">{{'COINS_SP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_sp" value="0" min="0" step="1">
</div>
</div>
<div class="shaped-row center-xs middle-xs">
<div class="col-30 small-label">{{'COINS_EP' | translate}}</div>
<div class="shaped-row center">
<div class="col-30 small-label vert-middle">{{'COINS_EP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_ep" value="0" min="0" step="1">
</div>
</div>
<div class="shaped-row center-xs middle-xs">
<div class="col-30 small-label">{{'COINS_GP' | translate}}</div>
<div class="shaped-row center">
<div class="col-30 small-label vert-middle">{{'COINS_GP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_gp" value="0" min="0" step="1">
</div>
</div>
<div class="shaped-row center-xs middle-xs">
<div class="col-30 small-label">{{'COINS_PP' | translate}}</div>
<div class="shaped-row center">
<div class="col-30 small-label vert-middle">{{'COINS_PP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_pp" value="0" min="0" step="1">
</div>
</div>
</div>
<div class="wrap-box">
<div class="shaped-row center-xs middle-xs">
<div class="shaped-row center vert-middle">
<div class="col-30 small-label bold">{{'COINS_GP' | translate}}</div>
<div class="col-70">
<input type="number" name="attr_money_total_gp" value="(@{cp} / @{copper_per_gold}) + (@{sp} / @{silver_per_gold}) + (@{ep} / @{electrum_per_gold}) + @{gp} + (@{pp} * @{platinum_per_gold})" class="bold" disabled>
D&D_5e_Shaped/precompiled/translations/en.json
+3
View File
@@ -136,6 +136,7 @@
"ARMOR_TYPE": "Armor Type",
"APPEARANCE": "Appearance",
"ATTACKS": "Attacks",
"BACKGROUND": "Background",
"BLINDSIGHT": "Blindsight",
"BONUS": "Bonus",
"BONUSES_AND_PENALTIES_TOOLTIP": "Auto add a bonus/penalty to rolls made using the sheet macros.<br>Usage: you acquire a magic item that gives +1 to your spell save DC, enter 1 in the spell save DC field. You are under the effects of the Bless spell, enter \"d4cs0cf0\" in both attack roll fields, and the saving throw one",
@@ -149,6 +150,7 @@
"CARRYING_PUSH_DRAG_LIFT": "Push/Drag/Lift",
"CHALLENGE": "Challenge",
"CHARACTER_NAME": "Character Name",
"CLASS": "Class",
"CLASS_ACTIONS": "Class Actions",
"CLASS_TITLE": "Class",
"CLASS_FEATURES": "Class Features",
@@ -222,6 +224,7 @@
"SAVES_AND_SKILL_CHECKS": "Saves and Skill Checks",
"SAVING_THROWS": "Saving Throws",
"SHORT_REST": "Short Rest",
"SHOW_ALL": "Show All",
"SIZE": "Size",
"SKILLS_TITLE": "Skills",
"SKIN": "Skin",