From 04567bd57938f14a51f3653fd976d2d6bb4d3efd Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Sat, 9 Nov 2024 15:57:36 -0300 Subject: [PATCH] feat: new "soul cores" item category flag Adding new flag from "13.40" --- Assets Editor/Appearances.cs | 1 + Assets Editor/DatEditor.xaml | 1 + Assets Editor/LegacyDatEditor.xaml | 1 + Assets Editor/appearances.proto | 29 +++++++++++++++-------------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Assets Editor/Appearances.cs b/Assets Editor/Appearances.cs index 24bc2ea..f2e2df3 100644 --- a/Assets Editor/Appearances.cs +++ b/Assets Editor/Appearances.cs @@ -258,6 +258,7 @@ public enum ITEM_CATEGORY { [pbr::OriginalName("ITEM_CATEGORY_BACKPACK")] Backpack = 28, [pbr::OriginalName("ITEM_CATEGORY_ONEHANDWEAPON")] Onehandweapon = 29, [pbr::OriginalName("ITEM_CATEGORY_ARROW")] Arrow = 30, + [pbr::OriginalName("ITEM_CATEGORY_SOULCORES")] SoulCores = 31, } public enum VOCATION { diff --git a/Assets Editor/DatEditor.xaml b/Assets Editor/DatEditor.xaml index 2727467..88775c6 100644 --- a/Assets Editor/DatEditor.xaml +++ b/Assets Editor/DatEditor.xaml @@ -343,6 +343,7 @@ + diff --git a/Assets Editor/LegacyDatEditor.xaml b/Assets Editor/LegacyDatEditor.xaml index 2e65c38..1345a84 100644 --- a/Assets Editor/LegacyDatEditor.xaml +++ b/Assets Editor/LegacyDatEditor.xaml @@ -303,6 +303,7 @@ + diff --git a/Assets Editor/appearances.proto b/Assets Editor/appearances.proto index fc0c5bb..b252914 100644 --- a/Assets Editor/appearances.proto +++ b/Assets Editor/appearances.proto @@ -22,7 +22,7 @@ message SpriteAnimation { optional ANIMATION_LOOP_TYPE loop_type = 4; optional uint32 loop_count = 5; repeated SpritePhase sprite_phase = 6; - optional ANIMATION_ANIMATION_MODE animation_mode = 7; + optional ANIMATION_ANIMATION_MODE animation_mode = 7; } message Box { @@ -42,13 +42,13 @@ message SpriteInfo { optional SpriteAnimation animation = 6; optional bool is_opaque = 8; repeated Box bounding_box_per_direction = 9; - optional uint32 pattern_size = 10; - optional uint32 pattern_layers = 11; + optional uint32 pattern_size = 10; + optional uint32 pattern_layers = 11; optional uint32 pattern_x = 12; optional uint32 pattern_y = 13; optional uint32 pattern_z = 14; - optional uint32 pattern_frames = 15; - optional bool is_animation = 16; + optional uint32 pattern_frames = 15; + optional bool is_animation = 16; } message FrameGroup { @@ -63,8 +63,8 @@ message Appearance { optional AppearanceFlags flags = 3; optional string name = 4; optional string description = 5; - optional APPEARANCE_TYPE appearance_type = 6; - repeated bytes sprite_data = 7; + optional APPEARANCE_TYPE appearance_type = 6; + repeated bytes sprite_data = 7; } message AppearanceFlags { @@ -125,7 +125,7 @@ message AppearanceFlags { optional bool expire = 55; optional bool expirestop = 56; optional bool deco_item_kit = 57; - optional bool hook_south = 58; + optional bool hook_south = 58; optional bool hook_east = 59; } @@ -170,8 +170,8 @@ message AppearanceFlagMarket { optional uint32 show_as_object_id = 3; repeated VOCATION restrict_to_vocation = 5; optional uint32 minimum_level = 6; - optional string name = 7; - optional VOCATION vocation = 8; + optional string name = 7; + optional VOCATION vocation = 8; } message AppearanceFlagNPC { @@ -263,11 +263,12 @@ enum ITEM_CATEGORY { ITEM_CATEGORY_TIBIA_COINS = 23; ITEM_CATEGORY_CREATURE_PRODUCTS = 24; ITEM_CATEGORY_QUIVER = 25; - ITEM_CATEGORY_TWOHANDWEAPON = 26; - ITEM_CATEGORY_HELMETS = 27; - ITEM_CATEGORY_BACKPACK = 28; - ITEM_CATEGORY_ONEHANDWEAPON = 29; + ITEM_CATEGORY_TWOHANDWEAPON = 26; + ITEM_CATEGORY_HELMETS = 27; + ITEM_CATEGORY_BACKPACK = 28; + ITEM_CATEGORY_ONEHANDWEAPON = 29; ITEM_CATEGORY_ARROW = 30; + ITEM_CATEGORY_SOULCORES = 31; } enum VOCATION {