diff --git a/data/images/game/dangerous.png b/data/images/game/dangerous.png new file mode 100644 index 00000000..c927c67f Binary files /dev/null and b/data/images/game/dangerous.png differ diff --git a/data/images/game/emblems/emblem_member.png b/data/images/game/emblems/emblem_member.png new file mode 100644 index 00000000..7af0ad97 Binary files /dev/null and b/data/images/game/emblems/emblem_member.png differ diff --git a/data/images/game/emblems/emblem_other.png b/data/images/game/emblems/emblem_other.png new file mode 100644 index 00000000..2b2d5ad6 Binary files /dev/null and b/data/images/game/emblems/emblem_other.png differ diff --git a/data/images/game/shields/shield_gray.png b/data/images/game/shields/shield_gray.png new file mode 100644 index 00000000..aa4689e5 Binary files /dev/null and b/data/images/game/shields/shield_gray.png differ diff --git a/data/images/game/summon_other.png b/data/images/game/summon_other.png new file mode 100644 index 00000000..6f6fa60a Binary files /dev/null and b/data/images/game/summon_other.png differ diff --git a/data/images/game/summon_own.png b/data/images/game/summon_own.png new file mode 100644 index 00000000..0abcb941 Binary files /dev/null and b/data/images/game/summon_own.png differ diff --git a/modules/gamelib/const.lua b/modules/gamelib/const.lua index 8970777a..faf55c84 100644 --- a/modules/gamelib/const.lua +++ b/modules/gamelib/const.lua @@ -22,11 +22,14 @@ ShieldBlueNoSharedExpBlink = 7 ShieldYellowNoSharedExpBlink = 8 ShieldBlueNoSharedExp = 9 ShieldYellowNoSharedExp = 10 +ShieldGray = 11 EmblemNone = 0 EmblemGreen = 1 EmblemRed = 2 EmblemBlue = 3 +EmblemMember = 4 +EmblemOther = 5 North = 0 East = 1 diff --git a/modules/gamelib/creature.lua b/modules/gamelib/creature.lua index 7fa9219f..22603871 100644 --- a/modules/gamelib/creature.lua +++ b/modules/gamelib/creature.lua @@ -52,23 +52,25 @@ function getShieldImagePathAndBlink(shieldId) if shieldId == ShieldWhiteYellow then path, blink = '/images/game/shields/shield_yellow_white', false elseif shieldId == ShieldWhiteBlue then - path, blink = '/images/game/shields//shield_blue_white', false + path, blink = '/images/game/shields/shield_blue_white', false elseif shieldId == ShieldBlue then - path, blink = '/images/game/shields//shield_blue', false + path, blink = '/images/game/shields/shield_blue', false elseif shieldId == ShieldYellow then - path, blink = '/images/game/shields//shield_yellow', false + path, blink = '/images/game/shields/shield_yellow', false elseif shieldId == ShieldBlueSharedExp then - path, blink = '/images/game/shields//shield_blue_shared', false + path, blink = '/images/game/shields/shield_blue_shared', false elseif shieldId == ShieldYellowSharedExp then - path, blink = '/images/game/shields//shield_yellow_shared', false + path, blink = '/images/game/shields/shield_yellow_shared', false elseif shieldId == ShieldBlueNoSharedExpBlink then - path, blink = '/images/game/shields//shield_blue_not_shared', true + path, blink = '/images/game/shields/shield_blue_not_shared', true elseif shieldId == ShieldYellowNoSharedExpBlink then - path, blink = '/images/game/shields//shield_yellow_not_shared', true + path, blink = '/images/game/shields/shield_yellow_not_shared', true elseif shieldId == ShieldBlueNoSharedExp then - path, blink = '/images/game/shields//shield_blue_not_shared', false + path, blink = '/images/game/shields/shield_blue_not_shared', false elseif shieldId == ShieldYellowNoSharedExp then - path, blink = '/images/game/shields//shield_yellow_not_shared', false + path, blink = '/images/game/shields/shield_yellow_not_shared', false + elseif shieldId == ShieldGray then + path, blink = '/images/game/shields/shield_gray', false end return path, blink end @@ -81,6 +83,10 @@ function getEmblemImagePath(emblemId) path = '/images/game/emblems/emblem_red' elseif emblemId == EmblemBlue then path = '/images/game/emblems/emblem_blue' + elseif emblemId == EmblemMember then + path = '/images/game/emblems/emblem_member' + elseif emblemId == EmblemOther then + path = '/images/game/emblems/emblem_other' end return path end diff --git a/src/client/const.h b/src/client/const.h index e1b9e421..bea888d4 100644 --- a/src/client/const.h +++ b/src/client/const.h @@ -227,14 +227,17 @@ namespace Otc ShieldBlueNoSharedExpBlink, // 7 party member sexp inactive guilty ShieldYellowNoSharedExpBlink, // 8 // party leader sexp inactive guilty ShieldBlueNoSharedExp, // 9 party member sexp inactive innocent - ShieldYellowNoSharedExp // 10 party leader sexp inactive innocent + ShieldYellowNoSharedExp, // 10 party leader sexp inactive innocent + ShieldGray // 11 member of another party }; enum PlayerEmblems { EmblemNone = 0, EmblemGreen, EmblemRed, - EmblemBlue + EmblemBlue, + EmblemMember, + EmblemOther }; enum PlayerStates { diff --git a/src/client/protocolcodes.h b/src/client/protocolcodes.h index c5b6c688..c12a4e13 100644 --- a/src/client/protocolcodes.h +++ b/src/client/protocolcodes.h @@ -250,7 +250,9 @@ namespace Proto { enum CreatureType { CreatureTypePlayer = 0, CreatureTypeMonster, - CreatureTypeNpc + CreatureTypeNpc, + CreatureTypeSummonOwn, + CreatureTypeSummonOther }; enum CreaturesIdRange {