Skip to content

Commit 1ea0038

Browse files
committed
Improve 'whilePresent' descriptions
See #386.
1 parent 7de4eae commit 1ea0038

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

cardshifter-core/src/main/java/com/cardshifter/core/groovy/WhilePresentDelegate.groovy

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,15 @@ class WhilePresentDelegate {
5050
[withPriority: {int priority ->
5151
[on: {Closure filter ->
5252
addModifier(resources, priority, filter, {deleg ->
53-
'Give ' + deleg.description + ' ' + change + ' ' + resources.join(' and ')
53+
String changeStr
54+
if (change == 0) {
55+
changeStr = 'unchanged'
56+
}
57+
else {
58+
changeStr = [change.abs(), change < 0 ? 'less' : 'more'].join(' ')
59+
}
60+
61+
[deleg.description.capitalize(), 'have', changeStr, resources.join(' and ')].join(' ')
5462
}, {Entity source, Entity target, ECSResource resource, int actualValue ->
5563
actualValue + change
5664
})
@@ -64,7 +72,7 @@ class WhilePresentDelegate {
6472
[withPriority: {int priority ->
6573
[on: {Closure filter ->
6674
addModifier(resources, priority, filter, { deleg ->
67-
'Set ' + resources.join(' and ') + ' to ' + deleg.description + ' ' + change
75+
[deleg.description.capitalize(), 'have', resources.join(' and '), 'set to', change].join(' ')
6876
}, {Entity source, Entity target, ECSResource resource, int actualValue ->
6977
change
7078
})

0 commit comments

Comments
 (0)