Renamed some connections (still does not work)

This commit is contained in:
AbdulmanovAI
2025-10-24 16:23:11 +04:00
parent fb21034c0e
commit ed321a375f
20 changed files with 107 additions and 90 deletions

View File

@@ -20,10 +20,23 @@ namespace _2DGAMELIB
foreach (var key in obj.Keys)
{
var newKey = KeyMap.TryGetValue(key, out var mapped) ? mapped : key;
var newDifs = obj.Difss[key];
var newTag = KeyMap.TryGetValue(obj.Difss[key].Tag, out var mappedTag) ? mappedTag : obj.Difss[key].Tag;
newDict.Add(newKey, obj.Difss[key]);
newDifs.Tag = newTag;
for (var i = 0; i < newDifs.CountX; i++)
{
var newDifTag = KeyMap.TryGetValue(newDifs[i].Tag, out var mappedDifTag) ? mappedDifTag : newDifs[i].Tag;
newDifs[i].Tag = newDifTag;
}
newDict.Add(newKey, newDifs);
}
var temp = newDict["Torso"];
obj.Difss = newDict;
}
}

View File

@@ -71,11 +71,11 @@ namespace SlaveMatrix
_背中_接続,
_噴乳_接続,
_上腕_接続,
_胸_接続,
_肌_接続,
_翼左_接続,
_翼右_接続,
Waist__接続,
Torso_胸_接続,
Torso_肌_接続,
Torso_翼左_接続,
Torso_翼右_接続,
Waist_Torso_接続,
Waist_腿左_接続,
Waist_腿右_接続,
Waist_膣基_接続,
@@ -349,15 +349,15 @@ namespace SlaveMatrix
_鯨_尾_接続,
_蛇_左_接続,
_蛇_右_接続,
_蛇__接続,
_蛇_Torso_接続,
_蟲_左0_接続,
_蟲_右0_接続,
_蟲_左1_接続,
_蟲_右1_接続,
_蟲__接続,
_蟲_Torso_接続,
_脇左_接続,
_脇右_接続,
__接続,
_Torso_接続,
_胸左_接続,
_胸右_接続,
_肌_接続,
@@ -414,12 +414,12 @@ namespace SlaveMatrix
_植_根中央_接続,
_植_根内右_接続,
_植_根外右_接続,
_蛇_左_接続,
_蛇_右_接続,
_蛇_胴_接続,
_蟲_左_接続,
_蟲_右_接続,
_蟲_胴_接続,
Torso_蛇_左_接続,
Torso_蛇_右_接続,
Torso_蛇_Torso_接続,
Torso_蟲_左_接続,
Torso_蟲_右_接続,
Torso_蟲_Torso_接続,
_顎左_接続,
_顎右_接続,
_花_接続,

View File

@@ -291,6 +291,7 @@ namespace SlaveMatrix
{
Torso 2 = this;
ThisType = GetType();
//This had no Torso (胴体)
= new Difs(Sta.["Torso"]);
Pars pars = [0][0];
X0Y0_胴 = pars["Torso"].ToPar();
@@ -354,7 +355,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo._胸_接続;
f.ConnectionType = ConnectionInfo.Torso_胸_接続;
f.(2._接続点);
return f;
}).ToArray();
@@ -365,7 +366,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo._肌_接続;
f.ConnectionType = ConnectionInfo.Torso_肌_接続;
f.(2._接続点);
return f;
}).ToArray();
@@ -376,7 +377,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo._翼左_接続;
f.ConnectionType = ConnectionInfo.Torso_翼左_接続;
f.(2._接続点);
return f;
}).ToArray();
@@ -387,7 +388,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo._翼右_接続;
f.ConnectionType = ConnectionInfo.Torso_翼右_接続;
f.(2._接続点);
return f;
}).ToArray();

View File

