0.9

comat0zz · Feb 6, 2023 · 9fe3cf1 · 9fe3cf1
1 parent 7947807
commit 9fe3cf1
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 14 deletions.
diff --git a/lang/ru.json b/lang/ru.json
@@ -40,7 +40,14 @@
  "Mod": "Выбор модификаторов",
  "YouModifyRoll": "Модификатор для броска",
  "MyItemInUse": "Использовать памятный предемет?",
- "UseElement": "Использовать элемент?"
+ "UseElement": "Использовать элемент?",
+ "Table": {
+ "Appr": "За подход",
+ "MyItem": "За памятный предмет",
+ "Element": "За элемент",
+ "Mod": "Модификатор",
+ "ReRoll": "Перебросить"
+ }
  },
 
  "Actor": {

diff --git a/module/actors/sheets/HeroActorSheet.js b/module/actors/sheets/HeroActorSheet.js
@@ -143,7 +143,40 @@ export class HeroActorSheet extends BaseActorSheet {
  }
 
  async rollApproach(appr_id, appr_val, appr_mod, html) {
+ const mod = html.find('select[name=set-mofidy] option:checked').val();
+ const element = html.find('select[name=elements] option:checked').val();
+ const myitem = html.find('input[name=myiteminuse]:checked').val();
+
+ let dices = appr_mod; // подход
+ dices += parseInt(mod); // select модификатор
+ if (typeof myitem !== 'undefined') {
+ dices += 1; // использую памятный предмет
+ }
+
+ if (parseInt(element) !== 0 ) {
+ dices += 1; // использую элемент
+ }
+
+ const formula = `${dices}d6`;
+ let roll = await new Roll(formula).evaluate({async: true});
+ const template = await renderTemplate(`${game.system_path}/templates/chats/dices-roll.hbs`, {
+ formula: formula,
+ result: roll.result,
+ total: roll.total,
+ appr_id: appr_id,
+ terms: roll.terms[0].results,
+ appr_mod: appr_mod,
+ myitem: (typeof myitem !== 'undefined')?true:false,
+ element: (parseInt(element) !== 0 )?true:false,
+ mod: mod
+ });
 
+ ChatMessage.create({
+ user: game.user._id,
+ speaker: ChatMessage.getSpeaker(),
+ content: template
+ });
+
  }
 
  async _onActorRollApproach(evt) {

diff --git a/module/handlebars/templates.js b/module/handlebars/templates.js
@@ -13,7 +13,8 @@ export const preloadHandlebarsTemplates = async function () {
 
  `${game.system_path}/templates/chats/get-cards.hbs`,
  `${game.system_path}/templates/chats/weapon-roll.hbs`,
- `${game.system_path}/templates/chats/attrs-roll.hbs` 
+ `${game.system_path}/templates/chats/attrs-roll.hbs`,
+ `${game.system_path}/templates/chats/dices-roll.hbs` 
  ];
 
  // Load the template parts 

diff --git a/src/less/sheet.less b/src/less/sheet.less
@@ -125,4 +125,15 @@
  font-size: 16px;
  }
  }
+}
+
+.dice-total table.dices-total {
+ font-size: 16px;
+ font-weight: normal;
+}
+
+.chat-reroll {
+ cursor: pointer;
+ text-align: center;
+ font-weight: bold;
 }
diff --git a/styles/index.css b/styles/index.css
@@ -109,6 +109,15 @@
  text-align: left;
  font-size: 16px;
 }
