Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(conditions): add rankmask flag selector #708

Merged
merged 10 commits into from
May 24, 2020
Merged

feat(conditions): add rankmask flag selector #708

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ef79f9
Update conditions
Kitzunu Apr 9, 2020
fcd1e1b
Revert "Update conditions"
Kitzunu Apr 9, 2020
5d869df
Merge remote-tracking branch 'upstream/master'
Kitzunu May 23, 2020
a7e9563
RANKMASK
Kitzunu May 23, 2020
c0eb4cb
Update conditions.component.html
Kitzunu May 23, 2020
045bc4d
Update conditions.component.ts
Kitzunu May 23, 2020
a278c13
fix travis
Kitzunu May 23, 2020
3d7a256
chore: fix indentation
FrancescoBorzi May 24, 2020
69ecba7
chore: enable for CONDITION_REPUTATION_RANK too
FrancescoBorzi May 24, 2020
2897ee8
chore: fix build
FrancescoBorzi May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/app/features/conditions/edit-conditions/conditions.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@
[config]="{ flags: QUEST_STATE, name: 'ConditionValue2' }"
[modalClass]="'modal-lg'"
></keira-flags-selector-btn>
<keira-flags-selector-btn
*ngIf="showReactionTo"
[control]="editorService.form.controls.ConditionValue2"
[config]="{ flags: RANKMASK, name: 'ConditionValue2' }"
[modalClass]="'modal-lg'"
></keira-flags-selector-btn>
Kitzunu marked this conversation as resolved.
Show resolved Hide resolved

<input [formControlName]="'ConditionValue2'" id="ConditionValue2" type="number" class="form-control form-control-sm">
</div>

Expand Down
7 changes: 6 additions & 1 deletion src/app/features/conditions/edit-conditions/conditions.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
SOURCE_ENTRY_TOOLTIPS,
SOURCE_GROUP_TOOLTIPS
} from './conditions-constants';
import { QUEST_STATE } from '@keira-constants/flags/quest-state';
import { QUEST_STATE, RANKMASK } from '@keira-constants/flags/conditions';

@Component({
selector: 'keira-conditions',
Expand All @@ -38,6 +38,7 @@ export class ConditionsComponent extends SingleRowEditorComponent<Conditions> {
public readonly CONDITION_VALUE_3_TOOLTIPS = CONDITION_VALUE_3_TOOLTIPS;

public readonly QUEST_STATE = QUEST_STATE;
public readonly RANKMASK = RANKMASK;

get selectedSourceType(): number {
return this.editorService.form.controls.SourceTypeOrReferenceId.value;
Expand All @@ -51,6 +52,10 @@ export class ConditionsComponent extends SingleRowEditorComponent<Conditions> {
return this.conditionType === CONDITION_TYPES.CONDITION_QUESTSTATE;
}

get showReactionTo(): boolean {
return this.conditionType === CONDITION_TYPES.CONDITION_REACTION_TO;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kitzunu I've updated this part to enable it also for CONDITION_REPUTATION_RANK since it's the same flag

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea I thought of doing that too :D


/* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690
constructor(
public editorService: ConditionsService,
Expand Down
11 changes: 11 additions & 0 deletions ...app/shared/constants/flags/quest-state.ts → src/app/shared/constants/flags/conditions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@ export const QUEST_STATE: Flag[] = [
{ bit: 5, name: 'FAILED', },
{ bit: 6, name: 'REWARDED', },
];

export const RANKMASK: Flag[] = [
{ bit: 0, name: 'HATED', },
{ bit: 1, name: 'HOSTILE', },
{ bit: 2, name: 'UNFRIENDLY', },
{ bit: 3, name: 'NEUTRAL', },
{ bit: 4, name: 'FRIENDLY', },
{ bit: 5, name: 'HONORED', },
{ bit: 6, name: 'REVERED', },
{ bit: 7, name: 'EXALTED', },
];