Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RLG Maker
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Romain DELEAU
RLG Maker
Commits
20e3bb43
Commit
20e3bb43
authored
Apr 05, 2024
by
Romain DELEAU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable 'OtherReward' (roles) in unity mode
parent
74fec145
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
role.component.html
src/app/pieces/role/role.component.html
+4
-3
role.component.ts
src/app/pieces/role/role.component.ts
+3
-1
No files found.
src/app/pieces/role/role.component.html
View file @
20e3bb43
...
...
@@ -60,7 +60,8 @@ matTooltipPosition="left" [matTooltipDisabled]="!tooltipService.activatedTooltip
<div
class=
"piece-form-rewards"
>
<label
for=
"reward"
>
{{'role_reward_label' | translate}}
</label>
<div
class=
"piece-form-rewards-reward"
*
ngFor=
"let reward of role.rewards, let i = index"
>
<div
class=
"piece-form-rewards-reward-type"
>
<div></div>
<div
class=
"piece-form-rewards-reward-type"
*
ngIf=
"!(unityService.unity_isActive && reward.type == 'other')"
>
<label>
{{'role_reward_type_label' | translate}}
</label>
<select
[(
ngModel
)]="
reward
.
type
"
(
change
)="
changeRewardType
(
i
,
reward
.
type
)"
[
matTooltip
]="
translate
.
instant
('
role_reward_tooltip
')"
...
...
@@ -72,7 +73,7 @@ matTooltipPosition="left" [matTooltipDisabled]="!tooltipService.activatedTooltip
<option
value=
"objects"
hidden
>
{{'role_reward_type_object' | translate}}
</option>
<option
value=
"object"
>
{{'role_reward_type_object' | translate}}
</option>
<option
value=
"discussion"
>
{{'role_reward_type_discussion' | translate}}
</option>
<option
value=
"other"
>
{{'role_reward_type_other' | translate}}
</option>
<option
value=
"other"
*
ngIf=
"!unityService.unity_isActive"
>
{{'role_reward_type_other' | translate}}
</option>
</select>
</div>
<div
class=
"piece-form-rewards-reward-objects"
*
ngIf=
"reward.type == 'objects'"
>
...
...
@@ -167,7 +168,7 @@ matTooltipPosition="left" [matTooltipDisabled]="!tooltipService.activatedTooltip
</select>
<button
mat-button
(
click
)="
removeReward
(
i
)"
><mat-icon
fontIcon=
"remove"
></mat-icon></button>
</div>
<div
class=
"piece-form-rewards-reward-other"
*
ngIf=
"reward.type == 'other'"
>
<div
class=
"piece-form-rewards-reward-other"
*
ngIf=
"reward.type == 'other'
&& !unityService.unity_isActive
"
>
<textarea
[(
ngModel
)]="
getOtherReward
(
i
).
text
"
(
change
)="
editTrace
($
event
,
'
Reward_
['+
i
+']
_other
')"
></textarea>
<button
mat-button
(
click
)="
removeReward
(
i
)"
><mat-icon
fontIcon=
"remove"
></mat-icon></button>
</div>
...
...
src/app/pieces/role/role.component.ts
View file @
20e3bb43
...
...
@@ -30,6 +30,7 @@ import { RoleOccurrence } from 'src/app/class/role-occurrence/role-occurrence';
import
{
ObjectReward
}
from
'src/app/class/rewards/object-reward/object-reward'
;
import
{
Reward
}
from
'src/app/class/rewards/reward'
;
import
{
DiscussionReward
}
from
'src/app/class/rewards/discussion-reward/discussion-reward'
;
import
{
UnityService
}
from
'src/app/services/unity/unity.service'
;
@
Component
({
selector
:
'app-role'
,
...
...
@@ -44,7 +45,8 @@ export class RoleComponent implements OnInit {
@
Input
()
i
:
number
=
0
;
@
Input
()
missionIndex
:
number
=
0
;
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
,
protected
tooltipService
:
TooltipService
,
public
dialog
:
MatDialog
,
private
minimapService
:
MinimapService
,
protected
translate
:
TranslateService
,
private
tutorialService
:
TutorialService
,
private
_snackBar
:
MatSnackBar
,
protected
copyRoleService
:
CopyRoleService
)
{
}
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
,
protected
tooltipService
:
TooltipService
,
public
dialog
:
MatDialog
,
private
minimapService
:
MinimapService
,
protected
translate
:
TranslateService
,
private
tutorialService
:
TutorialService
,
private
_snackBar
:
MatSnackBar
,
protected
copyRoleService
:
CopyRoleService
,
protected
unityService
:
UnityService
)
{
}
ngOnInit
():
void
{
this
.
mission
.
equalizeLengths
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment