UPDATE

mehah · Jun 27, 2024 · 9be2dcd · 9be2dcd
2 parents 6dd23c8 + 13a3d18
commit 9be2dcd
Show file tree

Hide file tree

Showing 318 changed files with 12,809 additions and 3,701 deletions.
diff --git a/data/fonts/verdana-11px-monochrome-underline.otfont b/data/fonts/verdana-11px-monochrome-underline.otfont
@@ -0,0 +1,7 @@
+Font
+  name: verdana-11px-monochrome-underline
+  texture: verdana-11px-monochrome_underline_cp1252
+  height: 14
+  glyph-size: 16 16
+  space-width: 3
+  spacing: -1 0
diff --git a/data/fonts/verdana-11px-monochrome_underline_cp1252.png b/data/fonts/verdana-11px-monochrome_underline_cp1252.png
diff --git a/data/images/automap/automap_buttons.png b/data/images/automap/automap_buttons.png
diff --git a/data/images/automap/automap_indicator_maplayers.png b/data/images/automap/automap_indicator_maplayers.png
diff --git a/data/images/automap/automap_indicator_slider_left.png b/data/images/automap/automap_indicator_slider_left.png
diff --git a/data/images/automap/automap_phantom.png b/data/images/automap/automap_phantom.png
diff --git a/data/images/automap/automap_rose.png b/data/images/automap/automap_rose.png
diff --git a/data/images/automap/timedisplay_scroll.png b/data/images/automap/timedisplay_scroll.png
diff --git a/data/images/background.png b/data/images/background.png
diff --git a/data/images/bars/horizontal_experience_progressbar_tiny.png b/data/images/bars/horizontal_experience_progressbar_tiny.png
diff --git a/data/images/bars/horizontal_health_progressbar_grey_large.png b/data/images/bars/horizontal_health_progressbar_grey_large.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_10.png b/data/images/bars/horizontal_health_progressbar_large_10.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_100.png b/data/images/bars/horizontal_health_progressbar_large_100.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_30.png b/data/images/bars/horizontal_health_progressbar_large_30.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_4.png b/data/images/bars/horizontal_health_progressbar_large_4.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_60.png b/data/images/bars/horizontal_health_progressbar_large_60.png
diff --git a/data/images/bars/horizontal_health_progressbar_large_95.png b/data/images/bars/horizontal_health_progressbar_large_95.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_10.png b/data/images/bars/horizontal_health_progressbar_small_10.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_100.png b/data/images/bars/horizontal_health_progressbar_small_100.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_30.png b/data/images/bars/horizontal_health_progressbar_small_30.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_4.png b/data/images/bars/horizontal_health_progressbar_small_4.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_60.png b/data/images/bars/horizontal_health_progressbar_small_60.png
diff --git a/data/images/bars/horizontal_health_progressbar_small_95.png b/data/images/bars/horizontal_health_progressbar_small_95.png
diff --git a/data/images/bars/horizontal_mana_progressbar_large.png b/data/images/bars/horizontal_mana_progressbar_large.png
diff --git a/data/images/bars/horizontal_mana_progressbar_small.png b/data/images/bars/horizontal_mana_progressbar_small.png
diff --git a/data/images/bars/horizontal_skill_progressbar_tiny.png b/data/images/bars/horizontal_skill_progressbar_tiny.png
diff --git a/data/images/bars/marker_left.png b/data/images/bars/marker_left.png
diff --git a/data/images/bars/marker_right.png b/data/images/bars/marker_right.png
diff --git a/data/images/bars/marker_top.png b/data/images/bars/marker_top.png
diff --git a/data/images/game/entergame/dailyreward_deactivated.png b/data/images/game/entergame/dailyreward_deactivated.png
diff --git a/data/images/game/states/bleeding.png b/data/images/game/states/bleeding.png
diff --git a/data/images/game/states/burning.png b/data/images/game/states/burning.png
diff --git a/data/images/game/states/cursed.png b/data/images/game/states/cursed.png
diff --git a/data/images/game/states/dazzled.png b/data/images/game/states/dazzled.png
diff --git a/data/images/game/states/drowning.png b/data/images/game/states/drowning.png
diff --git a/data/images/game/states/drunk.png b/data/images/game/states/drunk.png
diff --git a/data/images/game/states/electrified.png b/data/images/game/states/electrified.png
diff --git a/data/images/game/states/freezing.png b/data/images/game/states/freezing.png
diff --git a/data/images/game/states/haste.png b/data/images/game/states/haste.png
diff --git a/data/images/game/states/hungry.png b/data/images/game/states/hungry.png
diff --git a/data/images/game/states/logout_block.png b/data/images/game/states/logout_block.png
diff --git a/data/images/game/states/magic_shield.png b/data/images/game/states/magic_shield.png
diff --git a/data/images/game/states/poisoned.png b/data/images/game/states/poisoned.png
diff --git a/data/images/game/states/protection_zone.png b/data/images/game/states/protection_zone.png
diff --git a/data/images/game/states/protection_zone_block.png b/data/images/game/states/protection_zone_block.png
diff --git a/data/images/game/states/slowed.png b/data/images/game/states/slowed.png
diff --git a/data/images/game/states/strengthened.png b/data/images/game/states/strengthened.png
diff --git a/data/images/healthmana/hitpoints_bar_filled.png b/data/images/healthmana/hitpoints_bar_filled.png
diff --git a/data/images/healthmana/hitpoints_manapoints_bar_border.png b/data/images/healthmana/hitpoints_manapoints_bar_border.png
diff --git a/data/images/healthmana/hitpoints_symbol.png b/data/images/healthmana/hitpoints_symbol.png
diff --git a/data/images/healthmana/mana_bar_filled.png b/data/images/healthmana/mana_bar_filled.png
diff --git a/data/images/healthmana/mana_symbol.png b/data/images/healthmana/mana_symbol.png
diff --git a/data/images/icons/icon_axe.png b/data/images/icons/icon_axe.png
diff --git a/data/images/icons/icon_club.png b/data/images/icons/icon_club.png
diff --git a/data/images/icons/icon_controls.png b/data/images/icons/icon_controls.png
diff --git a/data/images/icons/icon_discord.png b/data/images/icons/icon_discord.png
diff --git a/data/images/icons/icon_distance.png b/data/images/icons/icon_distance.png
diff --git a/data/images/icons/icon_experience.png b/data/images/icons/icon_experience.png
diff --git a/data/images/icons/icon_fishing.png b/data/images/icons/icon_fishing.png
diff --git a/data/images/icons/icon_fist.png b/data/images/icons/icon_fist.png
diff --git a/data/images/icons/icon_graphics.png b/data/images/icons/icon_graphics.png
diff --git a/data/images/icons/icon_health.png b/data/images/icons/icon_health.png
diff --git a/data/images/icons/icon_help.png b/data/images/icons/icon_help.png
diff --git a/data/images/icons/icon_interface.png b/data/images/icons/icon_interface.png
diff --git a/data/images/icons/icon_magic.png b/data/images/icons/icon_magic.png
diff --git a/data/images/icons/icon_misc.png b/data/images/icons/icon_misc.png
diff --git a/data/images/icons/icon_options.png b/data/images/icons/icon_options.png
diff --git a/data/images/icons/icon_players.png b/data/images/icons/icon_players.png
diff --git a/data/images/icons/icon_seasonalevent.png b/data/images/icons/icon_seasonalevent.png
diff --git a/data/images/icons/icon_shielding.png b/data/images/icons/icon_shielding.png
diff --git a/data/images/icons/icon_sound.png b/data/images/icons/icon_sound.png
diff --git a/data/images/icons/icon_streamers.png b/data/images/icons/icon_streamers.png
diff --git a/data/images/icons/icon_sword.png b/data/images/icons/icon_sword.png
diff --git a/data/images/icons/icon_viewers.png b/data/images/icons/icon_viewers.png
diff --git a/data/images/icons/icon_youtube.png b/data/images/icons/icon_youtube.png
diff --git a/data/images/icons/icons-skills.png b/data/images/icons/icons-skills.png
diff --git a/data/images/icons/show_gui_help_grey.png b/data/images/icons/show_gui_help_grey.png
diff --git a/data/images/inventory/button-expert-small-disabled.png b/data/images/inventory/button-expert-small-disabled.png
diff --git a/data/images/inventory/button_blessings_gold.png b/data/images/inventory/button_blessings_gold.png
diff --git a/data/images/inventory/button_blessings_green.png b/data/images/inventory/button_blessings_green.png
diff --git a/data/images/inventory/button_blessings_grey.png b/data/images/inventory/button_blessings_grey.png
diff --git a/data/images/inventory/buttons_general.png b/data/images/inventory/buttons_general.png
diff --git a/data/images/inventory/containerslot.png b/data/images/inventory/containerslot.png
diff --git a/data/images/inventory/containerslot_goldenborder.png b/data/images/inventory/containerslot_goldenborder.png
diff --git a/data/images/inventory/inventory_back.png b/data/images/inventory/inventory_back.png
diff --git a/data/images/inventory/inventory_feet.png b/data/images/inventory/inventory_feet.png
diff --git a/data/images/inventory/inventory_finger.png b/data/images/inventory/inventory_finger.png
diff --git a/data/images/inventory/inventory_head.png b/data/images/inventory/inventory_head.png
diff --git a/data/images/inventory/inventory_hip.png b/data/images/inventory/inventory_hip.png
diff --git a/data/images/inventory/inventory_left_hand.png b/data/images/inventory/inventory_left_hand.png
diff --git a/data/images/inventory/inventory_legs.png b/data/images/inventory/inventory_legs.png
diff --git a/data/images/inventory/inventory_neck.png b/data/images/inventory/inventory_neck.png
diff --git a/data/images/inventory/inventory_right_hand.png b/data/images/inventory/inventory_right_hand.png
diff --git a/data/images/inventory/inventory_torso.png b/data/images/inventory/inventory_torso.png
diff --git a/data/images/inventory/max_button_small.png b/data/images/inventory/max_button_small.png
diff --git a/data/images/inventory/min_button_small.png b/data/images/inventory/min_button_small.png
diff --git a/data/images/options/analyzers.png b/data/images/options/analyzers.png
diff --git a/data/images/options/blue_large.png b/data/images/options/blue_large.png
diff --git a/data/images/options/bot.png b/data/images/options/bot.png
diff --git a/data/images/options/button_battlelist.png b/data/images/options/button_battlelist.png
diff --git a/data/images/options/button_empty.png b/data/images/options/button_empty.png
diff --git a/data/images/options/button_enlarge.png b/data/images/options/button_enlarge.png
diff --git a/data/images/options/button_frags.png b/data/images/options/button_frags.png
diff --git a/data/images/options/button_logout.png b/data/images/options/button_logout.png
diff --git a/data/images/options/button_options.png b/data/images/options/button_options.png
diff --git a/data/images/options/button_prey.png b/data/images/options/button_prey.png
diff --git a/data/images/options/button_preydialog.png b/data/images/options/button_preydialog.png
diff --git a/data/images/options/button_questlog.png b/data/images/options/button_questlog.png
diff --git a/data/images/options/button_shrink.png b/data/images/options/button_shrink.png
diff --git a/data/images/options/button_skills.png b/data/images/options/button_skills.png
diff --git a/data/images/options/button_spells.png b/data/images/options/button_spells.png
diff --git a/data/images/options/button_vip.png b/data/images/options/button_vip.png
diff --git a/data/images/options/cooldowns.png b/data/images/options/cooldowns.png
diff --git a/data/images/options/green_large.png b/data/images/options/green_large.png
diff --git a/data/images/options/hotkeys.png b/data/images/options/hotkeys.png
diff --git a/data/images/options/idk1.png b/data/images/options/idk1.png
diff --git a/data/images/options/idk2.png b/data/images/options/idk2.png
diff --git a/data/images/options/store_large.png b/data/images/options/store_large.png
diff --git a/data/images/options/terminal.png b/data/images/options/terminal.png
diff --git a/data/images/options/yellow_large.png b/data/images/options/yellow_large.png
diff --git a/data/images/topbuttons/button_mute_pressed.png b/data/images/topbuttons/button_mute_pressed.png
diff --git a/data/images/topbuttons/button_mute_up.png b/data/images/topbuttons/button_mute_up.png
diff --git a/data/images/topbuttons/button_options.png b/data/images/topbuttons/button_options.png
diff --git a/data/images/ui/1pixel_down_frame.png b/data/images/ui/1pixel_down_frame.png
diff --git a/data/images/ui/2pixel_up_frame_borderimage.png b/data/images/ui/2pixel_up_frame_borderimage.png
diff --git a/data/images/ui/2pixel_up_frame_borderimage_dark.png b/data/images/ui/2pixel_up_frame_borderimage_dark.png
diff --git a/data/images/ui/2pixel_up_frame_borderimage_dark_reversed.png b/data/images/ui/2pixel_up_frame_borderimage_dark_reversed.png
diff --git a/data/images/ui/3pixel_frame_borderimage.png b/data/images/ui/3pixel_frame_borderimage.png
diff --git a/data/images/ui/actionbar_locked.png b/data/images/ui/actionbar_locked.png
diff --git a/data/images/ui/actionbar_unlocked.png b/data/images/ui/actionbar_unlocked.png
diff --git a/data/images/ui/background.png b/data/images/ui/background.png
diff --git a/data/images/ui/background_dark.png b/data/images/ui/background_dark.png
diff --git a/data/images/ui/blank.png b/data/images/ui/blank.png
diff --git a/data/images/ui/button_topgame.png b/data/images/ui/button_topgame.png
diff --git a/data/images/ui/checkbox.png b/data/images/ui/checkbox.png
diff --git a/data/images/ui/combobox_new.png b/data/images/ui/combobox_new.png
diff --git a/data/images/ui/console_button.png b/data/images/ui/console_button.png
diff --git a/data/images/ui/console_buttons.png b/data/images/ui/console_buttons.png
diff --git a/data/images/ui/console_direction_button.png b/data/images/ui/console_direction_button.png
diff --git a/data/images/ui/console_flash_left.png b/data/images/ui/console_flash_left.png
diff --git a/data/images/ui/console_flash_right.png b/data/images/ui/console_flash_right.png
diff --git a/data/images/ui/console_say.png b/data/images/ui/console_say.png
diff --git a/data/images/ui/console_whisper.png b/data/images/ui/console_whisper.png
diff --git a/data/images/ui/console_yell.png b/data/images/ui/console_yell.png
diff --git a/data/images/ui/containerslot.png b/data/images/ui/containerslot.png
diff --git a/data/images/ui/divider_horizontal.png b/data/images/ui/divider_horizontal.png
diff --git a/data/images/ui/hide_eye.png b/data/images/ui/hide_eye.png
diff --git a/data/images/ui/high_ping.png b/data/images/ui/high_ping.png
diff --git a/data/images/ui/horizontal_line_bright.png b/data/images/ui/horizontal_line_bright.png
diff --git a/data/images/ui/horizontal_line_dark.png b/data/images/ui/horizontal_line_dark.png
diff --git a/data/images/ui/lenshelp.png b/data/images/ui/lenshelp.png
diff --git a/data/images/ui/low_ping.png b/data/images/ui/low_ping.png
diff --git a/data/images/ui/medium_ping.png b/data/images/ui/medium_ping.png
diff --git a/data/images/ui/miniwindow_buttons.png b/data/images/ui/miniwindow_buttons.png
diff --git a/data/images/ui/newcheckbox.png b/data/images/ui/newcheckbox.png
diff --git a/data/images/ui/outfits/checkbox_round.png b/data/images/ui/outfits/checkbox_round.png
diff --git a/data/images/ui/outfits/floor.png b/data/images/ui/outfits/floor.png
diff --git a/data/images/ui/outfits/minipanel.png b/data/images/ui/outfits/minipanel.png
diff --git a/data/images/ui/outfits/rotate_button.png b/data/images/ui/outfits/rotate_button.png
diff --git a/data/images/ui/regular_direction_button.png b/data/images/ui/regular_direction_button.png
diff --git a/data/images/ui/scrollbar.png b/data/images/ui/scrollbar.png
diff --git a/data/images/ui/scrollbar_new_horizontal.png b/data/images/ui/scrollbar_new_horizontal.png
diff --git a/data/images/ui/scrollbar_new_vertical.png b/data/images/ui/scrollbar_new_vertical.png
diff --git a/data/images/ui/tabbutton_new_shadowed.png b/data/images/ui/tabbutton_new_shadowed.png
diff --git a/data/images/ui/textedit.png b/data/images/ui/textedit.png
diff --git a/data/images/ui/top_bar_login.png b/data/images/ui/top_bar_login.png
diff --git a/data/images/ui/topstats_button_panel.png b/data/images/ui/topstats_button_panel.png
diff --git a/data/images/ui/vertical_line_bright.png b/data/images/ui/vertical_line_bright.png
diff --git a/data/images/ui/vertical_line_dark.png b/data/images/ui/vertical_line_dark.png
diff --git a/data/images/ui/widget_border.png b/data/images/ui/widget_border.png
diff --git a/data/images/ui/window_new.png b/data/images/ui/window_new.png
diff --git a/data/setup.otml b/data/setup.otml
@@ -29,7 +29,7 @@ game
 
   render
     invisible-ticks-per-frame: 75
