Skip to content

Fix -c arg handling. List each anonymous condition with index so it's easier to remove the right one. #132

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

Merged
merged 1 commit into from
Jul 5, 2015
Merged

Fix -c arg handling. List each anonymous condition with index so it's easier to remove the right one. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
103 changes: 61 additions & 42 deletions Conditions/conditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ var Conditions = Conditions || {
var objs = findObjs({_type: "attribute", _characterid: charIds[i], name: attr}) || [];
/////
//
//should make note that we couldn't find attribute
var attrObj = objs[0];
if (!attrObj){ continue; }
//try getAttrByName; create attribute if it gives us results
//should make note that we couldn't find attribute
//
/////
if (!charRec.base[attr]){
Expand Down Expand Up @@ -155,9 +156,10 @@ var Conditions = Conditions || {
var objs = findObjs({_type: "attribute", _characterid: charIds[i], name: attr}) || [];
/////
//
//should make note that we couldn't find attribute
var attrObj = objs[0];
if (!attrObj){ continue; }
//try getAttrByName; create attribute if it gives us results
//should make note that we couldn't find attribute
//
/////
if ((attrObj.get('current') != charRec.base[attr].current) || (attrObj.get('max') != charRec.base[attr].max)){
Expand Down Expand Up @@ -468,6 +470,48 @@ var Conditions = Conditions || {
delete state.Conditions.conditions[condName];
},

formatEffect: function(effect){
var retval = "";
switch (effect.type){
case "addfact":
var op = (effect.value >= 0 ? "+ " : "- ");
var val = Math.abs(effect.value);
var pctStr = op + (val * 100) + "%";
var absStr = op + val + "x";
retval += (pctStr.length <= absStr.length ? pctStr : absStr);
break;
case "multfact":
var opts = ["* " + (effect.value * 100) + "%", "* " + effect.value];
if (effect.value != 0){
opts.push("/ " + (100 / effect.value) + "%");
opts.push("/ " + (1 / effect.value));
}
opts.sort(function(x, y){ return x.length - y.length; });
retval += opts[0];
break;
case "offset":
var op = (effect.value >= 0 ? "+ " : "- ");
var val = Math.abs(effect.value);
retval += op + val;
break;
case "max":
retval += "< " + effect.value;
break;
case "min":
retval += "> " + effect.value;
break;
case "abs":
retval += "= " + effect.value;
break;
default:
retval += "(unrecognized effect type: " + effect.type + ")";
}
if (effect.stackClass){
retval += " (" + effect.stackClass + ")";
}
return retval;
},

listCondition: function(who, condName){
var output = "";
if (!condName){
Expand Down Expand Up @@ -515,43 +559,7 @@ var Conditions = Conditions || {
for (var i = 0; i < effectAttrs.length; i++){
var e = state.Conditions.conditions[condName].effects[effectAttrs[i]];
output += "\n" + effectAttrs[i] + " ";
switch (e.type){
case "addfact":
var op = (e.value >= 0 ? "+ " : "- ");
var val = Math.abs(e.value);
var pctOutput = op + (val * 100) + "%";
var absOutput = op + val + "x";
output += (pctOutput.length <= absOutput.length ? pctOutput : absOutput);
break;
case "multfact":
var outputOpts = ["* " + (e.value * 100) + "%", "* " + e.value];
if (e.value != 0){
outputOpts.push("/ " + (100 / e.value) + "%");
outputOpts.push("/ " + (1 / e.value));
}
outputOpts.sort(function(x, y){ return x.length - y.length; });
output += outputOpts[0];
break;
case "offset":
var op = (e.value >= 0 ? "+ " : "- ");
var val = Math.abs(e.value);
output += op + val;
break;
case "max":
output += "< " + e.value;
break;
case "min":
output += "> " + e.value;
break;
case "abs":
output += "= " + e.value;
break;
default:
output += "(unrecognized effect type: " + e.type + ")";
}
if (e.stackClass){
output += " (" + e.stackClass + ")";
}
output += Conditions.formatEffect(e);
}
}
else{
Expand Down Expand Up @@ -795,7 +803,13 @@ var Conditions = Conditions || {
output += "No conditions\n";
}
if (anonAttrs.length > 0){
output += "Anonymous Effects:\n " + anonAttrs.join("\n ");
output += "Anonymous Effects:";
for (var j = 0; j < anonAttrs.length; j++){
output += "\n " + anonAttrs[j] + ":";
for (var k = 0; k < anon[anonAttrs[j]].length; k++){
output += "\n " + k + ": " + Conditions.formatEffect(anon[anonAttrs[j]][k]);
}
}
}
else{
output += "No anonymous effects";
Expand Down Expand Up @@ -835,12 +849,17 @@ var Conditions = Conditions || {
attrs.sort();
output += "Modified Attributes (base value):";
for (var j = 0; j < attrs.length; j++){
/////
//
var objs = findObjs({_type: "attribute", _characterid: characters[i], name: attr}) || [];
var attrObj = objs[0];
if (!attrObj){
//try getAttrByName; suppress warning it gives us results
Conditions.write("Warning: Unable to get attribute " + attrs[j], who, "", "Cond");
continue;
}
//
/////
output += "\n " + attrs[j] + ": " + attrObj.get('current');
if (attrObj.get('max')){ output += " / " + attrObj.get('max'); }
output += " (" + baseVals[attrs[j]].current;
Expand All @@ -862,7 +881,7 @@ var Conditions = Conditions || {
if (getArg == "help"){
return Conditions.showHelp(msg.who, tokens[0], tokens[i]);
}
if (getArg == "character"){
if (getArg == "characters"){
if (!args[getArg]){ args[getArg] = []; }
args[getArg].push(tokens[i]);
}
Expand All @@ -885,7 +904,7 @@ var Conditions = Conditions || {
break;
case "-c":
case "--character":
getArg = 'character';
getArg = 'characters';
break;
default:
posArgs.push(tokens[i]);
Expand Down
2 changes: 1 addition & 1 deletion Conditions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Conditions",
"version": "0.1",
"version": "0.2",
"description": "Track attribute-modifying conditions.",
"authors": "manveti",
"roll20userid": "503018",
Expand Down