@@ -955,7 +955,7 @@ namespace SlaveMatrix
public W ;
public Ele[] _接続;
public Ele[] Torso_接続;
public Ele[] _接続;
@@ -2516,13 +2516,13 @@ namespace SlaveMatrix
= false;
}
Ele f;
if (e._接続.Count > 0)
if (e.Torso_接続.Count > 0)
{
_接続 = e._接続.Select(delegate(EleD g)
Torso_接続 = e.Torso_接続.Select(delegate(EleD g)
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo.Waist__接続;
f.ConnectionType = ConnectionInfo.Waist_Torso_接続;
f.(2._接続点);
return f;
}).ToArray();

View File

@@ -109,7 +109,7 @@ namespace SlaveMatrix
public bool ;
public List<EleD> _接続 = new List<EleD>();
public List<EleD> Torso_接続 = new List<EleD>();
public List<EleD> _接続 = new List<EleD>();
@@ -138,9 +138,9 @@ namespace SlaveMatrix
public void (EleD e)
{
_接続.Add(e);
Torso_接続.Add(e);
e.Par = this;
e. = ConnectionInfo.Waist__接続;
e. = ConnectionInfo.Waist_Torso_接続;
}
public void (EleD e)

View File

@@ -823,11 +823,11 @@ namespace SlaveMatrix
},
{
ConnectionInfo._翼左_接続,
ConnectionInfo.Torso_翼左_接続,
},
{
ConnectionInfo._翼右_接続,
ConnectionInfo.Torso_翼右_接続,
},
{
@@ -1055,11 +1055,11 @@ namespace SlaveMatrix
},
{
ConnectionInfo._蛇_左_接続,
ConnectionInfo.Torso_蛇_左_接続,
},
{
ConnectionInfo._蛇_右_接続,
ConnectionInfo.Torso_蛇_右_接続,
},
{
@@ -1127,11 +1127,11 @@ namespace SlaveMatrix
},
{
ConnectionInfo._蟲_左_接続,
ConnectionInfo.Torso_蟲_左_接続,
},
{
ConnectionInfo._蟲_右_接続,
ConnectionInfo.Torso_蟲_右_接続,
},
{
@@ -1199,19 +1199,19 @@ namespace SlaveMatrix
},
{
ConnectionInfo._蛇__接続,
ConnectionInfo._蛇_Torso_接続,
},
{
ConnectionInfo._蟲__接続,
ConnectionInfo._蟲_Torso_接続,
},
{
ConnectionInfo._蛇_胴_接続,
ConnectionInfo.Torso_蛇_Torso_接続,
},
{
ConnectionInfo._蟲_胴_接続,
ConnectionInfo.Torso_蟲_Torso_接続,
},
{
@@ -2164,7 +2164,7 @@ namespace SlaveMatrix
D2.(, , i, ConnectionInfo._額_接続, , , , );
D2.(, , i, ConnectionInfo._翼上左_接続, , , , );
D2.(, , i, ConnectionInfo._翼下左_接続, , , , );
D2.(, , i, ConnectionInfo._翼左_接続, , , , );
D2.(, , i, ConnectionInfo.Torso_翼左_接続, , , , );
.(, , i, ConnectionInfo.Waist_翼左_接続, , , , );
if ()
{
@@ -2355,7 +2355,7 @@ namespace SlaveMatrix
_蛇D _蛇D2 = Mix<_蛇D>(, , i, );
if (_蛇D2 != null)
{
_蛇D2.(, , i, ConnectionInfo._蛇_左_接続, , , , );
_蛇D2.(, , i, ConnectionInfo.Torso_蛇_左_接続, , , , );
D D2 = (D)_蛇D2.Copy();
_蛇D2.(_蛇D2);
int num11 = 2;
@@ -2367,7 +2367,7 @@ namespace SlaveMatrix
{
_蛇D2.(_蛇D2 = (_蛇D)D2.Copy());
}
_蛇D2.(, , i, ConnectionInfo._蛇_胴_接続, , , , );
_蛇D2.(, , i, ConnectionInfo.Torso_蛇_Torso_接続, , , , );
if (_蛇D2.EnumEleD().IsEleD<D>())
{
IEnumerable<_蛇D> eleDs = _蛇D2.EnumEleD().Skip(1).GetEleDs<_蛇D>();
@@ -2399,7 +2399,7 @@ namespace SlaveMatrix
}
else
{
_蛇D2.(, , i, ConnectionInfo._蛇__接続, , , , );
_蛇D2.(, , i, ConnectionInfo._蛇_Torso_接続, , , , );
}
_蛇D2.AlignC();
if (_蛇D2.)
@@ -2452,7 +2452,7 @@ namespace SlaveMatrix
_蟲D _蟲D2 = Mix<_蟲D>(, , i, );
if (_蟲D2 != null)
{
_蟲D2.(, , i, ConnectionInfo._蟲_左_接続, , , , );
_蟲D2.(, , i, ConnectionInfo.Torso_蟲_左_接続, , , , );
D D3 = (D)_蟲D2.Copy();
_蟲D2.(_蟲D2);
int num19 = 2;
@@ -2464,11 +2464,11 @@ namespace SlaveMatrix
{
_蟲D2.(_蟲D2 = (_蟲D)D3.Copy());
}
_蟲D2.(, , i, ConnectionInfo._蟲_胴_接続, , , , );
_蟲D2.(, , i, ConnectionInfo.Torso_蟲_Torso_接続, , , , );
}
else
{
_蟲D2.(, , i, ConnectionInfo._蟲__接続, , , , );
_蟲D2.(, , i, ConnectionInfo._蟲_Torso_接続, , , , );
}
_蟲D2.AlignC();
._接続.RemoveAll((EleD e) => e is D);
@@ -4475,7 +4475,7 @@ namespace SlaveMatrix
l = 0.0;
}
}
if (l == 0.0 && ( == ConnectionInfo._上腕_接続 || == ConnectionInfo.Waist_腿左_接続 || == ConnectionInfo.Waist_腿左_接続 || == ConnectionInfo._腿左_接続 || == ConnectionInfo._腿左_接続 || == ConnectionInfo._魚_尾_接続 || == ConnectionInfo._鯨_尾_接続 || == ConnectionInfo._蛇__接続 || == ConnectionInfo._蟲__接続 || == ConnectionInfo._蛇_胴_接続 || == ConnectionInfo._蟲_胴_接続 || == ConnectionInfo._蛸_軟体外左_接続 || == ConnectionInfo._蛸_軟体外右_接続 || == ConnectionInfo._蛸_軟体内左_接続 || == ConnectionInfo._蛸_軟体内右_接続 || == ConnectionInfo._植_根外左_接続 || == ConnectionInfo._植_根内左_接続 || == ConnectionInfo._植_根中央_接続 || == ConnectionInfo._植_根内右_接続 || == ConnectionInfo._植_根外右_接続 || == ConnectionInfo._宇_頭部後_接続 || (num * 1.1).Lot()))
if (l == 0.0 && ( == ConnectionInfo._上腕_接続 || == ConnectionInfo.Waist_腿左_接続 || == ConnectionInfo.Waist_腿左_接続 || == ConnectionInfo._腿左_接続 || == ConnectionInfo._腿左_接続 || == ConnectionInfo._魚_尾_接続 || == ConnectionInfo._鯨_尾_接続 || == ConnectionInfo._蛇_Torso_接続 || == ConnectionInfo._蟲_Torso_接続 || == ConnectionInfo.Torso_蛇_Torso_接続 || == ConnectionInfo.Torso_蟲_Torso_接続 || == ConnectionInfo._蛸_軟体外左_接続 || == ConnectionInfo._蛸_軟体外右_接続 || == ConnectionInfo._蛸_軟体内左_接続 || == ConnectionInfo._蛸_軟体内右_接続 || == ConnectionInfo._植_根外左_接続 || == ConnectionInfo._植_根内左_接続 || == ConnectionInfo._植_根中央_接続 || == ConnectionInfo._植_根内右_接続 || == ConnectionInfo._植_根外右_接続 || == ConnectionInfo._宇_頭部後_接続 || (num * 1.1).Lot()))
{
l = 1.0;
}

View File

@@ -949,7 +949,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = 2;
f.ConnectionType = ConnectionInfo.__接続;
f.ConnectionType = ConnectionInfo._Torso_接続;
f.(2._接続点);
return f;
}).ToArray();

