diff --git a/cards/card_manager.gd b/cards/card_manager.gd index 62e7eef..d755754 100644 --- a/cards/card_manager.gd +++ b/cards/card_manager.gd @@ -113,7 +113,12 @@ func _get_card_name(card_id: int) -> String: var color: String var suffix: String - if card_id < 13: + if card_id > 51 and card_id < 56: + return "jester" + elif card_id > 55: + return "magician" + + elif card_id < 13: color = "blue" elif card_id < 26: color = "green" diff --git a/cards/textures/stickman/blue_joker.webp b/cards/textures/stickman/blue_joker.webp deleted file mode 100644 index 9960661..0000000 Binary files a/cards/textures/stickman/blue_joker.webp and /dev/null differ diff --git a/cards/textures/stickman/blue_magician.webp b/cards/textures/stickman/blue_magician.webp deleted file mode 100644 index d50bcb7..0000000 Binary files a/cards/textures/stickman/blue_magician.webp and /dev/null differ diff --git a/cards/textures/stickman/green_joker.webp b/cards/textures/stickman/green_joker.webp deleted file mode 100644 index ea2ab38..0000000 Binary files a/cards/textures/stickman/green_joker.webp and /dev/null differ diff --git a/cards/textures/stickman/green_magician.webp b/cards/textures/stickman/green_magician.webp deleted file mode 100644 index e8a38ff..0000000 Binary files a/cards/textures/stickman/green_magician.webp and /dev/null differ diff --git a/cards/textures/stickman/jester.webp b/cards/textures/stickman/jester.webp new file mode 100644 index 0000000..412383d Binary files /dev/null and b/cards/textures/stickman/jester.webp differ diff --git a/cards/textures/stickman/jester.webp.import b/cards/textures/stickman/jester.webp.import new file mode 100644 index 0000000..dc374fd --- /dev/null +++ b/cards/textures/stickman/jester.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cbjxtiymwt2h0" +path="res://.godot/imported/jester.webp-b183cc87030e58aed6dc9f96e9909218.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://cards/textures/stickman/jester.webp" +dest_files=["res://.godot/imported/jester.webp-b183cc87030e58aed6dc9f96e9909218.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 diff --git a/cards/textures/stickman/magician.webp b/cards/textures/stickman/magician.webp new file mode 100644 index 0000000..b48516b Binary files /dev/null and b/cards/textures/stickman/magician.webp differ diff --git a/cards/textures/stickman/magician.webp.import b/cards/textures/stickman/magician.webp.import new file mode 100644 index 0000000..4cb9e2b --- /dev/null +++ b/cards/textures/stickman/magician.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dl1gqwijejlbk" +path="res://.godot/imported/magician.webp-ab5408731c9383771a322e4befa84ff0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://cards/textures/stickman/magician.webp" +dest_files=["res://.godot/imported/magician.webp-ab5408731c9383771a322e4befa84ff0.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 diff --git a/cards/textures/stickman/orange_joker.webp b/cards/textures/stickman/orange_joker.webp deleted file mode 100644 index adec55a..0000000 Binary files a/cards/textures/stickman/orange_joker.webp and /dev/null differ diff --git a/cards/textures/stickman/orange_magician.webp b/cards/textures/stickman/orange_magician.webp deleted file mode 100644 index 8eb0848..0000000 Binary files a/cards/textures/stickman/orange_magician.webp and /dev/null differ diff --git a/cards/textures/stickman/set.pdn b/cards/textures/stickman/set.pdn index 61a42d0..7e048bc 100644 Binary files a/cards/textures/stickman/set.pdn and b/cards/textures/stickman/set.pdn differ diff --git a/cards/textures/stickman/violet_joker.webp b/cards/textures/stickman/violet_joker.webp deleted file mode 100644 index 4c02faa..0000000 Binary files a/cards/textures/stickman/violet_joker.webp and /dev/null differ diff --git a/cards/textures/stickman/violet_magician.webp b/cards/textures/stickman/violet_magician.webp deleted file mode 100644 index 63a7b48..0000000 Binary files a/cards/textures/stickman/violet_magician.webp and /dev/null differ diff --git a/server_tcp.py b/server_tcp.py index 36651c4..3734cb1 100644 --- a/server_tcp.py +++ b/server_tcp.py @@ -505,7 +505,7 @@ async def process_input(message: str, websocket) -> None: # last client to bet; limit bet options total_bet = sum(lobby_manager.get_lobby(lobby_id).client_bets.values()) disallowed_bet = data_object["round"] - total_bet - print(f"bets: {data_object["round"]} / {total_bet}") + print(f"bets: {data_object['round']} / {total_bet}") if disallowed_bet < 0: disallowed_bet = -1 diff --git a/theme.tres b/theme.tres index 88341ec..6999908 100644 --- a/theme.tres +++ b/theme.tres @@ -1,4 +1,4 @@ [gd_resource type="Theme" format=3 uid="uid://7bv5whocnq53"] [resource] -default_font_size = 20 +default_font_size = 18