Skip to content

Commit

Permalink
Merge pull request #12218 from Almos80/patch-57
Browse files Browse the repository at this point in the history 
Godbound Minor Feature Update
  • Loading branch information
@mperes
mperes committed Oct 8, 2023
2 parents 36fa280 + a852bf7 commit 81f708f
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 244 deletions.
298 changes: 54 additions & 244 deletions Godbound/Godbound.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ <h3>Attacks</h3>
<input type="number" class="input-center" name="attr_weapon_damage_bonus_repeat" value="0" title="Attribute modifier already included in damage"/>
</div>
<div class="col-1-20 attr vert-middle center pad-r-sm">
<button type="roll" class="button" name="roll_weapon_repeat" value="&{template:godbound} {{name=@{character_name}}} {{title=Weapon}} {{roll=@{weapon_name_repeat} Attack}} {{range=@{weapon_range_repeat}}} {{area=@{weapon_area_repeat}}} {{weapon=[[1d20 + @{base_attack_bonus} + @{weapon_attribute_repeat} + @{weapon_bonus_repeat} + ?{Targets AC|9} + ?{Misc Attack Bonus|0}]]}} {{target=[[20]]}} {{damage=[[@{weapon_damage_die_repeat} + @{weapon_attribute_repeat} + @{weapon_damage_bonus_repeat}]]}} {{damage0=[[0]]}} {{damage1=[[1]]}} {{damage2=[[2]]}} {{damage4=[[4]]}}"></button>
<button type="roll" class="button" name="roll_weapon_repeat" value="&{template:godbound} {{name=@{character_name}}} {{title=Weapon}} {{roll=@{weapon_name_repeat} Attack}} {{range=@{weapon_range_repeat}}} {{area=@{weapon_area_repeat}}} {{weapon=[[20 - 1d20 - @{base_attack_bonus} - @{weapon_attribute_repeat} - @{weapon_bonus_repeat} - ?{Misc Attack Modifier|0}]]}} {{damage=[[@{weapon_damage_die_repeat} + @{weapon_attribute_repeat} + @{weapon_damage_bonus_repeat}]]}} {{damage0=[[0]]}} {{damage1=[[1]]}} {{damage2=[[2]]}} {{damage4=[[4]]}}"></button>
</div>
</div>
</fieldset>
Expand Down Expand Up @@ -1772,7 +1772,7 @@ <h3>Actions and Attacks</h3>
<input type="number" name="attr_npc_attack_bonus" value="0"/>
</div>
<div class="col-1-10 attr vert-middle center pad-l-smd pad-r-sm pad-b-sm">
<button type="roll" class="button" name="roll_npc_attack" value="&{template:godbound} {{name=@{character_name}}} {{title=Attack}} {{roll=NPC Attack}} {{range=@{npc_attack_range}}} {{area=@{npc_attack_area}}} {{npcattack=[[1d20 + @{npc_attack_bonus} + ?{Targets AC|9} + ?{Modifier|0}]]}} {{target=[[20]]}}"></button>
<button type="roll" class="button" name="roll_npc_attack" value="&{template:godbound} {{name=@{character_name}}} {{title=Attack}} {{roll=NPC Attack}} {{range=@{npc_attack_range}}} {{area=@{npc_attack_area}}} {{npcattack=[[20 - 1d20 - @{npc_attack_bonus} - ?{Misc Attack Modifier|0}]]}}"></button>
</div>
<div class="col-1-4 attr vert-middle right pad-l-sm pad-t-sm pad-r-md pad-b-sm">
Damage
Expand Down Expand Up @@ -1814,7 +1814,7 @@ <h3>Actions and Attacks</h3>
<input type="text" class="input-center" name="attr_npcweapon_damage_repeat" value="1d8 + 0"/>
</div>
<div class="col-1-10 attr vert-middle center pad-t-sm pad-r-sm pad-b-sm">
<button type="roll" class="button" name="roll_weapon_repeat" value="&{template:godbound} {{name=@{character_name}}} {{title=Weapon}} {{roll=@{npcweapon_name_repeat} Attack}} {{range=@{npcweapon_range_repeat}}} {{area=@{npcweapon_area_repeat}}} {{weapon=[[1d20 + @{npcweapon_attack_repeat} + ?{Targets AC|9} + ?{Modifier|0}]]}} {{target=[[20]]}} {{damage=[[@{npcweapon_damage_repeat}]]}} {{damage0=[[0]]}} {{damage1=[[1]]}} {{damage2=[[2]]}} {{damage4=[[4]]}}"></button>
<button type="roll" class="button" name="roll_weapon_repeat" value="&{template:godbound} {{name=@{character_name}}} {{title=Weapon}} {{roll=@{npcweapon_name_repeat} Attack}} {{range=@{npcweapon_range_repeat}}} {{area=@{npcweapon_area_repeat}}} {{weapon=[[20 - 1d20 - @{npcweapon_attack_repeat} - ?{Misc Attack Modifier|0}]]}} {{damage=[[@{npcweapon_damage_repeat}]]}} {{damage0=[[0]]}} {{damage1=[[1]]}} {{damage2=[[2]]}} {{damage4=[[4]]}}"></button>
</div>
<div class="col-1-10 attr vert-middle center underline pad-t-sm pad-r-sm pad-b-sm">
<input type="checkbox" class="circle-check" name="attr_npcweapon_description_show_repeat" value="1"><span></span>
Expand Down Expand Up @@ -3415,293 +3415,103 @@ <h3>Fail!</h3>
{{/fray}}
{{#weapon}}
<div class="sheet-row">
<div class="sheet-col-2-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Range
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Range
</div>
<div class="sheet-col-3-5 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
<div class="sheet-col-1-2 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
{{range}}
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-2-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Area
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Area
</div>
<div class="sheet-col-3-5 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
<div class="sheet-col-1-2 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
{{area}}
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Roll
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Result
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{weapon}}
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
Hit AC {{weapon}} or higher
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Target
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Straight Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{target}}
<div class="sheet-col-1-52sheet-pad-r-sm sheet-pad-b-sm">
{{damage}}
</div>
</div>
{{#rollWasFumble() weapon}}
{{#rollLess() damage 2}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Miss!</h3>
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
</div>
{{/rollWasFumble() weapon}}
{{#rollWasCrit() weapon}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
{{damage0}}
</div>
</div>
{{/rollLess() damage 2}}
{{#rollBetween() damage 2 5}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Straight Damage
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage}}
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
{{damage1}}
</div>
</div>
{{#rollLess() damage 2}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage0}}
</div>
{{/rollBetween() damage 2 5}}
{{#rollBetween() damage 6 9}}
<div class="sheet-row">
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
{{/rollLess() damage 2}}
{{#rollBetween() damage 2 5}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage1}}
</div>
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
{{damage2}}
</div>
{{/rollBetween() damage 2 5}}
{{#rollBetween() damage 6 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage2}}
</div>
</div>
{{/rollBetween() damage 6 9}}
{{#rollGreater() damage 9}}
<div class="sheet-row">
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
{{/rollBetween() damage 6 9}}
{{#rollGreater() damage 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage4}}
</div>
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
{{damage4}}
</div>
{{/rollGreater() damage 9}}
{{/rollWasCrit() weapon}}
{{#^rollWasCrit() weapon}}
{{#^rollWasFumble() weapon}}
{{#rollLess() weapon target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Miss!</h3>
</div>
</div>
{{/rollLess() weapon target}}
{{#rollTotal() weapon target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Straight Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage}}
</div>
</div>
{{#rollLess() damage 2}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage0}}
</div>
</div>
{{/rollLess() damage 2}}
{{#rollBetween() damage 2 5}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage1}}
</div>
</div>
{{/rollBetween() damage 2 5}}
{{#rollBetween() damage 6 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage2}}
</div>
</div>
{{/rollBetween() damage 6 9}}
{{#rollGreater() damage 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage4}}
</div>
</div>
{{/rollGreater() damage 9}}
{{/rollTotal() weapon target}}
{{#rollGreater() weapon target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Straight Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage}}
</div>
</div>
{{#rollLess() damage 2}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage0}}
</div>
</div>
{{/rollLess() damage 2}}
{{#rollBetween() damage 2 5}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage1}}
</div>
</div>
{{/rollBetween() damage 2 5}}
{{#rollBetween() damage 6 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage2}}
</div>
</div>
{{/rollBetween() damage 6 9}}
{{#rollGreater() damage 9}}
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Normal Damage
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{damage4}}
</div>
</div>
{{/rollGreater() damage 9}}
{{/rollGreater() weapon target}}
{{/^rollWasFumble() weapon}}
{{/^rollWasCrit() weapon}}
</div>
{{/rollGreater() damage 9}}
{{/weapon}}
{{#npcattack}}
<div class="sheet-row">
<div class="sheet-col-2-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Range
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Range
</div>
<div class="sheet-col-3-5 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
<div class="sheet-col-1-2 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
{{range}}
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-2-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Area
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Area
</div>
<div class="sheet-col-3-5 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
<div class="sheet-col-1-2 sheet-bold sheet-pad-r-sm sheet-pad-b-sm">
{{area}}
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
<div class="sheet-col-1-2 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Attack Roll
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{npcattack}}
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-bold sheet-pad-l-lg sheet-pad-r-md sheet-pad-b-sm">
Target
</div>
<div class="sheet-col-2-5 sheet-pad-r-sm sheet-pad-b-sm">
{{target}}
<div class="sheet-col-1-2 sheet-pad-r-sm sheet-pad-b-sm">
Hit AC {{npcattack}} or higher
</div>
</div>
{{#rollWasFumble() npcattack}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Miss!</h3>
</div>
</div>
{{/rollWasFumble() npcattack}}
{{#rollWasCrit() npcattack}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
</div>
</div>
{{/rollWasCrit() npcattack}}
{{#^rollWasCrit() npcattack}}
{{#^rollWasFumble() npcattack}}
{{#rollLess() npcattack target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Miss!</h3>
</div>
</div>
{{/rollLess() npcattack target}}
{{#rollTotal() npcattack target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
</div>
</div>
{{/rollTotal() npcattack target}}
{{#rollGreater() npcattack target}}
<div class="sheet-row">
<div class="sheet-col-1 sheet-title-banner-subheading sheet-center sheet-pad-t-md sheet-pad-r-sm sheet-pad-b-sm sheet-mar-t-md sheet-mar-b-sm">
<h3>Hit!</h3>
</div>
</div>
{{/rollGreater() npcattack target}}
{{/^rollWasFumble() npcattack}}
{{/^rollWasCrit() npcattack}}
{{/npcattack}}
{{#freedamage}}
<div class="sheet-row">
Expand Down
3 changes: 3 additions & 0 deletions Godbound/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ This sheet is created for use in Godbound games on Roll20, based on the Characte

## Features / Changelog

- v3.3
- Minor
* Attacks now do not require inputting target's AC. Instead, the rolltemplate displays the AC the attack would hit. New calculation is "20 - roll - modifiers." This makes combat faster by removing one step in the sheet's rolling process.
- v3.2
- Minor
* Add missing Effort entry for Invocations
Expand Down

0 comments on commit 81f708f

Please sign in to comment.