Skip to content

Commit a27b689

Browse files
TheDrawingCoder-GamerTheDrawingCoder-Gamer
authored
Merge pull request #1 from TheDrawingCoder-Gamer/gene-results
Gene results
2 parents 2446e43 + 9030fd4 commit a27b689

15 files changed

Lines changed: 594 additions & 14 deletions

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ lazy val web = project
114114
version := "0.1.0-SNAPSHOT",
115115

116116
scalaVersion := scala3Version,
117-
libraryDependencies += "com.armanbilge" %%% "calico"% "0.2.2-95-60c8853-SNAPSHOT",
117+
libraryDependencies += "com.armanbilge" %%% "calico"% "0.2.3",
118118
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.4.0",
119119
scalaJSUseMainModuleInitializer := true,
120120
webTarget := new File((Compile / target).value, "webpage"),

‎core/shared/src/main/scala/wobblelab/EarType.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum EarType(val display: String) {
5+
case TypeA extends EarType("Capsule")
6+
case TypeB extends EarType("TypeB")
7+
case Blunt extends EarType("Blunt")
8+
case Bent extends EarType("Bent")
9+
case Bulbous extends EarType("Bulbous")
10+
case Horn extends EarType("Horn")
11+
case Cross extends EarType("Cross")
12+
case Twisted extends EarType("Twisted")
13+
case Shepherd extends EarType("Shepherd")
14+
case Wavy extends EarType("Wavy")
15+
}

‎core/shared/src/main/scala/wobblelab/EyeType.scala‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum EyeType(val displayName: String) {
5+
case Standard extends EyeType("Standard")
6+
case Lidded extends EyeType("Lidded")
7+
case Oblong extends EyeType("Oblong")
8+
case Concerned extends EyeType("Concerned")
9+
case Spider extends EyeType("Spider")
10+
case Hex extends EyeType("Hex")
11+
case Double extends EyeType("Double")
12+
case Keyhole extends EyeType("Keyhole")
13+
case Lashes extends EyeType("Lashes")
14+
case Puck extends EyeType("Puck")
15+
case Slim extends EyeType("Slim")
16+
case Spiral extends EyeType("Spiral")
17+
case Square extends EyeType("Square")
18+
case Pupilless extends EyeType("Pupilless")
19+
case Triangle extends EyeType("Triangle")
20+
case Mitosis extends EyeType("Mitosis")
21+
}

‎core/shared/src/main/scala/wobblelab/HornPlacement.scala‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum HornPlacement(val display: String) {
5+
case HornPlacementNone extends HornPlacement("Standard")
6+
case HornPlacementCenter extends HornPlacement("Center")
7+
case HornPlacementTraditional extends HornPlacement("Traditional")
8+
}

‎core/shared/src/main/scala/wobblelab/HornType.scala‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum HornType(val display: String) {
5+
case NoHorns extends HornType("None")
6+
case Curled extends HornType("Curled")
7+
case Nub extends HornType("Nub")
8+
case Thick extends HornType("Thick")
9+
case Thin extends HornType("Thin")
10+
}

