diff --git a/server/gameserver/mt/AI.h b/server/gameserver/mt/AI.h index 29327fc9..39a9291a 100644 --- a/server/gameserver/mt/AI.h +++ b/server/gameserver/mt/AI.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AI, mtb::AI, - "ai@ai.csv", + "ai@ai.json", "id") public: diff --git a/server/gameserver/mt/AirDrop.h b/server/gameserver/mt/AirDrop.h index 1068242c..dbddfd7d 100644 --- a/server/gameserver/mt/AirDrop.h +++ b/server/gameserver/mt/AirDrop.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AirDrop, mtb::AirDrop, - "airDrop@airDrop.csv", + "airDrop@airDrop.json", "id") public: diff --git a/server/gameserver/mt/AirLine.h b/server/gameserver/mt/AirLine.h index 00295aca..03ff595d 100644 --- a/server/gameserver/mt/AirLine.h +++ b/server/gameserver/mt/AirLine.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AirLine, mtb::AirLine, - "airline@airline.csv", + "airline@airline.json", "id") public: diff --git a/server/gameserver/mt/AirRaid.h b/server/gameserver/mt/AirRaid.h index 6015433a..aa980ec3 100644 --- a/server/gameserver/mt/AirRaid.h +++ b/server/gameserver/mt/AirRaid.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(AirRaid, mtb::AirRaid, - "airRaid@airRaid.csv", + "airRaid@airRaid.json", "id") public: diff --git a/server/gameserver/mt/Attr.h b/server/gameserver/mt/Attr.h index 1c49f401..6e52bc40 100644 --- a/server/gameserver/mt/Attr.h +++ b/server/gameserver/mt/Attr.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Attr, mtb::Attr, - "attr@attr.csv", + "attr@attr.json", "attr_id") public: diff --git a/server/gameserver/mt/Buff.h b/server/gameserver/mt/Buff.h index 5f90861e..865b6b73 100644 --- a/server/gameserver/mt/Buff.h +++ b/server/gameserver/mt/Buff.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Buff, mtb::Buff, - "buff@buff.csv", + "buff@buff.json", "buff_id") public: diff --git a/server/gameserver/mt/Dress.h b/server/gameserver/mt/Dress.h index 7f700587..01a85e7d 100644 --- a/server/gameserver/mt/Dress.h +++ b/server/gameserver/mt/Dress.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Dress, mtb::Dress, - "dress@dress.csv", + "dress@dress.json", "id") public: diff --git a/server/gameserver/mt/Drop.h b/server/gameserver/mt/Drop.h index bb8dc28d..be48e2e9 100644 --- a/server/gameserver/mt/Drop.h +++ b/server/gameserver/mt/Drop.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Drop, mtb::Drop, - "drop@drop.csv", + "drop@drop.json", "drop_id") public: diff --git a/server/gameserver/mt/Equip.h b/server/gameserver/mt/Equip.h index ed25ae38..c9f439c9 100644 --- a/server/gameserver/mt/Equip.h +++ b/server/gameserver/mt/Equip.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Equip, mtb::Equip, - "equip@equip.csv", + "equip@equip.json", "id") public: int lock_time = 0; diff --git a/server/gameserver/mt/EquipUpgrade.h b/server/gameserver/mt/EquipUpgrade.h index 90d20456..087e4ea6 100644 --- a/server/gameserver/mt/EquipUpgrade.h +++ b/server/gameserver/mt/EquipUpgrade.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(EquipUpgrade, mtb::EquipUpgrade, - "equipUpgrade@equipUpgrade.csv", + "equipUpgrade@equipUpgrade.json", "id") public: diff --git a/server/gameserver/mt/FormulaPvp.h b/server/gameserver/mt/FormulaPvp.h index 7bae9740..53f3f957 100644 --- a/server/gameserver/mt/FormulaPvp.h +++ b/server/gameserver/mt/FormulaPvp.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_AUTO_ID_TABLE(FormulaPvp, mtb::FormulaPvp, - "formulaPvp@formulaPvp.csv" + "formulaPvp@formulaPvp.json" ) public: diff --git a/server/gameserver/mt/Hero.h b/server/gameserver/mt/Hero.h index 1acf28ff..d1667c7d 100644 --- a/server/gameserver/mt/Hero.h +++ b/server/gameserver/mt/Hero.h @@ -34,7 +34,7 @@ namespace mt }; DECLARE_ID_TABLE(Hero, mtb::Hero, - "hero@hero.csv", + "hero@hero.json", "id") public: diff --git a/server/gameserver/mt/Item.h b/server/gameserver/mt/Item.h index e441df08..aee59dda 100644 --- a/server/gameserver/mt/Item.h +++ b/server/gameserver/mt/Item.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Item, mtb::Item, - "item@item.csv", + "item@item.json", "id") public: diff --git a/server/gameserver/mt/KillPoint.h b/server/gameserver/mt/KillPoint.h index 69c49dd8..44960c2e 100644 --- a/server/gameserver/mt/KillPoint.h +++ b/server/gameserver/mt/KillPoint.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(KillPoint, mtb::KillPoint, - "killPoint@killPoint.csv", + "killPoint@killPoint.json", "kill_num") public: diff --git a/server/gameserver/mt/KillReward.h b/server/gameserver/mt/KillReward.h index ec1d532d..60a0988b 100644 --- a/server/gameserver/mt/KillReward.h +++ b/server/gameserver/mt/KillReward.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(KillReward, mtb::KillReward, - "killReward@killReward.csv", + "killReward@killReward.json", "kill_num") public: diff --git a/server/gameserver/mt/Map.h b/server/gameserver/mt/Map.h index dcbf1d2e..1d648a91 100644 --- a/server/gameserver/mt/Map.h +++ b/server/gameserver/mt/Map.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Map, mtb::Map, - "map@map.csv", + "map@map.json", "map_id") public: std::vector> template_list_; diff --git a/server/gameserver/mt/MapArea.h b/server/gameserver/mt/MapArea.h index 33be7b50..83984463 100644 --- a/server/gameserver/mt/MapArea.h +++ b/server/gameserver/mt/MapArea.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_AUTO_ID_TABLE(MapArea, mtb::MapArea, - "mapArea@mapArea.csv" + "mapArea@mapArea.json" ) public: diff --git a/server/gameserver/mt/MapThing.h b/server/gameserver/mt/MapThing.h index 2ebdf538..822013e1 100644 --- a/server/gameserver/mt/MapThing.h +++ b/server/gameserver/mt/MapThing.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(MapThing, mtb::MapThing, - "mapThing@mapThing.csv", + "mapThing@mapThing.json", "thing_id") public: std::vector _buff_list; diff --git a/server/gameserver/mt/NpcStandard.h b/server/gameserver/mt/NpcStandard.h index 2149830b..d80d289d 100644 --- a/server/gameserver/mt/NpcStandard.h +++ b/server/gameserver/mt/NpcStandard.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(NpcStandard, mtb::NpcStandard, - "npcStandard@npcStandard.csv", + "npcStandard@npcStandard.json", "id") public: diff --git a/server/gameserver/mt/Param.h b/server/gameserver/mt/Param.h index b5b1499c..d365572a 100644 --- a/server/gameserver/mt/Param.h +++ b/server/gameserver/mt/Param.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_NAME_TABLE(Param, mtb::Parameter, - "parameter@parameter.csv", + "parameter@parameter.json", "param_name") public: struct S { diff --git a/server/gameserver/mt/PveGemini.h b/server/gameserver/mt/PveGemini.h index c84a2d4e..ec2af829 100644 --- a/server/gameserver/mt/PveGemini.h +++ b/server/gameserver/mt/PveGemini.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(PveGemini, mtb::PveGemini, - "pveGemini@pveGemini.csv", + "pveGemini@pveGemini.json", "gemini_id") public: diff --git a/server/gameserver/mt/PveGeminiContent.h b/server/gameserver/mt/PveGeminiContent.h index 07733e97..6d397396 100644 --- a/server/gameserver/mt/PveGeminiContent.h +++ b/server/gameserver/mt/PveGeminiContent.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(PveGeminiContent, mtb::PveGeminiContent, - "pveGeminiContent@pveGeminiContent.csv", + "pveGeminiContent@pveGeminiContent.json", "id") public: diff --git a/server/gameserver/mt/PveGeminiMode.h b/server/gameserver/mt/PveGeminiMode.h index 9537447b..205a8313 100644 --- a/server/gameserver/mt/PveGeminiMode.h +++ b/server/gameserver/mt/PveGeminiMode.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(PveGeminiMode, mtb::PveGeminiMode, - "pveGeminiMode@pveGeminiMode.csv", + "pveGeminiMode@pveGeminiMode.json", "id") public: diff --git a/server/gameserver/mt/RankPoint.h b/server/gameserver/mt/RankPoint.h index e95919bf..ef3b8294 100644 --- a/server/gameserver/mt/RankPoint.h +++ b/server/gameserver/mt/RankPoint.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(RankPoint, mtb::RankPoint, - "rankPoint@rankPoint.csv", + "rankPoint@rankPoint.json", "rank") public: diff --git a/server/gameserver/mt/RankReward.h b/server/gameserver/mt/RankReward.h index efbc8edd..4776d287 100644 --- a/server/gameserver/mt/RankReward.h +++ b/server/gameserver/mt/RankReward.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(RankReward, mtb::RankReward, - "rankReward@rankReward.csv", + "rankReward@rankReward.json", "rank") public: diff --git a/server/gameserver/mt/RankRoom.h b/server/gameserver/mt/RankRoom.h index 1b13bf3d..914f9e11 100644 --- a/server/gameserver/mt/RankRoom.h +++ b/server/gameserver/mt/RankRoom.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(RankRoom, mtb::RankRoom, - "rankRoom@rankRoom.csv", + "rankRoom@rankRoom.json", "id") public: diff --git a/server/gameserver/mt/Robot.h b/server/gameserver/mt/Robot.h index f9a0d4d6..b40982e8 100644 --- a/server/gameserver/mt/Robot.h +++ b/server/gameserver/mt/Robot.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(Robot, mtb::Robot, - "robot@robot.csv", + "robot@robot.json", "id") public: diff --git a/server/gameserver/mt/SafeArea.h b/server/gameserver/mt/SafeArea.h index 96279899..0024b222 100644 --- a/server/gameserver/mt/SafeArea.h +++ b/server/gameserver/mt/SafeArea.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(SafeArea, mtb::SafeArea, - "safearea@safearea.csv", + "safearea@safearea.json", "id") public: diff --git a/server/gameserver/mt/SafeAreaPos.h b/server/gameserver/mt/SafeAreaPos.h index 5be09297..0b964072 100644 --- a/server/gameserver/mt/SafeAreaPos.h +++ b/server/gameserver/mt/SafeAreaPos.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_AUTO_ID_TABLE(SafeAreaPos, mtb::SafeAreaPos, - "safeAreaPos@safeAreaPos.csv" + "safeAreaPos@safeAreaPos.json" ) public: diff --git a/server/gameserver/mt/Skill.h b/server/gameserver/mt/Skill.h index 0884d3f7..3de60f5c 100644 --- a/server/gameserver/mt/Skill.h +++ b/server/gameserver/mt/Skill.h @@ -25,7 +25,7 @@ namespace mt }; DECLARE_ID_TABLE(Skill, mtb::Skill, - "skill@skill.csv", + "skill@skill.json", "skill_id") public: diff --git a/server/gameserver/mt/SkillNumber.h b/server/gameserver/mt/SkillNumber.h index 12626994..84506697 100644 --- a/server/gameserver/mt/SkillNumber.h +++ b/server/gameserver/mt/SkillNumber.h @@ -7,7 +7,7 @@ namespace mt { DECLARE_ID_TABLE(SkillNumber, mtb::SkillNumber, - "skillNumber@skillNumber.csv", + "skillNumber@skillNumber.json", "skill_id") public: diff --git a/server/gameserver/mt/Text.h b/server/gameserver/mt/Text.h index c8173679..69cfdd98 100644 --- a/server/gameserver/mt/Text.h +++ b/server/gameserver/mt/Text.h @@ -9,7 +9,7 @@ namespace mt { DECLARE_NAME_TABLE(Text, mtb::Text, - "text@text.csv", + "text@text.json", "textid") public: