Merge pull request #1863 from crnormand/main

0.16.7

changelog.md

@@ -1,5 +1,11 @@
 ### [Users Guide](https://bit.ly/2JaSlQd) for GURPS 4e Game Aid for Foundry VTT
 
+Release 0.16.7 12/17/23
+
+- Added import of markdown resolved notes for characters
+- Updated GCA import script
+- Added Exxar's "On Target" maneuvers as a option.
+
 Release 0.16.5 8/27/23
 
 - Fixed characters with SM +0 not importing in Foundry 11.308

exportutils/ExportToFoundryVTT/AssemblyInfo.vb

@@ -1,4 +1,4 @@
-Imports System
+Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
@@ -28,5 +28,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.12")> 
-<Assembly: AssemblyFileVersion("1.0.0.12")> 
+<Assembly: AssemblyVersion("1.0.0.13")> 
+<Assembly: AssemblyFileVersion("1.0.0.13")> 

gurps.lock

@@ -0,0 +1 @@
+🔒

lang/en.json

@@ -431,6 +431,11 @@
 	"GURPS.modifierRangeMHExtremeDesc": "Rival difficult to even see; sniper range",
 	"GURPS.modifierAddRangeRuler": "Bucket: Add Range Ruler modifier",
 	"GURPS.modifierAddRangeRulerHint": "If checked, the system will automatically add the last measured Range modifier to the Modifier Bucket.",
+	"GURPS.modifierAimAllOutAim": "to Aiming rolls (All-Out Aim)",
+	"GURPS.modifierAimAllOutAimBraced": "to Aiming rolls if braced (All-Out Aim)",
+	"GURPS.modifierAimCommittedAim": "to Aiming rolls (Committed Aim)",
+	"GURPS.modifierAimCommittedAimBraced": "to Aiming rolls if braced (Committed Aim)",
+	"GURPS.modifierAllOutAttackRanged": "to hit (All-Out Attack (Ranged))",
 	"GURPS.modifierAffliction": "Afflictions",
 	"GURPS.modifierAfflictionCough": "-3 to DX checks (Coughing)",
 	"GURPS.modifierAfflictionCoughIQ": "-1 to IQ checks (Coughing)",
@@ -455,6 +460,7 @@
 	"GURPS.modifierBlindDefend": "-4 to dodge (Blind -- cannot see attacker)",
 	"GURPS.modifierBlockRetreat": "to Block/Parry (retreat)",
 	"GURPS.modifierClickToAdd": "Click on modifiers above and to the right to add to your next roll.",
+	"GURPS.modifierCommittedAttackRanged": "to hit (Committed Attack (Ranged))",
 	"GURPS.modifierCommon": "Common Modifiers",
 	"GURPS.modifierCover": "Cover",
 	"GURPS.modifierCoverBehindFigure": "-4 to hit (Behind same-sized figure)",
@@ -484,6 +490,8 @@
 	"GURPS.modifierFavorable": "Favorable",
 	"GURPS.modifierFeverishDef": "Feverish Defense",
 	"GURPS.modifierDefDeceptiveAttack": "to defenses due to Deceptive attack",
+	"GURPS.modifierDefenseCommittedAim": "to defenses due to Committed Aim",
+	"GURPS.modifierDefenseCommittedAttackRanged": "to defenses due to Committed Attack (Ranged)",
 	"GURPS.modifierMaintainConcentration": "to Will Check, to maintain concentration",
 	"GURPS.modifierGrappling": "-4 to DX and DX-based skills (Grappled)",
 	"GURPS.modifierGMBlessed": "GM blessed",
@@ -565,9 +573,13 @@
 	"GURPS.modifierViewScaleHint": "Use this to scale up or down the size of the Modifier Bucket.",
 	"GURPS.modifierWillCheck": "WILL check to maintain Aim",
 	"__PDF References__": "=========",
