Fixed modded object group indentifier

* related to https://bugs.vcmi.eu/view.php?id=2850

Author: alexvins

editor_utils.pas

@@ -53,6 +53,8 @@   TStringCompare = class
   function NormalizeResourceName(const AName: string): string;
   function NormalizeKeyWord(const AValue: string): string;
 
+  function NormalizeIndentifier(const AValue: AnsiString): AnsiString;
+
   function StripScope(const AIdentifier: string): string;
 
   procedure GenerateDefaultVisitableFrom(ADest: TStrings; AGroup: UInt8; Atyp: Tobj);
@@ -62,7 +64,8 @@   TStringCompare = class
 
   function DecodeFullIdentifier(const ASource: AnsiString; out AMetaclass: TMetaclass; out AScope: AnsiString; out AIdentifier: AnsiString): Boolean;
   function EncodeFullIdentifier(AMetaclass: AnsiString; AScope: AnsiString; AIdentifier: AnsiString): AnsiString;
-  function EncodeFullIdentifier(AScope: AnsiString; AIdentifier: AnsiString): AnsiString;
+
+  function EncodeIdentifier(AScope: AnsiString; AIdentifier: AnsiString): AnsiString;
 
   function CompareStringProxy(const s1,s2: string): integer;
 
@@ -150,6 +153,25 @@ function NormalizeKeyWord(const AValue: string): string;
   result := UTF8LowerCase(UTF8Trim(AValue));
 end;
 
+function NormalizeIndentifier(const AValue: AnsiString): AnsiString;
+var
+  id_only: AnsiString;
+  mod_id, mod_id2: String;
+begin
+  id_only := AValue;
+
+  mod_id := ExtractModID2(id_only);
+
+  mod_id2 := mod_id;
+
+  while mod_id2 <> '' do
+  begin
+    mod_id2 := ExtractModID2(id_only);
+  end;
+
+  Result := EncodeIdentifier(mod_id, id_only);
+end;
+
 function StripScope(const AIdentifier: string): string;
 var
   colon_position: SizeInt;
@@ -310,7 +332,7 @@ function EncodeFullIdentifier(AMetaclass: AnsiString; AScope: AnsiString; AIdent
   end;
 end;
 
-function EncodeFullIdentifier(AScope: AnsiString; AIdentifier: AnsiString): AnsiString;
+function EncodeIdentifier(AScope: AnsiString; AIdentifier: AnsiString): AnsiString;
 begin
   if AScope = '' then
   begin

map.pas

@@ -452,6 +452,9 @@   TMapObject = class (TNamedCollectionItem, IMapObject, ISerializeSpecial)
     FMapObjectGroup: TMapObjectGroup;
     FMapObjectType: TMapObjectType;
 
+    FGroupID: AnsiString;
+    FTypeID: AnsiString;
+
     FModUsage: TModUsage;
     FPosition: TPosition;
     FLastFrame: Integer;
@@ -2209,15 +2212,15 @@ function TMapObject.GetSubtype: AnsiString;
   if Assigned(FMapObjectType) then
     Result := FMapObjectType.Identifier
   else
-    Result := '';
+    Result := FTypeID;
 end;
 
 function TMapObject.GetType: AnsiString;
 begin
   if Assigned(FMapObjectGroup) then
     Result := FMapObjectGroup.Identifier
   else
-    Result := '';
+    Result := FGroupID;
 end;
 
 function TMapObject.GetX: integer;
@@ -2362,10 +2365,12 @@ procedure TMapObject.SetSubtype(AValue: AnsiString);
 
   if old_subtype=AValue then Exit;
 
-  NotifyReferenced(old_subtype,AValue);
+  FTypeID:=NormalizeIndentifier(AValue);
+
+  NotifyReferenced(old_subtype,FTypeID);
 
   if Assigned(FMapObjectGroup) then
-    FMapObjectType := FMapObjectGroup.Types.FindItem(AValue)
+    FMapObjectType := FMapObjectGroup.Types.FindItem(FTypeID)
   else
     FMapObjectType := nil;
 
@@ -2380,9 +2385,11 @@ procedure TMapObject.SetType(AValue: AnsiString);
 
   if old_type=AValue then Exit;
 
-  NotifyReferenced(old_type,AValue);
+  FGroupID := NormalizeIndentifier(AValue);
+
+  NotifyReferenced(old_type,FGroupID);
 
-  FMapObjectGroup := GetMap.ObjectsManager.MapObjectGroups.FindItem(AValue);
+  FMapObjectGroup := GetMap.ObjectsManager.MapObjectGroups.FindItem(FGroupID);
   FMapObjectType := nil; //???
 
   RecreateOptions;

map_objects.pas

@@ -917,7 +917,7 @@ function TObjectsManager.FormatObjectName(AType, ASubtype: AnsiString): TLocaliz
 
   end;
 
-  Result := Format('%s:%s',[group_name, tp_name]);
+  Result := Format('%s::%s',[group_name, tp_name]);
 end;
 
 function TObjectsManager.TypToId(Typ, SubType: uint32): TLegacyTemplateId;

object_options.pas

@@ -2145,7 +2145,7 @@ procedure TPandorasOptions.BeforeSerialize(Sender: TObject);
 
     if DecodeFullIdentifier(r.Identifier, metaclass, scope, ident) then
     begin
-      full_ident := EncodeFullIdentifier(scope,ident);
+      full_ident := EncodeIdentifier(scope,ident);
 
       case metaclass of
         TMetaclass.artifact:

vcmi_json.pas

@@ -208,7 +208,7 @@   TJSONObjectHelper = class helper for TJSONObject
 implementation
 
 uses
-  LazLoggerBase, editor_consts, rttiutils, types;
+  LazLoggerBase, editor_consts, editor_utils, rttiutils, types;
 
 var
   rexp_oid: TRegExpr;
@@ -777,7 +777,7 @@ procedure TVCMIJSONDestreamer.CollectionObjCallback(const AName: TJSONStringType
     end
     else if {new_item.UseMeta and} (item is TVCMIJsonArray) then
     begin
-      meta := TVCMIJsonObject(Item).Meta;
+      meta := TVCMIJsonArray(Item).Meta;
       new_item.Meta:=Meta;
     end
     else
@@ -787,11 +787,11 @@ procedure TVCMIJSONDestreamer.CollectionObjCallback(const AName: TJSONStringType
 
     if new_item.UseMeta and (meta <> '') then
     begin
-      new_item.Identifier :=  Meta + ':' + AName;
+      new_item.Identifier := NormalizeIndentifier(EncodeIdentifier(Meta, AName));
     end
     else
     begin
-      new_item.Identifier := AName;
+      new_item.Identifier := NormalizeIndentifier(AName);
     end;
 
     DestreamCollectionItem(ACollection, Item, new_item);