Merge pull request #7446 from Tuxity/druid_models

[434] Add new druid forms for trolls and worgens.

1 files changed, 171 insertions, 32 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 950a73d50a5..2319438c14a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15951,6 +15951,72 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
                         return 892;
                 }
             }
+            else if (getRace() == RACE_TROLL)
+            {
+                uint8 hairColor = GetByteValue(PLAYER_BYTES, 3);
+                switch (hairColor)
+                {
+                    case 0: // Red
+                    case 1:
+                        return 33668;
+                    case 2: // Yellow
+                    case 3:
+                        return 33667;
+                    case 4: // Blue
+                    case 5:
+                    case 6:
+                        return 33666;
+                    case 7: // Purple
+                    case 10:
+                        return 33665;
+                    default: // original - white
+                        return 33669;
+                }
+            }
+            else if (getRace() == RACE_WORGEN)
+            {
+                // Based on Skin color
+                uint8 skinColor = GetByteValue(PLAYER_BYTES, 0);
+                // Male
+                if (getGender() == GENDER_MALE)
+                {
+                    switch (skinColor)
+                    {
+                        case 1: // Brown
+                            return 33662;
+                        case 2: // Black
+                        case 7:
+                            return 33661;
+                        case 4: // yellow
+                            return 33664;
+                        case 3: // White
+                        case 5:
+                            return 33663;
+                        default: // original - Gray
+                            return 33660;
+                    }
+                }
+                // Female
+                else
+                {
+                    switch (skinColor)
+                    {
+                        case 5: // Brown
+                        case 6:
+                            return 33662;
+                        case 7: // Black
+                        case 8:
+                            return 33661;
+                        case 3: // yellow
+                        case 4:
+                            return 33664;
+                        case 2: // White
+                            return 33663;
+                        default: // original - Gray
+                            return 33660;
+                    }
+                }
+            }
             // Based on Skin color
             else if (getRace() == RACE_TAUREN)
             {
@@ -15985,23 +16051,26 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
                     }
                 }
                 // Female
-                else switch (skinColor)
+                else
                 {
-                    case 10: // White
-                        return 29409;
-                    case 6: // Light Brown
-                    case 7:
-                        return 29410;
-                    case 4: // Brown
-                    case 5:
-                        return 29411;
-                    case 0: // Dark
-                    case 1:
-                    case 2:
-                    case 3:
-                        return 29412;
-                    default: // original - Grey
-                        return 8571;
+                    switch (skinColor)
+                    {
+                        case 10: // White
+                            return 29409;
+                        case 6: // Light Brown
+                        case 7:
+                            return 29410;
+                        case 4: // Brown
+                        case 5:
+                            return 29411;
+                        case 0: // Dark
+                        case 1:
+                        case 2:
+                        case 3:
+                            return 29412;
+                        default: // original - Grey
+                            return 8571;
+                    }
                 }
             }
             else if (Player::TeamForRace(getRace()) == ALLIANCE)
@@ -16029,6 +16098,73 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
                         return 2281;
                 }
             }
+            else if (getRace() == RACE_TROLL)
+            {
+                uint8 hairColor = GetByteValue(PLAYER_BYTES, 3);
+                switch (hairColor)
+                {
+                    case 0: // Red
+                    case 1:
+                        return 33657;
+                    case 2: // Yellow
+                    case 3:
+                        return 33659;
+                    case 7: // Purple
+                    case 10:
+                        return 33656;
+                    case 8: // White
+                    case 9:
+                    case 11:
+                    case 12:
+                        return 33658;
+                    default: // original - Blue
+                        return 33655;
+                }
+            }
+            else if (getRace() == RACE_WORGEN)
+            {
+                // Based on Skin color
+                uint8 skinColor = GetByteValue(PLAYER_BYTES, 0);
+                // Male
+                if (getGender() == GENDER_MALE)
+                {
+                    switch (skinColor)
+                    {
+                        case 1: // Brown
+                            return 33652;
+                        case 2: // Black
+                        case 7:
+                            return 33651;
+                        case 4: // Yellow
+                            return 33653;
+                        case 3: // White
+                        case 5:
+                            return 33654;
+                        default: // original - Gray
+                            return 33650;
+                    }
+                }
+                // Female
+                else
+                {
+                    switch (skinColor)
+                    {
+                        case 5: // Brown
+                        case 6:
+                            return 33652;
+                        case 7: // Black
+                        case 8:
+                            return 33651;
+                        case 3: // yellow
+                        case 4:
+                            return 33654;
+                        case 2: // White
+                            return 33653;
+                        default: // original - Gray
+                            return 33650;
+                    }
+                }
+            }
             // Based on Skin color
             else if (getRace() == RACE_TAUREN)
             {
@@ -16063,23 +16199,26 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
                     }
                 }
                 // Female
-                else switch (skinColor)
+                else
                 {
-                    case 0: // Dark (Black)
-                    case 1:
-                        return 29418;
-                    case 2: // White
-                    case 3:
-                        return 29419;
-                    case 6: // Light Brown/Grey
-                    case 7:
-                    case 8:
-                    case 9:
-                        return 29420;
-                    case 10: // Completly White
-                        return 29421;
-                    default: // original - Brown
-                        return 2289;
+                    switch (skinColor)
+                    {
+                        case 0: // Dark (Black)
+                        case 1:
+                            return 29418;
+                        case 2: // White
+                        case 3:
+                            return 29419;
+                        case 6: // Light Brown/Grey
+                        case 7:
+                        case 8:
+                        case 9:
+                            return 29420;
+                        case 10: // Completly White
+                            return 29421;
+                        default: // original - Brown
+                            return 2289;
+                    }
                 }
             }
             else if (Player::TeamForRace(getRace()) == ALLIANCE)