+	"GURPS.pdfAllOutAim": "PY77:25",
+	"GURPS.pdfAllOutAttackRanged": "PY77:26",
 	"GURPS.pdfAllOutDefense": "B365",
 	"GURPS.pdfBlockRetreat": "B377",
 	"GURPS.pdfCrippling": "B420",
+	"GURPS.pdfCommittedAim": "PY77:25",
+	"GURPS.pdfCommittedAttackRanged": "PY77:26",
 	"GURPS.pdfDeceptiveAttack": "B369",
 	"GURPS.pdfDeterminedAttack": "B365",
 	"GURPS.pdfDamageRoll": "B378",
@@ -707,15 +719,19 @@
 	"GURPS.maneuverDoNothing": "Do Nothing",
 	"GURPS.maneuverMove": "Move",
 	"GURPS.maneuverAim": "Aim",
+	"GURPS.maneuverCommittedAim": "Committed Aim",
+	"GURPS.maneuverAllOutAim": "All-out Aim",
 	"GURPS.maneuverChangePosture": "Change Posture",
 	"GURPS.maneuverEvaluate": "Evaluate",
 	"GURPS.maneuverAttack": "Attack",
 	"GURPS.maneuverFeint": "Feint",
+	"GURPS.maneuverCommittedAttackRanged": "Committed Attack (Ranged)",
 	"GURPS.maneuverAllOutAttack": "All-out Attack",
 	"GURPS.maneuverAllOutAttackDetermined": "All-out Attack (Determined)",
 	"GURPS.maneuverAllOutAttackDouble": "All-out Attack (Double)",
 	"GURPS.maneuverAllOutAttackFeint": "All-out Attack (Feint)",
 	"GURPS.maneuverAllOutAttackStrong": "All-out Attack (Strong)",
+	"GURPS.maneuverAllOutAttackRanged": "All-out Attack (Ranged Determined)",
 	"GURPS.maneuverAllOutAttackSuppressFire": "All-out Attack (Suppressing Fire)",
 	"GURPS.maneuverMoveAttack": "Move and Attack",
 	"GURPS.maneuverAllOutDefense": "All-out Defense",
@@ -919,6 +935,7 @@
 	"GURPS.sortContentsDescending": "Sort Contents (Descending)",
 	"GURPS.sortDescending": "Sort Descending",
 	"GURPS.actions": "Actions",
+	"GURPS.aiming": "Aiming",
 	"GURPS.addAdvantage": "Add an Advantage",
 	"GURPS.addMeleeAttack": "Add a Melee Attack",
 	"GURPS.addRangedAttack": "Add a Ranged Attack",
@@ -1061,6 +1078,7 @@
 	"GURPS.moveNone": "None ({reason})",
 	"GURPS.moveConstant": "{value} {unit}/sec ({reason})",
 	"GURPS.moveStep": "Step ({reason})",
+	"GURPS.moveTwoSteps": "Step or two steps ({reason})",
 	"GURPS.moveOneThird": "×1/3 ({reason})",
 	"GURPS.moveTwoThirds": "×2/3 ({reason})",
 	"GURPS.moveHalf": "Half ({reason})",

lib/miscellaneous-settings.js

@@ -63,6 +63,7 @@ export const SETTING_DEFAULT_ADD_ACTION = 'default-add-action'
 export const SETTING_PORTRAIT_PATH = 'portrait-path'
 export const SETTING_OVERWRITE_PORTRAITS = 'overwrite-portraitsk'
 export const SETTING_CTRL_KEY = 'ctrl-key'
+export const SETTING_USE_ON_TARGET = 'use-on-target'
 
 export const VERSION_096 = SemanticVersion.fromString('0.9.6')
 export const VERSION_097 = SemanticVersion.fromString('0.9.7')
@@ -601,6 +602,19 @@ export function initializeSettings() {
 			onChange: value => console.log(`${SETTING_MANEUVER_UPDATES_MOVE}: ${value}`),
 		})
 