View File

@@ -118,7 +118,7 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo.__接続;
e. = ConnectionInfo._Torso_接続;
}
public void (EleD e)

View File

@@ -44,21 +44,21 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._胸_接続;
e. = ConnectionInfo.Torso_胸_接続;
}
public void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._肌_接続;
e. = ConnectionInfo.Torso_肌_接続;
}
public void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._翼左_接続;
e. = ConnectionInfo.Torso_翼左_接続;
if (!(e is D))
{
return;
@@ -73,7 +73,7 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._翼右_接続;
e. = ConnectionInfo.Torso_翼右_接続;
if (!(e is D))
{
return;

View File

@@ -402,7 +402,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2;
f.ConnectionType = ConnectionInfo._蛇_左_接続;
f.ConnectionType = ConnectionInfo.Torso_蛇_左_接続;
f.(_蛇2._接続点);
return f;
}).ToArray();
@@ -413,7 +413,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2;
f.ConnectionType = ConnectionInfo._蛇_右_接続;
f.ConnectionType = ConnectionInfo.Torso_蛇_右_接続;
f.(_蛇2._接続点);
return f;
}).ToArray();
@@ -424,7 +424,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2;
f.ConnectionType = ConnectionInfo._蛇_胴_接続;
f.ConnectionType = ConnectionInfo.Torso_蛇_Torso_接続;
f.(_蛇2._接続点);
return f;
}).ToArray();