-    item-ticks-per-frame: 500
+    item-ticks-per-frame: 75
     effect-ticks-per-frame: 75
     missile-ticks-per-frame: 75
     animated-text-duration: 1000

diff --git a/data/styles/10-buttons.otui b/data/styles/10-buttons.otui
@@ -10,9 +10,6 @@ Button < UIButton
   padding: 5 10 5 10
   opacity: 1.0
 
-  $hover !disabled:
-    image-clip: 0 23 22 23
-
   $pressed:
     image-clip: 0 46 22 23
     text-offset: 1 1
@@ -85,3 +82,106 @@ AddButton < UIButton
 
   $disabled:
     image-color: #dfdfdf55
+
+PreviousConsoleQtButton < UIButton
+  size: 18 16
+  image-source: /images/ui/console_direction_button
+  image-clip: 36 0 18 16
+
+  $pressed:
+    image-clip: 18 0 18 16
+
+  $pressed disabled:
+    image-clip: 0 0 18 16
+
+  $disabled:
+    image-clip: 54 0 18 16
+
+PreviousConsoleRedQtButton < UIButton
+  size: 18 16
+  image-source: /images/ui/console_direction_button
+  image-clip: 90 0 18 16
+
+  $pressed:
+    image-clip: 72 0 18 16
+
+  $pressed disabled:
+    image-clip: 0 0 18 16
+
+  $disabled:
+    image-clip: 54 0 18 16
+
+NextConsoleQtButton < UIButton
+  size: 18 16
+  image-source: /images/ui/console_direction_button
+  image-clip: 36 16 18 16
+
+  $pressed:
+    image-clip: 18 16 18 16
+
+  $pressed disabled:
+    image-clip: 0 16 18 16
+
+  $disabled:
+    image-clip: 54 16 18 16
+
+NextConsoleRedQtButton < UIButton
+  size: 18 16
+  image-source: /images/ui/console_direction_button
+  image-clip: 90 16 18 16
+
+  $pressed:
+    image-clip: 72 16 18 16
+
+  $pressed disabled:
+    image-clip: 0 16 18 16
+
+  $disabled:
+    image-clip: 54 16 18 16
+
+PreviousQtButton < UIButton
+  size: 16 16
+  image-source: /images/ui/regular_direction_button
+  image-clip: 32 0 16 16
+
+  $pressed:
+    image-clip: 16 0 16 16
+
+  $pressed disabled:
+    image-clip: 0 0 16 16
+
+  $disabled:
+    image-clip: 48 0 16 16
+
+NextQtButton < UIButton
+  size: 16 16
+  image-source: /images/ui/regular_direction_button
+  image-clip: 32 16 16 16
+
+  $pressed:
+    image-clip: 16 16 16 16
+
+  $pressed disabled:
+    image-clip: 0 16 16 16
+
+  $disabled:
+    image-clip: 48 16 16 16
+
+QtButton < UIButton
+  font: cipsoftFont
+  size: 106 23
+  text-offset: 0 0
+  image-source: /images/ui/button
+  image-clip: 0 0 22 23
+  image-border: 3
+  padding: 5 10 5 10
+  opacity: 1.0
+  color: #b9b9b9ff
+
+  $pressed:
+    image-clip: 0 46 22 23
+    text-offset: 1 1
+
+  $disabled:
+    color: #dfdfdf88
+    opacity: 0.8
diff --git a/data/styles/10-checkboxes.otui b/data/styles/10-checkboxes.otui
@@ -61,4 +61,22 @@ ButtonBox < UICheckBox
     image-color: #dfdfdf88
 
 ButtonBoxRounded < ButtonBox