+		game.settings.register(SYSTEM_NAME, SETTING_USE_ON_TARGET, {
+			name: i18n('GURPS.settingOnTarget', 'Use On Target'),
+			hint: i18n(
+				'GURPS.settingHintOnTarget',
+				"Adds additional aiming-related maneuvers from the Pyramid #3/120 article On Target."
+			),
+			scope: 'world',
+			config: true,
+			type: Boolean,
+			default: false,
+			onChange: value => console.log(`${SETTING_USE_ON_TARGET}: ${value}`),
+		})
+
 		game.settings.register(SYSTEM_NAME, SETTING_SHIFT_CLICK_BLIND, {
 			name: i18n('GURPS.settingPlayerBlindRoll'),
 			hint: i18n('GURPS.settingHintPlayerBlindRoll'),

module/actor/actor.js

@@ -24,6 +24,7 @@ import {
 	MOVE_NONE,
 	MOVE_ONE,
 	MOVE_STEP,
+	MOVE_TWO_STEPS,
 	MOVE_ONETHIRD,
 	MOVE_HALF,
 	MOVE_TWOTHIRDS,
@@ -627,6 +628,9 @@ export class GurpsActor extends Actor {
 			case MOVE_STEP:
 				return { move: this._getStep(), text: i18n_f('GURPS.moveStep', { reason: reason }) }
 
+			case MOVE_TWO_STEPS:
+				return { move: this._getStep() * 2, text: i18n_f('GURPS.moveTwoSteps', { reason: reason }) }
+
 			case MOVE_ONETHIRD:
 				return {
 					move: Math.max(1, Math.ceil((move / 3) * threshold)),
@@ -1307,7 +1311,7 @@ export class GurpsActor extends Actor {
 		let a = new Advantage()
 		a.name = i.name + (i.levels ? ' ' + i.levels.toString() : '') || 'Trait'
 		a.points = i.calc?.points
-		a.note = i.notes
+		a.notes = i.calc?.resolved_notes ?? i.notes ?? ''
 		a.userdesc = i.userdesc
 		a.notes = ''
 
@@ -1368,7 +1372,7 @@ export class GurpsActor extends Actor {
 			if (s.level == 0) s.level = ''
 			s.points = i.points
 			s.relativelevel = i.calc?.rsl
-			s.notes = i.notes || ''
+			s.notes = i.calc?.resolved_notes ?? i.notes ?? ''
 		} else {
 			// Usually containers
 			s.level = ''
@@ -1408,7 +1412,7 @@ export class GurpsActor extends Actor {
 			s.maintain = i.maintenance_cost || ''
 			s.difficulty = i.difficulty.toUpperCase()
 			s.relativelevel = i.calc?.rsl
-			s.notes = i.notes || ''
+			s.notes = i.calc?.resolved_notes ?? i.notes ?? ''
 			s.duration = i.duration || ''
 			s.points = i.points || ''
 			s.casttime = i.casting_time || ''
@@ -1496,7 +1500,7 @@ export class GurpsActor extends Actor {
 		e.uuid = i.id
 		e.parentuuid = p
 		e.notes = ''
-		e.note = i.notes || ''
+		e.notes = i.calc?.resolved_notes ?? i.notes ?? ''
 		if (i.modifiers?.length) {
 			for (let j of i.modifiers)
 				if (!j.disabled) e.notes += `${!!e.notes ? '; ' : ''}${j.name}${!!j.notes ? ' (' + j.notes + ')' : ''}`
@@ -1561,7 +1565,7 @@ export class GurpsActor extends Actor {
 
 	importNote(i, p) {
 		let n = new Note()
-		n.notes = i.text || ''
+		n.notes = i.calc?.resolved_text ?? i.text ?? ""
 		n.uuid = i.id
 		n.parentuuid = p
 		n.pageRef(i.reference || '')