Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a no push option & solve difficulty > skill issue #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add a no push option & solve difficulty > skill issue #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52cb843
Add a no push option
ulrikL Nov 25, 2017
efbe622
Add difficulty dice
ulrikL Nov 26, 2017
30b803b
Fix push button
ulrikL Nov 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 53 additions & 28 deletions MutantYearZero/MutantYearZero.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ var MutantYearZero = MutantYearZero || (function() {
yellow: '#ddcf43',
lightYellow: '#FFF699',
black: '#1d1d1d',
lightBlack: '#8F8E8E'
lightBlack: '#8F8E8E',
red: '#FF0000'
},
defaults = {
css: {
Expand Down Expand Up @@ -118,7 +119,7 @@ var MutantYearZero = MutantYearZero || (function() {
reportingModes = {
'off': 'None',
'gm': 'GM',
'gm+player': 'GM & Player',
'gm+player': 'GM & Player',
'public': 'Public'
},
templates = {},
Expand Down Expand Up @@ -390,7 +391,7 @@ var MutantYearZero = MutantYearZero || (function() {
'</div>'+
'<b>Commands</b>'+
'<div style="padding-left:10px;">'+
'<b><span style="font-family: serif;">!myz '+ch('[')+'Skill Roll'+ch(']')+' '+ch('[')+'Base Roll'+ch(']')+' '+ch('[')+'Gear Roll'+ch(']')+' '+ch('[')+'--'+ch('<')+'Label'+ch('>')+ch('|')+ch('<')+'Message'+ch('>')+' ...'+ch(']')+'</span></b>'+
'<b><span style="font-family: serif;">!myz '+ch('[')+'Skill Roll'+ch(']')+' '+ch('[')+'Base Roll'+ch(']')+' '+ch('[')+'Gear Roll'+ch(']')+' '+ch('[')+'Diff Roll'+ch(']')+' '+ch('[')+'--'+ch('<')+'Label'+ch('>')+ch('|')+ch('<')+'Message'+ch('>')+' ...'+ch(']')+'</span></b>'+
'<div style="padding-left: 10px;padding-right:20px">'+
'<p>Performs a Mutant Year Zero Roll.</p>'+
'<ul>'+
Expand All @@ -403,6 +404,9 @@ var MutantYearZero = MutantYearZero || (function() {
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
'<b><span style="font-family: serif;">'+ch('[')+'Gear Roll'+ch(']')+'</span></b> '+ch('-')+' An inline dice expression rolling the d6s ('+symbols.radioactive+'). 1s are counted as Gear Degradation ('+symbols.explosion+'). Example: '+ch('[')+ch('[')+'2d6'+ch(']')+ch(']')+
'</li> '+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
'<b><span style="font-family: serif;">'+ch('[')+'Diff Roll'+ch(']')+'</span></b> '+ch('-')+' An inline dice expression rolling the d6s. 6s reduce the number of successes ('+symbols.radioactive+'). Shall be a positive value only if Skill role is a negative number of dice. Example: '+ch('[')+ch('[')+'0d6'+ch(']')+ch(']')+
'</li> '+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
'<b><span style="font-family: serif;">'+ch('[')+'--'+ch('<')+'Label'+ch('>')+ch('|')+ch('<')+'Message'+ch('>')+' ...'+ch(']')+'</span></b> '+ch('-')+' An optional set of text to be shown above the die roll. Label may be omitted to just provid a text field. You can specify as many optional descriptions as you like.'+
'<div style="padding-left: 10px;padding-right:20px">'+
Expand Down Expand Up @@ -476,12 +480,13 @@ var MutantYearZero = MutantYearZero || (function() {
var cnt = getRollableDiceCount(dice);
return ' '+ch('[')+ch('[')+cnt+'d6'+ch(']')+ch(']')+' ';
},
validatePlayerRollHash = function(playerid, hash, skill,base,gear){
validatePlayerRollHash = function(playerid, hash, skill,base,gear,diff){
var obj=state.MutantYearZero.playerRolls[playerid];
return (obj && obj.hash === hash &&
obj.dice.skillDice === skill &&
obj.dice.baseDice === base &&
obj.dice.gearDice === gear
obj.dice.gearDice === gear &&
obj.dice.diffDice === diff
);
},
getCountsForRoll = function(playerid,hash){
Expand Down Expand Up @@ -614,10 +619,12 @@ var MutantYearZero = MutantYearZero || (function() {
skillDice, // skill: green
baseDice, // base(stat): yellow, trauma on 1s
gearDice, // gear: black, degradation on 1s
diffDice,

skillDiceArray,
baseDiceArray,
gearDiceArray,
diffDiceArray,

successes=0,
trauma=0,
Expand All @@ -626,6 +633,7 @@ var MutantYearZero = MutantYearZero || (function() {
pushes,

push=false,
nopush=false,
pushButton,
w=false,
cmd,
Expand Down Expand Up @@ -672,6 +680,16 @@ var MutantYearZero = MutantYearZero || (function() {
cmd=matches[1];
hash=parseInt(matches[2],10);
}

if('!wmyz-np' === cmd) {
cmd='!wmyz';
nopush=true;
}

if('!myz-np' === cmd) {
cmd='!myz';
nopush=true;
}

switch(cmd) {
case '!wmyz':
Expand Down Expand Up @@ -709,8 +727,8 @@ var MutantYearZero = MutantYearZero || (function() {
skillDice=getDiceCounts(msg,rollIndices[0]);
baseDice=getDiceCounts(msg,rollIndices[1]);
gearDice=getDiceCounts(msg,rollIndices[2]);
diffDice=getDiceCounts(msg,rollIndices[3]);


if(push &&
(
_.has(state.MutantYearZero.playerRolls,owner) &&
Expand All @@ -719,26 +737,34 @@ var MutantYearZero = MutantYearZero || (function() {
!validatePlayerRollHash(owner,hash,
getDiceArray(skillDice).length,
getDiceArray(baseDice).length,
getDiceArray(gearDice).length
getDiceArray(gearDice).length,
getDiceArray(diffDice).length
)
){
reportBadPushCounts(msg.playerid);
return;
}
pushedValues=getCountsForRoll(owner,hash);

successes=pushedValues.success + (skillDice['6']||0) + (baseDice['6']||0) + (gearDice['6']||0) ;
successes=pushedValues.success + (skillDice['6']||0) + (baseDice['6']||0) + (gearDice['6']||0) - (diffDice['6']||0);
trauma = pushedValues.trauma + (baseDice['1']||0);
gearDamage = pushedValues.damage + (gearDice['1']||0);
pushes = pushedValues.pushes+1;

optional = (optional.length && optional) || getOptionalForRoll(owner,hash);


skillDiceArray=_.map(getDiceArray(skillDice),function(v){
switch(v){
case '6':
case '-6':
return symbols.radioactive;
default:
return v;
}
});

diffDiceArray=_.map(getDiceArray(diffDice),function(v){
switch(v){
case '6':
return symbols.radioactive;
default:
return v;
Expand Down Expand Up @@ -774,7 +800,8 @@ var MutantYearZero = MutantYearZero || (function() {
dice: {
skillDice: getRollableDiceCount(skillDiceArray),
baseDice: getRollableDiceCount(baseDiceArray),
gearDice: getRollableDiceCount(gearDiceArray)
gearDice: getRollableDiceCount(gearDiceArray),
diffDice: getRollableDiceCount(diffDiceArray)
},
counts: {
success: successes,
Expand All @@ -785,16 +812,19 @@ var MutantYearZero = MutantYearZero || (function() {
optional: optional
});

pushButton = (_.reduce([skillDiceArray,baseDiceArray,gearDiceArray],function(m,dice){ return m+getRollableDiceCount(dice);},0) ?
makeButton(
'!'+(w?'w':'')+'myz['+hash+'] '+
makeRerollExpression(skillDiceArray)+
makeRerollExpression(baseDiceArray)+
makeRerollExpression(gearDiceArray),
symbols.push+' '+pushes
) :
''
);
if(!nopush) {
pushButton = (_.reduce([skillDiceArray,baseDiceArray,gearDiceArray,diffDiceArray],function(m,dice){ return m+getRollableDiceCount(dice);},0) ?
makeButton(
'!'+(w?'w':'')+'myz['+hash+'] '+
makeRerollExpression(skillDiceArray)+
makeRerollExpression(baseDiceArray)+
makeRerollExpression(gearDiceArray)+
makeRerollExpression(diffDiceArray),
symbols.push+' '+pushes
) :
''
);
}

output = makeOutput([
makeLabel( successes+' '+symbols.radioactive, colors.lightGreen),
Expand All @@ -806,12 +836,11 @@ var MutantYearZero = MutantYearZero || (function() {
makeOptionalText(optional),
makeDiceImages(skillDiceArray,colors.green),
makeDiceImages(baseDiceArray,colors.yellow, colors.black),
makeDiceImages(gearDiceArray,colors.black)
makeDiceImages(gearDiceArray,colors.black),
makeDiceImages(diffDiceArray,colors.red)
].join('')
);



who=getObj('player',owner).get('displayname');
if(w){
sendChat(msg.who, '/w gm '+output);
Expand All @@ -821,7 +850,6 @@ var MutantYearZero = MutantYearZero || (function() {
} else {
sendChat(who, '/direct '+output);
}

break;

case '!myz-config':
Expand Down Expand Up @@ -878,9 +906,7 @@ var MutantYearZero = MutantYearZero || (function() {
'<div><b>Unsupported Option:</div> '+a+'</div>'
);
}

});

break;
}
},
Expand All @@ -905,4 +931,3 @@ on('ready',function() {