Skip to content

Commit

Permalink
Fix drag in item, add Tolerated&feared Social standing
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnthonyMonette
AnthonyMonette committed Sep 4, 2022
1 parent d892b80 commit f6f21f6
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
1 change: 1 addition & 0 deletions lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@
"WITCHER.socialStanding.hated": "Hated",
"WITCHER.socialStanding.feared": "Feared",
"WITCHER.socialStanding.hatedFeared": "Hated & Feared",
"WITCHER.socialStanding.toleratedFeared": "Tolerated & Feared",


"WITCHER.socialStanding.north": "The North",
Expand Down
28 changes: 8 additions & 20 deletions module/sheets/WitcherItemSheet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,18 @@ export default class WitcherItemSheet extends ItemSheet {
this._dragDrop.push(newDragDrop);
}

_onDrop(event) {
async _onDrop(event) {
if (this.item.type == "diagrams") {
let dragData = JSON.parse(event.dataTransfer.getData("text/plain"));
let dragEventData = TextEditor.getDragEventData(event)
if(dragEventData.pack) {
let pack = game.packs.get(dragEventData.pack)
pack.getDocument(dragEventData.id).then(item => {
let newComponentList = []
if (this.item.system.craftingComponents){
newComponentList = this.item.system.craftingComponents
}
newComponentList.push({id: genId(), name: item.system.name, quantity: 1})
this.item.update({'system.craftingComponents': newComponentList});
})
} else {
let item = game.items.get(dragEventData.id)
if (item) {
let newComponentList = []
if (this.item.system.craftingComponents){
newComponentList = this.item.system.craftingComponents
}
newComponentList.push({id: genId(), name: item.system.name, quantity: 1})
this.item.update({'system.craftingComponents': newComponentList});
let item = await fromUuid(dragEventData.uuid)
if (item) {
let newComponentList = []
if (this.item.system.craftingComponents){
newComponentList = this.item.system.craftingComponents
}
newComponentList.push({id: genId(), name: item.name, quantity: 1})
this.item.update({'system.craftingComponents': newComponentList});
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions module/witcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,16 +333,16 @@ function rollSkillCheck(thisActor, statNum, skillNum){
let rollFormula = !displayRollDetails ? `1d10+${stat}+${skill}` : `1d10+${stat}[${parentStat}]+${skill}[${skillName}]` ;

if (statNum == 4 && (skillNum == 0 || skillNum == 6 || skillNum == 7 || skillNum == 9)){
if (thisActor.system.general.socialStanding == "tolerated") {
if (thisActor.system.general.socialStanding == "tolerated" || thisActor.system.general.socialStanding == "toleratedFeared") {
rollFormula += !displayRollDetails ? `-1` : `-1[${game.i18n.localize("WITCHER.socialStanding.tolerated")}]` ;
} else if (thisActor.system.general.socialStanding == "hated" || thisActor.system.general.socialStanding == "hatedFeared") {
rollFormula += !displayRollDetails ? `-2` : `-2[${game.i18n.localize("WITCHER.socialStanding.hated")}]` ;
}
}
if (statNum == 4 && skillNum == 0 && (thisActor.system.general.socialStanding == "feared" || thisActor.system.general.socialStanding == "hatedFeared")){
if (statNum == 4 && skillNum == 0 && (thisActor.system.general.socialStanding == "feared" || thisActor.system.general.socialStanding == "hatedFeared" || thisActor.system.general.socialStanding == "toleratedFeared")){
rollFormula += !displayRollDetails ? `-1` : `-1[${game.i18n.localize("WITCHER.socialStanding.feared")}]` ;
}
if (statNum == 6 && skillNum == 2 && (thisActor.system.general.socialStanding == "feared" || thisActor.system.general.socialStanding == "hatedFeared")){
if (statNum == 6 && skillNum == 2 && (thisActor.system.general.socialStanding == "feared" || thisActor.system.general.socialStanding == "hatedFeared" || thisActor.system.general.socialStanding == "toleratedFeared")){
rollFormula += !displayRollDetails ? `+1` : `+1[${game.i18n.localize("WITCHER.socialStanding.feared")}]` ;
}

Expand Down
2 changes: 1 addition & 1 deletion system.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "The Witcher TRPG System.",
"minimumCoreVersion" : "10",
"compatibleCoreVersion" : "10",
"version": 0.86,
"version": 0.87,
"author": "TechAntho",
"scripts": [
],
Expand Down
1 change: 1 addition & 0 deletions templates/partials/character-header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand Down
5 changes: 5 additions & 0 deletions templates/partials/tab-profession.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ <h3><input class="inline-edit" data-field="system.perk4.name" type="text" valu
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -307,6 +308,7 @@ <h3><input class="inline-edit" data-field="system.perk4.name" type="text" valu
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -318,6 +320,7 @@ <h3><input class="inline-edit" data-field="system.perk4.name" type="text" valu
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -329,6 +332,7 @@ <h3><input class="inline-edit" data-field="system.perk4.name" type="text" valu
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -340,6 +344,7 @@ <h3><input class="inline-edit" data-field="system.perk4.name" type="text" valu
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand Down
2 changes: 1 addition & 1 deletion templates/sheets/diagrams-sheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<th>{{localize "WITCHER.Diagram.components"}}</th>
<th><label>{{localize "WITCHER.Item.Quantity"}}</label></th>
</tr>
{{#each system.craftingComponents as |component name|}}
{{#each item.system.craftingComponents as |component name|}}
<tr>
<th class="list-item" data-id="{{component.id}}">
<a class="remove-component" title="{{localize "WITCHER.Item.RemoveComponent"}}"><i class="fas fa-minus"></i></a>
Expand Down
5 changes: 5 additions & 0 deletions templates/sheets/race-sheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ <h3><input name="system.perk4.name" type="text" value="{{item.system.perk4.name}
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -56,6 +57,7 @@ <h3><input name="system.perk4.name" type="text" value="{{item.system.perk4.name}
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -67,6 +69,7 @@ <h3><input name="system.perk4.name" type="text" value="{{item.system.perk4.name}
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -78,6 +81,7 @@ <h3><input name="system.perk4.name" type="text" value="{{item.system.perk4.name}
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand All @@ -89,6 +93,7 @@ <h3><input name="system.perk4.name" type="text" value="{{item.system.perk4.name}
<option value="tolerated">{{localize "WITCHER.socialStanding.tolerated"}}</option>
<option value="hated">{{localize "WITCHER.socialStanding.hated"}}</option>
<option value="feared">{{localize "WITCHER.socialStanding.feared"}}</option>
<option value="toleratedFeared">{{localize "WITCHER.socialStanding.toleratedFeared"}}</option>
<option value="hatedFeared">{{localize "WITCHER.socialStanding.hatedFeared"}}</option>
{{/select}}
</select>
Expand Down

0 comments on commit f6f21f6

Please sign in to comment.