exposing force_char_stop_in_event and force_idle_action_in_event

jjppof · Nov 20, 2023 · 485b3d1 · 485b3d1
1 parent f095d5e
commit 485b3d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/base/ControllableChar.ts b/base/ControllableChar.ts
@@ -194,7 +194,9 @@ export abstract class ControllableChar {
         initial_action?: string | base_actions,
         initial_animation?: string,
         storage_keys?: ControllableChar["storage_keys"],
-        active?: boolean
+        active?: boolean,
+        force_char_stop_in_event?: boolean,
+        force_idle_action_in_event?: boolean
     ) {
         this.game = game;
         this.data = data;
@@ -282,8 +284,8 @@ export abstract class ControllableChar {
         this.crop_texture = false;
         this.shadow_following = true;
         this._shapes_collision_active = false;
-        this.force_char_stop_in_event = true;
-        this.force_idle_action_in_event = true;
+        this.force_char_stop_in_event = force_char_stop_in_event ?? true;
+        this.force_idle_action_in_event = force_idle_action_in_event ?? true;
         this._sweat_drops = null;
         this.on_stair = false;
         this._emoticon_sprite = null;

diff --git a/base/Map.ts b/base/Map.ts
@@ -1091,7 +1091,9 @@ export class Map {
                 step_max_variation,
                 move_freely_in_event,
                 property_info.allow_interaction_when_inactive,
-                property_info.after_psynergy_cast_events
+                property_info.after_psynergy_cast_events,
+                property_info.force_char_stop_in_event,
+                property_info.force_idle_action_in_event
             );
             this.npcs.push(npc);
             if (npc.label) {

diff --git a/base/NPC.ts b/base/NPC.ts
@@ -140,7 +140,9 @@ export class NPC extends ControllableChar {
         step_max_variation,
         move_freely_in_event,
         allow_interaction_when_inactive,
-        after_psynergy_cast_events
+        after_psynergy_cast_events,
+        force_char_stop_in_event,
+        force_idle_action_in_event
     ) {
         super(
             game,
@@ -156,7 +158,9 @@ export class NPC extends ControllableChar {
             initial_action,
             initial_animation,
             storage_keys,
-            active
+            active,
+            force_char_stop_in_event,
+            force_idle_action_in_event
         );
         this._npc_type = npc_type ?? npc_types.NORMAL;
         if (this.storage_keys.movement_type !== undefined) {