Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2025-12-14 13:24:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix level 8+ skill not being upgradeable

Browse Source
This commit is contained in:
Melledy
2025-10-31 00:47:21 -07:00
parent 78f992f2f5
commit 36004b3fc3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/nebula/data/resources/CharacterSkillUpgradeDef.java
View File

@@ -2,6 +2,7 @@ package emu.nebula.data.resources;
import emu.nebula.GameConstants; import emu.nebula.GameConstants;
import emu.nebula.data.BaseDef; import emu.nebula.data.BaseDef;
import emu.nebula.data.GameData;
import emu.nebula.data.ResourceType; import emu.nebula.data.ResourceType;
import emu.nebula.game.inventory.ItemParamMap; import emu.nebula.game.inventory.ItemParamMap;
@@ -52,5 +53,10 @@ public class CharacterSkillUpgradeDef extends BaseDef {
} }
this.upgradeId = (this.Group * 100) + this.AdvanceNum; this.upgradeId = (this.Group * 100) + this.AdvanceNum;
// Fix for duplicate skill upgrade ids
while (GameData.getCharacterSkillUpgradeDataTable().containsKey(this.getId())) {
this.upgradeId += 1;
}
} }
} }

3
src/main/java/emu/nebula/util/JsonUtils.java
View File

@@ -2,6 +2,7 @@ package emu.nebula.util;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -98,7 +99,7 @@ public class JsonUtils {
} }
public static <T1, T2> Map<T1, T2> loadToMap(InputStreamReader fileReader, Class<T1> keyType, Class<T2> valueType) throws IOException { public static <T1, T2> Map<T1, T2> loadToMap(InputStreamReader fileReader, Class<T1> keyType, Class<T2> valueType) throws IOException {
return gson.fromJson(fileReader, TypeToken.getParameterized(Map.class, keyType, valueType).getType()); return gson.fromJson(fileReader, TypeToken.getParameterized(LinkedHashMap.class, keyType, valueType).getType());
} }
public static <T1, T2> Map<T1, T2> loadToMap(String filename, Class<T1> keyType, Class<T2> valueType) throws IOException { public static <T1, T2> Map<T1, T2> loadToMap(String filename, Class<T1> keyType, Class<T2> valueType) throws IOException {