Skip to content

Commit 44a4e5c

Browse files
pacampbellpacampbell
committed
code review feedback
- Fix typo Inheritence -> Inheritance. - Remove 50 HP added to all items in CharacterCommon query.
1 parent a331681 commit 44a4e5c

16 files changed

Lines changed: 92 additions & 93 deletions

‎Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbCharacterCommon.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ private void QueryCharacterCommonData(DbConnection conn, CharacterCommon common)
157157

158158
using DbConnection connection3 = OpenNewConnection();
159159
item.AddStatusParamList = GetEquipmentLimitBreakRecord(item.UId, connection3);
160-
item.EquipStatParamList.Add(new CDataEquipStatParam() { EffectID = (byte) EquipStatId.MaxHp, EffectValue = 50 });
161160

162161
common.EquipmentTemplate.SetEquipItem(item, job, equipType, equipSlot);
163162
}

‎Arrowgene.Ddon.GameServer/Characters/JobEmblemManager.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ public void AddNewEmblemItem(Character character, string emblemUid)
7777
emblemItem.EquipStatParamList = GetEquipStatParamList(character.JobEmblems[jobId]);
7878
}
7979

80-
private byte GetInheritenceBasePercentageChance(Item item)
80+
private byte GetInheritanceBasePercentageChance(Item item)
8181
{
82-
if (item.EquipElementParamList.Count >= Server.GameSettings.EmblemSettings.InheritenceUnlockLevels.Count)
82+
if (item.EquipElementParamList.Count >= Server.GameSettings.EmblemSettings.InheritanceUnlockLevels.Count)
8383
{
84-
throw new ResponseErrorException(ErrorCode.ERROR_CODE_ITEM_INTERNAL_ERROR, $"No information for inheritence count {item.EquipElementParamList.Count}");
84+
throw new ResponseErrorException(ErrorCode.ERROR_CODE_ITEM_INTERNAL_ERROR, $"No information for inheritance count {item.EquipElementParamList.Count}");
8585
}
86-
return Server.GameSettings.EmblemSettings.InheritenceUnlockLevels[item.EquipElementParamList.Count].BaseChance;
86+
return Server.GameSettings.EmblemSettings.InheritanceUnlockLevels[item.EquipElementParamList.Count].BaseChance;
8787
}
8888

