Merge pull request #145 from false-spring/feature/1.3.2

fix: Update to support 1.3.x game versions
false-spring · Jul 1, 2024 · 1b90a5e · 1b90a5e
2 parents 83df3d5 + b156815
commit 1b90a5e
Show file tree

Hide file tree

Showing 67 changed files with 5,184 additions and 544 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2024-05-04"
diff --git a/src-hook/src/hooks/ffi.rs b/src-hook/src/hooks/ffi.rs
@@ -4,8 +4,8 @@ use std::ffi::CString;
 #[repr(C)]
 pub struct QuestState {
     pub quest_id: u32,        // 0x00
-    padding_640: [u8; 0x644], // 0x004 - 0x648
-    pub elapsed_time: u32,    // 0x648
+    padding_640: [u8; 0x648], // 0x004 - 0x64C
+    pub elapsed_time: u32,    // 0x64C
 }
 
 #[derive(Debug)]
@@ -44,8 +44,8 @@ pub struct SigilList {
     pub character_name: [u8; 16], //0x01E8
     padding_1f8: [u8; 16],        //0x01F8
     pub display_name: [u8; 16],   //0x0208
-    padding_218: [u8; 24],        //0x0218
-    pub party_index: u32,         //0x0230
+    padding_218: [u8; 20],        //0x0218
+    pub party_index: u32,         //0x022C
 }
 
 #[derive(Debug)]

diff --git a/src-hook/src/hooks/mod.rs b/src-hook/src/hooks/mod.rs
@@ -94,7 +94,7 @@ pub fn get_source_parent(source_type_id: u32, source: *const usize) -> Option<(u
         }
         // Pl2000: Id's Dragon Form -> Pl1900
         0xF5755C0E => {
-            let parent_instance = parent_specified_instance_at(source, 0xD338)?;
+            let parent_instance = parent_specified_instance_at(source, 0xD488)?;
             Some((actor_type_id(parent_instance), actor_idx(parent_instance)))
         }
         // Wp2290: Seofon's Avatar

diff --git a/src-hook/src/hooks/quest.rs b/src-hook/src/hooks/quest.rs
@@ -105,6 +105,9 @@ impl OnQuestCompleteHook {
         let quest_state_ptr = QUEST_STATE_PTR.load(Ordering::Relaxed);
 
         if !quest_state_ptr.is_null() {
+            #[cfg(feature = "console")]
+            println!("quest_state_ptr: {:p}", quest_state_ptr);
+
             let quest_state = unsafe { quest_state_ptr.read() };
             let quest_id = quest_state.quest_id;
             let timer = quest_state.elapsed_time;

diff --git a/src-tauri/lang/bp/items.json b/src-tauri/lang/bp/items.json
@@ -35,6 +35,10 @@
     "key": "ITEM_01_0053",
     "text": "Cabo da Espadaflor"
   },
+  "09e6f629": {
+    "key": "ITEM_25_0131",
+    "text": "Pedra-artífice do Terror"
+  },
   "09f9339e": {
     "key": "ITEM_32_0056",
     "text": "Chifre Abissal"
@@ -43,6 +47,10 @@
     "key": "ITEM_27_9999",
     "text": "Pedra-artífice da Fortificação"
   },
+  "0bd373a4": {
+    "key": "ITEM_28_0130",
+    "text": "Pedra-artífice do Isolamento"
+  },
   "0f34eabc": {
     "key": "ITEM_32_0042",
     "text": "Coroa do Lamento"
@@ -131,6 +139,10 @@
     "key": "ITEM_18_0000",
     "text": "Resíduo Sombrio"
   },
+  "202a0db9": {
+    "key": "ITEM_28_0131",
+    "text": "Pedra-artífice do Isolamento"
+  },
   "20612b0a": {
     "key": "ITEM_31_0020",
     "text": "Osso do Purgatório"
@@ -259,6 +271,10 @@
     "key": "ITEM_26_0030",
     "text": "Pedra-artífice da Vitalidade"
   },
+  "3ef6def5": {
+    "key": "ITEM_26_0130",
+    "text": "Pedra-artífice da Vitalidade"
+  },
   "3f8f4efd": {
     "key": "ITEM_16_0002",
     "text": "Urna do Terror"
@@ -359,6 +375,14 @@
     "key": "ITEM_32_0050",
     "text": "Cornamenta Ancestral"
   },
+  "5af14960": {
+    "key": "ITEM_70_0017",
+    "text": "Pacote de Cor de Personagem 5"
+  },
+  "5b5b8603": {
+    "key": "ITEM_23_0003",
+    "text": "Cartão de Tripul.: Sandalphon"
+  },
   "5c07839a": {
     "key": "ITEM_14_0032",
     "text": "Emblema de Dalia de Ouro"
@@ -415,6 +439,10 @@
     "key": "ITEM_31_0032",
     "text": "Bico Gigante"
   },
+  "667ee1d3": {
+    "key": "ITEM_27_0131",
+    "text": "Pedra-artífice da Fortificação"
+  },
   "67e3f274": {
     "key": "ITEM_32_0030",
     "text": "Cabeça de Tayu'itar"
@@ -451,6 +479,10 @@
     "key": "ITEM_14_0021",
     "text": "Prova de Campeão"
   },
+  "71173866": {
+    "key": "ITEM_26_0131",
+    "text": "Pedra-artífice da Vitalidade"
+  },
   "71bc9232": {
     "key": "ITEM_70_0006",
     "text": "Elpis, o Trancamentes"
@@ -727,6 +759,10 @@
     "key": "ITEM_25_1000",
     "text": "Pedra-artífice do Terror"
   },
+  "a9cbb5af": {
+    "key": "ITEM_18_0002",
+    "text": "Florescer de Canaã"
+  },
   "aa4626f6": {
     "key": "ITEM_25_0020",
     "text": "Pedra-artífice do Terror"
@@ -803,6 +839,14 @@
     "key": "ITEM_05_0000",
     "text": "Anima de Excavallion"
   },
+  "bcdbc4b6": {
+    "key": "ITEM_25_0130",
+    "text": "Pedra-artífice do Terror"
+  },
+  "be6124ad": {
+    "key": "ITEM_27_0130",
+    "text": "Pedra-artífice da Fortificação"
+  },
   "bee8897d": {
     "key": "ITEM_22_0000",
     "text": "Escama de Dragão"