Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into art

This commit is contained in:
pytunia 2024-01-28 11:26:39 +01:00
parent c09497686d b345937708
commit 1e4caae6c6
8 changed files with 268 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
godot/scenes/Tim.gd
View File

@ -70,6 +70,7 @@ func _on_stamina_empty():
var fade = get_node("/root/IngameScene/UI/FadeOverlay")
fade.modulate.a = fade.minimum_opacity
fade.visible = true
get_node("/root/IngameScene/UI/Curtain").visible = true
get_viewport().set_input_as_handled()
get_tree().paused = true

2
godot/scenes/crowd/crowd.gd
View File

@ -24,4 +24,4 @@ func _ready():
func _process(_delta):
overall_mood = 0
for m in audience:
overall_mood += m.mood
overall_mood += m.mood * 10

40
godot/scenes/crowd/crowd.tscn
View File

@ -12,25 +12,25 @@ script = ExtResource("1_y7wyj")
[node name="Table_1" type="Sprite2D" parent="Tables"]
z_index = 35
position = Vector2(-70, -33)
position = Vector2(-149, -41)
scale = Vector2(0.25, 0.25)
texture = ExtResource("2_bax5s")
[node name="Table_2" type="Sprite2D" parent="Tables"]
z_index = 25
position = Vector2(119, -94)
position = Vector2(136, -118)
scale = Vector2(0.25, 0.25)
texture = ExtResource("2_bax5s")
[node name="Table_3" type="Sprite2D" parent="Tables"]
z_index = 15
position = Vector2(-37, -148)
position = Vector2(-23, -153)
scale = Vector2(0.25, 0.25)
texture = ExtResource("2_bax5s")
[node name="Table_4" type="Sprite2D" parent="Tables"]
z_index = 45
position = Vector2(79, -2)
position = Vector2(239, -14)
scale = Vector2(0.25, 0.25)
texture = ExtResource("2_bax5s")
@ -38,96 +38,96 @@ texture = ExtResource("2_bax5s")
[node name="Seat_5" type="Node2D" parent="Seats"]
z_index = 10
position = Vector2(-35, -197)
position = Vector2(-21, -214)
[node name="Chair" parent="Seats/Seat_5" instance=ExtResource("3_y4hpm")]
[node name="Seat_6" type="Node2D" parent="Seats"]
z_index = 12
position = Vector2(-81, -153)
position = Vector2(-67, -170)
[node name="Chair" parent="Seats/Seat_6" instance=ExtResource("3_y4hpm")]
[node name="Seat_7" type="Node2D" parent="Seats"]
z_index = 13
position = Vector2(9, -151)
position = Vector2(23, -168)
[node name="Chair" parent="Seats/Seat_7" instance=ExtResource("3_y4hpm")]
[node name="Seat_8" type="Node2D" parent="Seats"]
z_index = 17
position = Vector2(-36, -102)
position = Vector2(-22, -119)
[node name="Chair" parent="Seats/Seat_8" instance=ExtResource("3_y4hpm")]
[node name="Seat_9" type="Node2D" parent="Seats"]
z_index = 20
position = Vector2(119, -138)
position = Vector2(137, -177)
[node name="Chair" parent="Seats/Seat_9" instance=ExtResource("3_y4hpm")]
[node name="Seat_10" type="Node2D" parent="Seats"]
z_index = 22
position = Vector2(71, -95)
position = Vector2(89, -134)
[node name="Chair" parent="Seats/Seat_10" instance=ExtResource("3_y4hpm")]
[node name="Seat_11" type="Node2D" parent="Seats"]
z_index = 23
position = Vector2(161, -99)
position = Vector2(179, -138)
[node name="Chair" parent="Seats/Seat_11" instance=ExtResource("3_y4hpm")]
[node name="Seat_12" type="Node2D" parent="Seats"]
z_index = 26
position = Vector2(119, -48)
position = Vector2(137, -87)
[node name="Chair" parent="Seats/Seat_12" instance=ExtResource("3_y4hpm")]
[node name="Seat_1" type="Node2D" parent="Seats"]
z_index = 30
position = Vector2(-72, -76)
position = Vector2(-151, -100)
[node name="Chair" parent="Seats/Seat_1" instance=ExtResource("3_y4hpm")]
[node name="Seat_2" type="Node2D" parent="Seats"]
z_index = 32
position = Vector2(-118, -35)
position = Vector2(-197, -59)
[node name="Chair" parent="Seats/Seat_2" instance=ExtResource("3_y4hpm")]
[node name="Seat_3" type="Node2D" parent="Seats"]
z_index = 33
position = Vector2(-23, -33)
position = Vector2(-102, -57)
[node name="Chair" parent="Seats/Seat_3" instance=ExtResource("3_y4hpm")]
[node name="Seat_4" type="Node2D" parent="Seats"]
z_index = 36
position = Vector2(-74, 12)
position = Vector2(-153, -12)
[node name="Chair" parent="Seats/Seat_4" instance=ExtResource("3_y4hpm")]
[node name="Seat_13" type="Node2D" parent="Seats"]
z_index = 40
position = Vector2(75, -45)
position = Vector2(232, -72)
[node name="Chair" parent="Seats/Seat_13" instance=ExtResource("3_y4hpm")]
[node name="Seat_14" type="Node2D" parent="Seats"]
z_index = 42
position = Vector2(36, 0)
position = Vector2(193, -27)
[node name="Chair" parent="Seats/Seat_14" instance=ExtResource("3_y4hpm")]
[node name="Seat_15" type="Node2D" parent="Seats"]
z_index = 43
position = Vector2(126, -1)
position = Vector2(283, -28)
[node name="Chair" parent="Seats/Seat_15" instance=ExtResource("3_y4hpm")]
[node name="Seat_16" type="Node2D" parent="Seats"]
z_index = 46
position = Vector2(80, 42)
position = Vector2(237, 15)
[node name="Chair" parent="Seats/Seat_16" instance=ExtResource("3_y4hpm")]

