Merge branch 'master' into 292-better-grid

CHANGELOG.md

@@ -7,6 +7,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added UI for Entity Grid (hotkey G) with additional settings [#292](https://github.com/CCDirectLink/crosscode-map-editor/issues/292)
 
+## [1.4.0] 2024-02-23
+### Added
+- Added proper support for the event steps `SHOW_MODAL_CHOICE` and `SET_MSG_EXPRESSION`.
+- Added rendering of text colors in relevant events (such as `SHOW_MSG`).
+
+### Changed
+- `VarConditions` now use the string editor, as opposed to the JSON editor.
+- Improved support for event/action step property previews - specifically for `Vec2`, `Vec3`, `Offset`, `Entity`, `EnemyType`, `NumberExpression`, `StringExpression`, `BooleanExpression`, `VarName`, `Effect`, and `Animation`.
+
+### Fixed
+- Events with children/branching steps (such as `IF`, `SHOW_CHOICE`, `SHOW_MODAL_CHOICE`, etc.) will no longer fully refresh upon any edits, causing focus to be reset.
 
 ## [1.3.1] 2024-02-09
 ### Changed

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-map-editor",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "license": "MIT",
   "repository": "https://github.com/CCDirectLink/crosscode-map-editor",
   "main": "main.js",

webapp/src/app/components/widgets/enemy-type-widget/enemy-type-overlay/enemy-type-overlay.component.ts

@@ -16,7 +16,7 @@ export class EnemyTypeWidgetOverlayComponent extends AbstractWidget implements O
 		'OTHER'
 	];
 	readonly partyAttributes: AttributeValue = {
-		type: 'string',
+		type: 'String',
 		description: '',
 		withNull: true,
 		options: this.makeOptions(this.partyOptions)
@@ -32,7 +32,7 @@ export class EnemyTypeWidgetOverlayComponent extends AbstractWidget implements O
 		'NORTH_WEST'
 	];
 	readonly faceAttributes: AttributeValue = {
-		type: 'string',
+		type: 'String',
 		description: '',
 		withNull: true,
 		options: this.makeOptions(this.faceOptions)

webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.ts

@@ -44,8 +44,10 @@ export class EventDetailComponent implements OnDestroy {
 	}
 
 	public loadEvent(event: AbstractEvent<any>) {
-		this.event = event;
-		this.loadSettings();
+		if(this.event !== event) {
+			this.event = event;
+			this.loadSettings();
+		}
 	}
 
 	private clearSubscriptions() {
@@ -94,6 +96,7 @@ export class EventDetailComponent implements OnDestroy {
 		instance.key = key;
 		instance.attribute = val;
 		const sub = instance.onChange.subscribe(() => this.update());
+
 		this.changeSubscriptions.push(sub);
 		return instance;
 	}

webapp/src/app/components/widgets/event-widget/event-editor/event-helper.service.ts

@@ -27,7 +27,7 @@ export class EventHelperService {
 			if (valIf.elseStep) {
 				valIf.elseStep = valIf.elseStep.map((v: EventType) => this.getEventFromType(v, actionStep));
 			}
-		} else if (val.type === 'SHOW_CHOICE') {
+		} else if (val.type === 'SHOW_CHOICE' || val.type === 'SHOW_MODAL_CHOICE') {
 			const valChoice = val as any;
 			valChoice.options.forEach((option: any, index: number) => {
 				valChoice[index] = valChoice[index].map((v: EventType) => this.getEventFromType(v, actionStep));