From 6327f89bc807d7350eecbcf25bbf6bf590135ff7 Mon Sep 17 00:00:00 2001 From: Graham Barber Date: Mon, 6 Oct 2025 10:58:07 -0700 Subject: [PATCH] replace barks with single button --- assets/buttons/button_down.png | Bin 0 -> 7544 bytes assets/buttons/button_down.png.import | 40 ++++++++++++++++ assets/buttons/button_up.png | Bin 0 -> 6530 bytes assets/buttons/button_up.png.import | 40 ++++++++++++++++ audience_manager.gd | 3 +- bark.gd | 28 +++++++++++ bark.gd.uid | 1 + desk.gd | 2 + desk.tscn | 29 +++++++++++- main.tscn | 64 ++------------------------ world.gd.uid | 2 +- 11 files changed, 143 insertions(+), 66 deletions(-) create mode 100644 assets/buttons/button_down.png create mode 100644 assets/buttons/button_down.png.import create mode 100644 assets/buttons/button_up.png create mode 100644 assets/buttons/button_up.png.import create mode 100644 bark.gd create mode 100644 bark.gd.uid diff --git a/assets/buttons/button_down.png b/assets/buttons/button_down.png new file mode 100644 index 0000000000000000000000000000000000000000..6b003780fe77521c00d5d5ee74ed167bea944079 GIT binary patch literal 7544 zcmeHMdpy(o|F^kR3Q31#hoLAZ_lhyIP739I$)yq}mt3cfj3ri`)JaAv$*td^lxv6M zR%X8W7KtqtavPahxede2ZQu9D=~Ulyd7Qs~|9$7N?X}P6{d&Eguj~8u{JmM9SLA!bwB~mJGeuN`Nczw7o6h3r29V{9dGlj`#?E29{18@I?KoPM|>tnz-^s)kPAnCVn zhd`oVNT^Q)4v%!ey?I7x#mo4ly(w;u1jhK7U@Oo(P` zt1C0HZLmU{5FHlbL(~oHd@Q6TM z7!s1}^8+q2!c0vKQuO)t8%{rB;1^9{gimGx19hQ0y81eLx_`w6jQx!7zqp7#;eX2% z5$OLnx}ZD1v8_7eH;iZqfyrt(JuCu4{lW;q9?Wh%J@hKJKi&Ca-B+CMf6MvRov%27 zVJ7?Weo*?j;BX(cwMPJWk_iht? zl(wFc31kE$=D*f{B?oediMx{@0T&Vpg%M+9pa)*M`p_p@_fNO~$ohrTH7qa!WAKUP z510SQh;|=Z&=sA^B}9&=EaL|J8)wiC}!`}_*j~)O`1#09oDHnQTpYh{EKX~ zQ@F>{ZFWcBR&7PNMAmpgJV{0f=2i z%2q%jAE|l6JoZh=LVDi9=LA8yjpX%~4FiHJr zi&=MvSyzyZDL=7rL9xH@WiA`*$qB9;Rc}n?yA|4ZoTxF!33km&Tz9)<0HF%m^e8^$ z2dC8>ajJ)3S8HCyZ9Q;n@l1wq_jhKk(JrJ%-;oNgt}VzsFd@*f^V;b$UYuDrnyXb; z$O`<{CRjSJV!22-!A(VFaOw~wvXnB3i%qB)d3(yaV(@J0s$Tan+>%~ZR+UXuDODl&-$|Ka#q*{0Fr z$8mL;k3TlvTr|s3a2~d(C5JplyQ~(^=11{)m;Y=LR(jh3%*&btLG;j+^F*|cG)6L= z*JSpt=)}!JvmWZW+j5n1>0oFm_rpQ}2kl8~Jbeajx#&9X%Ioi$y~7WVjB{h1KxH#h zcjDEU*dzYkmJn=*_3qdp^*vDE_dWm&`yBZD?-B|V1WwnUW&2fV-XT3GCe`MSE4uxR z%05CVSngoCakh98ki{&;;&Wayio&)|%Q?4-oLR%Vkrl>*2c6Tvn%~Uu!XZ&_K7|1Y zzhb=|@|qQFz12@U2dDy)_EG(R}jzmySZ+O?kq`%(~7c-2U zj(LIa=wI(pk+bZ#OkHNg)EOmv1awpb$l+!2;zPdPtw5Cb5!m{sBE#TgK)$iZ03Edv zMUm4j>2=2Z@|~^Bj^xh9HdI1+4{keyn}V)WC?l?*yOpL%s!XhBsn{$O*MS_k{6>Y< z##0MwD*8&RHRPc1e1z2m3X`>blXjf<>pA73xd;MfFT<_w2$IG>9mkO(P(WP_$Bm)9ERuA`9`QJ91#Pf5glx1f@r@i7Hv&Ao3BAMJOEjXlpxW|Ua-vay8mMEe0;p)6`};NmnOp4Z;Reji zE4P8n<7*Q$MLmYlTCF1_mJnqy4l#CCmCI4UL-sDHaJD)6So5AeUx{J??eu*(_*m{DJal7I(b0&a$>` zva-E|e#O^r_|&}8keIx$CB>-cXvEx(A)eZ(8zU#ARI79-Hf{5 z_@c7;WXO0ekf7U#J_Rpv#w__biqhV;I9Ul#Pc=5xygnWvw6wRFXyYiKYwu_B3g<|s z*%;JHVpTz0gx$79?!7UoytMRyyV_m)(}xv&YBZyN$D_LUb2jE(D~N3z>taq$TRF+ zjoolYe;wZ$N!Xgsn=gu{+o!9a8sE-fAod570y-H){#;Z9sd#FLZ>1ck6g-7K`)lX3 z{^!#YuT9EFRy}PF+^Zu7xrJz551-zYkqS8-$Zjg>isma1mkeZ`H6^#C_)4?SATLN6 z=NP3MHfKKfZdlxV42SH0ZM-@|FhFiHA`t3OYsUeJU#`bAlZUt{^Q%4j@crw2?bHd% z`=y3uLnfvIq`iNgy3F4L!y!v+P|(a!rSK@ecV&|ZB%~7v{CxSt&NXGX6Fd4d!ul>$ zBs>`i)0qs`2sTkAY)juC7&I2&9397AQhD{v#n#2Em{H|*x|Td+VmJs|ES3WTLD#e* z0{cFIZvJ|-8M9Q97CJ1&5aFOUlb(*%l;? zQ5LZQG?jWU;AO9U9FU#^_rZz`yILPWdzZ$G`Ey7IADjO?Vu>z6i{F95Gy0Cr1c=)DJlyQ=^?#^>%F zo`JB!@m`bc?(^qkG8ojUd1j;6zk(Tjvl8L#oCJP6GT#V9z(yTJz+X%1B9PSy98fab zp#%WkmrWL}Ii*El>?Ukb_^~b2NI<>PMSz!6N_*B9zp0mAu{V(%f9p_7&TKA( z+Fr|d07F#RwM2j+A7HR!w?l1j_?v25>1_l=R9|@}-wAWZS3tc%Emm2kQbrb9M`LkI zbn_$LZ@IB~=Z(J1Zt}^tHd+8qJQfIYvPcIa#rCf2)mT$zz5gCg9M6cIF`LUJAl5}i z(A9ew(;s*#EJf;4eomZn?AnY$zQkY72Vb@PA*|ET&-e)s{;iV_22C?|5;nWqsgCA+ z+uuIUKNEY*Y=yb-QULBOl2qcB*lAi9os&qSs2^Q(L6+V=0X8BbLP-^XvXgxjpZT=F z5wc$w6zn!WlEA2o97zf*t%#e=S>KY)B4QRO6l!NwdmW1*J}pSDDCEZ0zV9~{+CC>9 z>{4n{Ea-;HSPC>GquajwAzBe+rJ+lOHE_Jr+6}3qFU+1VQAavzn$6fjl=6z@js;hA zbZy0Q?r44|bAFnn?8ZTt31=RgWRHQ7;jHg6m6tkRaf?JLjYJF3%{-nUB0}1iO;Sl4 zLgO=;Up(rL-K+o50^0g^dc!`S0`zR8ecznYD7isua^nUD#3?e`X3|sNWn5^QqbKn{ z%pL7{DF`x)!!6fhN|H1e8B;D(E}Q_8B?o;3kLY3_#Vadb{KsI{8m=jO*FYLmU0DwP zcRSZ3u6U7>LtvD3vs!pZM>zt^G}2YhhpCFns58>Jd$OZC8KcW%M9;-13k$`Ag@X_2 z3{Kl|f^u|L^gkV6>P-pA4ER!sQ-!9WFB)Th5XrwmkU>#Y-UOQ$XJ(~ZGlGWPNGJOG zy(k^LLe5JjEp$&aA6+m?SNgJb|IOSb-~Y_L_;g>wRW8}Lszx)tk;gCN&9{>(yJ*wz zK&Pyx)5(d&?aHyiNk2c%DW{GIQe-(iUmVEV6EDa!GrQ>FG;NZo;MQ}HOkj%y<5={4 z))wf;Sx`@3uD^Oy*Q2)PIw`3pz^a$ zjH_o?e3v`$7@9JNKQk8kEuFH!#GZ4QCqq@_3DQj4b7Xa1lL38DM$#O#sCevEto>rR zJpqY&(Cb_@hb2(TyHB>RfD;z+IFcaWzMM8&&gob*V=&4xEq@C6jwISOoF@;#ya*18 z*v+e_nGDcCGg3XFM!pf=utGxWCsA5XyO8o~8a>Bf_{V|iJw)NbL}{%`;i3_VzGzNS z$znCl8EP&XGo8<&8qA8uq=xhkNrA#2@B$@3YOQJmKnL^yPM;fFp))g8ET%g@ctP39 z&Us?r5z>S9?7-3N(C5xsIkT4Eak3+yoA=BYPSG(dh!epz(>)}bKN_#R6K@CV3{~O@ zCa3xtAoyecI}xbOCxPt};Z_WEc*j87r96sqgZU&OI?`?%i(%H^g@?Bjc|=!Ck0vMg zr+gEzi@6G^Dy6mjVe}kE#dCQ&dfHf+#h`ag+81)AhIV^OLHkG;fZNLpjsSizwgt!Y zt;LssGQFyLQ~s1ZD!H7$n;=8rDi@he*5Eeel5`x{#?xa|eos3iAyMdfj#G}`o{7PL z5vmb=`8WfZ`VSNIu@MS7P3{^pw@pB z$gXl$*8{R=w8Pn$el#|n9V^-YkvR5C4LM%Nie+1ot0CP@@%eotoDqzOK9ho+0N8AEjr02Zd z0aCR+oL$$iwgx||{Gn~ECcoPx8*R?&$xwedSI@7^nbN9SH?-u!OPMWXdJ?vFWg{$q z+EKcWDC*%nr3mHU4G_=kR^ou#=ne+tqKEU4U1EpGRcx$5SqI|#Y~cj{=9{MZf~m^N zswf$%i8;%Ssrl;8nR`RPAcFt*5m6<${N@Hs=?kfbh9_N|G+CxVgB~zMc7m zf~&6U7mURi*&8jBL_hj#i9rv0egT3{wx*o|N%86$IK*W<+_)AXe!hvw!3-9INkR9j z6zM7HiSf)*Ibj!dzpc5$E|9+me3t0mB1dQ4P zS&NBR5mpD|s?6Ragl%jo65TQi6-g>#aNaz5A4B4lbD}4c!sI6<%F+)VfOzJ?b}uM+ z9{|zsc7Z2BHuuyZVQ0Vj5UAp0H#FKZpN_SJE8({)hT1c3CE5y*V60xf<1?FPU+q4A1`VZX_2>XKvgml*OLE2iQ@yO|Ho?faS7;q=4m(71UI zMDTD;Tmp$jUR{a@i1Y(%-hvMZuZay3{EYgbfW& zT4?s^)st2ofN)lmMS$=Vwe*~&hdyFujESd`4oI`(71OJ)DB!m~e9yF#WjBb|k`Zv|eIxKjFICM!n|GHY|Etw_{-};Hx&5jdx z^-5Mz&T2@&k*Eqz&nL4jppAM0K<~4?5)Yc6-lh214*lW4!#DDW-7CfJ(!Z~#Rtz}Y zcC1%wN-PhuffQhYURaq9v^p2G&F3C_G$7zmL?OfeNBn;~VL-TUNv8Ap&mMvcJ>NqA PUbH@7XHoLK_xb+-q3B_W literal 0 HcmV?d00001 diff --git a/assets/buttons/button_down.png.import b/assets/buttons/button_down.png.import new file mode 100644 index 0000000..d33802f --- /dev/null +++ b/assets/buttons/button_down.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bdjfior4od5ub" +path="res://.godot/imported/button_down.png-b31c37be4e6104f2104294b39e187e63.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/buttons/button_down.png" +dest_files=["res://.godot/imported/button_down.png-b31c37be4e6104f2104294b39e187e63.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/buttons/button_up.png b/assets/buttons/button_up.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed07818e41e709a969c365d90ffbd1fd8721f42 GIT binary patch literal 6530 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 void: desk.numpad.ask_proposed.connect(_handle_ask_proposed) timer.timeout.connect(_handle_bid_delay_timeout) - bark_buttons.auctioneer_bark.connect(_handle_auctioneer_bark) + desk.bark.bark.connect(_handle_auctioneer_bark) desk.numpad.reminder_timer.timeout.connect(try_clear_currently_animated_collector) desk.gavel.gavel_hit.connect(try_clear_currently_animated_collector) diff --git a/bark.gd b/bark.gd new file mode 100644 index 0000000..1c2cddc --- /dev/null +++ b/bark.gd @@ -0,0 +1,28 @@ +class_name Bark extends Node2D + +@export var bark_speed = 4.0 + +var turn_manager: TurnManager +signal bark + + +func _on_bark_button_pressed() -> void: + bark.emit() + + var chance = randf() + if chance < 0.25: + turn_manager.speak_bark("It's an investment piece!", bark_speed) + elif chance < 0.5: + turn_manager.speak_bark("It's an innovative artist!", bark_speed) + elif chance < 0.75: + turn_manager.speak_bark("It's a stunning message!", bark_speed) + else: + turn_manager.speak_bark("It's a great buy!", bark_speed) + + +func _on_bark_button_button_down() -> void: + $BarkButton.mouse_default_cursor_shape = Control.CURSOR_DRAG + + +func _on_bark_button_button_up() -> void: + $BarkButton.mouse_default_cursor_shape = Control.CURSOR_ARROW diff --git a/bark.gd.uid b/bark.gd.uid new file mode 100644 index 0000000..d071009 --- /dev/null +++ b/bark.gd.uid @@ -0,0 +1 @@ +uid://cwnif1u23aa2 diff --git a/desk.gd b/desk.gd index 81a3579..f5eb1b0 100644 --- a/desk.gd +++ b/desk.gd @@ -5,8 +5,10 @@ class_name Desk extends Control @export var turn_manager: TurnManager @export var audience_manager: AudienceManager @export var gavel: Gavel +@export var bark: Bark func _ready() -> void: numpad.turn_manager = turn_manager numpad.game_manager = game_manager numpad.audience_manager = audience_manager + bark.turn_manager = turn_manager diff --git a/desk.tscn b/desk.tscn index 19ef5ec..f1cc644 100644 --- a/desk.tscn +++ b/desk.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=3 uid="uid://bohp0o2smdkwe"] +[gd_scene load_steps=60 format=3 uid="uid://bohp0o2smdkwe"] [ext_resource type="Script" uid="uid://c2mrlu8d75ry4" path="res://gavel.gd" id="1_ep8l3"] [ext_resource type="Script" uid="uid://d2ophrxm0wtr6" path="res://desk.gd" id="1_yugeg"] @@ -53,6 +53,9 @@ [ext_resource type="Texture2D" uid="uid://cxwxmqnnbyl3s" path="res://assets/numpad/ask-depressed.png" id="28_4l1rv"] [ext_resource type="AudioStream" uid="uid://bvto7ghmy8j0o" path="res://assets/gavel/audio/invalid-bet.wav" id="31_v5y5a"] [ext_resource type="AudioStream" uid="uid://bq5yl788b424g" path="res://assets/numpad/ask-bet-final.wav" id="53_mq8ri"] +[ext_resource type="Script" uid="uid://cwnif1u23aa2" path="res://bark.gd" id="54_bxpdm"] +[ext_resource type="Texture2D" uid="uid://b6n841u18dddv" path="res://assets/buttons/button_up.png" id="55_8sdgr"] +[ext_resource type="Texture2D" uid="uid://bdjfior4od5ub" path="res://assets/buttons/button_down.png" id="56_k4eer"] [sub_resource type="SpriteFrames" id="SpriteFrames_g470s"] animations = [{ @@ -149,7 +152,7 @@ bg_color = Color(0.5109665, 0, 0.077832855, 1) [sub_resource type="Theme" id="Theme_8sdgr"] ProgressBar/styles/fill = SubResource("StyleBoxFlat_8sdgr") -[node name="Desk" type="Control" node_paths=PackedStringArray("numpad", "gavel")] +[node name="Desk" type="Control" node_paths=PackedStringArray("numpad", "gavel", "bark")] layout_mode = 3 anchors_preset = 0 offset_right = 1280.0 @@ -157,6 +160,7 @@ offset_bottom = 720.0 script = ExtResource("1_yugeg") numpad = NodePath("Numpad") gavel = NodePath("Gavel") +bark = NodePath("Bark") [node name="Gavel" type="Node2D" parent="." node_paths=PackedStringArray("audio_player")] position = Vector2(825, 300) @@ -319,7 +323,28 @@ theme = SubResource("Theme_8sdgr") theme_type_variation = &"Red" show_percentage = false +[node name="Bark" type="Node2D" parent="."] +script = ExtResource("54_bxpdm") + +[node name="BarkButton" type="TextureButton" parent="Bark"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = 31.0 +offset_top = 348.0 +offset_right = 431.0 +offset_bottom = 748.0 +grow_horizontal = 2 +grow_vertical = 2 +texture_normal = ExtResource("55_8sdgr") +texture_pressed = ExtResource("56_k4eer") + [connection signal="button_down" from="Gavel/TextureButton" to="Gavel" method="_on_texture_button_button_down"] [connection signal="button_up" from="Gavel/TextureButton" to="Gavel" method="_on_texture_button_button_release"] [connection signal="mouse_entered" from="Gavel/TextureButton" to="Gavel" method="_on_texture_button_mouse_entered"] [connection signal="mouse_exited" from="Gavel/TextureButton" to="Gavel" method="_on_texture_button_mouse_exited"] +[connection signal="button_down" from="Bark/BarkButton" to="Bark" method="_on_bark_button_button_down"] +[connection signal="button_up" from="Bark/BarkButton" to="Bark" method="_on_bark_button_button_up"] +[connection signal="pressed" from="Bark/BarkButton" to="Bark" method="_on_bark_button_pressed"] diff --git a/main.tscn b/main.tscn index 7f28467..84fd2d9 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://dt4nq0nkmjiit"] +[gd_scene load_steps=18 format=3 uid="uid://dt4nq0nkmjiit"] [ext_resource type="Script" uid="uid://b5tcsve1oo5ht" path="res://game_manager.gd" id="1_ig7tw"] [ext_resource type="Texture2D" uid="uid://cvqsf1nlfqwpr" path="res://assets/background/background.png" id="1_lquwl"] @@ -12,16 +12,7 @@ [ext_resource type="AudioStream" uid="uid://cicodo74wnevu" path="res://assets/game sfx/next-round.wav" id="6_82xsv"] [ext_resource type="PackedScene" uid="uid://c1acpop6amvcl" path="res://audience_manager.tscn" id="6_272bh"] [ext_resource type="PackedScene" uid="uid://b8key4hjaldui" path="res://turn_manager.tscn" id="7_272bh"] -[ext_resource type="Texture2D" uid="uid://d2142cf22t1lv" path="res://assets/buttons/button1.png" id="9_2cqfq"] -[ext_resource type="Script" uid="uid://bg1vk1o2eq3fg" path="res://bark_buttons.gd" id="9_yaehf"] -[ext_resource type="Script" uid="uid://sfhg7pkumnwa" path="res://captions.gd" id="10_ryguw"] -[ext_resource type="Texture2D" uid="uid://ut655l8y8xmi" path="res://assets/buttons/button1pressed.png" id="10_yaehf"] -[ext_resource type="Texture2D" uid="uid://c0iad21xtnjdd" path="res://assets/buttons/button3.png" id="11_074og"] -[ext_resource type="Texture2D" uid="uid://dx4dadmb37khl" path="res://assets/buttons/button3pressed.png" id="12_cegan"] -[ext_resource type="Texture2D" uid="uid://14hw6p3ck5e7" path="res://assets/buttons/button2.png" id="13_82xsv"] -[ext_resource type="Texture2D" uid="uid://dve6bedyuod2b" path="res://assets/buttons/button2pressed.png" id="14_getpj"] -[ext_resource type="Texture2D" uid="uid://heqlxtsfl26k" path="res://assets/buttons/button4.png" id="15_ryguw"] -[ext_resource type="Texture2D" uid="uid://bnjj1gp2jx82x" path="res://assets/buttons/button4pressed.png" id="16_d13ii"] +[ext_resource type="Script" path="res://captions.gd" id="10_ryguw"] [ext_resource type="PackedScene" uid="uid://6a4hl2twv0lj" path="res://cursor_manager.tscn" id="20_82xsv"] [ext_resource type="AudioStream" uid="uid://b6u25i4ivxist" path="res://theme.ogg" id="22_ryguw"] @@ -129,54 +120,13 @@ script = ExtResource("10_ryguw") [node name="AudienceManager" parent="." node_paths=PackedStringArray("desk", "game_manager", "bark_buttons") instance=ExtResource("6_272bh")] desk = NodePath("../Desk") game_manager = NodePath("../GameManager") -bark_buttons = NodePath("../BarkButtons") +bark_buttons = NodePath("") [node name="TurnManager" parent="." node_paths=PackedStringArray("desk", "captions", "audience_manager") instance=ExtResource("7_272bh")] -tts_sentence_speed = 4.5 desk = NodePath("../Desk") captions = NodePath("../UI/Captions") audience_manager = NodePath("../AudienceManager") -[node name="BarkButtons" type="Node2D" parent="." node_paths=PackedStringArray("turn_manager")] -position = Vector2(180, 500) -script = ExtResource("9_yaehf") -turn_manager = NodePath("../TurnManager") - -[node name="GreatBuy" type="TextureButton" parent="BarkButtons"] -offset_top = -14.0 -offset_right = 100.0 -offset_bottom = 86.0 -texture_normal = ExtResource("9_2cqfq") -texture_pressed = ExtResource("10_yaehf") -texture_hover = ExtResource("10_yaehf") - -[node name="InvestmentPiece" type="TextureButton" parent="BarkButtons"] -offset_left = -98.0 -offset_top = 47.0 -offset_right = 2.0 -offset_bottom = 147.0 -texture_normal = ExtResource("11_074og") -texture_pressed = ExtResource("12_cegan") -texture_hover = ExtResource("12_cegan") - -[node name="StunningMessage" type="TextureButton" parent="BarkButtons"] -offset_left = -4.0 -offset_top = 103.0 -offset_right = 96.0 -offset_bottom = 203.0 -texture_normal = ExtResource("13_82xsv") -texture_pressed = ExtResource("14_getpj") -texture_hover = ExtResource("14_getpj") - -[node name="InnovativeArtist" type="TextureButton" parent="BarkButtons"] -offset_left = 92.0 -offset_top = 43.0 -offset_right = 192.0 -offset_bottom = 143.0 -texture_normal = ExtResource("15_ryguw") -texture_pressed = ExtResource("16_d13ii") -texture_hover = ExtResource("16_d13ii") - [node name="CursorManager" parent="." instance=ExtResource("20_82xsv")] [node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] @@ -247,11 +197,3 @@ layout_mode = 2 size_flags_horizontal = 3 [connection signal="timer_timeout" from="TurnManager" to="GameManager" method="_on_turn_manager_timer_timeout"] -[connection signal="button_down" from="BarkButtons/GreatBuy" to="BarkButtons" method="_on_great_buy_button_down"] -[connection signal="button_up" from="BarkButtons/GreatBuy" to="BarkButtons" method="_on_great_buy_button_release"] -[connection signal="button_down" from="BarkButtons/InvestmentPiece" to="BarkButtons" method="_on_investment_piece_button_down"] -[connection signal="button_up" from="BarkButtons/InvestmentPiece" to="BarkButtons" method="_on_investment_piece_button_up"] -[connection signal="button_down" from="BarkButtons/StunningMessage" to="BarkButtons" method="_on_stunning_message_button_down"] -[connection signal="button_up" from="BarkButtons/StunningMessage" to="BarkButtons" method="_on_stunning_message_button_release"] -[connection signal="button_down" from="BarkButtons/InnovativeArtist" to="BarkButtons" method="_on_innovative_artist_button_down"] -[connection signal="button_up" from="BarkButtons/InnovativeArtist" to="BarkButtons" method="_on_innovative_artist_button_release"] diff --git a/world.gd.uid b/world.gd.uid index 2a76f19..46fcb92 100644 --- a/world.gd.uid +++ b/world.gd.uid @@ -1 +1 @@ -uid://btq5lp33qphwg +uid://k52hesjc1onk