From e9ecc97e5e53c90004c1c04902f5230a6f9a46e2 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mhoekveen@gmail.com>
Date: Sun, 22 Mar 2020 13:30:47 +0100
Subject: [PATCH] Adds extra recombination options

---
 RecombinationStation.tscn | 25 +++++++++--------
 homunculus3.gd            | 57 ++++++++++++++++++++++++++++++---------
 homunculus3.tscn          |  7 +++++
 3 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/RecombinationStation.tscn b/RecombinationStation.tscn
index 68334a9..ecbbc38 100644
--- a/RecombinationStation.tscn
+++ b/RecombinationStation.tscn
@@ -6,6 +6,7 @@
 
 [sub_resource type="Environment" id=1]
 background_mode = 1
+background_color = Color( 0.0235294, 0.129412, 0.207843, 1 )
 
 [sub_resource type="PlaneMesh" id=2]
 size = Vector2( 10, 10 )
@@ -18,8 +19,10 @@ top_radius = 0.5
 bottom_radius = 1.649
 
 [sub_resource type="SpatialMaterial" id=5]
-albedo_color = Color( 0.113725, 0.0862745, 0.0862745, 1 )
-metallic = 0.61
+albedo_color = Color( 0.729412, 0.729412, 0.729412, 1 )
+metallic = 1.0
+metallic_specular = 0.59
+roughness = 0.45
 
 [node name="RecombinationStation" type="Spatial"]
 
@@ -42,17 +45,8 @@ transform = Transform( -1.62921e-08, 0, -0.1, 0, 0.1, 0, 0.1, 0, -1.62921e-08, -
 visible = false
 
 [node name="Camera" type="Camera" parent="."]
-transform = Transform( -4.37114e-08, 0.258819, -0.965926, 0, 0.965926, 0.258819, 1, 1.13133e-08, -4.2222e-08, -1.09989, 1.85265, -4.80778e-08 )
-
-[node name="SpotLight" type="SpotLight" parent="."]
-transform = Transform( -4.37114e-08, 0.707107, -0.707107, 0, 0.707107, 0.707107, 1, 3.09086e-08, -3.09086e-08, -1.76577, 2.99932, 3.70767e-08 )
-light_color = Color( 1, 0.992157, 0.968627, 1 )
-light_energy = 4.04
-light_indirect_energy = 2.52
-spot_range = 8.0
-spot_attenuation = 3.13834
-spot_angle = 44.0
-spot_angle_attenuation = 1.18921
+transform = Transform( -4.37114e-08, 0.258819, -0.965926, 0, 0.965926, 0.258819, 1, 1.13133e-08, -4.2222e-08, -3.99468, 2.55107, -1.74613e-07 )
+fov = 13.2
 
 [node name="GUI" type="Control" parent="."]
 margin_right = 1920.0
@@ -68,4 +62,9 @@ text = "Respawn"
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="OmniLight" type="OmniLight" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.08659, 2.72793, 0 )
+omni_range = 48.7
+omni_attenuation = 1.93187
 [connection signal="pressed" from="GUI/Respawn" to="Pedestal" method="_on_Respawn_pressed"]
diff --git a/homunculus3.gd b/homunculus3.gd
index e5ed18e..58cfcdd 100644
--- a/homunculus3.gd
+++ b/homunculus3.gd
@@ -28,18 +28,34 @@ const SKIN_COLORS = [
 	Color("#333333")
 ]
 const ARM_MODES = [
+	"TentaclesArms",
+	"HandClaws",
 	"HandBase",
 	"HandClaws",
 	"HandBase",
+	"HandClaws",
 	"HandBase",
-	"HandBase",
-	"HandBase",
-	"HandBase",
-	"HandBase",
-	"HandBase",
+	"HandClaws",
+	"HandClaws",
 	"HandBase"
 ]
 
+const HEAD_MODES = [
+	"WingsBase",
+	"WingsBase",
+	"ForeheadHorns",
+	"ForeheadHorns",
+	"",
+	"",
+	"",
+	""
+]
+
+const PENIS_MODES = [
+	"DongBigDick",
+	""
+]
+
 var SKIN_MATERIALS = [
 	SpatialMaterial.new()
 ]
@@ -106,7 +122,7 @@ func set_color():
 		if genotype[i]:
 			x = j
 			break
-		j += 1	
+		j += 1
 	var mesh = get_node("Homunculus")
 	var mat = mesh.get_surface_material(0).duplicate()
 	mat.albedo_color = SKIN_COLORS[x]
@@ -116,27 +132,42 @@ func set_color():
 	print(SKIN_COLORS[x])
 
 func set_penis():
-	var mesh = get_node("Homunculus/DongBigDick")
+	var x = PENIS_MODES.size()-1
+	var j = 0
 	for i in range_trait("Penis"):
 		if genotype[i]:
-			mesh.visible = true
+			x = j
+			break
+		j += 1
+	if PENIS_MODES[x] != "":
+		get_node("Homunculus/"+PENIS_MODES[x]).visible = true
 
 func set_arm():
-	var x = 0
+	var x = ARM_MODES.size()-1
 	var j = 0
 	for i in range_trait("Arm"):
 		if genotype[i]:
 			x = j
 			break
-		j += 1	
-	var set_true = ARM_MODES[x]
-	var mesh = get_node("Homunculus/"+set_true)
-	mesh.visible = true
+		j += 1
+	get_node("Homunculus/"+ARM_MODES[x]).visible = true
+	
+func set_head():
+	var x = HEAD_MODES.size()-1
+	var j = 0
+	for i in range_trait("Head"):
+		if genotype[i]:
+			x = j
+			break
+		j += 1
+	if HEAD_MODES[x] != "":
+		get_node("Homunculus/"+HEAD_MODES[x]).visible = true	
 
 func phenotype_it():
 	set_color()
 	set_penis()
 	set_arm()
+	set_head()
 
 func _ready():
 	rng.randomize()
diff --git a/homunculus3.tscn b/homunculus3.tscn
index e8a4d0e..08f21b3 100644
--- a/homunculus3.tscn
+++ b/homunculus3.tscn
@@ -4,6 +4,7 @@
 [ext_resource path="res://homunculus3.gd" type="Script" id=2]
 
 [sub_resource type="SpatialMaterial" id=1]
+albedo_color = Color( 0.952941, 0.929412, 0.882353, 1 )
 
 [sub_resource type="CylinderShape" id=2]
 height = 7.0
@@ -17,6 +18,9 @@ material/0 = SubResource( 1 )
 [node name="DongBigDick" parent="Homunculus" index="0"]
 visible = false
 
+[node name="Eyes" parent="Homunculus" index="1"]
+visible = false
+
 [node name="ForeheadHorns" parent="Homunculus" index="2"]
 visible = false
 
@@ -26,6 +30,9 @@ visible = false
 [node name="HandClaws" parent="Homunculus" index="4"]
 visible = false
 
+[node name="TailBase" parent="Homunculus" index="5"]
+visible = false
+
 [node name="TentaclesArms" parent="Homunculus" index="6"]
 visible = false