View File

@@ -39,21 +39,21 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蛇_左_接続;
e. = ConnectionInfo.Torso_蛇_左_接続;
}
public override void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蛇_右_接続;
e. = ConnectionInfo.Torso_蛇_右_接続;
}
public override void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蛇_胴_接続;
e. = ConnectionInfo.Torso_蛇_Torso_接続;
}
public override Ele GetEle(double DisUnit, Med Med, )

View File

@@ -562,7 +562,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2;
f.ConnectionType = ConnectionInfo._蟲_左_接続;
f.ConnectionType = ConnectionInfo.Torso_蟲_左_接続;
f.(_蟲2._接続点);
return f;
}).ToArray();
@@ -573,7 +573,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2;
f.ConnectionType = ConnectionInfo._蟲_右_接続;
f.ConnectionType = ConnectionInfo.Torso_蟲_右_接続;
f.(_蟲2._接続点);
return f;
}).ToArray();
@@ -584,7 +584,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2;
f.ConnectionType = ConnectionInfo._蟲_胴_接続;
f.ConnectionType = ConnectionInfo.Torso_蟲_Torso_接続;
f.(_蟲2._接続点);
return f;
}).ToArray();

View File

@@ -57,21 +57,21 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蟲_左_接続;
e. = ConnectionInfo.Torso_蟲_左_接続;
}
public override void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蟲_右_接続;
e. = ConnectionInfo.Torso_蟲_右_接続;
}
public override void (EleD e)
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蟲_胴_接続;
e. = ConnectionInfo.Torso_蟲_Torso_接続;
}
public override Ele GetEle(double DisUnit, Med Med, )

View File

@@ -395,7 +395,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2;
f.ConnectionType = ConnectionInfo._蛇__接続;
f.ConnectionType = ConnectionInfo._蛇_Torso_接続;
f.(_蛇2._接続点);
return f;
}).ToArray();

View File

@@ -58,7 +58,7 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蛇__接続;
e. = ConnectionInfo._蛇_Torso_接続;
}
public override Ele GetEle(double DisUnit, Med Med, )

View File

@@ -650,7 +650,7 @@ namespace SlaveMatrix
{
f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2;
f.ConnectionType = ConnectionInfo._蟲__接続;
f.ConnectionType = ConnectionInfo._蟲_Torso_接続;
f.(_蟲2._接続点);
return f;
}).ToArray();

View File

@@ -98,7 +98,7 @@ namespace SlaveMatrix
{
_接続.Add(e);
e.Par = this;
e. = ConnectionInfo._蟲__接続;
e. = ConnectionInfo._蟲_Torso_接続;
}
public override Ele GetEle(double DisUnit, Med Med, )

View File

