Merge branch 'main' of git@192.168.8.1:tough_crowd into balancing

godot/icon.svg

@@ -1 +1,110 @@
-<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><g transform="translate(32 32)"><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99z" fill="#363d52"/><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99zm0 4h96c6.64 0 12 5.35 12 11.99v95.98c0 6.64-5.35 11.99-12 11.99h-96c-6.64 0-12-5.35-12-11.99v-95.98c0-6.64 5.36-11.99 12-11.99z" fill-opacity=".4"/></g><g stroke-width="9.92746" transform="matrix(.10073078 0 0 .10073078 12.425923 2.256365)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 919.24059 771.67186)"/><path d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 104.69892 525.90697)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 784.07144 817.24284)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 389.21484 625.67104)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 367.36686 631.05679)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 511.99336 724.73954)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 634.78706 625.67104)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 656.64056 631.05679)"/></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="23.8125mm"
+   height="23.812496mm"
+   viewBox="0 0 23.8125 23.812496"
+   version="1.1"
+   id="svg674"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:docname="´tim_side.svg"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview676"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.5091049"
+     inkscape:cx="-781.2578"
+     inkscape:cy="-306.80438"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="false"><inkscape:grid
+       type="xygrid"
+       id="grid1241" /></sodipodi:namedview><defs
+     id="defs671" /><g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(116.76625,-45.090914)"><circle
+       style="fill:#363d52;fill-opacity:1;stroke:none;stroke-width:2.05509"
+       id="path7499"
+       cx="-104.85999"
+       cy="56.997162"
+       r="11.90625"
+       inkscape:export-filename="icon_tough_crowd.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" /><g
+       id="g7525"
+       inkscape:export-filename="2024\tough_crowd\godot\sprites\faces\jenny_not_amused.svg"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       transform="translate(1.6381067,-38.433539)"><g
+         id="g7523"
+         transform="matrix(1.21,0,0,1.21,-82.927262,-18.41175)"
+         style="stroke-width:0.826446"
+         inkscape:export-filename="2024\tough_crowd\godot\sprites\faces\jenny_not_amused.svg"
+         inkscape:export-xdpi="96"
+         inkscape:export-ydpi="96"><path
+           style="fill:#ffdd55;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -23.36896,88.206978 -1.239733,3.719198 c 0,0 -0.764225,3.1499 -0.867813,5.020918 0.01693,0.888151 0.171492,2.009608 0.681853,3.103156 l 10.225303,1.00225 c 0,0 0.746511,-1.490873 0.818779,-2.000208 0.219846,-1.549424 0.317997,-2.230511 0.241065,-4.215284 -0.100709,-2.598178 -0.491411,-4.810244 -0.74742,-5.514271 z"
+           id="path7501"
+           sodipodi:nodetypes="cccccsscc" /><path
+           style="fill:#deaa87;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -20.765522,87.835059 c -1.184323,0.638814 -2.332287,2.362485 -2.851385,3.595224 -0.519098,1.232739 -0.583585,1.853755 -0.433907,3.409265 0.149678,1.55551 0.458667,4.583653 1.859599,5.640782 1.400932,1.05713 3.115829,1.03499 4.587011,0.18596 1.471182,-0.849028 2.148027,-3.30061 2.603439,-4.95893 0.455412,-1.65832 0.677373,-3.270346 0.247946,-4.710983 -0.429427,-1.440637 -1.358982,-2.936247 -2.541452,-3.471251 -1.18247,-0.535004 -2.286928,-0.328881 -3.471251,0.309933 z"
+           id="path7503"
+           sodipodi:nodetypes="zzzzzzzzz" /><path
+           style="fill:#ffdd55;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -23.244987,92.112136 3.657211,0.123973 3.843171,0.247946 c 0,0 0.0994,-2.211136 -0.371919,-2.913372 -0.471316,-0.702236 -1.043271,-0.847817 -1.859599,-1.053772 -0.816328,-0.205955 -1.867223,-0.51229 -2.913372,0.06199 -1.046149,0.57428 -2.355492,3.533235 -2.355492,3.533235 z"
+           id="path7505"
+           sodipodi:nodetypes="ccczzzc" /><path
+           style="fill:#ffdd55;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -23.988827,90.872404 c 0,0 0.468082,-2.497254 0.991786,-3.285291 0.523704,-0.788037 1.0887,-0.994892 2.107546,-1.301721 1.018846,-0.306829 2.869059,-0.381597 3.905158,-0.123973 1.036099,0.257624 1.583552,0.488327 2.169532,1.239734 0.58598,0.751407 0.867813,3.099332 0.867813,3.099332 0,0 -1.524401,-0.235973 -2.107545,-0.712847 -0.583145,-0.476873 -1.422447,-0.697205 -2.60344,-0.836821 -1.180992,-0.139617 -2.738314,0.428045 -3.223305,0.588873 -0.484991,0.160828 -1.843169,1.178079 -2.107545,1.332714 z"
+           id="path7507"
+           sodipodi:nodetypes="czzzzczzzc" /><path
+           style="fill:#deaa87;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -23.864854,92.948955 c 0,0 -0.656883,-0.02939 -0.898806,0.309935 -0.241923,0.339324 -0.09745,1.124521 0,1.549665 0.09745,0.425144 0.227144,0.820277 0.4649,0.960792 0.237756,0.140515 0.588873,-0.03099 0.588873,-0.03099 z"
+           id="path7509"
+           sodipodi:nodetypes="czzzcc" /><path
+           style="fill:#deaa87;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -15.133358,93.537828 c 0,0 0.656883,-0.02939 0.898806,0.309935 0.241923,0.339324 0.09745,1.124521 0,1.549665 -0.09745,0.425144 -0.227144,0.820277 -0.4649,0.960792 -0.237756,0.140515 -0.588873,-0.03099 -0.588873,-0.03099 z"
+           id="path7511"
+           sodipodi:nodetypes="czzzcc" /><path
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -21.571348,92.762997 c -0.377641,0.0092 -0.444835,0.214993 -0.588873,0.526886 -0.144038,0.311893 -0.141712,0.932941 -0.03099,1.270725 0.110722,0.337784 0.242788,0.605357 0.526887,0.681852 0.284099,0.07649 0.588663,-0.07606 0.836819,-0.340926 0.248156,-0.264867 0.531304,-0.768674 0.402914,-1.208738 -0.12839,-0.440064 -0.769116,-0.938978 -1.146757,-0.929799 z"
+           id="path7513"
+           sodipodi:nodetypes="zzzzzzz" /><path
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           d="m -17.43559,92.97995 c 0.377641,0.0092 0.444835,0.214993 0.588873,0.526886 0.144038,0.311893 0.141712,0.932941 0.03099,1.270725 -0.110722,0.337784 -0.242788,0.605357 -0.526887,0.681852 -0.284099,0.07649 -0.588663,-0.07606 -0.836819,-0.340926 -0.248156,-0.264867 -0.531304,-0.768674 -0.402914,-1.208738 0.12839,-0.440064 0.769116,-0.938978 1.146757,-0.929799 z"
+           id="path7515"
+           sodipodi:nodetypes="zzzzzzz" /><ellipse
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           id="ellipse7517"
+           cx="-21.447374"
+           cy="94.219681"
+           rx="0.61986631"
+           ry="0.71284634" /><ellipse
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.437328"
+           id="ellipse7519"
+           cx="-17.635197"
+           cy="94.43663"
+           rx="0.61986631"
+           ry="0.71284634" /><path
+           style="fill:none;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.437328"
+           d="m -21.726315,99.054638 c 0,0 0.930076,-2.698677 1.797613,-2.727412 0.867537,-0.02873 1.549665,3.068338 1.549665,3.068338"
+           id="path7521"
+           sodipodi:nodetypes="czc" /></g></g></g></svg>

