Skip to content

feat: new "soul cores" item category flag #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Arch-Mina merged 1 commit into from
Nov 10, 2024
Merged

feat: new "soul cores" item category flag #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Assets Editor/Appearances.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions Assets Editor/DatEditor.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@
<ComboBoxItem Content="Tibia Coins"/>
<ComboBoxItem Content="Creature Products"/>
<ComboBoxItem Content="Quiver"/>
<ComboBoxItem Content="SoulCores"/>
</ComboBox>
</StackPanel>
<StackPanel Width="320" Orientation="Horizontal" HorizontalAlignment="Left" Height="20">
Expand Down
1 change: 1 addition & 0 deletions Assets Editor/LegacyDatEditor.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
<ComboBoxItem Content="Tibia Coins"/>
<ComboBoxItem Content="Creature Products"/>
<ComboBoxItem Content="Quiver"/>
<ComboBoxItem Content="SoulCores"/>
</ComboBox>
</StackPanel>
<StackPanel Width="320" Orientation="Horizontal" HorizontalAlignment="Left" Height="20">
Expand Down
29 changes: 15 additions & 14 deletions Assets Editor/appearances.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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;

}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down