2
godot/scenes/crowd/person.gd
View File

@ -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

20
godot/scenes/ingame_scene.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=3 uid="uid://cik30de5gaaah"]
[gd_scene load_steps=8 format=3 uid="uid://cik30de5gaaah"]
[ext_resource type="Script" path="res://scenes/ingame_scene.gd" id="1_objyc"]
[ext_resource type="PackedScene" uid="uid://bkk87o2ooo6at" path="res://ui/overlays/fade_overlay.tscn" id="1_y6ebv"]
@ -6,6 +6,7 @@
[ext_resource type="PackedScene" uid="uid://b0xc4jjyahlvk" path="res://scenes/score_overlay.tscn" id="3_yvlw3"]
[ext_resource type="PackedScene" uid="uid://bx6htkgx23t8v" path="res://scenes/crowd/crowd.tscn" id="4_aeh13"]
[ext_resource type="PackedScene" uid="uid://cicyfp5xjvvu4" path="res://scenes/stage.tscn" id="5_borcq"]
[ext_resource type="Texture2D" uid="uid://c8nhtntxhrfaq" path="res://sprites/room/curtain.svg" id="5_ykdj2"]
[node name="IngameScene" type="Node2D"]
script = ExtResource("1_objyc")
@ -23,6 +24,23 @@ position = Vector2(291, 346)
unique_name_in_owner = true
visible = false
[node name="Curtain" type="Control" parent="UI"]
visible = false
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="TextureRect" type="TextureRect" parent="UI/Curtain"]
layout_mode = 0
offset_right = 576.0
offset_bottom = 324.0
texture = ExtResource("5_ykdj2")
expand_mode = 2
stretch_mode = 4
[node name="ScoreOverlay" parent="UI" instance=ExtResource("3_yvlw3")]
unique_name_in_owner = true
visible = false

