Skip to content

Commit 84cbafe

Browse files
authored
Merge pull request #47 from orffen/4e
4e updates
2 parents fe5fe6a + 8882f0d commit 84cbafe

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,10 @@ The monster sheet has a "special abilities" field. This field should be 0, 1, or
3232

3333
All software components are licensed under the MIT license - see *LICENSE.txt* for details.
3434

35-
All Basic Fantasy Role-Playing Game content is licensed under the [Open Game License and Basic Fantasy Role-Playing Game Product Identity License](https://www.basicfantasy.org/srd/#open_game_license).
35+
Basic Fantasy Role-Playing Game content is distributed under the terms of the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/).
3636

3737
### Copyright Notices
3838

39-
- Open Game License v 1.0 Copyright 2000, Wizards of the Coast, Inc.
40-
- System Reference Document Copyright 2000-2003, Wizards of the Coast, Inc.; Authors Jonathan Tweet, Monte Cook, Skip Williams, Rich Baker, Andy Collins, David Noonan, Rich Redman, Bruce R. Cordell, John D. Rateliff, Thomas Reid, James Wyatt, based on original material by E. Gary Gygax and Dave Arneson.
41-
- Castles & Crusades: Players Handbook, Copyright 2004, Troll Lord Games; Authors Davis Chenault and Mac Golden.
42-
- Castles & Crusades: Monsters Product Support, Copyright 2005, Troll Lord Games.
43-
- The Basic Fantasy Field Guide Copyright © 2010 Chris Gonnerman and Contributors.
44-
- Basic Fantasy Role-Playing Game Copyright © 2006-2015 Chris Gonnerman.
39+
- Basic Fantasy Role-Playing Game Copyright © 2006-2023 Chris Gonnerman.
4540
- Boilerplate System Copyright © 2020 Asacolips Projects / Foundry Mods.
4641
- Basic Fantasy RPG for FoundryVTT © 2022 Steve Simenic.

module/sheets/actor-sheet.mjs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ export class BasicFantasyRPGActorSheet extends ActorSheet {
125125
if (!quantity || quantity == '' || Number.isNaN(quantity) || quantity < 0) {
126126
return; // check we have a valid quantity, and do nothing if we do not
127127
}
128-
let q = Math.floor(quantity / 10);
128+
let q = Math.floor(quantity / 20);
129129
if (!Number.isNaN(parseFloat(moreWeight))) {
130130
this.value += parseFloat(moreWeight) * quantity;
131-
} else if (moreWeight === '*' && q > 0) {
131+
} else if (moreWeight === '*' && q > 0) { // '*' is gold pieces
132132
this.value += q;
133133
}
134134
}
@@ -158,9 +158,12 @@ export class BasicFantasyRPGActorSheet extends ActorSheet {
158158

159159
// Iterate through money, add to carried weight
160160
if (context.data.money) {
161-
for (let [k, v] of Object.entries(context.data.money)) {
162-
carriedWeight._addWeight('*', v.value);
163-
}
161+
let gp = Number(context.data.money.gp.value);
162+
gp += context.data.money.pp.value * 5;
163+
gp += context.data.money.ep.value / 5;
164+
gp += context.data.money.sp.value / 10;
165+
gp += context.data.money.cp.value / 100;
166+
carriedWeight._addWeight('*', gp); // '*' will calculate GP weight
164167
}
165168

166169
// Assign and return

system.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
"id": "basicfantasyrpg",
33
"title": "Basic Fantasy RPG",
44
"description": "The Basic Fantasy RPG system for FoundryVTT!",
5-
"version": "r10",
5+
"version": "r11",
66
"compatibility": {
77
"minimum": "11",
8-
"verified": "11",
9-
"maximum": "11"
8+
"verified": "11"
109
},
1110
"authors": [
1211
{
1312
"name": "Orffen",
1413
"email": "orffen@orffenspace.com",
15-
"discord": "Orffen#4571"
14+
"discord": "Orffen"
1615
}
1716
],
1817
"esmodules": ["module/basicfantasyrpg.mjs"],
@@ -31,7 +30,7 @@
3130
"primaryTokenAttribute": "hitPoints",
3231
"secondaryTokenAttribute": null,
3332
"url": "https://github.com/orffen/basicfantasyrpg",
34-
"manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
35-
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r10.zip",
33+
"manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/r11/system.json",
34+
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r11.zip",
3635
"license": "LICENSE.txt"
3736
}

0 commit comments

Comments
 (0)