diff --git a/ENGLISH.md b/ENGLISH.md index 0735467..792b7dd 100644 --- a/ENGLISH.md +++ b/ENGLISH.md @@ -23,7 +23,11 @@
You can trade the pets with others.

-Choose from over 40 different pets and raise them. +Choose from over 50 different pets and raise them. +
+ +You can buy and manage pet in [hompage](https://gitanimals.org) +
@@ -98,8 +102,8 @@ Pets can be acquired in two ways: When you accumulate 30 commits, a new pet will appear. At this point, all pets have different probabilities of appearing. The maximum number of pets you can have is 30. If you have more than 30 pets, they will go into - your inventory, and you can swap them with the pets displayed at any time. <- Under development -2. **Purchase Pets <- Under development** + your inventory, and you can swap them with the pets displayed at any time. +2. **Purchase Pets** You can buy pets sold by other users with commit points. A certain amount of points will be given per commit. Alternatively, you can sell your own pets to earn commit points. @@ -113,6 +117,7 @@ _New contributions may take up to 1 hour to be reflected._ | name | ratio | Description | |------------------------------------------------------------------------------------------------------|-------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| RABBIT
| 0.9 | | | MOLE
| 0.3 | | | MOLE_GRASS
| 0.1 | | | QUOKKA
| 0.3 | | diff --git a/README.md b/README.md index a30e540..4b1ec09 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,11 @@
키운 펫은 다른사람과 거래할 수 있어요.

-40 종류가 넘는 펫을 뽑고 기르세요. +50 종류가 넘는 펫을 뽑고 기르세요. +
+ + [홈페이지](https://gitanimals.org) 에서 펫을 거래하고 관리할 수 있어요. +
@@ -95,8 +99,8 @@ farm mode는 갖고있는 모든 동물과 추가적인 정보를 보여줘요. 1. **커밋 30번하기** 커밋이 30번 누적되면 새로운 펫이 등장해요. 이때, 모든 펫들은 등장하는 확률이 달라요. - 이때, 최대로 얻을 수 있는 펫은 30개 입니다. 30개가 넘는 펫은 인벤토리로 들어가며, 언제든지 보여지는 펫과 교체할 수 있어요. **_<- 개발중_** -2. **펫 구매하기** **_<- 개발중_** + 이때, 최대로 얻을 수 있는 펫은 30개 입니다. 30개가 넘는 펫은 인벤토리로 들어가며, 홈페이지에서 언제든지 보여지는 펫과 교체할 수 있어요. +2. **펫 구매하기** 다른 유저가 판매하는 펫을 커밋포인트로 구매할 수 있어요. 커밋 1회당 일정량의 포인트가 지급됩니다. 혹은 자신의 펫을 판매해서 커밋포인트를 얻을수도 있어요. @@ -109,6 +113,7 @@ _새로운 contribution은 반영은 최대 1시간이 소요될 수 있어요._ | name | ratio | Description | |------------------------------------------------------------------------------------------------------|-------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| RABBIT
| 0.9 | | | MOLE
| 0.3 | | | MOLE_GRASS
| 0.1 | | | QUOKKA
| 0.3 | | diff --git a/docs/mole-grass.svg b/docs/mole-grass.svg index ebef13a..1bc8165 100644 --- a/docs/mole-grass.svg +++ b/docs/mole-grass.svg @@ -26,13 +26,13 @@ @keyframes mole-14-body-move { 0% { - transform: translate(0px, -10px) + transform: translate(0px, -10px); } 50% { - transform: translate(0px, -8.5px) + transform: translate(0px, -8.5px); } - 0% { - transform: translate(0px, -10px) + 100% { + transform: translate(0px, -10px); } } diff --git a/docs/mole.svg b/docs/mole.svg index 29bdf0e..4fd7b8c 100644 --- a/docs/mole.svg +++ b/docs/mole.svg @@ -26,13 +26,13 @@ @keyframes mole-14-body-move { 0% { - transform: translate(0px, -10px) + transform: translate(0px, -10px); } 50% { - transform: translate(0px, -8.5px) + transform: translate(0px, -8.5px); } - 0% { - transform: translate(0px, -10px) + 100% { + transform: translate(0px, -10px); } } diff --git a/docs/rabbit.svg b/docs/rabbit.svg new file mode 100644 index 0000000..42519bb --- /dev/null +++ b/docs/rabbit.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt b/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt index 8fd17a8..9414062 100644 --- a/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt +++ b/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt @@ -1086,6 +1086,21 @@ enum class PersonaType(private val weight: Double) { StringBuilder().moveRandomly("mole", id, 40, "180s", 5, 14.0) .toString() }, + RABBIT(0.9){ + override fun loadSvg(user: User, persona: Persona, mode: Mode): String { + return rabbitSvg.replace("*{act}", act(persona.id)) + .replace("*{id}", persona.id.toString()) + .replace("*{level}", persona.level.value.toSvg(14.0, 2.0)) + .replace( + "*{levelx}", + (-9 + (-1 * (persona.level.value.toString().length))).toString() + ) + } + + override fun act(id: Long): String = + StringBuilder().moveRandomly("rabbit", id, 40, "180s", 5, 10.0) + .toString() + }, ; init { diff --git a/src/main/kotlin/org/gitanimals/render/domain/Svgs.kt b/src/main/kotlin/org/gitanimals/render/domain/Svgs.kt index 25293e1..93d0d94 100644 --- a/src/main/kotlin/org/gitanimals/render/domain/Svgs.kt +++ b/src/main/kotlin/org/gitanimals/render/domain/Svgs.kt @@ -193,6 +193,9 @@ val moleSvg: String = ClassPathResource("persona/animal/mole.svg") val moleGrassSvg: String = ClassPathResource("persona/animal/mole-grass.svg") .getContentAsString(Charset.defaultCharset()) +val rabbitSvg: String = ClassPathResource("persona/animal/rabbit.svg") + .getContentAsString(Charset.defaultCharset()) + val largeTextSvgs = lazy { val map = mutableMapOf() for (i in 'A'..'Z') { diff --git a/src/main/resources/persona/animal/mole-grass.svg b/src/main/resources/persona/animal/mole-grass.svg index 3564ef8..e497719 100644 --- a/src/main/resources/persona/animal/mole-grass.svg +++ b/src/main/resources/persona/animal/mole-grass.svg @@ -33,7 +33,7 @@ 50% { transform: translate(0px, -8.5px); } - 0% { + 100% { transform: translate(0px, -10px); } } diff --git a/src/main/resources/persona/animal/mole.svg b/src/main/resources/persona/animal/mole.svg index 8d8f45f..9ab5823 100644 --- a/src/main/resources/persona/animal/mole.svg +++ b/src/main/resources/persona/animal/mole.svg @@ -33,7 +33,7 @@ 50% { transform: translate(0px, -8.5px); } - 0% { + 100% { transform: translate(0px, -10px); } } diff --git a/src/main/resources/persona/animal/rabbit.svg b/src/main/resources/persona/animal/rabbit.svg new file mode 100644 index 0000000..c855c06 --- /dev/null +++ b/src/main/resources/persona/animal/rabbit.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + *{contribution} + + + + + + + + + + + + + + + + + + + + *{level} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/persona/goose/test.svg b/src/test/resources/persona/goose/test.svg index 939bb42..23ac9d8 100644 --- a/src/test/resources/persona/goose/test.svg +++ b/src/test/resources/persona/goose/test.svg @@ -1,106 +1,115 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +