Skip to content

Commit a56d6d0

Browse files
shdwjkshdwjk
authored
Updated GroupInitiative, fixed bugs in Terrain Generator, Update to WildDice, Update to Ammo, Update to Tagmar (#916)
* Updated 1 Script * Fix bugs in Terrain Generator * Updated 1 Script * Updated 1 Script * Updated 1 Script * Updated 1 Script
1 parent 1013c3b commit a56d6d0

File tree

14 files changed

+3247
-340
lines changed

14 files changed

+3247
-340
lines changed

‎Ammo/0.3.10/Ammo.js

+343
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,343 @@
1+
// Github: https://github.com/shdwjk/Roll20API/blob/master/Ammo/Ammo.js
2+
// By: The Aaron, Arcane Scriptomancer
3+
// Contact: https://app.roll20.net/users/104025/the-aaron
4+
5+
var Ammo = Ammo || (function() {
6+
'use strict';
7+
8+
var version = '0.3.10',
9+
lastUpdate = 1584729310,
10+
schemaVersion = 0.1,
11+
12+
ch = function (c) {
13+
var entities = {
14+
'<' : 'lt',
15+
'>' : 'gt',
16+
"'" : '#39',
17+
'@' : '#64',
18+
'{' : '#123',
19+
'|' : '#124',
20+
'}' : '#125',
21+
'[' : '#91',
22+
']' : '#93',
23+
'"' : 'quot',
24+
'-' : 'mdash',
25+
' ' : 'nbsp'
26+
};
27+
28+
if(_.has(entities,c) ){
29+
return ('&'+entities[c]+';');
30+
}
31+
return '';
32+
},
33+
sendMessage = function(message, who, whisper) {
34+
sendChat(
35+
'Ammo',
36+
`${(whisper||'gm'===who)?`/w ${who} `:''}<div style="padding:1px 3px;border: 1px solid #8B4513;background: #eeffee; color: #8B4513; font-size: 80%;">${message}</div>`
37+
);
38+
},
39+
40+
adjustAmmo = function (ec) {
41+
let who = ec.output.who;
42+
let attr = ec.operation.attr;
43+
let amount = ec.operation.amount;
44+
let label = ec.operation.label || 'ammo';
45+
let playerid = ec.output.playerid;
46+
47+
const chr = getObj('character',attr.get('characterid'));
48+
const val = parseInt(attr.get('current'),10)||0;
49+
const max = parseInt(attr.get('max'),10)||Number.MAX_SAFE_INTEGER;
50+
51+
let adjustedValue = (val+amount);
52+
let overage = 0;
53+
let valid = true;
54+
55+
if(ec.options.allowPartial) {
56+
if (adjustedValue < 0) {
57+
overage = Math.abs(adjustedValue);
58+
adjustedValue = 0;
59+
} else if( adjustedValue > max ) {
60+
overage = adjustedValue - max;
61+
adjustedValue = max;
62+
}
63+
}
64+
65+
if(adjustedValue < 0 ) {
66+
sendMessage(
67+
'<b>'+chr.get('name') + '</b> does not have enough '+label+'. Needs '+Math.abs(amount)+', but only has '+
68+
'<span style="color: #ff0000;">'+val+'</span>.'+
69+
'<span style="font-weight:normal;color:#708090;>'+ch('[')+'Attribute: '+attr.get('name')+ch(']')+'</span>',
70+
who,
71+
ec.output.whisper
72+
);
73+
valid = false;
74+
} else if( adjustedValue > max) {
75+
sendMessage(
76+
'<b>'+chr.get('name') + '</b> does not have enough storage space for '+label+'. Needs '+adjustedValue+', but only has '+
77+
'<span style="color: #ff0000;">'+max+'</span>.'+
78+
'<span style="font-weight:normal;color:#708090;>'+ch('[')+'Attribute: '+attr.get('name')+ch(']')+'</span>',
79+
who,
80+
ec.output.whisper
81+
);
82+
valid = false;
83+
}
84+
85+
if( playerIsGM(playerid) || valid ) {
86+
attr.setWithWorker({current: adjustedValue});
87+
let verb = (adjustedValue < val) ? 'use' : 'gain';
88+
sendMessage(
89+
`<b>${chr.get('name')}</b> ${verb}s ${Math.abs(amount)} ${label} and has ${adjustedValue} remaining. ${overage ? `Unable to ${verb} ${overage} ${label}.`:''}`,
90+
who,
91+
ec.output.whisper
92+
);
93+
if(!valid) {
94+
sendMessage(
95+
'Ignoring warnings and applying adjustment anyway. Was: '+val+'/'+max+' Now: '+adjustedValue+'/'+max,
96+
who,
97+
ec.output.whisper
98+
);
99+
}
100+
}
101+
},
102+
103+
showHelp = function(who,playerid) {
104+
105+
sendChat('',
106+
'/w "'+who+'" '+
107+
'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'+
108+
'<div style="font-weight: bold; border-bottom: 1px solid black;font-size: 130%;">'+
109+
'Ammo v'+version+
110+
'</div>'+
111+
'<div style="padding-left:10px;margin-bottom:3px;">'+
112+
'<p>Ammo provides inventory management for ammunition stored in a character '+
113+
'attribute. If the adjustment would change the attribute to be below 0 or above '+
114+
'it'+ch("'")+'s maximum value, a warning will be issued and the attribute will not be'+
115+
'changed.</p>'+
116+
117+
( (playerIsGM(playerid)) ? '<p><b>Note:</b> As the GM, bounds will not be '+
118+
'enforced for you. You will be whispered the warnings, but the operation '+
119+
'will succeed. You will also be told the previous and current state in case '+
120+
'you want to revert the change.' : '')+
121+
122+
'</div>'+
123+
'<b>Commands</b>'+
124+
'<div style="padding-left:10px;">'+
125+
'<b><span style="font-family: serif;">!ammo '+ch('<')+'id'+ch('>')+' '+ch('<')+'attribute'+ch('>')+' '+ch('<')+'amount'+ch('>')+' '+ch('[')+'resource name'+ch(']')+'</span></b>'+
126+
'<div style="padding-left: 10px;padding-right:20px">'+
127+
'This command requires 3 parameters:'+
128+
'<ul>'+
129+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
130+
'<b><span style="font-family: serif;">id</span></b> -- The id of the character which has the attribute. You can pass this as '+ch('@')+ch('{')+'selected|token_id'+ch('}')+' and the character id will be pulled from represents field of the token.'+
131+
'</li> '+
132+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
133+
'<b><span style="font-family: serif;">attribute</span></b> -- The name of the attribute representing ammunition.'+
134+
'</li> '+
135+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
136+
'<b><span style="font-family: serif;">amount</span></b> -- The change to apply to the current quantity of ammo. Use negative numbers to decrease the amount, and positive numbers to increase it. You can use inline rolls to determine the number.'+
137+
'</li> '+
138+
'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'+
139+
'<b><span style="font-family: serif;">resource name</span></b> -- Anything you put after the amount to adjust by will be used as the resource name (default: "ammo").'+
140+
'</li> '+
141+
'</ul>'+
142+
'</div>'+
143+
'<b><span style="font-family: serif;">!wammo '+ch('<')+'id'+ch('>')+' '+ch('<')+'attribute'+ch('>')+' '+ch('<')+'amount'+ch('>')+' '+ch('[')+'resource name'+ch(']')+'</span></b>'+
144+
'<div style="padding-left: 10px;padding-right:20px">'+
145+
'This command is identical to !ammo but will whisper all output.'+
146+
'</div>'+
147+
'</div>'+
148+
'</div>'
149+
);
150+
},
151+
152+
attrLookup = function(character,name,caseSensitive){
153+
let match=name.match(/^(repeating_.*)_\$(\d+)_.*$/);
154+
if(match){
155+
let index=match[2],
156+
attrMatcher=new RegExp(`^${name.replace(/_\$\d+_/,'_([-\\da-zA-Z]+)_')}$`,(caseSensitive?'i':'')),
157+
createOrderKeys=[],
158+
attrs=_.chain(findObjs({type:'attribute', characterid:character.id}))
159+
.map((a)=>{
160+
return {attr:a,match:a.get('name').match(attrMatcher)};
161+
})
162+
.filter((o)=>o.match)
163+
.each((o)=>createOrderKeys.push(o.match[1]))
164+
.reduce((m,o)=>{ m[o.match[1]]=o.attr; return m;},{})
165+
.value(),
166+
sortOrderKeys = _.chain( ((findObjs({
167+
type:'attribute',
168+
characterid:character.id,
169+
name: `_reporder_${match[1]}`
170+
})[0]||{get:_.noop}).get('current') || '' ).split(/\s*,\s*/))
171+
.intersection(createOrderKeys)
172+
.union(createOrderKeys)
173+
.value();
174+
if(index<sortOrderKeys.length && _.has(attrs,sortOrderKeys[index])){
175+
return attrs[sortOrderKeys[index]];
176+
}
177+
return;
178+
}
179+
return findObjs({ type:'attribute', characterid:character.id, name: name}, {caseInsensitive: !caseSensitive})[0];
180+
},
181+
182+
HandleInput = function(msg_orig) {
183+
if (msg_orig.type !== "api") {
184+
return;
185+
}
186+
187+
let msg = _.clone(msg_orig);
188+
189+
if(_.has(msg,'inlinerolls')){
190+
msg.content = _.chain(msg.inlinerolls)
191+
.reduce(function(m,v,k){
192+
m['$[['+k+']]']=v.results.total || 0;
193+
return m;
194+
},{})
195+
.reduce(function(m,v,k){
196+
return m.replace(k,v);
197+
},msg.content)
198+
.value();
199+
}
200+
201+
let whisper = false;
202+
let ignoreMissing = false;
203+
let allowPartial = false;
204+
205+
let who=(getObj('player',msg.playerid)||{get:()=>'API'}).get('_displayname');
206+
let attr, amount, chr, token, label;
207+
208+
let args = msg.content.split(/\s+/);
209+
let switches = args.filter((a)=>/^--/.test(a));
210+
args = args.filter((a)=>!/^--/.test(a));
211+
switch(args.shift()) {
212+
case '!wammo':
213+
whisper = true;
214+
/* break; // intentional dropthrough */ /* falls through */
215+
216+
case '!ammo':
217+
if((args.length + switches.length) > 1) {
218+
219+
switches.forEach((s)=>{
220+
switch(s) {
221+
case '--help':
222+
return showHelp(who,msg.playerid);
223+
224+
case '--ignore-missing':
225+
ignoreMissing = true;
226+
break;
227+
228+
case '--allow-partial':
229+
allowPartial = true;
230+
break;
231+
}
232+
});
233+
234+
235+
chr = getObj('character', args[0]);
236+
if( ! chr ) {
237+
token = getObj('graphic', args[0]);
238+
if(token) {
239+
chr = getObj('character', token.get('represents'));
240+
}
241+
}
242+
if(chr) {
243+
if(! playerIsGM(msg.playerid) &&
244+
! _.contains(chr.get('controlledby').split(','),msg.playerid) &&
245+
! _.contains(chr.get('controlledby').split(','),'all')
246+
)
247+
{
248+
sendMessage(
249+
'You do not control the specified character: '+chr.id ,
250+
(playerIsGM(msg.playerid) ? 'gm' : who),
251+
whisper
252+
);
253+
sendMessage(
254+
'<b>'+getObj('player',msg.playerid).get('_displayname')+'</b> attempted to adjust attribute <b>'+args[1]+'</b> on character <b>'+chr.get('name')+'</b>.',
255+
'gm',
256+
whisper
257+
);
258+
return;
259+
}
260+
261+
attr = attrLookup(chr,args[1],false);
262+
}
263+
amount=parseInt(args[2],10);
264+
label=_.rest(args,3).join(' ');
265+
if(attr) {
266+
adjustAmmo({
267+
output: {
268+
who,
269+
playerid: msg.playerid,
270+
whisper
271+
},
272+
operation: {
273+
attr,
274+
amount,
275+
label
276+
},
277+
options: {
278+
ignoreMissing,
279+
allowPartial
280+
}
281+
});
282+
283+
} else if(!ignoreMissing) {
284+
if(chr) {
285+
sendMessage(
286+
`Attribute [${args[1]}] was not found. Please verify that you have the right name.`,
287+
(playerIsGM(msg.playerid) ? 'gm' : who),
288+
whisper
289+
);
290+
} else {
291+
sendMessage(
292+
( token ? 'Token id ['+args[0]+'] does not represent a character. ' : 'Character/Token id ['+args[0]+'] is not valid. ' ) +
293+
'Please be sure you are specifying it correctly, either with '+ch('@')+ch('{')+'selected|token_id'+ch('}')+
294+
' or '+ch('@')+ch('{')+'selected|character_id'+ch('}')+'.',
295+
(playerIsGM(msg.playerid) ? 'gm' : who),
296+
whisper
297+
);
298+
}
299+
}
300+
} else {
301+
showHelp(who,msg.playerid);
302+
}
303+
break;
304+
}
305+
306+
},
307+
checkInstall = function() {
308+
log('-=> Ammo v'+version+' <=- ['+(new Date(lastUpdate*1000))+']');
309+
if( ! _.has(state,'Ammo') || state.Ammo.version !== schemaVersion) {
310+
log(' > Updating Schema to v'+schemaVersion+' <');
311+
state.Ammo = {
312+
version: schemaVersion,
313+
config: {
314+
},
315+
policies: {
316+
global: {
317+
recoveryUpdatesMaximum: false
318+
},
319+
byAttribute: {
320+
},
321+
byCharacter: {
322+
}
323+
}
324+
};
325+
}
326+
},
327+
328+
RegisterEventHandlers = function() {
329+
on('chat:message', HandleInput);
330+
};
331+
332+
return {
333+
CheckInstall: checkInstall,
334+
RegisterEventHandlers: RegisterEventHandlers
335+
};
336+
}());
337+
338+
on("ready",function(){
339+
'use strict';
340+
341+
Ammo.CheckInstall();
342+
Ammo.RegisterEventHandlers();
343+
});

‎Ammo/Ammo.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
var Ammo = Ammo || (function() {
66
'use strict';
77

8-
var version = '0.3.8',
9-
lastUpdate = 1533040966,
8+
var version = '0.3.10',
9+
lastUpdate = 1584729310,
1010
schemaVersion = 0.1,
1111

1212
ch = function (c) {
@@ -46,7 +46,7 @@ var Ammo = Ammo || (function() {
4646

4747
const chr = getObj('character',attr.get('characterid'));
4848
const val = parseInt(attr.get('current'),10)||0;
49-
const max = parseInt(attr.get('max'),10)||10000;
49+
const max = parseInt(attr.get('max'),10)||Number.MAX_SAFE_INTEGER;
5050

5151
let adjustedValue = (val+amount);
5252
let overage = 0;
@@ -83,7 +83,7 @@ var Ammo = Ammo || (function() {
8383
}
8484

8585
if( playerIsGM(playerid) || valid ) {
86-
attr.set({current: adjustedValue});
86+
attr.setWithWorker({current: adjustedValue});
8787
let verb = (adjustedValue < val) ? 'use' : 'gain';
8888
sendMessage(
8989
`<b>${chr.get('name')}</b> ${verb}s ${Math.abs(amount)} ${label} and has ${adjustedValue} remaining. ${overage ? `Unable to ${verb} ${overage} ${label}.`:''}`,

‎Ammo/script.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Ammo",
33
"script": "Ammo.js",
4-
"version": "0.3.8",
4+
"version": "0.3.10",
55
"description": "Ammo provides inventory management for ammunition stored in a character attribute. If the adjustment would change the attribute to be below 0 or above it's maximum value, a warning will be issued and the attribute will not be changed.\r\r**Note:** As the GM, bounds will not be enforced for you. You will be whispered the warnings, but the operation will succeed. You will also be told the previous and current state in case you want to revert the change.\r\r## Commands\r\r```!ammo <id> <attribute> <amount> [resource name]```\r\rThis command requires 3 parameters:\r\r* `id` -- The id of the character which has the attribute. You can pass this as `@{character_id}` or `@{selected|token_id}` and the character id will be pulled from represents field of the token.\r* `attribute` -- The name of the attribute representing ammunition.\r **Note:** this is the name without `@{ }` around it. This works with repeating sections as well, but you will need to find the repeating row id to build the attribute name.\r* `amount` -- The change to apply to the current quantity of ammo. Use negative numbers to decrease the amount, and positive numbers to increase it. You can use inline rolls to determine the number.\r* `resource name` -- Anything you put after the amount to adjust by will be used as the resource name (default: \"ammo\").\r\r```!wammo <id> <attribute> <amount> [resource name]```\r\rThis command is identical to !ammo but will whisper all output.\r\r\r### Examples:\rShoot 1 arrow:\r\r```!ammo @{character_id} arrows -1 arrow```\r\rShoot 3 arrows:\r\r```!ammo @{character_id} arrows -3 arrow```\r\rRecover 1d6 arrows:\r\r```!ammo @{character_id} arrows [[1d6]] arrow```\r\r\rRefill all arrows (by picking up the difference between the current and max value).\r\r```!ammo @{character_id} arrows [[@{selected|arrows|max}-@{selected|arrows}]]```\r\rUsing a repeating group's field with rowid:\r\r```!ammo @{character_id} repeating_weapons_-J1as31234_weapon_arrows -1 arrows```\r\rUsing a repeating group's field with index:\r\r```!ammo @{character_id} repeating_weapons_$2_weapon_arrows -1 arrows```\r\rWhisper ammo changes to yourself:\r\r```!wammo @{character_id} arrows -1 arrow```\r",
66
"authors": "The Aaron",
77
"roll20userid": "104025",
@@ -26,6 +26,7 @@
2626
"0.3.4",
2727
"0.3.5",
2828
"0.3.6",
29-
"0.3.7"
29+
"0.3.7",
30+
"0.3.8"
3031
]
3132
}

0 commit comments

Comments
 (0)