Merge pull request #3571 from teaseal/master

Star Wars FFG API-Compatible, Warfare skill and image fixes
This commit is contained in:
wing-it
2018-03-20 09:22:20 -04:00
committed by GitHub
3 changed files with 29 additions and 25 deletions
@@ -1,6 +1,6 @@
/*
Version Info:
Version 6.3.2
Version 6.4.3
*/
.sheet-clear {
clear: both
@@ -1327,61 +1327,61 @@ button.sheet-btn-roll-crit[type=roll]:active {
/* TIP HELP */
.sheet-icon-S {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/S.png') center center no-repeat;
background: url('https://i.imgur.com/z79ieDp.png') center center no-repeat;
}
/* Success - Symbol */
.sheet-icon-F {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/F.png') center center no-repeat;
background: url('https://i.imgur.com/y2qABhW.png') center center no-repeat;
}
/* Failure - Symbol */
.sheet-icon-A {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/A.png') center center no-repeat;
background: url('https://i.imgur.com/Gav94H2.png') center center no-repeat;
}
/* Advantage - Symbol */
.sheet-icon-Tri {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/Triumph.png') center center no-repeat;
background: url('https://i.imgur.com/1lJCfnB.png') center center no-repeat;
}
/* Triumph - Symbol */
.sheet-icon-T {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/T.png') center center no-repeat;
background: url('https://i.imgur.com/o8EQ4z6.png') center center no-repeat;
}
/* Threat - Symbol */
.sheet-icon-Des {
background: url('http://galacticcampaigns.com/images/EotE/Symbols/Despair.png') center center no-repeat;
background: url('https://i.imgur.com/rOEJlCc.png') center center no-repeat;
}
/* Despair - Symbol */
.sheet-icon-B {
background: url('http://galacticcampaigns.com/images/EotE/Boost/boostBlank.png') center center no-repeat;
background: url('http://i.imgur.com/nlIAfJx.png') center center no-repeat;
}
.sheet-icon-G {
background: url('http://galacticcampaigns.com/images/EotE/Ability/abilityBlank.png') center center no-repeat;
background: url('https://i.imgur.com/g3hoJRG.png') center center no-repeat;
}
.sheet-icon-Y {
background: url('http://galacticcampaigns.com/images/EotE/Proficiency/ProficiencyBlank.png') center center no-repeat;
background: url('https://i.imgur.com/4bQ0dY8.png') center center no-repeat;
}
.sheet-icon-P {
background: url('http://galacticcampaigns.com/images/EotE/Difficulty/DifficultyBlank.png') center center no-repeat;
background: url('https://i.imgur.com/oxbKghK.png') center center no-repeat;
}
.sheet-icon-R {
background: url('http://galacticcampaigns.com/images/EotE/Challenge/ChallengeBlank.png') center center no-repeat;
background: url('https://i.imgur.com/GInMHEN.png') center center no-repeat;
}
.sheet-icon-BLK {
background: url('http://galacticcampaigns.com/images/EotE/Setback/SetBackBlank.png') center center no-repeat;
background: url('https://i.imgur.com/n9W07Lp.png') center center no-repeat;
}
.sheet-icon-W {
background: url('http://galacticcampaigns.com/images/EotE/Force/ForceD.png') center center no-repeat;
background: url('https://i.imgur.com/JCI7Mgm.png') center center no-repeat;
}
/* Force Die - Black - Symbol */
@@ -10,7 +10,7 @@
<tr>
<td><label>Version</label></td>
<td>
6.4.1
6.4.3
</td>
<td style="width: 28%;"><label data-i18n="moreinfo">For more information on this version visit:</label></td>
<td><input disabled value="https://github.com/khendar/Roll20_StarWars" type="text"/></td>
@@ -59,8 +59,8 @@
<label data-i18n="upgrade">
&nbsp;&nbsp;&nbsp;&nbsp;Upgrade:</label>
<input name="attr_upgradeAbility" type="number" step="1" max="9" min="0" value="0">
<input name="attr_downgradeProficiency" type="number" step="1" max="9" min="0" value="0">
<label data-i18n="downgrade">
:Downgrade
@@ -75,8 +75,8 @@
<label data-i18n="upgrade">
&nbsp;&nbsp;&nbsp;&nbsp;Upgrade:</label>
<input name="attr_upgradeDifficulty" type="number" step="1" max="9" min="0" value="0">
<input name="attr_downgradeChallenge" type="number" step="1" max="9" min="0" value="0">
<label data-i18n="downgrade">Downgrade:
</label>
@@ -1455,7 +1455,7 @@
<input type="text" name="attr_diceWarfare" />
</div>
</td>
<td><button type='roll' name='roll_Warfare' value='!eed characterID(@{character_id}) label(skill:Warfare) @{diceXenology} skill(@{rankWarfare}|@{intellect}) @{dicePool} (gmdice)'></button></td>
<td><button type='roll' name='roll_Warfare' value='!eed characterID(@{character_id}) label(skill:Warfare) @{diceWarfare} skill(@{rankWarfare}|@{intellect}) @{dicePool} (gmdice)'></button></td>
</tr><!--Warfare-->
</tbody>
</table><!--Knowledge Skills Section-->
@@ -2992,7 +2992,7 @@
<tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|starship|@{starship-critId})" data-i18n="repair">Repair</button></td></tr>
</tbody>
</table>
</fieldset>
</fieldset>
</div>
<div class="sheet-small-3 sheet-column">
<table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
@@ -3502,7 +3502,7 @@
<tr><td><button type='roll' class="sheet-btn-heal-crit" value="!eed characterID(@{character_id}) crit(heal|vehicle|@{vehicle-critId})" data-i18n="repair">Repair</button></td></tr>
</tbody>
</table>
</fieldset>
</fieldset>
</div>
<div class="sheet-small-3 sheet-column">
<table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
@@ -8996,4 +8996,4 @@
<tr><td><img src="http://i.imgur.com/rOEJlCc.png" title="despair" height="20" width="20"/><img src="http://i.imgur.com/rOEJlCc.png" title="despair" height="20" width="20"/></td><td>{{2despair}}</td></tr>
{{/2despair}}
</table>
</rolltemplate><!-- Roll Template-Suggestions -->
</rolltemplate><!-- Roll Template-Suggestions -->
+6 -2
View File
@@ -22,7 +22,11 @@ Collapsible sections
Fixed broken images.
6.4.0 Updates
Implement translation tags for character vehicule and group sheet
Implement translation tags for character vehicle and group sheet
6.4.2 Updates
Add rolls for NPC in vehicules and fix roll template typo for riding beasts weapons
Add rolls for NPC in vehicles and fix roll template typo for riding beasts weapons
6.4.3 Updates
Fixed Warfare to no longer roll from Xenology dice
Redirected some sheet icons to imgur