Skip to content

Commit 6fc2dcc

Browse files
Algor0113Algor0113
authored
Merge pull request #443 from gmmatt/dev
v 12.2.2 dev-> master merge
2 parents edb217a + d5c6777 commit 6fc2dcc

File tree

7 files changed

+186
-20
lines changed

7 files changed

+186
-20
lines changed

‎Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# TORG Eternity Changelog
22

3+
## v. 12.2.2
4+
5+
- Added ammunition handling to vehicles (and some other item handling)
6+
- More migrations for active effects (values of _True_ won't be handled)
7+
- Item drop on vehicles were somewhat messy
8+
39
## v. 12.2.1
410

511
- With the new hook on end of turn in ct, active defense was deleted as well. Squished that (it's about the end of the round, this will be part of 12.3.0)

‎css/torgeternity.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ a.inline-roll.broken:hover {
181181
font-family: Alaska;
182182
font-size: 13px;
183183
text-transform: capitalize;
184-
right: -158px;
185-
top: 158px;
184+
right: -209px;
185+
top: 210px;
186186
}
187187

188188
.window-content .actor-sheet .vehicle-description .editor {

‎module/documents/active-effect/torgActiveEffect.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ export default class TorgActiveEffect extends ActiveEffect {
5050
for (const change of data.changes) {
5151
if (change.key.includes('.isFav') && (change.value === '1' || change.value === '0')) {
5252
change.value = change.value === '1' ? 'true' : 'false';
53+
} else if (
54+
change.key.includes('.isFav') &&
55+
(change.value === 'True' || change.value === 'False')
56+
) {
57+
change.value = change.value.toLowerCase();
5358
}
5459
}
5560
}

‎module/sheets/torgeternityItemSheet.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ export default class TorgeternityItemSheet extends ItemSheet {
156156
this.item.update({ 'system.pulpPowers.limitationNumber': newShown });
157157
});
158158

159-
html.find('.reload-weapon').click((ev) => {
159+
html.find('.reload-weapon').click(async (ev) => {
160160
const button = ev.currentTarget.closest('[data-item-id]');
161161
const usedAmmo = this?.actor.items.get(button.dataset.itemId);
162162

163-
reloadAmmo(this.actor, this.object, usedAmmo);
163+
await reloadAmmo(this.actor, this.object, usedAmmo, this);
164+
this.render(true);
164165
});
165166

166167
html.find('.selectSecondaryAxiom').click((ev) => {

‎module/torgeternity.js

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,20 +1021,25 @@ Hooks.on('renderChatLog', (app, html, data) => {
10211021
});
10221022

10231023
// When a "non-vehicle actor" is drop on a "vehicle actor", proposes to replace the driver and his skill value
1024-
Hooks.on('dropActorSheetData', async (myVehicle, mySheet, myPassenger) => {
1025-
if (myVehicle.type !== 'vehicle' || fromUuidSync(myPassenger.uuid).type === 'vehicle') return;
1026-
const driver = fromUuidSync(myPassenger.uuid);
1027-
const skill = myVehicle.system.type.toLowerCase();
1028-
const skillValue = driver.system.skills[skill + 'Vehicles'].value;
1029-
if (skillValue > 0) {
1030-
myVehicle.update({
1031-
'system.operator.name': driver.name,
1032-
'system.operator.skillValue': skillValue,
1033-
});
1034-
} else {
1035-
ui.notifications.warn(
1036-
await game.i18n.format('torgeternity.notifications.noCapacity', { a: driver.name })
1037-
);
1024+
Hooks.on('dropActorSheetData', async (myVehicle, mySheet, dropItem) => {
1025+
if (
1026+
(myVehicle.type === 'vehicle' && fromUuidSync(dropItem.uuid).type === 'stormknight') ||
1027+
(fromUuidSync(dropItem.uuid).type === 'threat' &&
1028+
fromUuidSync(dropItem.uuid).type !== 'vehicle')
1029+
) {
1030+
const driver = fromUuidSync(dropItem.uuid);
1031+
const skill = myVehicle.system.type.toLowerCase();
1032+
const skillValue = driver?.system?.skills[skill + 'Vehicles']?.value ?? 0;
1033+
if (skillValue > 0) {
1034+
myVehicle.update({
1035+
'system.operator.name': driver.name,
1036+
'system.operator.skillValue': skillValue,
1037+
});
1038+
} else if (skillValue === 0) {
1039+
ui.notifications.warn(
1040+
await game.i18n.format('torgeternity.notifications.noCapacity', { a: driver.name })
1041+
);
1042+
}
10381043
}
10391044
/* await Dialog.confirm({
10401045
title: game.i18n.localize('torgeternity.dialogWindow.dragDropDriver.windowTitle'),

‎system.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"flags": {}
1616
}
1717
],
18-
"version": "12.2.0",
18+
"version": "12.2.2",
1919
"compatibility": {
2020
"minimum": "12",
2121
"verified": "12.327"

‎templates/actors/vehicle/main.hbs

Lines changed: 150 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
<nav class="sheet-tabs tabs vehicle" data-group="primary">
77
<a class="item" data-tab="stats">{{localize "torgeternity.sheetLabels.stats"}}</a>
8+
<a class="item" data-tab="gear">{{localize "torgeternity.sheetLabels.gear"}}</a>
89
<a class="item" data-tab="effects">{{localize "torgeternity.sheetLabels.effects"}}</a>
910
<a class="item" data-tab="description">{{localize "torgeternity.sheetLabels.description"}}</a>
1011
</nav>
@@ -242,6 +243,9 @@
242243
<a class="item-control item-edit" data-tooltip="{{localize 'torgeternity.iconeTitles.edit'}}">
243244
<i class="fas fa-edit"></i>
244245
</a>
246+
<a class="item-control" data-weapon="{{item}}" data-tooltip="{{localize "torgeternity.iconeTitles.reload"}}">
247+
<i class="fa-solid fa-bullseye reload-weapon"></i>
248+
</a>
245249
<a
246250
class="item-control item-delete"
247251
data-tooltip="{{localize 'torgeternity.iconeTitles.delete'}}"
@@ -251,7 +255,7 @@
251255
</div>
252256
</li>
253257
{{/each}}
254-
</div>
258+
</div>
255259
<h2>{{localize "torgeternity.sheetLabels.addOns"}}</h2>
256260
<div class="item-list">
257261
<li class="add-on-header">
@@ -289,6 +293,151 @@
289293
</div>
290294
</div>
291295

296+
<div class="tab gear" data-group="primary" data-tab="gear" style="display:unset">
297+
{{#if heavyweapon}}
298+
<h2>{{localize "torgeternity.sheetLabels.heavyWeapons"}}/{{localize "torgeternity.sheetLabels.explosives"}}</h2>
299+
<ol class="item-list">
300+
301+
{{#each heavyweapon as |item id|}}
302+
<li class="item block" data-item-id="{{item._id}}">
303+
<div class="item-row flexrow">
304+
<img src="{{item.img}}" data-tooltip="{{item.name}}" />
305+
<a class="item-name">{{item.name}}
306+
({{localize 'torgeternity.sheetLabels.heavyWeapons'}}/{{localize
307+
'torgeternity.sheetLabels.explosives'}})</a>
308+
<div class="item-controls">
309+
<a class="item-control item-attackRoll" data-tooltip="{{localize 'torgeternity.iconeTitles.attackRoll'}}">
310+
<i class="fas fa-dice-d20"></i>
311+
</a>
312+
<a class="item-control item-edit" data-tooltip="{{localize 'torgeternity.iconeTitles.edit'}}">
313+
<i class="fas fa-edit"></i>
314+
</a>
315+
<a class="item-control item-delete" data-tooltip="{{localize 'torgeternity.iconeTitles.delete'}}">
316+
<i class="fas fa-trash"></i>
317+
</a>
318+
</div>
319+
</div>
320+
<div class="item-detail">
321+
<div class="item-dropdown-description">
322+
{{{item.description}}}
323+
<p></p>
324+
<div class="item-dropdown-extras">
325+
{{item.system.cosm}}
326+
</div>
327+
<div class="item-dropdown-extras">
328+
{{localize 'torgeternity.gear.tl'}}
329+
{{item.system.techlevel}}
330+
</div>
331+
<div class="item-dropdown-extras">
332+
{{item.system.price}}
333+
({{item.system.value}})
334+
</div>
335+
<div class="item-dropdown-extras">
336+
{{item.system.range}}
337+
</div>
338+
<div class="item-dropdown-extras">
339+
{{localize 'torgeternity.gear.ammo'}}:
340+
{{item.system.ammo.value}}
341+
/
342+
{{item.system.ammo.max}}
343+
</div>
344+
<div class="item-dropdown-extras">
345+
{{item.system.notes}}
346+
</div>
347+
</div>
348+
</div>
349+
</li>
350+
{{/each}}
351+
</ol>
352+
{{/if}}
353+
{{#if ammunitions}}
354+
<h2>{{localize "torgeternity.sheetLabels.ammunition"}}</h2>
355+
<ol class="item-list">
356+
{{#each ammunitions as |item id|}}
357+
<li class="item block gear" data-item-id="{{item._id}}">
358+
<div class="item-row flexrow">
359+
<img src="{{item.img}}" data-tooltip="{{item.name}}" />
360+
<a class="item-name">{{item.name}}
361+
({{localize 'torgeternity.sheetLabels.ammunition'}})</a>
362+
<div class="item-controls">
363+
<a class="item-control item-edit" data-tooltip="{{localize 'torgeternity.iconeTitles.edit'}}">
364+
<i class="fas fa-edit"></i>
365+
</a>
366+
<a class="item-control item-delete" data-tooltip="{{localize 'torgeternity.iconeTitles.delete'}}">
367+
<i class="fas fa-trash"></i>
368+
</a>
369+
</div>
370+
</div>
371+
372+
<div class="item-detail">
373+
<div class="item-dropdown-description">
374+
{{{item.description}}}
375+
<p></p>
376+
<div class="item-dropdown-extras">
377+
{{localize 'torgeternity.sheetLabels.quantity'}}
378+
{{item.system.quantity}}
379+
</div>
380+
<div class="item-dropdown-extras">
381+
{{localize 'torgeternity.gear.tl'}}
382+
{{item.system.techlevel}}
383+
</div>
384+
<div class="item-dropdown-extras">
385+
{{item.system.price}}
386+
({{item.system.value}})
387+
</div>
388+
<div class="item-dropdown-extras">
389+
{{item.system.notes}}
390+
</div>
391+
</div>
392+
</div>
393+
</li>
394+
{{/each}}
395+
</ol>
396+
{{/if}}
397+
{{#if gear}}
398+
<h2>{{localize "torgeternity.sheetLabels.gear"}}</h2>
399+
<ol class="item-list">
400+
401+
{{#each gear as |item id|}}
402+
<li class="item" data-item-id="{{item._id}}">
403+
<div class="item-row flexrow">
404+
<img src="{{item.img}}" data-tooltip="{{item.name}}" />
405+
<a class="item-name">{{item.name}}</a>
406+
<div class="item-controls">
407+
<a class="item-control item-tochat" data-tooltip="{{localize 'torgeternity.iconeTitles.sendToChat'}}">
408+
<i class="fas fa-comment"></i>
409+
</a>
410+
<a class="item-control item-edit" data-tooltip="{{localize 'torgeternity.iconeTitles.edit'}}">
411+
<i class="fas fa-edit"></i>
412+
</a>
413+
<a class="item-control item-delete" data-tooltip="{{localize 'torgeternity.iconeTitles.delete'}}">
414+
<i class="fas fa-trash"></i>
415+
</a>
416+
</div>
417+
</div>
418+
<div class="item-detail">
419+
<div class="item-dropdown-description">
420+
{{{item.description}}}
421+
</div>
422+
<div class="item-dropdown-extras">
423+
{{item.system.cosm}}
424+
</div>
425+
<div class="item-dropdown-extras">
426+
{{item.system.price}}
427+
({{item.system.value}})
428+
</div>
429+
<div class="item-dropdown-extras">
430+
{{localize 'torgeternity.gear.tl'}}
431+
{{item.system.techlevel}}
432+
</div>
433+
434+
</div>
435+
</li>
436+
{{/each}}
437+
</ol>
438+
{{/if}}
439+
</div>
440+
292441
<div class="tab effects" data-group="primary" data-tab="effects">
293442
<div class="effects block">
294443
{{> "systems/torgeternity/templates/parts/active-effects.hbs"}}

0 commit comments

Comments
 (0)