‎core/shared/src/main/scala/wobblelab/Main.scala‎

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,18 +305,15 @@ object Dog {
305305

306306
val tailScaleMin: Float = 0.5
307307
val tailScaleMax: Float = 1.75
308-
val tailScaleCap: Float = 2.25
309308

310309
val tailNumMin: Float = 1
311310
val tailNumMax: Float = 1
312-
val tailNumCap: Int = 4
313311

314312
val wingScaleMin: Float = 0.75
315313
val wingScaleMax: Float = 0.5
316314

317315
val wingNumberMin: Float = 1
318-
val wingNumberMax: Float = 1
319-
val wingNumberCap: Int = 4
316+
val wingNumberMax: Float = 2
320317

321318
// wing z??
322319

@@ -335,6 +332,7 @@ object Dog {
335332

336333
val legNumberMin: Float = 1
337334
val legNumberMax: Float = 2
335+
val legNumberIncreaseRate: Float = 0.975f
338336

339337
// ???
340338
val legNumberCap: Int = 6
@@ -361,7 +359,64 @@ object Dog {
361359

362360
val snoutModScaleMin: Float = 0.5
363361
val snoutModScaleMax: Float = 1
362+
363+
object earModInfo {
364+
sealed trait MinMax {
365+
val min: Float
366+
val max: Float
367+
}
368+
369+
object TypeA extends MinMax {
370+
val min = 0.4
371+
val max = 0.3
372+
}
373+
374+
object TypeB extends MinMax {
375+
val min = 0.8
376+
val max = 0.5
377+
}
378+
379+
object Bent extends MinMax {
380+
val min = 0.2
381+
val max = 0.2
382+
}
383+
384+
object Cross extends MinMax {
385+
val min = 0.15
386+
val max = 0.225
387+
}
388+
389+
object Twisted extends MinMax {
390+
val min = 0.15
391+
val max = 0.225
392+
}
393+
394+
object Wavy extends MinMax {
395+
val min = 0.2
396+
val max = 0.225
397+
}
398+
399+
object NotAffected extends MinMax {
400+
val min = 0
401+
val max = 0
402+
}
403+
}
404+
405+
def earModA(earType: EarType): earModInfo.MinMax = {
406+
earType match {
407+
case EarType.TypeA => earModInfo.TypeA
408+
case EarType.TypeB => earModInfo.TypeB
409+
case EarType.Bent => earModInfo.Bent
410+
case EarType.Cross => earModInfo.Cross
411+
case EarType.Twisted => earModInfo.Twisted
412+
case EarType.Wavy => earModInfo.Wavy
413+
case _ => earModInfo.NotAffected
414+
}
415+
}
364416

417+
val noseSizeMin: Float = 0.7
418+
val noseSizeMax: Float = 0.6
419+
365420
trait Material {
366421
val base: util.ColorF
367422
val emission: util.ColorF

‎core/shared/src/main/scala/wobblelab/MouthType.scala‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum MouthType(val displayName: String) {
5+
case Standard extends MouthType("Standard")
6+
case MouthNone extends MouthType("None")
7+
case Simple extends MouthType("Simple")
8+
case Ah extends MouthType("Ah")
9+
case Boom extends MouthType("Boom")
10+
case Cheeky extends MouthType("Cheeky")
11+
case Diamond extends MouthType("Diamond")
12+
case Wise extends MouthType("Wiseguy")
13+
case MouthBreather extends MouthType("Mouth breather")
14+
case Pointed extends MouthType("Pointed")
15+
case Smug extends MouthType("Smug")
16+
case Toothy extends MouthType("Toothy")
17+
case Blank extends MouthType("Blank")
18+
case Wobbly extends MouthType("Wobbly")
19+
20+
}

‎core/shared/src/main/scala/wobblelab/NoseType.scala‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum NoseType(val display: String) {
5+
case TypeA extends NoseType("Sphere")
6+
case Bulb extends NoseType("Bulb")
7+
case Greyhound extends NoseType("Greyhound")
8+
case HalfMallow extends NoseType("Half Mallow")
9+
case Mallow extends NoseType("Mallow")
10+
case Pug extends NoseType("Pug")
11+
case Square extends NoseType("Square")
12+
case Triangle extends NoseType("Triangle")
13+
case Wide extends NoseType("Wide")
14+
}

‎core/shared/src/main/scala/wobblelab/TailType.scala‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum TailType(val display: String) {
5+
case NoTail extends TailType("None")
6+
case Stiff extends TailType("Stiff")
7+
case StiffCurly extends TailType("Stiff Curly")
8+
case Flowy extends TailType("Flowy")
9+
case Nub extends TailType("Nub")
10+
case StiffSlightlyCurly extends TailType("Stiff Slightly Curly")
11+
case Bulbous extends TailType("Bulbous")
12+
case Feral extends TailType("Feral")
13+
case Lifted extends TailType("Lifted")
14+
case Paddle extends TailType("Paddle")
15+
case Plume extends TailType("Plume")
16+
case Whip extends TailType("Whip")
17+
case Curl extends TailType("Curl")
18+
case DoubleCurl extends TailType("Double Curl")
19+
case Tri extends TailType("Tri")
20+
}

‎core/shared/src/main/scala/wobblelab/WingType.scala‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package net.bulbyvr
2+
package wobblelab
3+
4+
enum WingType(val display: String) {
5+
case NoWings extends WingType("None")
6+
case Angel extends WingType("Fluffy")
7+
// real name?
8+
case Bat extends WingType("Bat")
9+
// real name?
10+
case Paradise extends WingType("Paradise")
11+
case Vestigial extends WingType("Insect")
12+
// real name?
13+
case Vulture extends WingType("Vulture")
14+
}

0 commit comments

Comments
 (0)