Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gender neutral #548

Merged
merged 1 commit into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions module/actor/actor-active-effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ export class HeroSystem6eActorActiveEffects extends ActiveEffect {
};

// Temporary BLIND status/effect until enhanced senses can be fully implemented.
// When a character cannot perceive his opponent with any
// Targeting Sense, he is at ½ DCV. He’s also at ½ OCV in HTH
// When a character cannot perceive their opponent with any
// Targeting Sense, they are at ½ DCV. He’s also at ½ OCV in HTH
// Combat and 0 OCV in Ranged Combat.
// As a Half Phase Action, a character can attempt a PER Roll
// to perceive a particular target with a Nontargeting Sense (at -5 if
Expand Down
24 changes: 7 additions & 17 deletions module/actor/actor.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export class HeroSystem6eActor extends Actor {
);
if (existingEffect) {
if (activeEffect.id == "knockedOut") {
//When he wakes up, his END equals his
//current STUN total.
// When they wakes up, their END equals their
// current STUN total.
let newEnd = Math.min(
parseInt(this.system.characteristics.stun.value),
parseInt(this.system.characteristics.end.max),
Expand Down Expand Up @@ -290,7 +290,7 @@ export class HeroSystem6eActor extends Actor {
// RECOVERING
// Characters use REC to regain lost STUN and expended END.
// This is known as “Recovering” or “taking a Recovery.”
// When a character Recovers, add his REC to his current
// When a character Recovers, add their REC to their current
// STUN and END totals (to a maximum of their full values, of
// course). Characters get to Recover in two situations: Post-
// Segment and when they choose to Recover as a Full Phase
Expand All @@ -300,17 +300,17 @@ export class HeroSystem6eActor extends Actor {
// Recovering is a Full Phase Action and occurs at the end of
// the Segment (after all other characters who have a Phase that
// Segment have acted). A character who Recovers during a Phase
// may do nothing else. He cannot even maintain a Constant Power
// may do nothing else. They cannot even maintain a Constant Power
// or perform Actions that cost no END or take no time. However,
// he may take Zero Phase Actions at the beginning of his Phase
// they may take Zero Phase Actions at the beginning of their Phase
// to turn off Powers, and Persistent Powers that don’t cost END
// remain in effect.

let token = this.token;
let speaker = ChatMessage.getSpeaker({ actor: this, token });
speaker["alias"] = this.name;

// A character who holds his breath does not get to Recover (even
// A character who holds their breath does not get to Recover (even
// on Post-Segment 12)
if (this.statuses.has("holdingBreath")) {
const content = this.name + " <i>is holding their breath</i>.";
Expand Down Expand Up @@ -357,16 +357,6 @@ export class HeroSystem6eActor extends Actor {
{ hideChatMessage: true },
);

// let content = this.name + ` <span title="
// Recovering is a Full Phase Action and occurs at the end of
// the Segment (after all other characters who have a Phase that
// Segment have acted). A character who Recovers during a Phase
// may do nothing else. He cannot even maintain a Constant Power
// or perform Actions that cost no END or take no time. However,
// he may take Zero Phase Actions at the beginning of his Phase
// to turn off Powers, and Persistent Powers that don't cost END
// remain in effect."><i>Takes a Recovery</i></span>`;

let content = this.name + ` <i>Takes a Recovery</i>`;
if (deltaEnd || deltaStun) {
content += `, gaining ${deltaEnd} endurance and ${deltaStun} stun.`;
Expand Down Expand Up @@ -455,7 +445,7 @@ export class HeroSystem6eActor extends Actor {
// A character
// who is Stunned or recovering from being
// Stunned can take no Actions, take no Recoveries
// (except his free Post-Segment 12 Recovery), cannot
// (except their free Post-Segment 12 Recovery), cannot
// move, and cannot be affected by Presence Attacks.

// Recovering from being Stunned requires a Full
Expand Down
6 changes: 3 additions & 3 deletions module/combat.js
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ export class HeroSystem6eCombat extends Combat {

// STUNNING
// The character remains Stunned and can take no
// Actions (not even Aborting to a defensive action) until his next
// Actions (not even Aborting to a defensive action) until their next
// Phase.
// Use actor.canAct to block actions
// Remove STUNNED effect _onEndTurn
Expand Down Expand Up @@ -706,10 +706,10 @@ export class HeroSystem6eCombat extends Combat {
for (let combatant of this.combatants.filter((o) => !o.defeated)) {
const actor = combatant.actor;

/// If this is an NPC and their STUN <= 0 then leave them be.
// If this is an NPC and their STUN <= 0 then leave them be.
// Typically, you should only use the Recovery Time Table for
// PCs. Once an NPC is Knocked Out below the -10 STUN level
// he should normally remain unconscious until the fight ends.
// they should normally remain unconscious until the fight ends.
// ACTOR#ONUPDATE SHOULD MARK AS DEFEATED
// if (actor.type != "pc" && parseInt(actor.system.characteristics.stun.value) <= -10)
// {
Expand Down
2 changes: 1 addition & 1 deletion module/herosystem6e.js
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ Hooks.on("updateWorldTime", async (worldTime, options) => {
// If this is an NPC and their STUN <= 0 then leave them be.
// Typically, you should only use the Recovery Time Table for
// PCs. Once an NPC is Knocked Out below the -10 STUN level
// he should normally remain unconscious until the fight ends.
// they should normally remain unconscious until the fight ends.
if (
actor.type === "pc" ||
parseInt(actor.system.characteristics.stun.value) > -10
Expand Down
4 changes: 2 additions & 2 deletions module/item/item-attack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2728,8 +2728,8 @@ async function _calcDamage(damageResult, item, options) {
`minimum damage invoked <i class="fal fa-circle-info" data-tooltip="` +
`<b>MINIMUM DAMAGE FROM INJURIES</b><br>` +
`A character automatically takes 1 STUN for every 1 point of BODY
damage that gets through his defenses. He can Recover this STUN
normally; he doesn't have to heal the BODY damage first.` +
damage that gets through their defenses. They can Recover this STUN
normally; they don't have to heal the BODY damage first.` +
`"></i> `;
}

Expand Down
2 changes: 1 addition & 1 deletion module/utility/damage.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export function convertToDcFromItem(item, options) {
// Move By (add in velocity)
// ((STR/2) + (v/10))d6; attacker takes 1/3 damage
//
// A character can accelerate at a rate of 5m per meter, up to his
// A character can accelerate at a rate of 5m per meter, up to their
// maximum normal Combat Movement in meters per Phase. Thus
// a character with 50m of Flight would be moving at a velocity of
// 5m after traveling one meter, 10m after traveling two meters,
Expand Down
4 changes: 2 additions & 2 deletions module/utility/round.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function RoundFavorPlayerDown(number) {
// Character. For example, when calculating the cost of a Power,
// it’s to the character’s advantage if the Power costs fewer CP, so a
// .5 in a cost would round down; if a Combat Maneuver halves a
// character’s DCV, it’s to the character’s advantage for his DCV to
// character’s DCV, it’s to the character’s advantage for their DCV to
// be as high as possible, so a .5 in that calculation would round
// up.
// const fraction = Math.floor((number % 1) * 10) / 10
Expand All @@ -28,7 +28,7 @@ export function RoundFavorPlayerUp(number) {
// Character. For example, when calculating the cost of a Power,
// it’s to the character’s advantage if the Power costs fewer CP, so a
// .5 in a cost would round down; if a Combat Maneuver halves a
// character’s DCV, it’s to the character’s advantage for his DCV to
// character’s DCV, it’s to the character’s advantage for their DCV to
// be as high as possible, so a .5 in that calculation would round
// up.
if (number % 1 < 0.5) return Math.floor(number);
Expand Down