diff --git a/godot/scenes/crowd/crowd.tscn b/godot/scenes/crowd/crowd.tscn index 4acf097..137dfad 100644 --- a/godot/scenes/crowd/crowd.tscn +++ b/godot/scenes/crowd/crowd.tscn @@ -6,7 +6,6 @@ [node name="Crowd" type="Node2D"] position = Vector2(240, 232) script = ExtResource("1_y7wyj") -max_persons = 1 [node name="Tables" type="Node" parent="."] diff --git a/godot/scenes/crowd/person.gd b/godot/scenes/crowd/person.gd index 3b63478..ba898ab 100644 --- a/godot/scenes/crowd/person.gd +++ b/godot/scenes/crowd/person.gd @@ -68,7 +68,7 @@ func _process(delta): mood += profile.lashout_decay * delta - if mood < -9.9: + if mood < profile.lashout_threshold: throw_bottle() update_expression() diff --git a/godot/scenes/crowd/person.tscn b/godot/scenes/crowd/person.tscn index 2d317be..28bfa87 100644 --- a/godot/scenes/crowd/person.tscn +++ b/godot/scenes/crowd/person.tscn @@ -30,5 +30,5 @@ script = ExtResource("2_bsodr") happy_threshold = 3.0 angry_threshold = -3.0 lashout_threshold = -10.0 -happiness_decay = 1.0 -lashout_decay = 10.0 +happiness_decay = 0.1 +lashout_decay = 0.1 diff --git a/godot/scenes/objects/bottle.tscn b/godot/scenes/objects/bottle.tscn index 1532287..3945282 100644 --- a/godot/scenes/objects/bottle.tscn +++ b/godot/scenes/objects/bottle.tscn @@ -8,6 +8,7 @@ radius = 22.4893 height = 44.9786 [node name="BottleSprite" type="Sprite2D"] +z_index = 50 scale = Vector2(0.25, 0.25) texture = ExtResource("1_uea7l") script = ExtResource("1_87ktq") diff --git a/godot/scenes/stage.tscn b/godot/scenes/stage.tscn index cc99824..edc5643 100644 --- a/godot/scenes/stage.tscn +++ b/godot/scenes/stage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://cicyfp5xjvvu4"] +[gd_scene load_steps=8 format=3 uid="uid://cicyfp5xjvvu4"] [ext_resource type="Script" path="res://scenes/Tim.gd" id="1_g3k2b"] [ext_resource type="Texture2D" uid="uid://kq63ictuirhc" path="res://sprites/tim_side.png" id="1_saxit"] @@ -8,6 +8,9 @@ [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_3hx6l"] size = Vector2(600, 200) +[sub_resource type="CircleShape2D" id="CircleShape2D_4pu36"] +radius = 33.0151 + [sub_resource type="RectangleShape2D" id="RectangleShape2D_wmfel"] size = Vector2(100, 10000) @@ -26,6 +29,12 @@ boundary = NodePath("../Boundary") tim_sprite = NodePath("Sprite2D") transmitter_area = NodePath("Joke Transmitter/Area2D") +[node name="ThrowPoint" type="Area2D" parent="Tim"] +position = Vector2(0, -151) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Tim/ThrowPoint"] +shape = SubResource("CircleShape2D_4pu36") + [node name="Sprite2D" type="Sprite2D" parent="Tim"] z_index = 110 position = Vector2(-12, -142)