Skip to content

Commit d0e2861

Browse files
authored
feat: support new combat condition (#3734)
1 parent 47d6603 commit d0e2861

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

apps/keira/src/assets/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@
711711
"CONDITION_QUEST_OBJECTIVE_PROGRESS": "quest_template.id",
712712
"CONDITION_WORLD_SCRIPT": "WorldStateCondition (defined in WorldState.h)",
713713
"CONDITION_AI_DATA": "data index",
714-
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)"
714+
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)",
715+
"CONDITION_UNIT_IN_COMBAT": "Always 0 (evaluates to true when the ConditionTarget unit is in combat)"
715716
},
716717
"VALUE2": {
717718
"CONDITION_NONE": "(Never used)",

apps/keira/src/assets/i18n/es.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@
711711
"CONDITION_QUEST_OBJECTIVE_PROGRESS": "Identificador de Misión extrado dentro de la tabla 'quest_template.id'",
712712
"CONDITION_WORLD_SCRIPT": "WorldStateCondition (definido en WorldState.h)",
713713
"CONDITION_AI_DATA": "índice de datos",
714-
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)"
714+
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)",
715+
"CONDITION_UNIT_IN_COMBAT": "Siempre es 0 (se evalúa como verdadero cuando la unidad objetivo (ConditionTarget) está en combate)"
715716
},
716717
"VALUE2": {
717718
"CONDITION_NONE": "(Nunca usado)",

apps/keira/src/assets/i18n/ru.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@
711711
"CONDITION_QUEST_OBJECTIVE_PROGRESS": "quest_template.id",
712712
"CONDITION_WORLD_SCRIPT": "WorldStateCondition (определено в WorldState.h)",
713713
"CONDITION_AI_DATA": "индекс данных",
714-
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)"
714+
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)",
715+
"CONDITION_UNIT_IN_COMBAT": "Всегда 0 (принимает значение true, когда цель (ConditionTarget) находится в бою)"
715716
},
716717
"VALUE2": {
717718
"CONDITION_NONE": "(Не используется)",

apps/keira/src/assets/i18n/zh.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@
711711
"CONDITION_QUEST_OBJECTIVE_PROGRESS": "quest_template表的id字段",
712712
"CONDITION_WORLD_SCRIPT": "WorldStateCondition(定义在WorldState.h中)",
713713
"CONDITION_AI_DATA": "数据索引",
714-
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)"
714+
"CONDITION_RANDOM_DUNGEON": "0 = do not check difficulty; 1 = check difficulty (ConditionValue2)",
715+
"CONDITION_UNIT_IN_COMBAT": "总是 0(当 ConditionTarget 单位处于战斗状态时返回 true)"
715716
},
716717
"VALUE2": {
717718
"CONDITION_NONE": "(未使用)",

libs/features/conditions/src/edit-conditions/conditions-constants.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ CONDITION_VALUE_1_TOOLTIPS[CT.CONDITION_QUEST_OBJECTIVE_PROGRESS] = 'CONDITIONS.
154154
CONDITION_VALUE_1_TOOLTIPS[CT.CONDITION_WORLD_SCRIPT] = 'CONDITIONS.EDITOR.VALUE1.CONDITION_WORLD_SCRIPT';
155155
CONDITION_VALUE_1_TOOLTIPS[CT.CONDITION_AI_DATA] = 'CONDITIONS.EDITOR.VALUE1.CONDITION_AI_DATA';
156156
CONDITION_VALUE_1_TOOLTIPS[CT.CONDITION_RANDOM_DUNGEON] = 'CONDITIONS.EDITOR.VALUE1.CONDITION_RANDOM_DUNGEON';
157+
CONDITION_VALUE_1_TOOLTIPS[CT.CONDITION_UNIT_IN_COMBAT] = 'CONDITIONS.EDITOR.VALUE1.CONDITION_UNIT_IN_COMBAT';
157158

158159
export const CONDITION_VALUE_2_TOOLTIPS: Record<string, string> = {};
159160
CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_NONE] = 'CONDITIONS.EDITOR.VALUE2.CONDITION_NONE';
@@ -208,6 +209,7 @@ CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_QUEST_OBJECTIVE_PROGRESS] = 'CONDITIONS.
208209
CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_WORLD_SCRIPT] = 'CONDITIONS.EDITOR.VALUE2.CONDITION_WORLD_SCRIPT';
209210
CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_AI_DATA] = 'CONDITIONS.EDITOR.VALUE2.CONDITION_AI_DATA';
210211
CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_RANDOM_DUNGEON] = 'CONDITIONS.EDITOR.VALUE2.CONDITION_RANDOM_DUNGEON';
212+
CONDITION_VALUE_2_TOOLTIPS[CT.CONDITION_UNIT_IN_COMBAT] = 'ALWAYS_0';
211213

212214
export const CONDITION_VALUE_3_TOOLTIPS: Record<string, string> = {};
213215
CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_NONE] = 'CONDITIONS.EDITOR.VALUE3.CONDITION_NONE';
@@ -262,3 +264,4 @@ CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_QUEST_OBJECTIVE_PROGRESS] = 'CONDITIONS.
262264
CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_WORLD_SCRIPT] = 'ALWAYS_0';
263265
CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_AI_DATA] = 'ALWAYS_0';
264266
CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_RANDOM_DUNGEON] = 'ALWAYS_0';
267+
CONDITION_VALUE_3_TOOLTIPS[CT.CONDITION_UNIT_IN_COMBAT] = 'ALWAYS_0';

libs/shared/acore-world-model/src/entities/conditions.type.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,5 @@ export enum CONDITION_TYPES {
123123
CONDITION_WORLD_SCRIPT,
124124
CONDITION_AI_DATA,
125125
CONDITION_RANDOM_DUNGEON,
126+
CONDITION_UNIT_IN_COMBAT,
126127
}

0 commit comments

Comments
 (0)