diff --git a/Stars_Without_Number_Revised/ReadMe.md b/Stars_Without_Number_Revised/ReadMe.md index 9ebf80134d..62c6e8aa3b 100644 --- a/Stars_Without_Number_Revised/ReadMe.md +++ b/Stars_Without_Number_Revised/ReadMe.md @@ -48,6 +48,8 @@ Report any problems, suggestions, or features by [creating an issue](https://git * Added the option to enable ammo tracking with ChatSetAttr to the sheet default settings. * Added a place to track skill points that can only be spent on psionics. * Changed armor to be a repeating section. +* The gear section now has a header. +* Exert can now be used as a weapon's attack skill. ### 2.1.0 diff --git a/Stars_Without_Number_Revised/Source/pug/character.pug b/Stars_Without_Number_Revised/Source/pug/character.pug index 009597a9cd..eb7e0b0643 100644 --- a/Stars_Without_Number_Revised/Source/pug/character.pug +++ b/Stars_Without_Number_Revised/Source/pug/character.pug @@ -229,8 +229,9 @@ input(type="hidden", name="attr_setting_skill_query", value="hover").skills-quer +text-input("weapon_attack", "ATTACK_BONUS_SHORT")(type="number", value="0").ab.center +fake-text-input("SKILL").skills-either.weapon-skill.center select(name="attr_weapon_skill_bonus") - option.skills-revised(value="@{skill_shoot}", data-i18n="SHOOT") + option.skills-revised(value="@{skill_exert}", data-i18n="EXERT") option.skills-revised(value="@{skill_punch}", data-i18n="PUNCH") + option.skills-revised(value="@{skill_shoot}", data-i18n="SHOOT", selected) option.skills-revised(value="@{skill_stab}", data-i18n="STAB") option.skills-first(value="@{skill_combat_energy}", data-i18n="COMBAT_ENERGY") option.skills-first(value="@{skill_combat_gunnery}", data-i18n="COMBAT_GUNNERY") diff --git a/Stars_Without_Number_Revised/Source/workers.js b/Stars_Without_Number_Revised/Source/workers.js index ed974e263c..48637c47d3 100644 --- a/Stars_Without_Number_Revised/Source/workers.js +++ b/Stars_Without_Number_Revised/Source/workers.js @@ -20,7 +20,7 @@ "remove:repeating_ship-fittings" ].join(" "); const weaponSkills = [ - "skill_shoot", "skill_punch", "skill_stab", "skill_combat_energy", + "skill_exert", "skill_punch", "skill_shoot", "skill_stab", "skill_combat_energy", "skill_combat_gunnery", "skill_combat_primitive", "skill_combat_projectile", "skill_combat_psitech", "skill_combat_unarmed", "skill_telekinesis" ]; @@ -1420,7 +1420,8 @@ // Makes sure that the select for the weapon skill is never in an invalid state. const prefixes = (ids && ids.map(id => `repeating_weapons_${id}`)) || ["repeating_weapons"]; getAttrs(["homebrew_skill_list", ...prefixes.map(p => `${p}_weapon_skill_bonus`)], v => { - const revisedList = ["@{skill_shoot}", "@{skill_punch}", "@{skill_stab}", "@{skill_telekinesis}", "0"], + const revisedList = ["@{skill_exert}", "@{skill_punch}", "@{skill_shoot}", "@{skill_stab}", + "@{skill_telekinesis}", "0"], firstList = ["@{skill_combat_energy}", "@{skill_combat_gunnery}", "@{skill_combat_primitive}", "@{skill_combat_projectile}", "@{skill_combat_psitech}", "@{skill_combat_unarmed}", "@{skill_telekinesis}", "0" ], diff --git a/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html b/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html index e2312922af..f18b586797 100644 --- a/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html +++ b/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html @@ -1,3 +1,3 @@ -

API

/
/
/

/
/

(, : ). :  / 
/

-

+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +

+ + + + + +
+ + + + + +
+ + + + + +

:

+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +

-

/
/

:

/
/
/
/

:(;;  ,  ,  ). :  / 
/

:( ,  ).

:( ,  ).

/

( )

+

API

/
/
/

/
/

(, : ). :  / 
/

-

+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +

+ + + + + +
+ + + + + +
+ + + + + +

:

+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +

-

/
/

:

/
/
/
/

:(;;  ,  ,  ). :  / 
/

:( ,  ).

:( ,  ).

/

( )

{{charname}}
{{title}}
{{#reaction}}
{{#rollLess() reaction 3}} {{/rollLess() reaction 3}}{{#rollBetween() reaction 3 5}} {{/rollBetween() reaction 3 5}}{{#rollBetween() reaction 6 8}} {{/rollBetween() reaction 6 8}}{{#rollBetween() reaction 9 11}} {{/rollBetween() reaction 9 11}}{{#rollGreater() reaction 11}} {{/rollGreater() reaction 11}}
{{reaction}}
{{/reaction}} {{#info}}
{{info}}
{{/info}} {{#rollGreater() damage 0}}
{{damage}}
{{/rollGreater() damage 0}} {{#allprops() charname title damage reaction desc info buttons}}
{{key}}
{{value}}
{{/allprops() charname title damage reaction desc info buttons}}
{{desc}}
{{buttons}}
{{charname}}
{{title}} {{#rollGreater() burst 0}}(){{/rollGreater() burst 0}} {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}{{#rollGreater() mod 0}}+ {{mod}}{{/rollGreater() mod 0}}
{{attack}}
{{damage}}
{{#attack2}}
{{attack2}}
{{damage2}}
{{/attack2}}{{#attack3}}
{{attack3}}
{{damage3}}
{{/attack3}}{{#attack4}}
{{attack4}}
{{damage4}}
{{/attack4}} {{#shock}}
{{shock}}
{{/shock}}
{{#range}} {{range}}{{/range}}{{#ammo}} {{ammo}}{{/ammo}}
{{desc}}
{{charname}}
{{title}} {{attribute}} {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}{{#rollGreater() mod 0}}+ {{mod}}{{/rollGreater() mod 0}}
{{dice}}
{{#save}} {{#^rollLess() dice save}}
{{charname}}
{{title}}
{{dice}}
{{save}}{{morale}}
{{/^rollLess() dice save}} {{#rollLess() dice save}}
{{charname}}
{{title}}
{{dice}}
{{save}}{{morale}}
{{/rollLess() dice save}} {{/save}} {{#morale}} {{#^rollGreater() dice morale}}
{{charname}}
{{title}}
{{dice}}
{{save}}{{morale}}
{{/^rollGreater() dice morale}} {{#rollGreater() dice morale}}
{{charname}}
{{title}}
{{dice}}
{{save}}{{morale}}
{{/rollGreater() dice morale}} {{/morale}} - +