godot/logo.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://crcky5h28s70a"
+path="res://.godot/imported/logo.svg-8d8cf086b974db23ad31f8a2f3ea7d0f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://logo.svg"
+dest_files=["res://.godot/imported/logo.svg-8d8cf086b974db23ad31f8a2f3ea7d0f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/project.godot

@@ -11,6 +11,7 @@ config_version=5
 [application]
 
 config/name="Tough Crowd"
+config/description="Tough Crowd is a resource management game where you play as a Standup Comedian. The crowd is tough, but so are you. Can you find the right jokes and please your audience before you run out of jokes?"
 run/main_scene="res://scenes/boot/godot/godot_bootsplash_scene.tscn"
 config/features=PackedStringArray("4.2")
 config/icon="res://icon.svg"

godot/scenes/boot/bootsplash_scene.tscn

@@ -13,15 +13,15 @@ script = ExtResource("2")
 fade_duration = 2.0
 
 [node name="ColorRect" type="ColorRect" parent="."]
-anchors_preset = 15
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-color = Color(0, 0, 0, 1)
+color = Color(0.211765, 0.239216, 0.321569, 1)
 
 [node name="CenterContainer" type="CenterContainer" parent="."]
-anchors_preset = 15
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
@@ -29,13 +29,7 @@ grow_vertical = 2
 
 [node name="NodeContainer" type="Control" parent="CenterContainer"]
 unique_name_in_owner = true
-layout_mode = 3
+layout_mode = 2
-anchors_preset = 0
-offset_left = 288.0
-offset_top = 162.0
-offset_right = 288.0
-offset_bottom = 162.0
 
 [node name="Camera2D" type="Camera2D" parent="."]
 anchor_mode = 0
-current = true

godot/scenes/boot/game_logo.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://exxpofm0yfg3"]
+
+[ext_resource type="Texture2D" uid="uid://crcky5h28s70a" path="res://logo.svg" id="1_eiyd2"]
+
+[node name="GodotLogo" type="Node2D"]
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+scale = Vector2(0.3, 0.3)
+texture = ExtResource("1_eiyd2")

godot/scenes/boot/godot/godot_bootsplash_scene.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Theme" uid="uid://d22mpqutkotsu" path="res://ui/theme.tres" id="1_il62e"]
 [ext_resource type="PackedScene" uid="uid://ehrvsjvp61gu" path="res://scenes/boot/bootsplash_scene.tscn" id="2_ixabf"]
-[ext_resource type="PackedScene" uid="uid://cmmr5jbylu08i" path="res://scenes/boot/godot/godot_logo.tscn" id="3_e0rf4"]
+[ext_resource type="PackedScene" uid="uid://exxpofm0yfg3" path="res://scenes/boot/game_logo.tscn" id="3_liysd"]
 [ext_resource type="PackedScene" uid="uid://dv2y18ye8j7o0" path="res://scenes/main_menu_scene.tscn" id="4_n5qhh"]
 
 [node name="GodotBootsplashScene" type="Control"]
@@ -17,5 +17,5 @@ theme = ExtResource("1_il62e")
 [node name="BootsplashScene" parent="." instance=ExtResource("2_ixabf")]
 layout_mode = 1
 theme = ExtResource("1_il62e")
-node = ExtResource("3_e0rf4")
+node = ExtResource("3_liysd")
 next_scene = ExtResource("4_n5qhh")

godot/scenes/crowd/person.gd

@@ -145,7 +145,7 @@ func on_joke_finish(joke: Joke):
 	is_listening = false
 	var mood_change = profile.joke_mood_mapping.get(joke.type, 0)
 	if joke.type == last_joke_heard:
-		mood_change = max(0, mood_change)
+		mood_change = min(0, mood_change)
 	update_mood(mood_change)
 	last_joke_heard = joke.type
 

godot/ui/components/game_logo.tscn

@@ -3,21 +3,16 @@
 [ext_resource type="Texture2D" uid="uid://dmelj2qgr8w7k" path="res://icon.svg" id="1_scjn5"]
 
 [node name="GameLogo" type="CenterContainer"]
-offset_right = 128.0
+offset_right = 110.0
-offset_bottom = 128.0
+offset_bottom = 110.0
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
-offset_right = 148.0
+layout_mode = 2
-offset_bottom = 148.0
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
 [node name="TextureRect" type="TextureRect" parent="MarginContainer"]
-offset_left = 10.0
+layout_mode = 2
-offset_top = 10.0
-offset_right = 138.0
-offset_bottom = 138.0
 texture = ExtResource("1_scjn5")
-stretch_mode = 2