-  image-source: /images/ui/button_rounded
+  image-source: /images/ui/button_rounded
+
+QtCheckBox < UICheckBox
+  size: 14 14
+  text-align: left
+  text-offset: 18 1
+  color: #dfdfdfff
+  image-color: #dfdfdfff
+  image-rect: 0 0 14 14
+  image-source: /images/ui/newcheckbox
+
+  $!checked:
+    image-clip: 0 0 14 14
+
+  $checked !disabled:
+    image-clip: 0 13 14 14
+
+  $checked disabled:
+    image-clip: 0 26 14 14
diff --git a/data/styles/10-comboboxes.otui b/data/styles/10-comboboxes.otui
@@ -104,3 +104,69 @@ ComboBoxRoundedPopupMenu < UIPopupMenu
 ComboBoxRounded < ComboBox
   image-source: /images/ui/combobox_rounded
   image-border: 3
+
+QtComboBoxPopupScrollMenuButton < UIButton
+  height: 23
+  font: verdana-11px-antialised
+  text-align: left
+  text-offset: 4 0
+  color: #dfdfdf
+  background-color: alpha
+  margin: 1
+
+  $hover !disabled:
+    color: #dfdfdf
+    background-color: #355d89
+
+  $disabled:
+    color: #dfdfdf88
+
+QtComboBoxPopupScrollMenu < UIPopupScrollMenu
+  image-source: /images/ui/combobox_square
+  image-clip: 0 69 91 23
+  image-border: 1
+
+QtComboBoxPopupMenuButton < UIButton
+  height: 20
+  text-align: left
+  text-offset: 5 0
+  color: #c0c0c0ff
+  background-color: #ffffff00
+
+  $hover !disabled:
+    color: #f4f4f4ff
+    background-color: #ffffff1b
+
+  $!hover !disabled:
+    color: #c0c0c0ff
+    background-color: #ffffff00
+
+  $disabled:
+    color: #888888ff
+    background-color: #ffffff00
+
+QtComboBoxPopupMenu < UIPopupMenu
+  image-source: /images/ui/combobox_new
+  image-clip: 0 60 91 20
+  image-border: 2
+
+QtComboBox < UIComboBox
+  color: #c0c0c0ff
+  size: 91 20
+  text-offset: -11 0
+  text-align: center
+  image-source: /images/ui/combobox_new
+  image-border: 2
+  image-border-right: 22
+  image-clip: 0 0 91 20
+
+  $pressed !disabled:
+    image-clip: 0 20 91 20
+    text-offset: -10 1
+
+  $on:
+    image-clip: 0 20 91 20
+    text-offset: -10 1
+
+  $disabled:
+    image-clip: 0 40 91 20