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
25734a4f
Commit
25734a4f
authored
Apr 10, 2024
by
Romain DELEAU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change missionLimitRepeat by a checkbox
parent
a2f107a2
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
20 deletions
+17
-20
repeat.ts
src/app/class/repeat/repeat.ts
+1
-1
annexe-task.component.html
src/app/pieces/tasks/annexe-task/annexe-task.component.html
+2
-2
final-task.component.html
src/app/pieces/tasks/final-task/final-task.component.html
+2
-2
optionnal-task.component.html
...pieces/tasks/optionnal-task/optionnal-task.component.html
+2
-2
random-event.component.html
...app/pieces/tasks/random-event/random-event.component.html
+2
-2
repeat-task.component.html
src/app/pieces/tasks/repeat-task/repeat-task.component.html
+2
-2
task.component.html
src/app/pieces/tasks/task/task.component.html
+2
-2
repeat.component.html
src/app/sider-pieces/repeat/repeat.component.html
+2
-3
en.json
src/assets/lang/en.json
+1
-2
fr.json
src/assets/lang/fr.json
+1
-2
No files found.
src/app/class/repeat/repeat.ts
View file @
25734a4f
...
@@ -2,6 +2,6 @@ export class Repeat {
...
@@ -2,6 +2,6 @@ export class Repeat {
iteration
:
number
=
0
;
iteration
:
number
=
0
;
while
:
string
=
''
;
while
:
string
=
''
;
limitMissionRepeat
:
number
=
1
;
limitMissionRepeat
:
boolean
=
false
;
}
}
src/app/pieces/tasks/annexe-task/annexe-task.component.html
View file @
25734a4f
...
@@ -118,8 +118,8 @@
...
@@ -118,8 +118,8 @@
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
<div
class=
"piece-form-top-title"
>
{{'annexeTask_title' | translate}}
</div>
<div
class=
"piece-form-top-title"
>
{{'annexeTask_title' | translate}}
</div>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
(
change
)="
editTrace
($
event
,'
Task_action
')"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
annexe
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
annexe
')[
1
])
?
urlIcon
:
''"
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
(
change
)="
editTrace
($
event
,'
Task_action
')"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
annexe
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
annexe
')[
1
])
?
urlIcon
:
''"
*
ngIf=
"!unityService.unity_isActive"
*
ngIf=
"!unityService.unity_isActive"
...
...
src/app/pieces/tasks/final-task/final-task.component.html
View file @
25734a4f
...
@@ -146,8 +146,8 @@
...
@@ -146,8 +146,8 @@
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
<div
class=
"piece-form-top-title"
>
{{'finalTask_title' | translate}}
</div>
<div
class=
"piece-form-top-title"
>
{{'finalTask_title' | translate}}
</div>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
...
...
src/app/pieces/tasks/optionnal-task/optionnal-task.component.html
View file @
25734a4f
...
@@ -147,8 +147,8 @@
...
@@ -147,8 +147,8 @@
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
<div
class=
"piece-form-top-title"
>
{{'optionnalTask_title1' | translate}}
<br>
{{'optionnalTask_title2' | translate}}
</div>
<div
class=
"piece-form-top-title"
>
{{'optionnalTask_title1' | translate}}
<br>
{{'optionnalTask_title2' | translate}}
</div>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
...
...
src/app/pieces/tasks/random-event/random-event.component.html
View file @
25734a4f
...
@@ -135,8 +135,8 @@
...
@@ -135,8 +135,8 @@
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
<div
class=
"piece-form-top-title"
>
{{'randomEvent_title1' | translate}}
<br>
{{'randomEvent_title2' | translate}}
</div>
<div
class=
"piece-form-top-title"
>
{{'randomEvent_title1' | translate}}
<br>
{{'randomEvent_title2' | translate}}
</div>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
...
...
src/app/pieces/tasks/repeat-task/repeat-task.component.html
View file @
25734a4f
...
@@ -102,8 +102,8 @@
...
@@ -102,8 +102,8 @@
[
matTooltip
]="
translate
.
instant
('
task_action_tooltip
')"
[
matTooltip
]="
translate
.
instant
('
task_action_tooltip
')"
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
></textarea>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
></textarea>
<mat-icon
class=
"piece-form-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
<mat-icon
class=
"piece-form-character"
fontIcon=
"person"
*
ngIf=
"task.characters.length > 0 && !unityService.unity_isActive"
<mat-icon
class=
"piece-form-character"
fontIcon=
"person"
*
ngIf=
"task.characters.length > 0 && !unityService.unity_isActive"
[
style
.
color
]="
task
.
characters
.
length =
=
1
?
task
.
characters
[
0
].
color
:
'
black
'"
[
style
.
color
]="
task
.
characters
.
length =
=
1
?
task
.
characters
[
0
].
color
:
'
black
'"
[
style
.
background
]="
task
.
characters
.
length
>
1 ? 'linear-gradient('+ task.characters[0].color +','+ task.characters[task.characters.length-1].color +')' : 'white'">
</mat-icon>
[
style
.
background
]="
task
.
characters
.
length
>
1 ? 'linear-gradient('+ task.characters[0].color +','+ task.characters[task.characters.length-1].color +')' : 'white'">
</mat-icon>
...
...
src/app/pieces/tasks/task/task.component.html
View file @
25734a4f
...
@@ -145,8 +145,8 @@
...
@@ -145,8 +145,8 @@
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
/>
<div
class=
"piece-form-top-title"
>
{{'normalTask_title' | translate}}
</div>
<div
class=
"piece-form-top-title"
>
{{'normalTask_title' | translate}}
</div>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != '') && !unityService.unity_isActive"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat
) && !unityService.unity_isActive"
></mat-icon>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
) && !unityService.unity_isActive && task.repeat.limitMissionRepeat == 1
"
></span>
<span
class=
"piece-form-top-repeat-off"
*
ngIf=
"(task.repeat.iteration > 0 || task.repeat.while != ''
|| task.repeat.limitMissionRepeat) && !unityService.unity_isActive && task.repeat.limitMissionRepeat
"
></span>
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
<button
mat-button
class=
"piece-form-top-symbol"
(
click
)="
changeDisplaySymbolChoice
()"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
[
matTooltip
]="
translate
.
instant
('
task_common_tooltip
')"
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
matTooltipPosition=
"above"
[
matTooltipDisabled
]="!
tooltipService
.
activatedTooltips
"
>
...
...
src/app/sider-pieces/repeat/repeat.component.html
View file @
25734a4f
...
@@ -15,9 +15,8 @@ matTooltipPosition="before" [matTooltipDisabled]="!tooltipService.activatedToolt
...
@@ -15,9 +15,8 @@ matTooltipPosition="before" [matTooltipDisabled]="!tooltipService.activatedToolt
<textarea
[(
ngModel
)]="
task
.
repeat
.
while
"
(
change
)="
editTrace
($
event
,'
repeat_stopCondition
')"
></textarea>
<textarea
[(
ngModel
)]="
task
.
repeat
.
while
"
(
change
)="
editTrace
($
event
,'
repeat_stopCondition
')"
></textarea>
</div>
</div>
<div
class=
"piece-form-missionRepeatLimit"
>
<div
class=
"piece-form-missionRepeatLimit"
>
<label>
{{'repeat_missionRepeatLimit1' | translate}}
</label>
<input
type=
"checkbox"
[(
ngModel
)]="
task
.
repeat
.
limitMissionRepeat
"
/>
<input
type=
"text"
min=
"1"
[(
ngModel
)]="
task
.
repeat
.
limitMissionRepeat
"
(
change
)="
editTrace
($
event
,
'
repeat_missionRepeatLimit
')"
/>
<label>
{{'repeat_missionRepeatLimit' | translate}}
</label>
<label>
{{'repeat_missionRepeatLimit2' | translate}}
</label>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/assets/lang/en.json
View file @
25734a4f
...
@@ -299,8 +299,7 @@
...
@@ -299,8 +299,7 @@
"repeat_title1"
:
"Repeat"
,
"repeat_title1"
:
"Repeat"
,
"repeat_title2"
:
"times"
,
"repeat_title2"
:
"times"
,
"repeat_title3"
:
"or until:"
,
"repeat_title3"
:
"or until:"
,
"repeat_missionRepeatLimit1"
:
"Can only be repeated"
,
"repeat_missionRepeatLimit"
:
"Play only one round"
,
"repeat_missionRepeatLimit2"
:
"times in the mission"
,
"supplementaryRole_title"
:
"Task related to the additional role"
,
"supplementaryRole_title"
:
"Task related to the additional role"
,
"supplementaryRole_tooltip"
:
"Used to associate or not associate a task with an additional role."
,
"supplementaryRole_tooltip"
:
"Used to associate or not associate a task with an additional role."
,
...
...
src/assets/lang/fr.json
View file @
25734a4f
...
@@ -299,8 +299,7 @@
...
@@ -299,8 +299,7 @@
"repeat_title1"
:
"Répéter"
,
"repeat_title1"
:
"Répéter"
,
"repeat_title2"
:
"fois"
,
"repeat_title2"
:
"fois"
,
"repeat_title3"
:
"ou jusqu'à ce que :"
,
"repeat_title3"
:
"ou jusqu'à ce que :"
,
"repeat_missionRepeatLimit1"
:
"Ne peut être répétée que"
,
"repeat_missionRepeatLimit"
:
"Ne jouer qu'un seul tour"
,
"repeat_missionRepeatLimit2"
:
"fois dans la mission"
,
"supplementaryRole_title"
:
"Tâche liée au rôle supplémentaire"
,
"supplementaryRole_title"
:
"Tâche liée au rôle supplémentaire"
,
"supplementaryRole_tooltip"
:
"Sert à associer ou non une tâche à un Rôle supplémentaire."
,
"supplementaryRole_tooltip"
:
"Sert à associer ou non une tâche à un Rôle supplémentaire."
,
...
...
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