From 38a0e1421ffbd513cc5c1157b7e810a4b09c92a0 Mon Sep 17 00:00:00 2001 From: salix5 Date: Sun, 1 Dec 2024 13:08:55 +0800 Subject: [PATCH] update card_data.h --- card.h | 6 ------ card_data.h | 10 +++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/card.h b/card.h index 2facceb2a..3633fe571 100644 --- a/card.h +++ b/card.h @@ -109,12 +109,6 @@ struct material_info { }; const material_info null_info; -constexpr uint32 CARD_MARINE_DOLPHIN = 78734254; -constexpr uint32 CARD_TWINKLE_MOSS = 13857930; -constexpr uint32 CARD_TIMAEUS = 1784686; -constexpr uint32 CARD_CRITIAS = 11082056; -constexpr uint32 CARD_HERMOS = 46232525; - class card { public: struct effect_relation_hash { diff --git a/card_data.h b/card_data.h index c0559b69a..2bf5d14a6 100644 --- a/card_data.h +++ b/card_data.h @@ -5,7 +5,15 @@ constexpr int CARD_ARTWORK_VERSIONS_OFFSET = 20; constexpr int SIZE_SETCODE = 16; -constexpr int CARD_BLACK_LUSTER_SOLDIER2 = 5405695; + +constexpr uint32 CARD_BLACK_LUSTER_SOLDIER2 = 5405695; + +//double name +constexpr uint32 CARD_MARINE_DOLPHIN = 78734254; +constexpr uint32 CARD_TWINKLE_MOSS = 13857930; +constexpr uint32 CARD_TIMAEUS = 1784686; +constexpr uint32 CARD_CRITIAS = 11082056; +constexpr uint32 CARD_HERMOS = 46232525; struct card_data { uint32 code{};