+.dice-total table.dices-total {
+ font-size: 16px;
+ font-weight: normal;
+}
+.chat-reroll {
+ cursor: pointer;
+ text-align: center;
+ font-weight: bold;
+}
 /* Items Sheet */
 .item-cards .window-content {
  font-family: CardText;

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
  "id": "see-you-in-hell",
  "title": "Встретимся в АДУ",
  "description": "Брутальный нарративный боевик о крутых парнях, которые останавливают инфернальное вторжение. Игра от команды Silver Hoof Games",
- "version": "0.1",
+ "version": "0.9",
  "compatibility": {
  "minimum": "10",
  "verified": "10.291"

diff --git a/templates/chats/dices-roll.hbs b/templates/chats/dices-roll.hbs
@@ -0,0 +1,67 @@
+ <div class="dice-roll">
+ <div class="dice-result">
+ <div class="dice-formula">
+ {{#ife appr_id "BloodthirstyColdBlooded"}}
+ {{#ife appr_id 1}}
+ {{localize "CZT.Actor.Approaches.Bloodthirsty"}}
+ {{else}}
+ {{localize "CZT.Actor.Approaches.ColdBlooded"}}
+ {{/ife}}
+ {{/ife}}
+ {{#ife appr_id "ElusiveImpenetrable"}}
+ {{#ife appr_id 1}}
+ {{localize "CZT.Actor.Approaches.Elusive"}}
+ {{else}}
+ {{localize "CZT.Actor.Approaches.Impenetrable"}}
+ {{/ife}}
+ {{/ife}}
+ {{#ife appr_id "ConfidentCalculating"}}
+ {{#ife appr_id 1}}
+ {{localize "CZT.Actor.Approaches.Confident"}}
+ {{else}}
+ {{localize "CZT.Actor.Approaches.Calculating"}}
+ {{/ife}}
+ {{/ife}}
+ &nbsp;{{localize "CZT.Actor.Approach"}}: 
+ {{formula}}</div>
+ <div class="dice-tooltip expanded">
+ <section class="tooltip-part">
+ <div class="dice">
+ <header class="part-header flexrow">
+ <span class="part-formula">{{formula}}</span> 
+ <span class="part-total">{{total}}</span>
+ </header>
+ <ol class="dice-rolls">
+ {{#each terms as |dice key|}}
+ <li class="roll die d6{{#ife dice.result 1}} min{{/ife}}{{#ife dice.result 6}} max{{/ife}}{{#ife dice.result 5}} max{{/ife}}">{{dice.result}}</li>
+ {{/each}}
+ </ol>
+ </div>
+ </section>
+ </div>
+
+ <table class="dices-total">
+ <tr>
+ <td>{{localize "CZT.Rolls.Table.Appr"}}</td>
+ <td>{{appr_mod}}d6</td>
+ </tr>
+ {{#if myitem}}
+ <tr>
+ <td>{{localize "CZT.Rolls.Table.MyItem"}}</td>
+ <td>+1d6</td>
+ </tr>
+ {{/if}}
+ {{#if element}}
+ <tr>
+ <td>{{localize "CZT.Rolls.Table.Element"}}</td>
+ <td>+1d6</td>
+ </tr>
+ {{/if}}
+ <tr>
+ <td>{{localize "CZT.Rolls.Table.Mod"}}</td>
+ <td>{{mod}}d6</td>
+ </tr>
+ <tr><td class="chat-reroll" colspan="2">{{localize "CZT.Rolls.Table.ReRoll"}}</td></tr>
+ </table>
+ </div>
+</div>
diff --git a/templates/dialogs/modify-attrs-roll.hbs b/templates/dialogs/modify-attrs-roll.hbs
@@ -31,25 +31,22 @@
  <div class="actor-column">{{localize "CZT.Rolls.YouModifyRoll"}}:</div>
  <div class="actor-column">
  <select name="set-mofidy">
- <option value="-5">-5</option>
- <option value="-4">-4</option>
- <option value="-3">-3</option>
  <option value="-2">-2</option>
  <option value="-1">-1</option>
- <option value="0" selected>0</option>
- <option value="1">+1</option>
- <option value="2">+2</option>
- <option value="3">+3</option>
- <option value="4">+4</option>
- <option value="5">+5</option>
+ <option value="+0" selected>0</option>
+ <option value="+1">+1</option>
+ <option value="+2">+2</option>
+ <option value="+3">+3</option>
+ <option value="+4">+4</option>
+ <option value="+5">+5</option>
  </select>
  </div>
  </div>
  {{#if elements}}
  <div class="actor-row dialog-select-mofidy">
  <div class="actor-column">{{localize "CZT.Rolls.UseElement"}}</div>
  <div class="actor-column">
- <select name="myitem">
+ <select name="elements">
  <option value="0" selected>{{localize "CZT.Common.Select.No"}}</option>
  {{#each elements as |item key|}}
  <option value="{{item.id}}">{{item.name}}</option>
@@ -62,7 +59,7 @@
  <div class="actor-row dialog-select-mofidy">
  <div class="actor-column">{{localize "CZT.Rolls.MyItemInUse"}}</div>
  <div class="actor-column">
- <input type="checkbox" name="myiteminuse" />
+ <input type="checkbox" name="myiteminuse" value="1" />
  </div>
  </div>
  {{/if}}