161
godot/sprites/room/curtain.svg Normal file
View File

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="192.73598mm"
height="106.50258mm"
viewBox="0 0 192.73598 106.50258"
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.0670983"
inkscape:cx="-501.3596"
inkscape:cy="-309.24985"
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="true"><inkscape:grid
type="xygrid"
id="grid1241" /></sodipodi:namedview><defs
id="defs671" /><g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(285.39457,74.622831)"><rect
style="fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:0.889922"
id="rect1603"
width="57.391693"
height="100.35677"
x="-284.58267"
y="-68.5187"
inkscape:export-filename="curtain.svg"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -226.74841,13.761032 -0.01,6.934059 c 0,0 -10.54442,-0.786385 -11.74667,1.778167 -1.20226,2.564552 3.54338,0.996723 3.68182,2.980521 0.13844,1.983798 -2.2217,4.111232 -5.90088,4.639872 -3.67918,0.52864 -8.24039,-1.290164 -8.67599,-3.600384 -0.4356,-2.31022 5.72896,-1.418541 4.55844,-4.383116 -1.17052,-2.964575 -11.43704,-3.083237 -12.7987,-0.175327 -1.36166,2.90791 4.55952,2.772777 4.20779,4.909093 -0.35173,2.136316 -3.19288,3.172691 -5.61039,3.331167 -2.41751,0.158476 -6.59096,-1.0009 -7.36364,-3.155844 -0.77268,-2.154944 4.20004,-2.629867 2.62987,-5.084416 -1.57017,-2.454549 -10.55124,-2.110949 -11.74675,0.525976 -1.19551,2.636925 4.12229,2.269505 3.50649,4.383117 -0.6158,2.113612 -4.83155,2.485875 -7.18831,2.454545 -2.35676,-0.03133 -5.50734,-0.339454 -6.13636,-2.279222 -0.62902,-1.939768 4.59124,-2.006965 3.15584,-4.733766"
id="path9062"
sodipodi:nodetypes="cczzzzzzzzzzzzzzc" /><path
id="rect9589"
style="fill:#c83737;fill-opacity:1;stroke:none;stroke-width:0.264301;stroke-dasharray:none"
d="m -284.58266,-68.518695 c 3.6142,57.667844 2.90315,66.2399102 2.39662,90.804322 3.4942,3.105549 5.91684,2.134448 6.66264,0.175183 1.19551,-2.636922 10.1764,-2.980612 11.74657,-0.526066 3.06811,1.707562 5.20112,2.377868 6.13658,0 1.36166,-2.907907 11.62818,-2.789389 12.7987,0.175183 2.25901,2.404705 5.89691,1.437941 6.33657,0.363285 1.20224,-2.564549 11.74657,-1.778186 11.74657,-1.778186 l 0.006,-3.844726 h 0.32039 v -85.207715 z"
sodipodi:nodetypes="cccccccccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="M -284.64031,27.01924 V -74.143095 h 14.90259 l -2.27922,100.987012 z"
id="path5706"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -266.40655,27.01924 0.85747,-101.509785 h 12.08464 l 0.0319,101.334462 z"
id="path5708"
sodipodi:nodetypes="ccccc" /><rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
id="rect11104"
width="66.623375"
height="98.181824"
x="-264.91559"
y="-132.37013"
inkscape:export-filename="curtain.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /><g
id="g14690"
transform="matrix(-1,0,0,1,-343.79249,47.728822)"><rect
style="fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:0.993853"
id="rect14666"
width="69.348129"
height="100.2328"
x="-179.29068"
y="-116.08189" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -177.95907,-18.440059 0.1285,-14.866207 70.5621,-0.495896 -0.01,6.934059 c 0,0 -10.54442,-0.786385 -11.74667,1.778167 -1.20226,2.564552 3.54338,0.996723 3.68182,2.980521 0.13844,1.983798 -2.2217,4.111232 -5.90088,4.639872 -3.67918,0.52864 -8.24039,-1.290164 -8.67599,-3.600384 -0.4356,-2.31022 5.72896,-1.418541 4.55844,-4.383116 -1.17052,-2.964575 -11.43704,-3.083237 -12.7987,-0.175327 -1.36166,2.90791 4.55952,2.772777 4.20779,4.909093 -0.35173,2.136316 -3.19288,3.172691 -5.61039,3.331167 -2.41751,0.158476 -6.59096,-1.0009 -7.36364,-3.155844 -0.77268,-2.154944 4.20004,-2.629867 2.62987,-5.084416 -1.57017,-2.454549 -10.55124,-2.110949 -11.74675,0.525976 -1.19551,2.636925 4.12229,2.269505 3.50649,4.383117 -0.6158,2.113612 -4.83155,2.485875 -7.18831,2.454545 -2.35676,-0.03133 -5.50734,-0.339454 -6.13636,-2.279222 -0.62902,-1.939768 4.59124,-2.006965 3.15584,-4.733766 -1.4354,-2.726801 -10.67922,-1.793891 -12.27273,0.175326 -1.5935,1.969218 3.33413,2.290975 2.8052,4.207791 -0.52893,1.916816 -5.78571,2.454544 -5.78571,2.454544"
id="path14668"
sodipodi:nodetypes="cccczzzzzzzzzzzzzzzzzc" /><path
id="path14670"
style="fill:#c83737;fill-opacity:1;stroke:none;stroke-width:0.264301;stroke-dasharray:none"
d="m -189.00475,-115.92061 v 85.207716 h 11.15177 c 2.78637,9.045914 2.35271,6.343231 2.87424,5.61051 1.59351,-1.969215 10.83724,-2.901981 12.27264,-0.175183 3.4942,3.105549 5.91684,2.134448 6.66264,0.175183 1.19551,-2.636922 10.1764,-2.980612 11.74657,-0.526066 3.06811,1.707562 5.20112,2.377868 6.13658,0 1.36166,-2.907907 11.62818,-2.789389 12.7987,0.175183 2.25901,2.404705 5.89691,1.437941 6.33657,0.363285 1.20224,-2.564549 12.27574,-1.778186 12.27574,-1.778186 l -0.52317,-3.844726 h 0.32039 v -85.207716 z"
sodipodi:nodetypes="ccccccccccccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -165.86167,-20.543954 0.7013,-101.162336 h 14.90259 l -2.27922,100.987013 z"
id="path14672"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -146.92661,-20.543954 0.85747,-101.509786 h 12.08464 l 0.0319,101.334463 z"
id="path14674"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -129.92011,-21.069927 0.6636,-101.116103 13.97752,0.0296 -0.0642,100.047025 z"
id="path14676"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -183.9369,-20.706818 -0.20087,-100.802112 h 12.61381 l -0.6494,100.614327 z"
id="path14678"
sodipodi:nodetypes="ccccc" /><rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
id="rect14680"
width="66.623375"
height="98.181824"
x="-177.08246"
y="-115.21928"
inkscape:export-filename="curtain.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /></g><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.257774;stroke-dasharray:none"
d="m -249.40005,26.493267 0.62989,-101.116102 13.26739,0.0296 0.67951,100.047014 z"
id="path5710"
sodipodi:nodetypes="ccccc" /><rect
style="fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:0.996587"
id="rect16083"
width="72.075546"
height="100.21555"
x="-164.99719"
y="-68.335808" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -163.66558,29.306009 0.1285,-14.866207 70.562101,-0.495896 -0.01,6.934059 c 0,0 -10.544421,-0.786385 -11.746671,1.778167 -1.20226,2.564552 3.54338,0.996723 3.68182,2.980521 0.13844,1.983798 -2.2217,4.111232 -5.90088,4.639872 -3.67918,0.52864 -8.24039,-1.290164 -8.67599,-3.600384 -0.4356,-2.31022 5.72896,-1.418541 4.55844,-4.383116 -1.17052,-2.964575 -11.43704,-3.083237 -12.7987,-0.175327 -1.36166,2.90791 4.55952,2.772777 4.20779,4.909093 -0.35173,2.136316 -3.19288,3.172691 -5.61039,3.331167 -2.41751,0.158476 -6.59096,-1.0009 -7.36364,-3.155844 -0.77268,-2.154944 4.20004,-2.629867 2.62987,-5.084416 -1.57017,-2.454549 -10.55124,-2.110949 -11.74675,0.525976 -1.19551,2.636925 4.12229,2.269505 3.50649,4.383117 -0.6158,2.113612 -4.83155,2.485875 -7.18831,2.454545 -2.35676,-0.03133 -5.50734,-0.339454 -6.13636,-2.279222 -0.62902,-1.939768 4.59124,-2.006965 3.15584,-4.733766 -1.4354,-2.726801 -10.67922,-1.793891 -12.27273,0.175326 -1.5935,1.969218 3.33413,2.290975 2.8052,4.207791 -0.52893,1.916816 -5.78571,2.454544 -5.78571,2.454544"
id="path16085"
sodipodi:nodetypes="cccczzzzzzzzzzzzzzzzzc" /><path
id="path16087"
style="fill:#c83737;fill-opacity:1;stroke:none;stroke-width:0.264301;stroke-dasharray:none"
d="m -168.36126,-68.174465 v 85.207704 h 4.80177 c 2.78637,9.045914 2.35271,6.343231 2.87424,5.61051 1.59351,-1.969215 10.83724,-2.901981 12.27264,-0.175183 3.4942,3.105549 5.91684,2.134448 6.66264,0.175183 1.19551,-2.636922 10.1764,-2.980612 11.74657,-0.526066 3.06811,1.707562 5.20112,2.377868 6.13658,0 1.36166,-2.907907 11.62818,-2.789389 12.7987,0.175183 2.25901,2.404705 5.89691,1.437941 6.33657,0.363285 1.20224,-2.564549 11.746571,-1.778186 11.746571,-1.778186 l 0.32639,-89.05243 z"
sodipodi:nodetypes="ccccccccccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -151.56818,27.202114 0.7013,-101.162329 h 14.90259 l -2.27922,100.987006 z"
id="path16089"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -132.63312,27.202114 0.85747,-101.509779 h 12.08464 l 0.0319,101.334456 z"
id="path16091"
sodipodi:nodetypes="ccccc" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
d="m -169.64341,27.03925 -0.20087,-100.802105 h 12.61381 l -0.6494,100.61432 c -2.02732,0.905834 -3.25422,2.403183 -5.78571,2.454544 -3.78713,0.07684 -4.69491,-0.111669 -5.97783,-2.266759 z"
id="path16093"
sodipodi:nodetypes="ccccsc" /><rect
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-dasharray:none"
id="rect16095"
width="66.623375"
height="98.181824"
x="-162.78897"
y="-67.473198"
inkscape:export-filename="curtain.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /><path
style="fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.257774;stroke-dasharray:none"
d="m -115.62662,26.676141 0.62989,-101.116096 13.26739,0.0296 0.67951,100.047008 z"
id="path16097"
sodipodi:nodetypes="ccccc" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

37
godot/sprites/room/curtain.svg.import Normal file
View File

@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c8nhtntxhrfaq"
path="res://.godot/imported/curtain.svg-0e81b667ce9dc117892a1828f829b9e3.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/room/curtain.svg"
dest_files=["res://.godot/imported/curtain.svg-0e81b667ce9dc117892a1828f829b9e3.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

56
godot/ui/theme.tres
View File

File diff suppressed because one or more lines are too long