Little Fixes

+ Pet Statusses + Camera + Settings Fixes + Some Optimizations + Continued Database Rewriting + Coninuted Pets Rewriting + Continued Code Cleaning
ovflowd · Jan 8, 2016 · 48086de · 48086de
1 parent 761039c
commit 48086de
Show file tree

Hide file tree

Showing 10 changed files with 247 additions and 229 deletions.
diff --git a/SQL/Database.sql b/SQL/Database.sql
diff --git a/Yupi/Build/Variables/Settings/main.ini b/Yupi/Build/Variables/Settings/main.ini
@@ -1,7 +1,7 @@
 ## Yupi Server Main Settings
 
 ## MySQL Configuration
-db.hostname=172.16.9.59
+db.hostname=172.16.9.63
 db.port=3306
 db.username=azure
 db.password=123
@@ -18,7 +18,7 @@ game.tcp.conlimit=11000
 game.tcp.enablenagles=true
 
 ## Game Thread Configuration
-game.multithread.enabled=true
+game.multithread.enabled=false
 
 ## Tcp Flood AntiDDoS  Comment: For proxy antiddos=false
 game.tcp.antiddos=false
@@ -38,10 +38,10 @@ client.ping.interval=20000
 client.maxrequests=300
 
 ## Client Thread Configuration
-client.multithread.enabled=true
+client.multithread.enabled=false
 
 ## Debug Packet Data
-debug.packet=true
+debug.packet=false
 
 ## Language System
 server.lang=english

diff --git a/Yupi/Build/Variables/Settings/other.ini b/Yupi/Build/Variables/Settings/other.ini
@@ -27,9 +27,9 @@ change.name.everyone=false
 
 ## Habbo Camera Settings
 stories.api.enabled=true
-stories.api.url=http://azure-stories-content.azurewebsites.net/servercamera.php
-stories.api.host=http://azure-stories-content.azurewebsites.net/
-stories.api.thumbnail.url=http://azure-stories-content.azurewebsites.net/servert.php
+stories.api.url=http://172.16.9.63/resources/server-camera/server-camera.php?run
+stories.api.host=http://172.16.9.63/resources/server-camera/
+stories.api.thumbnail.url=http://172.16.9.63/resources/server-camera/server-camera.php?room
 
 ## Furniture (ex: furnidata_xml.xml) XML File URL
-furnidata.url=http://172.16.9.55/extractor/swf/gamedata/furnidata_xml/1
+furnidata.url=http://172.16.9.63/resources/swf/gamedata/furnidata_xml/1
diff --git a/Yupi/Game/Catalogs/CatalogManager.cs b/Yupi/Game/Catalogs/CatalogManager.cs
@@ -105,8 +105,6 @@ internal class CatalogManager
         /// <returns>Pet.</returns>
         internal static Pet CreatePet(uint userId, string name, string type, string race, string color, int rarity = 0)
         {
-            Console.WriteLine("Race: " + race);
-
             uint trace = Convert.ToUInt32(race);
 
             Pet pet = new Pet(404u, userId, 0u, name, type, trace, 0, 100, 150, 0, Yupi.GetUnixTimeStamp(), 0, 0, 0.0, false, 0, 0, -1, rarity, DateTime.Now.AddHours(36.0), DateTime.Now.AddHours(48.0), null, color)
@@ -417,13 +415,6 @@ internal void HandlePurchase(GameClient session, uint pageId, uint itemId, strin
             }
             #endregion
 
-            #region Check if is a Pet. If is we have problem. WHY?
-
-            //if (item.Items.Keys.Any(current => InteractionTypes.AreFamiliar(GlobalInteractions.Pet, current.InteractionType)))
-            //    return;
-
-            #endregion
-
             #region Limited Items Purchase
             if (item.IsLimited)
             {
@@ -685,12 +676,12 @@ internal void HandlePurchase(GameClient session, uint pageId, uint itemId, strin
 
                         if (!CheckPetName(petName))
                             return;
+
                         if (race.Length != 1 && race.Length != 2)
                             return;
+
                         if (color.Length != 6)
                             return;
-
-                        Yupi.GetGame().GetAchievementManager().ProgressUserAchievement(session, "ACH_PetLover", 1);
                         break;
 
                     case Interaction.Mannequin:

diff --git a/Yupi/Game/Pets/Composers/RespectPetComposer.cs b/Yupi/Game/Pets/Composers/RespectPetComposer.cs
@@ -8,7 +8,7 @@ class RespectPetComposer
     {
         internal static void GenerateMessage(Pet pet)
         {
-            ServerMessage serverMessage = new ServerMessage(LibraryParser.OutgoingRequest("RespectPetComposer"));
+            ServerMessage serverMessage = new ServerMessage(LibraryParser.OutgoingRequest("RespectPetMessageComposer"));
             serverMessage.AppendInteger(pet.VirtualId);
             serverMessage.AppendBool(true);
             pet.Room.SendMessage(serverMessage);