Skip to content

Commit 408485d

Browse files
jjppofjjppof
committed
New game event keep_custom_psynergy property.
1 parent 90dc667 commit 408485d

File tree

75 files changed

+331
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+331
-124
lines changed

‎base/game_events/AddItemToPartyEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export class AddItemToPartyEvent extends GameEvent {
55
private item_key: string;
66
private quantity: number;
77

8-
constructor(game, data, active, key_name, keep_reveal, item_key, quantity) {
9-
super(game, data, event_types.ADD_ITEM_TO_PARTY, active, key_name, keep_reveal);
8+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, item_key, quantity) {
9+
super(game, data, event_types.ADD_ITEM_TO_PARTY, active, key_name, keep_reveal, keep_custom_psynergy);
1010
this.item_key = item_key;
1111
this.quantity = quantity ?? 1;
1212
}

‎base/game_events/AudioPlayEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export class AudioPlayEvent extends GameEvent {
2222
active,
2323
key_name,
2424
keep_reveal,
25+
keep_custom_psynergy,
2526
audio_type,
2627
audio_key,
2728
volume,
@@ -31,7 +32,7 @@ export class AudioPlayEvent extends GameEvent {
3132
bgm_identifier,
3233
finish_events
3334
) {
34-
super(game, data, event_types.AUDIO_PLAY, active, key_name, keep_reveal);
35+
super(game, data, event_types.AUDIO_PLAY, active, key_name, keep_reveal, keep_custom_psynergy);
3536
this.audio_type = audio_type;
3637
this.audio_key = audio_key;
3738
this.volume = volume ?? 1.0;

‎base/game_events/AudioStopEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export class AudioStopEvent extends GameEvent {
55
private fade_out: boolean;
66
private bgm_identifier: string;
77

8-
constructor(game, data, active, key_name, keep_reveal, pause_only, fade_out, bgm_identifier) {
9-
super(game, data, event_types.AUDIO_STOP, active, key_name, keep_reveal);
8+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, pause_only, fade_out, bgm_identifier) {
9+
super(game, data, event_types.AUDIO_STOP, active, key_name, keep_reveal, keep_custom_psynergy);
1010
this.pause_only = pause_only;
1111
this.fade_out = fade_out;
1212
this.bgm_identifier = bgm_identifier;

‎base/game_events/BattleEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class BattleEvent extends GameEvent {
2424
active,
2525
key_name,
2626
keep_reveal,
27+
keep_custom_psynergy,
2728
background_key,
2829
enemy_party_key,
2930
return_to_sanctum,
@@ -35,7 +36,7 @@ export class BattleEvent extends GameEvent {
3536
before_fade_victory_events,
3637
before_fade_defeat_events
3738
) {
38-
super(game, data, event_types.BATTLE, active, key_name, keep_reveal);
39+
super(game, data, event_types.BATTLE, active, key_name, keep_reveal, keep_custom_psynergy);
3940
this.background_key = background_key;
4041
this.enemy_party_key = enemy_party_key;
4142
this.return_to_sanctum = return_to_sanctum ?? true;

‎base/game_events/BranchEvent.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,19 @@ export class BranchEvent extends GameEvent {
2525
private events: GameEvent[] = [];
2626
private else_events: GameEvent[] = [];
2727

28-
constructor(game, data, active, key_name, keep_reveal, combination, comparator_pairs, events, else_events) {
29-
super(game, data, event_types.BRANCH, active, key_name, keep_reveal);
28+
constructor(
29+
game,
30+
data,
31+
active,
32+
key_name,
33+
keep_reveal,
34+
keep_custom_psynergy,
35+
combination,
36+
comparator_pairs,
37+
events,
38+
else_events
39+
) {
40+
super(game, data, event_types.BRANCH, active, key_name, keep_reveal, keep_custom_psynergy);
3041
this.combination = combination ?? combinations.OR;
3142
this.comparator_pairs = comparator_pairs ?? [];
3243
this.initialize_events(events, else_events);

‎base/game_events/CameraFadeEvent.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,19 @@ export class CameraFadeEvent extends GameEvent {
1111
private duration: number;
1212
private color: string;
1313

14-
constructor(game, data, active, key_name, keep_reveal, fade_type, duration, color, finish_events) {
15-
super(game, data, event_types.CAMERA_FADE, active, key_name, keep_reveal);
14+
constructor(
15+
game,
16+
data,
17+
active,
18+
key_name,
19+
keep_reveal,
20+
keep_custom_psynergy,
21+
fade_type,
22+
duration,
23+
color,
24+
finish_events
25+
) {
26+
super(game, data, event_types.CAMERA_FADE, active, key_name, keep_reveal, keep_custom_psynergy);
1627
this.fade_type = fade_type;
1728
this.duration = duration ?? 500;
1829
this.color = color;

‎base/game_events/CameraFollowEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ export class CameraFollowEvent extends GameEvent {
1515
active,
1616
key_name,
1717
keep_reveal,
18+
keep_custom_psynergy,
1819
follow,
1920
is_hero,
2021
npc_label,
2122
io_label,
2223
transition_duration,
2324
transition_end_events
2425
) {
25-
super(game, data, event_types.CAMERA_FOLLOW, active, key_name, keep_reveal);
26+
super(game, data, event_types.CAMERA_FOLLOW, active, key_name, keep_reveal, keep_custom_psynergy);
2627
this.follow = follow ?? true;
2728
this.is_hero = is_hero ?? true;
2829
this.npc_label = npc_label;

‎base/game_events/CameraMoveEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ export class CameraMoveEvent extends GameEvent {
2020
active,
2121
key_name,
2222
keep_reveal,
23+
keep_custom_psynergy,
2324
positions,
2425
reset_follow,
2526
return_to_target_duration,
2627
finish_events
2728
) {
28-
super(game, data, event_types.CAMERA_MOVE, active, key_name, keep_reveal);
29+
super(game, data, event_types.CAMERA_MOVE, active, key_name, keep_reveal, keep_custom_psynergy);
2930
this.positions = positions ?? [];
3031
this.reset_follow = reset_follow ?? false;
3132
this.return_to_target_duration = return_to_target_duration ?? 0;

‎base/game_events/CameraShakeEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {GameEvent, event_types} from "./GameEvent";
33
export class CameraShakeEvent extends GameEvent {
44
private enable: boolean;
55

6-
constructor(game, data, active, key_name, keep_reveal, enable) {
7-
super(game, data, event_types.CAMERA_SHAKE, active, key_name, keep_reveal);
6+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, enable) {
7+
super(game, data, event_types.CAMERA_SHAKE, active, key_name, keep_reveal, keep_custom_psynergy);
88
this.enable = enable;
99
}
1010

‎base/game_events/CastingAuraEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export class CastingAuraEvent extends GameEvent {
66
private npc_label: string;
77
private enable: boolean;
88

9-
constructor(game, data, active, key_name, keep_reveal, is_npc, npc_label, enable) {
10-
super(game, data, event_types.CASTING_AURA, active, key_name, keep_reveal);
9+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, is_npc, npc_label, enable) {
10+
super(game, data, event_types.CASTING_AURA, active, key_name, keep_reveal, keep_custom_psynergy);
1111
this.npc_label = npc_label;
1212
this.is_npc = is_npc;
1313
this.enable = enable;

‎base/game_events/ChangeCollisionLayerEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {GameEvent, event_types} from "./GameEvent";
33
export class ChangeCollisionLayerEvent extends GameEvent {
44
private target_collision_layer: number;
55

6-
constructor(game, data, active, key_name, keep_reveal, target_collision_layer) {
7-
super(game, data, event_types.CHANGE_COLLISION_LAYER, active, key_name, keep_reveal);
6+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, target_collision_layer) {
7+
super(game, data, event_types.CHANGE_COLLISION_LAYER, active, key_name, keep_reveal, keep_custom_psynergy);
88
this.target_collision_layer = target_collision_layer;
99
}
1010

‎base/game_events/CharAnimPlayEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export class CharAnimPlayEvent extends GameEvent {
1818
active,
1919
key_name,
2020
keep_reveal,
21+
keep_custom_psynergy,
2122
is_npc,
2223
npc_label,
2324
action,
@@ -29,7 +30,7 @@ export class CharAnimPlayEvent extends GameEvent {
2930
reset_before_start,
3031
finish_events
3132
) {
32-
super(game, data, event_types.CHAR_ANIMATION_PLAY, active, key_name, keep_reveal);
33+
super(game, data, event_types.CHAR_ANIMATION_PLAY, active, key_name, keep_reveal, keep_custom_psynergy);
3334
this.npc_label = npc_label;
3435
this.is_npc = is_npc;
3536
this.action = action;

‎base/game_events/CharBlendModeEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export class CharBlendModeEvent extends GameEvent {
55
private npc_label: string;
66
private blend_mode: string;
77

8-
constructor(game, data, active, key_name, keep_reveal, is_npc, npc_label, blend_mode) {
9-
super(game, data, event_types.CHAR_BLEND_MODE, active, key_name, keep_reveal);
8+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, is_npc, npc_label, blend_mode) {
9+
super(game, data, event_types.CHAR_BLEND_MODE, active, key_name, keep_reveal, keep_custom_psynergy);
1010
this.blend_mode = blend_mode ?? "normal";
1111
this.is_npc = is_npc;
1212
this.npc_label = npc_label;

‎base/game_events/CharFallEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export class CharFallEvent extends GameEvent {
1313
active,
1414
key_name,
1515
keep_reveal,
16+
keep_custom_psynergy,
1617
is_npc,
1718
npc_label,
1819
y_destination_position,
@@ -24,7 +25,7 @@ export class CharFallEvent extends GameEvent {
2425
teleport,
2526
finish_events
2627
) {
27-
super(game, data, event_types.CHAR_FALL, active, key_name, keep_reveal);
28+
super(game, data, event_types.CHAR_FALL, active, key_name, keep_reveal, keep_custom_psynergy);
2829
this.is_npc = is_npc;
2930
this.npc_label = npc_label;
3031
this.options = {

‎base/game_events/CharHueEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export class CharHueEvent extends GameEvent {
66
private enable: boolean;
77
private angle: number;
88

9-
constructor(game, data, active, key_name, keep_reveal, is_npc, npc_label, enable, angle) {
10-
super(game, data, event_types.CHAR_HUE, active, key_name, keep_reveal);
9+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, is_npc, npc_label, enable, angle) {
10+
super(game, data, event_types.CHAR_HUE, active, key_name, keep_reveal, keep_custom_psynergy);
1111
this.enable = enable ?? true;
1212
this.angle = angle ?? -1.0;
1313
this.is_npc = is_npc;

‎base/game_events/CharItemManipulationEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class CharItemManipulationEvent extends GameEvent {
2626
active,
2727
key_name,
2828
keep_reveal,
29+
keep_custom_psynergy,
2930
char_key,
3031
control_type,
3132
item_key,
@@ -37,7 +38,7 @@ export class CharItemManipulationEvent extends GameEvent {
3738
manipulation_done_events,
3839
manipulation_fail_events
3940
) {
40-
super(game, data, event_types.CHAR_ITEM_MANIPULATION, active, key_name, keep_reveal);
41+
super(game, data, event_types.CHAR_ITEM_MANIPULATION, active, key_name, keep_reveal, keep_custom_psynergy);
4142
this.char_key = char_key;
4243
this.control_type = control_type;
4344
this.item_key = item_key;

‎base/game_events/CharLevelChangeEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export class CharLevelChangeEvent extends GameEvent {
44
private target_char_key: string;
55
private target_level_value: number;
66

7-
constructor(game, data, active, key_name, keep_reveal, target_char_key, target_level_value) {
8-
super(game, data, event_types.CHAR_LEVEL_CHANGE, active, key_name, keep_reveal);
7+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, target_char_key, target_level_value) {
8+
super(game, data, event_types.CHAR_LEVEL_CHANGE, active, key_name, keep_reveal, keep_custom_psynergy);
99
this.target_char_key = target_char_key;
1010
this.target_level_value = target_level_value;
1111
}

‎base/game_events/CharRotationEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ export class CharRotationEvent extends GameEvent {
1313
active,
1414
key_name,
1515
keep_reveal,
16+
keep_custom_psynergy,
1617
is_npc,
1718
npc_label,
1819
rotate,
1920
interframe_interval,
2021
frame_index
2122
) {
22-
super(game, data, event_types.CHAR_ROTATION, active, key_name, keep_reveal);
23+
super(game, data, event_types.CHAR_ROTATION, active, key_name, keep_reveal, keep_custom_psynergy);
2324
this.is_npc = is_npc;
2425
this.npc_label = npc_label;
2526
this.rotate = rotate;

‎base/game_events/CharShadowVisibilityEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export class CharShadowVisibilityEvent extends GameEvent {
55
private npc_label: string;
66
private visible: boolean;
77

8-
constructor(game, data, active, key_name, keep_reveal, is_npc, npc_label, visible) {
9-
super(game, data, event_types.CHAR_SHADOW_VISIBILITY, active, key_name, keep_reveal);
8+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, is_npc, npc_label, visible) {
9+
super(game, data, event_types.CHAR_SHADOW_VISIBILITY, active, key_name, keep_reveal, keep_custom_psynergy);
1010
this.is_npc = is_npc;
1111
this.npc_label = npc_label;
1212
this.visible = visible;

‎base/game_events/CharTweenPositionEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class CharTweenPositionEvent extends GameEvent {
2626
active,
2727
key_name,
2828
keep_reveal,
29+
keep_custom_psynergy,
2930
is_npc,
3031
npc_label,
3132
duration,
@@ -41,7 +42,7 @@ export class CharTweenPositionEvent extends GameEvent {
4142
shadow_follow_char,
4243
keep_char_collision_disable
4344
) {
44-
super(game, data, event_types.CHAR_TWEEN_POSITION, active, key_name, keep_reveal);
45+
super(game, data, event_types.CHAR_TWEEN_POSITION, active, key_name, keep_reveal, keep_custom_psynergy);
4546
this.is_npc = is_npc;
4647
this.npc_label = npc_label;
4748
this.duration = duration;

‎base/game_events/ChestEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export class ChestEvent extends GameEvent {
3232
active,
3333
key_name,
3434
keep_reveal,
35+
keep_custom_psynergy,
3536
item_key_name,
3637
quantity,
3738
finish_events,
@@ -41,7 +42,7 @@ export class ChestEvent extends GameEvent {
4142
hide_on_finish,
4243
standard_chest
4344
) {
44-
super(game, data, event_types.CHEST, active, key_name, keep_reveal);
45+
super(game, data, event_types.CHEST, active, key_name, keep_reveal, keep_custom_psynergy);
4546
this.item = this.data.info.items_list[item_key_name];
4647
this.quantity = quantity ?? 1;
4748
this.no_chest = no_chest ?? false;

‎base/game_events/ColorizeCharEvent.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,20 @@ export class ColorizeCharEvent extends GameEvent {
77
private intensity: number;
88
private gray: number;
99

10-
constructor(game, data, active, key_name, keep_reveal, is_npc, npc_label, color_key, intensity, gray) {
11-
super(game, data, event_types.COLORIZE_CHAR, active, key_name, keep_reveal);
10+
constructor(
11+
game,
12+
data,
13+
active,
14+
key_name,
15+
keep_reveal,
16+
keep_custom_psynergy,
17+
is_npc,
18+
npc_label,
19+
color_key,
20+
intensity,
21+
gray
22+
) {
23+
super(game, data, event_types.COLORIZE_CHAR, active, key_name, keep_reveal, keep_custom_psynergy);
1224
this.color_key = color_key;
1325
this.intensity = intensity;
1426
this.gray = gray;

‎base/game_events/ColorizeMapEvent.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export class ColorizeMapEvent extends GameEvent {
1616
active,
1717
key_name,
1818
keep_reveal,
19+
keep_custom_psynergy,
1920
color_key,
2021
intensity,
2122
gray,
@@ -24,7 +25,7 @@ export class ColorizeMapEvent extends GameEvent {
2425
layer,
2526
detach_transition
2627
) {
27-
super(game, data, event_types.COLORIZE_MAP, active, key_name, keep_reveal);
28+
super(game, data, event_types.COLORIZE_MAP, active, key_name, keep_reveal, keep_custom_psynergy);
2829
this.color_key = color_key;
2930
this.intensity = intensity;
3031
this.gray = gray;

‎base/game_events/ControlBgmEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export class ControlBgmEvent extends GameEvent {
1111
private control_type: control_types;
1212
private volume: number;
1313

14-
constructor(game, data, active, key_name, keep_reveal, control_type, volume) {
15-
super(game, data, event_types.CONTROL_BGM, active, key_name, keep_reveal);
14+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, control_type, volume) {
15+
super(game, data, event_types.CONTROL_BGM, active, key_name, keep_reveal, keep_custom_psynergy);
1616
this.control_type = control_type;
1717
this.volume = volume;
1818
}

‎base/game_events/CreateStorageVarEvent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export class CreateStorageVarEvent extends GameEvent {
66
private initial_value: RawStorageRecord["value"];
77
private add: boolean;
88

9-
constructor(game, data, active, key_name, keep_reveal, var_name, initial_value, add) {
10-
super(game, data, event_types.CREATE_STORAGE_VAR, active, key_name, keep_reveal);
9+
constructor(game, data, active, key_name, keep_reveal, keep_custom_psynergy, var_name, initial_value, add) {
10+
super(game, data, event_types.CREATE_STORAGE_VAR, active, key_name, keep_reveal, keep_custom_psynergy);
1111
this.var_name = var_name;
1212
this.initial_value = initial_value;
1313
this.add = add ?? true;

‎base/game_events/CustomCollisionBodyEvent.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,21 @@ export class CustomCollisionBodyEvent extends GameEvent {
1414
collision_layer?: number;
1515
};
1616

17-
constructor(game, data, active, key_name, keep_reveal, label, create, x, y, body_type, properties) {
18-
super(game, data, event_types.CUSTOM_COLLISION_BODY, active, key_name, keep_reveal);
17+
constructor(
18+
game,
19+
data,
20+
active,
21+
key_name,
22+
keep_reveal,
23+
keep_custom_psynergy,
24+
label,
25+
create,
26+
x,
27+
y,
28+
body_type,
29+
properties
30+
) {
31+
super(game, data, event_types.CUSTOM_COLLISION_BODY, active, key_name, keep_reveal, keep_custom_psynergy);
1932
this.label = label;
2033
this.create = create;
2134
this.x = x;

0 commit comments

Comments
 (0)