89-
private byte GetInheritenceAdditionalPercentageChance(List<CDataItemAmount> payments)
89+
private byte GetInheritanceAdditionalPercentageChance(List<CDataItemAmount> payments)
9090
{
9191
byte additionalChance = 0;
9292
foreach (var payment in payments)
9393
{
94-
var match = Server.GameSettings.EmblemSettings.InheritenceChanceIncreaseItems.Where(x => x.ItemId == payment.ItemId).FirstOrDefault();
94+
var match = Server.GameSettings.EmblemSettings.InheritanceChanceIncreaseItems.Where(x => x.ItemId == payment.ItemId).FirstOrDefault();
9595
if (match.ItemId == 0)
9696
{
9797
throw new ResponseErrorException(ErrorCode.ERROR_CODE_ITEM_NOT_FOUND, $"Unable to find configuration information for {payment.ItemId}");
@@ -104,12 +104,12 @@ private byte GetInheritenceAdditionalPercentageChance(List<CDataItemAmount> paym
104104

105105
additionalChance = (byte)(match.PercentIncrease * (payment.Num / match.AmountConsumed));
106106
}
107-
return Math.Min(additionalChance, Server.GameSettings.EmblemSettings.MaxInhertienceChanceIncrease);
107+
return Math.Min(additionalChance, Server.GameSettings.EmblemSettings.MaxInheritanceChanceIncrease);
108108
}
109109

110-
public float GetInheritenceChance(Item item, List<CDataItemAmount> payments)
110+
public float GetInheritanceChance(Item item, List<CDataItemAmount> payments)
111111
{
112-
var chance = Math.Min(GetInheritenceBasePercentageChance(item) + GetInheritenceAdditionalPercentageChance(payments), 100);
112+
var chance = Math.Min(GetInheritanceBasePercentageChance(item) + GetInheritanceAdditionalPercentageChance(payments), 100);
113113
return (float)chance / 100.0f;
114114
}
115115

‎Arrowgene.Ddon.GameServer/Handler/JobEmblemAttachElementHandler.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemAttachElementR
3434
var (storageType, storageInfo) = client.Character.Storage.FindItemByUIdInStorage(ItemManager.EquipmentStorages, request.EmblemUIDs[0]);
3535
var emblemItem = storageInfo.Item2;
3636

37-
var inheritenceChance = Server.JobEmblemManager.GetInheritenceChance(emblemItem, request.AttachChanceItems);
38-
bool isSuccess = (Random.Shared.NextDouble() <= inheritenceChance);
37+
var inheritanceChance = Server.JobEmblemManager.GetInheritanceChance(emblemItem, request.AttachChanceItems);
38+
bool isSuccess = (Random.Shared.NextDouble() <= inheritanceChance);
3939
bool isItemLost = !(request.PremiumCurrencyCost.Count > 0);
4040
Server.Database.ExecuteInTransaction(connection =>
4141
{
@@ -58,7 +58,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemAttachElementR
5858
.ToList();
5959
if (crestIds.Count == 0)
6060
{
61-
throw new ResponseErrorException(ErrorCode.ERROR_CODE_ITEM_INTERNAL_ERROR, "Failed to locate crest ids for emblem inheritence");
61+
throw new ResponseErrorException(ErrorCode.ERROR_CODE_ITEM_INTERNAL_ERROR, "Failed to locate crest ids for emblem inheritance");
6262
}
6363

6464
// Select a random crest to inherit if there are multiple
@@ -80,12 +80,12 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemAttachElementR
8080

8181
// itemUpdateNtc.UpdateItemList.Add(Server.ItemManager.CreateItemUpdateResult(characterCommon, item, storageType, relativeSlotNo, 0, 0));
8282

83-
var match = item.EquipElementParamList.Where(x => x.SlotNo == request.InheritenceSlot).FirstOrDefault();
83+
var match = item.EquipElementParamList.Where(x => x.SlotNo == request.InheritanceSlot).FirstOrDefault();
8484
if (match == null)
8585
{
8686
item.EquipElementParamList.Add(new CDataEquipElementParam()
8787
{
88-
SlotNo = request.InheritenceSlot,
88+
SlotNo = request.InheritanceSlot,
8989
CrestId = crestId,
9090
});
9191
}
@@ -95,7 +95,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemAttachElementR
9595
match.Add = 0;
9696
}
9797

98-
Server.Database.InsertCrest(characterCommon.CommonId, uid, request.InheritenceSlot, crestId, 0, connection);
98+
Server.Database.InsertCrest(characterCommon.CommonId, uid, request.InheritanceSlot, crestId, 0, connection);
9999
itemUpdateNtc.UpdateItemList.Add(Server.ItemManager.CreateItemUpdateResult(characterCommon, item, storageType, relativeSlotNo, 1, 1));
100100
}
101101
}
@@ -111,7 +111,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemAttachElementR
111111

112112
client.Enqueue(new S2CJobEmblemAttachElementRes()
113113
{
114-
InheritenceResult = new()
114+
InheritanceResult = new()
115115
{
116116
JobId = request.JobId,
117117
IsSuccess = isSuccess,

‎Arrowgene.Ddon.GameServer/Handler/JobEmblemDetachElementHandler.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemDetachElementR
2323

2424
var response = new S2CJobEmblemDetachElementRes()
2525
{
26-
InheritenceResult = new()
26+
InheritanceResult = new()
2727
{
2828
JobId = request.JobId,
2929
IsSuccess = true,
@@ -52,12 +52,12 @@ public override PacketQueue Handle(GameClient client, C2SJobEmblemDetachElementR
5252
}
5353

5454
updateCharacterItemNtc.UpdateItemList.Add(Server.ItemManager.CreateItemUpdateResult(characterCommon, item, storageType, relativeSlotNo, 0, 0));
55-
item.EquipElementParamList.Where(x => x.SlotNo == request.InheritenceSlot).FirstOrDefault().CrestId = 0;
56-
Server.Database.RemoveCrest(characterCommon.CommonId, uid, request.InheritenceSlot, connection);
55+
item.EquipElementParamList.Where(x => x.SlotNo == request.InheritanceSlot).FirstOrDefault().CrestId = 0;
56+
Server.Database.RemoveCrest(characterCommon.CommonId, uid, request.InheritanceSlot, connection);
5757
updateCharacterItemNtc.UpdateItemList.Add(Server.ItemManager.CreateItemUpdateResult(characterCommon, item, storageType, relativeSlotNo, 1, 1));
5858

5959
// note: This might be set multiple times but should all be the same
60-
response.InheritenceResult.EquipElementParamList = item.EquipElementParamList;
60+
response.InheritanceResult.EquipElementParamList = item.EquipElementParamList;
6161
}
6262
});
6363
client.Enqueue(response, packets);

‎Arrowgene.Ddon.GameServer/Handler/JobEmblemGetEmblemListHandler.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,23 @@ public override S2CJobEmblemGetEmblemListRes Handle(GameClient client, C2SJobEmb
5959

6060
result.EmblemSettings.StatUpgradeDataList = Server.ScriptManager.JobEmblemStatModule.GetData();
6161

62-
result.EmblemSettings.CrestSlotRestrictionList = Server.GameSettings.EmblemSettings.InheritenceUnlockLevels
62+
result.EmblemSettings.CrestSlotRestrictionList = Server.GameSettings.EmblemSettings.InheritanceUnlockLevels
6363
.OrderBy(x => x.UnlockLevel)
6464
.Select(x => new CDataJobEmblemSlotRestriction()
6565
{
6666
LevelUnlocked = x.UnlockLevel,
6767
})
6868
.ToList();
6969

70-
result.EmblemSettings.EmblemCrestInheritenceBaseChanceList = Server.GameSettings.EmblemSettings.InheritenceUnlockLevels
71-
.Select((x, index) => new CDataJobEmblemCrestInheritenceBaseChance()
70+
result.EmblemSettings.EmblemCrestInheritanceBaseChanceList = Server.GameSettings.EmblemSettings.InheritanceUnlockLevels
71+
.Select((x, index) => new CDataJobEmblemCrestInheritanceBaseChance()
7272
{
7373
Slot = (byte)index,
7474
BaseChanceAmount = x.BaseChance
7575
})
7676
.ToList();
7777

78-
result.EmblemSettings.InhertianceIncreaseChanceItemList = Server.GameSettings.EmblemSettings.InheritenceChanceIncreaseItems
78+
result.EmblemSettings.InheritanceIncreaseChanceItemList = Server.GameSettings.EmblemSettings.InheritanceChanceIncreaseItems
7979
.Select(x => new CDataJobEmblemInhertianceIncreaseChanceItem()
8080
{
8181
ItemId = x.ItemId,
@@ -104,15 +104,15 @@ public override S2CJobEmblemGetEmblemListRes Handle(GameClient client, C2SJobEmb
104104
}
105105
};
106106

107-
result.EmblemSettings.InheritencePremiumCurrencyCost.Add(new CDataJobEmblemActionCostParam()
107+
result.EmblemSettings.InheritancePremiumCurrencyCost.Add(new CDataJobEmblemActionCostParam()
108108
{
109109
PointType = (byte) WalletType.GoldenGemstones,
110-
Amount = Server.GameSettings.EmblemSettings.EmblemInheritenceEquipLossGGCost
110+
Amount = Server.GameSettings.EmblemSettings.EmblemInheritanceEquipLossGGCost
111111
});
112112

113113
result.EmblemSettings.MaxEmblemPoints = Server.GameSettings.EmblemSettings.MaxEmblemPoints;
114114
result.EmblemSettings.MaxEmblemLevel = Server.GameSettings.EmblemSettings.MaxEmblemLevel;
115-
result.EmblemSettings.MaxInhertienceChanceIncrease = Server.GameSettings.EmblemSettings.MaxInhertienceChanceIncrease;
115+
result.EmblemSettings.MaxInhertienceChanceIncrease = Server.GameSettings.EmblemSettings.MaxInheritanceChanceIncrease;
116116

117117
result.EmblemSettings.InventoryFilter.Add(new CDataCommonU8(1)); // Common
118118
result.EmblemSettings.InventoryFilter.Add(new CDataCommonU8(2)); // High Grade Earrings

‎Arrowgene.Ddon.Server/Settings/EmblemSettings.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,36 +57,36 @@ public ushort MaxEmblemPoints
5757
/// <summary>
5858
/// Defines the maximum amount you can increase your odds when attaching crests to the job emblem.
5959
/// </summary>
60-
[DefaultValue(_MaxInhertienceChanceIncrease)]
61-
public byte MaxInhertienceChanceIncrease
60+
[DefaultValue(_MaxInheritanceChanceIncrease)]
61+
public byte MaxInheritanceChanceIncrease
6262
{
6363
set
6464
{
65-
SetSetting("MaxInhertienceChanceIncrease", value);
65+
SetSetting("MaxInheritanceChanceIncrease", value);
6666
}
6767
get
6868
{
69-
return TryGetSetting("MaxInhertienceChanceIncrease", _MaxInhertienceChanceIncrease);
69+
return TryGetSetting("MaxInheritanceChanceIncrease", _MaxInheritanceChanceIncrease);
7070
}
7171
}
72-
private const byte _MaxInhertienceChanceIncrease = 20;
72+
private const byte _MaxInheritanceChanceIncrease = 20;
7373

7474
/// <summary>
75-
/// Defines the amount GG needed to prevent a piece of equipment from being lost when inheritence fails.
75+
/// Defines the amount GG needed to prevent a piece of equipment from being lost when inheritance fails.
7676
/// </summary>
77-
[DefaultValue(_EmblemInheritenceEquipLossGGCost)]
78-
public uint EmblemInheritenceEquipLossGGCost
77+
[DefaultValue(_EmblemInheritanceEquipLossGGCost)]
78+
public uint EmblemInheritanceEquipLossGGCost
7979
{
8080
set
8181
{
82-
SetSetting("EmblemInheritenceEquipLossGGCost", value);
82+
SetSetting("EmblemInheritanceEquipLossGGCost", value);
8383
}
8484
get
8585
{
86-
return TryGetSetting("EmblemInheritenceEquipLossGGCost", _EmblemInheritenceEquipLossGGCost);
86+
return TryGetSetting("EmblemInheritanceEquipLossGGCost", _EmblemInheritanceEquipLossGGCost);
8787
}
8888
}
89-
private const uint _EmblemInheritenceEquipLossGGCost = 2;
89+
private const uint _EmblemInheritanceEquipLossGGCost = 2;
9090

9191
/// <summary>
9292
/// Defines the amount GG needed to reset the emblem points.
@@ -132,15 +132,15 @@ public uint EmblemPointResetPPAmount
132132
(ItemId.QualityDefenseUpgradeRock, 100, 1),
133133
(ItemId.WhiteDragonDefenseUpgradeRock, 1, 1),
134134
});")]
135-
public List<(ItemId ItemId, ushort AmountConsumed, byte PercentIncrease)> InheritenceChanceIncreaseItems
135+
public List<(ItemId ItemId, ushort AmountConsumed, byte PercentIncrease)> InheritanceChanceIncreaseItems
136136
{
137137
set
138138
{
139-
SetSetting("InheritenceChanceIncreaseItems", value);
139+
SetSetting("InheritanceChanceIncreaseItems", value);
140140
}
141141
get
142142
{
143-
return TryGetSetting("InheritenceChanceIncreaseItems", new List<(ItemId ItemId, ushort AmountConsumed, byte PercentIncrease)>
143+
return TryGetSetting("InheritanceChanceIncreaseItems", new List<(ItemId ItemId, ushort AmountConsumed, byte PercentIncrease)>
144144
{
145145
(ItemId.QualityDefenseUpgradeRock, 100, 1),
146146
(ItemId.WhiteDragonDefenseUpgradeRock, 1, 1),
@@ -150,7 +150,7 @@ public uint EmblemPointResetPPAmount
150150

151151

152152
/// <summary>
153-
/// The levels which additional inheritence (the crest slots) unlock on the emblems.
153+
/// The levels which additional inheritance (the crest slots) unlock on the emblems.
154154
/// Emblems always start with 1 slot unlocked.
155155
/// </summary>
156156
[DefaultValue(@"new List<(ushort UnlockLevel, byte BaseChance)>
@@ -160,15 +160,15 @@ public uint EmblemPointResetPPAmount
160160
(11, 16),
161161
(16, 8),
162162
})")]
163-
public List<(ushort UnlockLevel, byte BaseChance)> InheritenceUnlockLevels
163+
public List<(ushort UnlockLevel, byte BaseChance)> InheritanceUnlockLevels
164164
{
165165
set
166166
{
167-
SetSetting("InheritenceUnlockLevels", value);
167+
SetSetting("InheritanceUnlockLevels", value);
168168
}
169169
get
170170
{
171-
return TryGetSetting("InheritenceUnlockLevels", new List<(ushort UnlockLevel, byte BaseChance)>
171+
return TryGetSetting("InheritanceUnlockLevels", new List<(ushort UnlockLevel, byte BaseChance)>
172172
{
173173
(0, 64),
174174
(6, 32),

‎Arrowgene.Ddon.Shared/Entity/EntitySerializer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ static EntitySerializer()
247247
Create(new CDataJumpLocation.Serializer());
248248

249249
Create(new CDataJobEmblem.Serializer());
250-
Create(new CDataJobEmblemCrestInheritenceBaseChance.Serializer());
251-
Create(new CDataJobEmblemInheritenceResult.Serializer());
250+
Create(new CDataJobEmblemCrestInheritanceBaseChance.Serializer());
251+
Create(new CDataJobEmblemInheritanceResult.Serializer());
252252
Create(new CDataJobEmblemInhertianceIncreaseChanceItem.Serializer());
253253
Create(new CDataJobEmblemLevelData.Serializer());
254254
Create(new CDataJobEmblemPoints.Serializer());

‎Arrowgene.Ddon.Shared/Entity/PacketStructure/C2SJobEmblemAttachElementReq.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public C2SJobEmblemAttachElementReq()
1919
}
2020

2121
public JobId JobId { get; set; }
22-
public byte InheritenceSlot { get; set; }
22+
public byte InheritanceSlot { get; set; }
2323
public List<string> EmblemUIDs { get; set; }
2424
public List<string> JewelryUIDs { get; set; }
2525
public List<CDataItemAmount> AttachChanceItems { get; set; }
@@ -30,7 +30,7 @@ public class Serializer : PacketEntitySerializer<C2SJobEmblemAttachElementReq>
3030
public override void Write(IBuffer buffer, C2SJobEmblemAttachElementReq obj)
3131
{
3232
WriteByte(buffer, (byte) obj.JobId);
33-
WriteByte(buffer, obj.InheritenceSlot);
33+
WriteByte(buffer, obj.InheritanceSlot);
3434
WriteMtStringList(buffer, obj.EmblemUIDs);
3535
WriteMtStringList(buffer, obj.JewelryUIDs);
3636
WriteEntityList(buffer, obj.AttachChanceItems);
@@ -41,7 +41,7 @@ public override C2SJobEmblemAttachElementReq Read(IBuffer buffer)
4141
{
4242
C2SJobEmblemAttachElementReq obj = new C2SJobEmblemAttachElementReq();
4343
obj.JobId = (JobId) ReadByte(buffer);
44-
obj.InheritenceSlot = ReadByte(buffer);
44+
obj.InheritanceSlot = ReadByte(buffer);
4545
obj.EmblemUIDs = ReadMtStringList(buffer);
4646
obj.JewelryUIDs = ReadMtStringList(buffer);
4747
obj.AttachChanceItems = ReadEntityList<CDataItemAmount>(buffer);

‎Arrowgene.Ddon.Shared/Entity/PacketStructure/C2SJobEmblemDetachElementReq.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ public C2SJobEmblemDetachElementReq()
1515
}
1616

1717
public JobId JobId { get; set; }
18-
public byte InheritenceSlot { get; set; }
18+
public byte InheritanceSlot { get; set; }
1919
public List<string> EmblemUIDs { get; set; }
2020

2121
public class Serializer : PacketEntitySerializer<C2SJobEmblemDetachElementReq>
2222
{
2323
public override void Write(IBuffer buffer, C2SJobEmblemDetachElementReq obj)
2424
{
2525
WriteByte(buffer, (byte) obj.JobId);
26-
WriteByte(buffer, obj.InheritenceSlot);
26+
WriteByte(buffer, obj.InheritanceSlot);
2727
WriteMtStringList(buffer, obj.EmblemUIDs);
2828
}
2929

3030
public override C2SJobEmblemDetachElementReq Read(IBuffer buffer)
3131
{
3232
C2SJobEmblemDetachElementReq obj = new C2SJobEmblemDetachElementReq();
3333
obj.JobId = (JobId) ReadByte(buffer);
34-
obj.InheritenceSlot = ReadByte(buffer);
34+
obj.InheritanceSlot = ReadByte(buffer);
3535
obj.EmblemUIDs = ReadMtStringList(buffer);
3636
return obj;
3737
}

0 commit comments

Comments
 (0)