diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/base.gd | 20 | ||||
| -rw-r--r-- | scripts/exporter.gd | 2 | ||||
| -rw-r--r-- | scripts/incubator.gd | 2 | ||||
| -rw-r--r-- | scripts/life.gd | 2 | ||||
| -rw-r--r-- | scripts/messages.gd | 6 | ||||
| -rw-r--r-- | scripts/popup.gd | 1 | ||||
| -rw-r--r-- | scripts/template.gd | 6 | ||||
| -rw-r--r-- | scripts/template_incubate.gd | 2 |
8 files changed, 12 insertions, 29 deletions
diff --git a/scripts/base.gd b/scripts/base.gd index 39d171e..1a41750 100644 --- a/scripts/base.gd +++ b/scripts/base.gd @@ -34,26 +34,6 @@ func _input(event): if event.scancode == KEY_W: self.cam.translate(Vector3(0,0.1,0)) - if event.is_pressed(): - if event.scancode == KEY_H: - var s = self.cam.get_selected() - if s != null: - get_node("Incubator").push_world(s) - if event.scancode == KEY_N: - var w = self.builder.combine(Vector3(0,0,0), []) - w.set_scale(Vector3(0.02, 0.02, 0.02)) - add_child(w) - get_node("Incubator").push_world(w) - if event.scancode == KEY_Q: - var w = get_node("World") - if w != null: - var pos = get_node("cmb2inc") - w.set_translation(Vector3(0,0,0)) - remove_child(w) - pos.add_child(w) - get_node("AnimationPlayer").play("cmb2inc") - - func _on_AnimationPlayer_animation_finished( name ): if name == "cmb2inc": var w = get_node("cmb2inc/World") diff --git a/scripts/exporter.gd b/scripts/exporter.gd index 74f457e..e545646 100644 --- a/scripts/exporter.gd +++ b/scripts/exporter.gd @@ -59,7 +59,7 @@ func _on_panel_input_event( camera, event, click_pos, click_normal, shape_idx ): self.selected = null else: message = "Cannot sell, no world!" - get_tree().get_root().get_node("Game/HUD").display_message(message, 15) + get_tree().get_root().get_node("Game/HUD").display_message(message, 25) func _on_cylinder_input_event( camera, event, click_pos, click_normal, shape_idx , node, pos): if event.type == InputEvent.MOUSE_BUTTON and event.button_index == BUTTON_LEFT and event.is_pressed(): diff --git a/scripts/incubator.gd b/scripts/incubator.gd index 3fd25cf..d098f13 100644 --- a/scripts/incubator.gd +++ b/scripts/incubator.gd @@ -79,7 +79,7 @@ func _on_left_input_event( camera, event, click_pos, click_normal, shape_idx ): message = null else: message = "Cannot evolve, no world!" - get_tree().get_root().get_node("Game/HUD").display_message(message) + get_tree().get_root().get_node("Game/HUD").display_message(message, 25) func _on_cylinder_input_event( camera, event, click_pos, click_normal, shape_idx, node, pos ): if event.type == InputEvent.MOUSE_BUTTON and event.button_index == BUTTON_LEFT and event.is_pressed(): diff --git a/scripts/life.gd b/scripts/life.gd index 4355e31..14ca0bc 100644 --- a/scripts/life.gd +++ b/scripts/life.gd @@ -52,7 +52,7 @@ func choice(i): return var r = randf() var result - if r > 0.4: + if r > 0.3: result = "correct" self.stage = int(min(self.stage + 1, 6)) else: diff --git a/scripts/messages.gd b/scripts/messages.gd index c525fd2..f15dcd2 100644 --- a/scripts/messages.gd +++ b/scripts/messages.gd @@ -15,10 +15,10 @@ func _process(delta): var len = lengths[i] var label = labels[i] var far = run + delta - if far >= (3*len/4): + if far >= (4*len/5): label.set_modulate(Color(1,1,1,0.3)) - elif far >= len/2: - label.set_modulate(Color(1,1,1,0.5)) + elif far >= (3*len/4): + label.set_modulate(Color(1,1,1,0.6)) if far >= len: to_remove.append(i) else: diff --git a/scripts/popup.gd b/scripts/popup.gd index ce3e254..a4b1a4c 100644 --- a/scripts/popup.gd +++ b/scripts/popup.gd @@ -30,6 +30,7 @@ func set_options(options): label.add_text(opt) label.newline() i += 1 + button.select(0) label.pop() func set_life(life): diff --git a/scripts/template.gd b/scripts/template.gd index 6e1affc..a0bf7c1 100644 --- a/scripts/template.gd +++ b/scripts/template.gd @@ -20,9 +20,11 @@ func replace_all(base, values): if values.has(key): var from = values[key] if typeof(from) == TYPE_DICTIONARY: - replace = from[from.keys()[randi() % from.size()]] + if from.size() > 0: + replace = from[from.keys()[randi() % from.size()]] elif typeof(from) == TYPE_ARRAY: - replace = from[randi() % from.size()] + if from.size() > 0: + replace = from[randi() % from.size()] else: replace = str(from) base = self.regex.sub(base, replace) diff --git a/scripts/template_incubate.gd b/scripts/template_incubate.gd index d85b710..92cac41 100644 --- a/scripts/template_incubate.gd +++ b/scripts/template_incubate.gd @@ -14,7 +14,7 @@ func template(world): var misc = [] for mat in world.materials: if mat in self.data["misc"]: - misc.append(self.data["misc"][mat]) + misc += self.data["misc"][mat] d["misc"] = misc print(d) return self.replace_all(base, d) |