@@ -3829,7 +3829,7 @@ namespace SlaveMatrix
n = .Count;
if ( != null)
{
= ._接続.GetEle<Torso>();
= .Torso_接続.GetEle<Torso>();
_人 = ._接続.GetEle<_人>();
_人 = _人._接続.GetEle<>();
_人.SetHitFalse();

View File

@@ -600,11 +600,11 @@ namespace SlaveMatrix
ConnectionInfo._背中_接続 => 0,
ConnectionInfo._噴乳_接続 => 1,
ConnectionInfo._上腕_接続 => 1,
ConnectionInfo._胸_接続 => 1,
ConnectionInfo._肌_接続 => 1,
ConnectionInfo._翼左_接続 => 0,
ConnectionInfo._翼右_接続 => 0,
ConnectionInfo.Waist__接続 => 1,
ConnectionInfo.Torso_胸_接続 => 1,
ConnectionInfo.Torso_肌_接続 => 1,
ConnectionInfo.Torso_翼左_接続 => 0,
ConnectionInfo.Torso_翼右_接続 => 0,
ConnectionInfo.Waist_Torso_接続 => 1,
ConnectionInfo.Waist_腿左_接続 => 1,
ConnectionInfo.Waist_腿右_接続 => 1,
ConnectionInfo.Waist_膣基_接続 => 1,
@@ -877,15 +877,15 @@ namespace SlaveMatrix
ConnectionInfo._鯨_尾_接続 => 0,
ConnectionInfo._蛇_左_接続 => 1,
ConnectionInfo._蛇_右_接続 => 1,
ConnectionInfo._蛇__接続 => 0,
ConnectionInfo._蛇_Torso_接続 => 0,
ConnectionInfo._蟲_左0_接続 => 1,
ConnectionInfo._蟲_右0_接続 => 1,
ConnectionInfo._蟲_左1_接続 => 1,
ConnectionInfo._蟲_右1_接続 => 1,
ConnectionInfo._蟲__接続 => 0,
ConnectionInfo._蟲_Torso_接続 => 0,
ConnectionInfo._脇左_接続 => 0,
ConnectionInfo._脇右_接続 => 0,
ConnectionInfo.__接続 => 0,
ConnectionInfo._Torso_接続 => 0,
ConnectionInfo._胸左_接続 => 1,
ConnectionInfo._胸右_接続 => 1,
ConnectionInfo._肌_接続 => 1,
@@ -942,12 +942,12 @@ namespace SlaveMatrix
ConnectionInfo._植_根中央_接続 => 0,
ConnectionInfo._植_根内右_接続 => 0,
ConnectionInfo._植_根外右_接続 => 0,
ConnectionInfo._蛇_左_接続 => 1,
ConnectionInfo._蛇_右_接続 => 1,
ConnectionInfo._蛇_胴_接続 => 0,
ConnectionInfo._蟲_左_接続 => 1,
ConnectionInfo._蟲_右_接続 => 1,
ConnectionInfo._蟲_胴_接続 => 0,
ConnectionInfo.Torso_蛇_左_接続 => 1,
ConnectionInfo.Torso_蛇_右_接続 => 1,
ConnectionInfo.Torso_蛇_Torso_接続 => 0,
ConnectionInfo.Torso_蟲_左_接続 => 1,
ConnectionInfo.Torso_蟲_右_接続 => 1,
ConnectionInfo.Torso_蟲_Torso_接続 => 0,
ConnectionInfo._顎左_接続 => 1,
ConnectionInfo._顎右_接続 => 1,
ConnectionInfo._花_接続 => 1,

View File

@@ -1086,6 +1086,9 @@ namespace SlaveMatrix
{
var obj = Resources..ObjLoad();
obj.MigrateKeys();
var tmp = obj["Torso"];
= obj;
//胴体.SaveExMod("C:\\Users\\dave\\Documents\\胴体");
@@ -1336,9 +1339,9 @@ namespace SlaveMatrix
ConnectionInfo._首_接続,
ConnectionInfo._肌_接続,
ConnectionInfo._背中_接続,
ConnectionInfo._胸_接続,
ConnectionInfo._肌_接続,
ConnectionInfo.Waist__接続,
ConnectionInfo.Torso_胸_接続,
ConnectionInfo.Torso_肌_接続,
ConnectionInfo.Waist_Torso_接続,
ConnectionInfo.Waist_肌_接続,
ConnectionInfo.Waist_膣基_接続,
ConnectionInfo.Waist_肛門_接続,
@@ -1363,9 +1366,9 @@ namespace SlaveMatrix
ConnectionInfo._鯨_尾先_接続,
ConnectionInfo._魚_尾_接続,
ConnectionInfo._鯨_尾_接続,
ConnectionInfo._蛇__接続,
ConnectionInfo._蟲__接続,
ConnectionInfo.__接続,
ConnectionInfo._蛇_Torso_接続,
ConnectionInfo._蟲_Torso_接続,
ConnectionInfo._Torso_接続,
ConnectionInfo._肌_接続,
ConnectionInfo._背中_接続,
ConnectionInfo._腰_接続,
@@ -1379,8 +1382,8 @@ namespace SlaveMatrix
ConnectionInfo._蜘_尾_接続,
ConnectionInfo._蠍_尾_接続,
ConnectionInfo._植_根中央_接続,
ConnectionInfo._蛇_胴_接続,
ConnectionInfo._蟲_胴_接続,
ConnectionInfo.Torso_蛇_Torso_接続,
ConnectionInfo.Torso_蟲_Torso_接続,
ConnectionInfo._尿道_接続
});
t = typeof(ConnectionInfo);