Merge pull request #3 from Campofinale/development

1.1.7 ready

Campofinale/Game/Entities/EntityInteractive.cs

@@ -171,26 +171,6 @@ namespace Campofinale.Game.Entities
             }else if(eventName == "pick_inst")
             {
                 //TODO
-            }else if(eventName == "set_state_true")
-            {
-                ScSceneUpdateInteractiveProperty update = new()
-                {
-                    Id = guid,
-                    SceneNumId = GetOwner().curSceneNumId,
-                    Properties =
-                    {
-                        {1, new DynamicParameter()
-                        {
-                            RealType=3,
-                            ValueType=3,
-                            ValueIntList={1}
-                        } }
-                    }
-                };
-                GetOwner().sceneManager.KillEntity(guid, true, 1);
-                GetOwner().noSpawnAnymore.Add(guid);
-                GetOwner().sceneManager.GetScene(sceneNumId).AddCollection(templateId, 1);
-                GetOwner().Send(ScMsgId.ScSceneUpdateInteractiveProperty, update);
             }
             return false;
         }

Campofinale/Packets/Cs/HandleCsSceneInteractSpInteractive.cs

@@ -3,7 +3,6 @@ using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
-using System;
 using static Campofinale.Resource.ResourceManager;
 
 namespace Campofinale.Packets.Cs
@@ -24,18 +23,6 @@ namespace Campofinale.Packets.Cs
                     case SpInteractiveOpType.CommonActive:
                         session.bitsetManager.AddValue(Resource.BitsetType.InteractiveActive, ResourceManager.levelShortIdTable[scene.id].ids[(long)entity.guid]);
                         break;
-                    case SpInteractiveOpType.DoodadCommonPick:
-                        EntityInteractive interactive = entity as EntityInteractive;
-                        if (interactive.templateId== "int_doodad_flower_2")
-                        {
-                            session.inventoryManager.AddRewards("reward_doodad_moss_3", interactive.Position, 1);
-                        }
-                        if (interactive.templateId == "int_doodad_flower_1")
-                        {
-                            session.inventoryManager.AddRewards("reward_doodad_moss_3", interactive.Position, 1);
-                        }
-                        session.sceneManager.KillEntity(interactive.guid, true, 1);
-                        break;
                     default:
                         break;
                 }

Campofinale/Program.cs

@@ -13,7 +13,7 @@ class Program
     static void Main(string[] args)
     {
        StartServer(args);
-      // FakeClientTester();
+       //FakeClientTester();
     }
     public static byte[] ConcatenateByteArrays(byte[] array1, byte[] array2)
     {

Campofinale/Server.cs

@@ -59,7 +59,7 @@ namespace Campofinale
             public delegate void HandlerDelegate(Player sender, string command, string[] args, Player target);
         }
         public static List<Player> clients = new List<Player>();
-        public static string ServerVersion = "1.1.8-dev";
+        public static string ServerVersion = "1.1.7";
         public static bool Initialized = false;
         public static bool showLogs = true;
         public static bool showWarningLogs = true;