Skip to content

Commit 074394e

Browse files
devxbdevxb
authored
release: 2.4.0 (#428)
2 parents c363c64 + 9f4e8d1 commit 074394e

File tree

9 files changed

+44
-11
lines changed

9 files changed

+44
-11
lines changed

โ€Žsrc/main/kotlin/org/gitanimals/core/PersonaGrade.ktโ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.gitanimals.core
2+
3+
enum class PersonaGrade {
4+
5+
DEFAULT,
6+
EVOLUTION,
7+
COLLABORATOR,
8+
;
9+
}

โ€Žsrc/main/kotlin/org/gitanimals/core/PersonaType.ktโ€Ž

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import kotlin.math.max
66
import kotlin.math.min
77
import kotlin.random.Random
88

9-
enum class PersonaType(val weight: Double, private var dropRate: String? = null) {
9+
enum class PersonaType(
10+
val weight: Double,
11+
val grade: PersonaGrade = PersonaGrade.DEFAULT,
12+
private var dropRate: String? = null,
13+
) {
1014
GOOSE(1.0) {
1115
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
1216
val goose = gooseSvg.replace("*{act}", act(animationId))
@@ -916,7 +920,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
916920
.toString()
917921
},
918922

919-
PIG_COLLABORATOR(0.0) {
923+
PIG_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
920924
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
921925
return pigCollaboratorSvg.replace("*{act}", act(animationId))
922926
.replace("*{id}", animationId.toString())
@@ -1282,7 +1286,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
12821286
.toString()
12831287
},
12841288

1285-
CHEESE_CAT_COLLABORATOR(0.0) {
1289+
CHEESE_CAT_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
12861290
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
12871291
return cheeseCatCollaboratorSvg.replace("*{act}", act(animationId))
12881292
.replace("*{id}", animationId.toString())
@@ -1345,7 +1349,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
13451349
.toString()
13461350
},
13471351

1348-
WHITE_CAT_COLLABORATOR(0.00) {
1352+
WHITE_CAT_COLLABORATOR(0.00, grade = PersonaGrade.COLLABORATOR) {
13491353
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
13501354
return whiteCatCollaboratorSvg.replace("*{act}", act(animationId))
13511355
.replace("*{id}", animationId.toString())
@@ -1546,7 +1550,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
15461550
StringBuilder().moveRandomly("rabbit", id, 40, "180s", 5, 10.0)
15471551
.toString()
15481552
},
1549-
RABBIT_COLLABORATOR(0.0) {
1553+
RABBIT_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
15501554
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
15511555
return rabbitCollaboratorSvg.replace("*{act}", act(animationId))
15521556
.replace("*{id}", animationId.toString())
@@ -1607,7 +1611,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
16071611
StringBuilder().moveRandomly("dessert-fox", id, 40, "180s", 5, 26.0)
16081612
.toString()
16091613
},
1610-
DESSERT_FOX_COLLABORATOR(0.0) {
1614+
DESSERT_FOX_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
16111615
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
16121616
return dessertFoxCollaboratorSvg.replace("*{act}", act(animationId))
16131617
.replace("*{id}", animationId.toString())
@@ -1767,7 +1771,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
17671771
.moveRandomly("ghost", id, 20, "180s", 7, 26.0)
17681772
.toString()
17691773
},
1770-
GHOST_COLLABORATOR(0.0) {
1774+
GHOST_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
17711775
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
17721776
return ghostCollaboratorSvg.replace("*{act}", act(animationId))
17731777
.replace("*{id}", animationId.toString())
@@ -2067,7 +2071,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
20672071
StringBuilder().moveRandomly("maltese", id, 40, "180s", 5, 12.0)
20682072
.toString()
20692073
},
2070-
HAMSTER_COLLABORATOR(0.0) {
2074+
HAMSTER_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
20712075
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
20722076
return hamsterCollaboratorSvg.replace("*{act}", act(animationId))
20732077
.replace("*{id}", animationId.toString())
@@ -2108,7 +2112,7 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
21082112
.toString()
21092113
},
21102114

2111-
MALTESE_COLLABORATOR(0.0) {
2115+
MALTESE_COLLABORATOR(0.0, grade = PersonaGrade.COLLABORATOR) {
21122116
override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
21132117
return malteseCollaboratorSvg.replace("*{act}", act(animationId))
21142118
.replace("*{id}", animationId.toString())

โ€Žsrc/main/kotlin/org/gitanimals/rank/app/UpdateUserContributionFacade.ktโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class UpdateUserContributionFacade(
3636
from = from,
3737
to = to,
3838
)
39-
logger.info("[UpdateUserContributionFacade] weeklyContributions: $weeklyContributions")
39+
logger.info("[UpdateUserContributionFacade] from: $from, to: $to, weeklyContributions: $weeklyContributions")
4040

4141
val updatedUserContributionRank = UserContributionRank.create(
4242
image = user.profileImage,

โ€Žsrc/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.ktโ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class InternalPersonaController(
4747
visible = persona.visible,
4848
appVisible = persona.appVisible,
4949
dropRate = persona.dropRate,
50+
grade = persona.grade,
5051
)
5152
}
5253

@@ -72,6 +73,7 @@ class InternalPersonaController(
7273
visible = persona.visible,
7374
appVisible = persona.appVisible,
7475
dropRate = persona.dropRate,
76+
grade = persona.grade,
7577
)
7678
}
7779
}
@@ -91,6 +93,7 @@ class InternalPersonaController(
9193
visible = persona.visible,
9294
appVisible = persona.appVisible,
9395
dropRate = persona.dropRate,
96+
grade = persona.grade,
9497
)
9598
}
9699

โ€Žsrc/main/kotlin/org/gitanimals/render/controller/PersonaController.ktโ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class PersonaController(
4242
visible = persona.visible,
4343
appVisible = persona.appVisible,
4444
dropRate = persona.dropRate,
45+
grade = persona.grade,
4546
)
4647
}
4748

@@ -61,6 +62,7 @@ class PersonaController(
6162
visible = changedPersona.visible,
6263
appVisible = changedPersona.appVisible,
6364
dropRate = changedPersona.dropRate,
65+
grade = changedPersona.grade,
6466
)
6567
}
6668

โ€Žsrc/main/kotlin/org/gitanimals/render/controller/response/PersonaEnumResponse.ktโ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
package org.gitanimals.render.controller.response
22

3+
import org.gitanimals.core.PersonaGrade
34
import org.gitanimals.core.PersonaType
45

56
data class PersonaEnumResponse(
67
val type: PersonaType,
78
val dropRate: String,
9+
val grade: PersonaGrade,
810
) {
911

1012
companion object {
1113
fun from(personaType: PersonaType): PersonaEnumResponse {
12-
return PersonaEnumResponse(personaType, personaType.getDropRate())
14+
return PersonaEnumResponse(
15+
type = personaType,
16+
dropRate = personaType.getDropRate(),
17+
grade = personaType.grade,
18+
)
1319
}
1420
}
1521
}

โ€Žsrc/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.ktโ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.gitanimals.render.controller.response
22

3+
import org.gitanimals.core.PersonaGrade
34
import org.gitanimals.core.PersonaType
45
import org.gitanimals.render.domain.response.PersonaResponse
56

@@ -10,6 +11,7 @@ data class PersonaResponse(
1011
val visible: Boolean,
1112
val appVisible: Boolean,
1213
val dropRate: String,
14+
val grade: PersonaGrade,
1315
) {
1416

1517
companion object {
@@ -21,6 +23,7 @@ data class PersonaResponse(
2123
visible = personaResponse.visible,
2224
appVisible = personaResponse.appVisible,
2325
dropRate = personaResponse.dropRate,
26+
grade = personaResponse.grade,
2427
)
2528
}
2629
}

โ€Žsrc/main/kotlin/org/gitanimals/render/controller/response/UserResponse.ktโ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ data class UserResponse(
2323
visible = it.visible,
2424
appVisible = it.appVisible,
2525
dropRate = it.type.getDropRate(),
26+
grade = it.type.grade,
2627
)
2728
}.toList()
2829
)
@@ -43,6 +44,7 @@ data class UserResponse(
4344
visible = it.visible,
4445
appVisible = it.appVisible,
4546
dropRate = it.type.getDropRate(),
47+
grade = it.type.grade,
4648
)
4749
}.toList()
4850
)
@@ -63,6 +65,7 @@ data class UserResponse(
6365
visible = it.visible,
6466
appVisible = it.appVisible,
6567
dropRate = it.type.getDropRate(),
68+
grade = it.type.grade,
6669
)
6770
}
6871
)

โ€Žsrc/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.ktโ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.gitanimals.render.domain.response
22

3+
import org.gitanimals.core.PersonaGrade
34
import org.gitanimals.render.domain.Persona
45
import org.gitanimals.core.PersonaType
56

@@ -10,6 +11,7 @@ data class PersonaResponse(
1011
val visible: Boolean,
1112
val appVisible: Boolean,
1213
val dropRate: String,
14+
val grade: PersonaGrade,
1315
) {
1416
companion object {
1517
fun from(persona: Persona): PersonaResponse {
@@ -20,6 +22,7 @@ data class PersonaResponse(
2022
visible = persona.visible,
2123
appVisible = persona.appVisible,
2224
dropRate = persona.type.getDropRate(),
25+
grade = persona.type.grade,
2326
)
2427
}
2528
}

0 commit comments

Comments
ย (0)