From 47aa4dde5c86e2b31933189f88503873ce9f7e3f Mon Sep 17 00:00:00 2001 From: Jaysyn904 <68194417+Jaysyn904@users.noreply.github.com> Date: Sun, 3 Mar 2024 20:23:34 -0500 Subject: [PATCH] Updated for PRC8 update Updated for PRC8 update --- _module/PackModule.cmd | 2 +- _module/UnpackModule.cmd | 2 +- _module/ifo/module.ifo.json | 165 +++++----------- _module/ncs/array_example.ncs | Bin 7973 -> 0 bytes _module/nss/array_example.nss | 144 -------------- _module/nss/nwnx_data.nss | 351 ---------------------------------- 6 files changed, 53 insertions(+), 611 deletions(-) delete mode 100644 _module/ncs/array_example.ncs delete mode 100644 _module/nss/array_example.nss delete mode 100644 _module/nss/nwnx_data.nss diff --git a/_module/PackModule.cmd b/_module/PackModule.cmd index 782733ed..2c33f388 100644 --- a/_module/PackModule.cmd +++ b/_module/PackModule.cmd @@ -1 +1 @@ -Module.Packer.exe "Anphillia Unlimited [PRC8-CEP2].mod" p \ No newline at end of file +Module.Packer.exe "Anphillia Unlimited [PRC8-CEP3].mod" p \ No newline at end of file diff --git a/_module/UnpackModule.cmd b/_module/UnpackModule.cmd index 478eb0d0..fc79ca35 100644 --- a/_module/UnpackModule.cmd +++ b/_module/UnpackModule.cmd @@ -1 +1 @@ -Module.Packer.exe "Anphillia Unlimited [PRC8-CEP2].mod" u \ No newline at end of file +Module.Packer.exe "Anphillia Unlimited [PRC8-CEP3].mod" u \ No newline at end of file diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json index 80ecb6e1..532afd31 100644 --- a/_module/ifo/module.ifo.json +++ b/_module/ifo/module.ifo.json @@ -2339,7 +2339,7 @@ }, "Mod_CustomTlk": { "type": "cexostring", - "value": "prc8_cep269_mrg" + "value": "prc8_cep3_merge" }, "Mod_CutSceneList": { "type": "list", @@ -2409,7 +2409,7 @@ "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "prc8_cep269_mrg" + "value": "prc8_cep3_merge" } }, { @@ -2430,7 +2430,7 @@ "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "prc8_newspellbook" + "value": "prc8_nsb" } }, { @@ -2489,6 +2489,13 @@ "value": "prc8_craft2das" } }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_2das" + } + }, { "__struct_id": 8, "Mod_Hak": { @@ -2496,6 +2503,41 @@ "value": "cep3_armor" } }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_core0" + } + }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_core1" + } + }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_core2" + } + }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_core3" + } + }, + { + "__struct_id": 8, + "Mod_Hak": { + "type": "cexostring", + "value": "cep3_doors" + } + }, { "__struct_id": 8, "Mod_Hak": { @@ -2514,140 +2556,35 @@ "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "cep2_add_ee" + "value": "cep3_phenos" } }, { "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "cep2_add_doors" + "value": "cep3_portraits" } }, { "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "cep2_add_reforge" + "value": "cep3_reforge" } }, { "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "cep2_add_loads" + "value": "cep3_skies" } }, { "__struct_id": 8, "Mod_Hak": { "type": "cexostring", - "value": "cep2_add_phenos1" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_phenos2" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_phenos3" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_phenos4" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_skies" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_tiles1" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_add_tiles2" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_top_2_69" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core0" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core1" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core2" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core3" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core4" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core5" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core6" - } - }, - { - "__struct_id": 8, - "Mod_Hak": { - "type": "cexostring", - "value": "cep2_core7" + "value": "cep3_tiles" } } ] @@ -2671,7 +2608,7 @@ "Mod_Name": { "type": "cexolocstring", "value": { - "0": "Anphillia Unlimited [PRC8-CEP2]" + "0": "Anphillia Unlimited [PRC8-CEP3]" } }, "Mod_OnAcquirItem": { diff --git a/_module/ncs/array_example.ncs b/_module/ncs/array_example.ncs deleted file mode 100644 index 934bf671f0ba0c47d7ed50ddff95a545822d8248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7973 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 cAw index >= 0. -/// @ingroup data -/// @param obj The object. -/// @param tag The tag. -/// @param index The index. -/// @param element The element. -/// @{ -void NWNX_Data_Array_Insert_Flt(object obj, string tag, int index, float element); -void NWNX_Data_Array_Insert_Int(object obj, string tag, int index, int element); -void NWNX_Data_Array_Insert_Obj(object obj, string tag, int index, object element); -void NWNX_Data_Array_Insert_Str(object obj, string tag, int index, string element); -/// @} - -/// @defgroup data_array_pushback Array Pushback -/// @brief Pushes an element to the back of the collection. -/// @remark Functionally identical to an insert at index size-1. -/// @ingroup data -/// @param obj The object. -/// @param tag The tag. -/// @param element The element. -/// @{ -void NWNX_Data_Array_PushBack_Flt(object obj, string tag, float element); -void NWNX_Data_Array_PushBack_Int(object obj, string tag, int element); -void NWNX_Data_Array_PushBack_Obj(object obj, string tag, object element); -void NWNX_Data_Array_PushBack_Str(object obj, string tag, string element); -/// @} - -/// Resizes the array. If the array is shrinking, it chops off elements at the ned. -void NWNX_Data_Array_Resize(int type, object obj, string tag, int size); - -/// Reorders the array such each possible permutation of elements has equal probability of appearance. -void NWNX_Data_Array_Shuffle(int type, object obj, string tag); - -/// Returns the size of the array. -int NWNX_Data_Array_Size(int type, object obj, string tag); - -/// Sorts the collection based on descending order. -void NWNX_Data_Array_SortAscending(int type, object obj, string tag); - -/// Sorts the collection based on descending order. -void NWNX_Data_Array_SortDescending(int type, object obj, string tag); - -/// @defgroup data_array_set Array Set -/// @brief Sets the element at the index, where size > index >= 0. -/// @ingroup data -/// @param obj The object. -/// @param tag The tag. -/// @param index The index. -/// @param element The element. -/// @{ -void NWNX_Data_Array_Set_Flt(object obj, string tag, int index, float element); -void NWNX_Data_Array_Set_Int(object obj, string tag, int index, int element); -void NWNX_Data_Array_Set_Obj(object obj, string tag, int index, object element); -void NWNX_Data_Array_Set_Str(object obj, string tag, int index, string element); -/// @} - -/// @} - -//////////////////////////////////////////////////////////////////////////////// -// return the value contained in location "index" -string NWNX_Data_Array_At_Str(object obj, string tag, int index) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_At_Str(tag, index, obj); -} - -float NWNX_Data_Array_At_Flt(object obj, string tag, int index) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_At_Flt(tag, index, obj); -} - -int NWNX_Data_Array_At_Int(object obj, string tag, int index) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_At_Int(tag, index, obj); -} - -object NWNX_Data_Array_At_Obj(object obj, string tag, int index) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_At_Obj(tag, index, obj); -} - -void NWNX_Data_Array_Clear(int type, object obj, string tag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Clear(tag, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Return true/value (1/0) if the array contains the value "element" -int NWNX_Data_Array_Contains_Str(object obj, string tag, string element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Contains_Str(tag, element, obj); -} - -int NWNX_Data_Array_Contains_Flt(object obj, string tag, float element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Contains_Flt(tag, element, obj); -} - -int NWNX_Data_Array_Contains_Int(object obj, string tag, int element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Contains_Int(tag, element, obj); -} - -int NWNX_Data_Array_Contains_Obj(object obj, string tag, object element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Contains_Obj(tag, element, obj); -} - - -//////////////////////////////////////////////////////////////////////////////// -void NWNX_Data_Array_Copy(int type, object obj, string tag, string otherTag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Copy(tag, otherTag, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -void NWNX_Data_Array_Erase(int type, object obj, string tag, int index) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Erase(tag, index, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// return the index in the array containing "element" -// if not found, return NWNX_DATA_INVALID_INDEX -int NWNX_Data_Array_Find_Str(object obj, string tag, string element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Find_Str(tag, element, obj); -} - -int NWNX_Data_Array_Find_Flt(object obj, string tag, float element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Find_Flt(tag, element, obj); -} - -int NWNX_Data_Array_Find_Int(object obj, string tag, int element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Find_Int(tag, element, obj); -} - -int NWNX_Data_Array_Find_Obj(object obj, string tag, object element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Find_Obj(tag, element, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Insert a new element into position 'index'. If index is beyond the number of rows in the array, -// this will quietly fail. This could be changed if you wanted to support sparse -// arrays. -void NWNX_Data_Array_Insert_Str(object obj, string tag, int index, string element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Insert_Str(tag, index, element, obj); -} - -void NWNX_Data_Array_Insert_Flt(object obj, string tag, int index, float element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Insert_Flt(tag, index, element, obj); -} - -void NWNX_Data_Array_Insert_Int(object obj, string tag, int index, int element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Insert_Int(tag, index, element, obj); -} - -void NWNX_Data_Array_Insert_Obj(object obj, string tag, int index, object element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Insert_Obj(tag, index, element, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Insert a new element at the end of the array. -void NWNX_Data_Array_PushBack_Str(object obj, string tag, string element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_PushBack_Str(tag, element, obj); -} - -void NWNX_Data_Array_PushBack_Flt(object obj, string tag, float element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_PushBack_Flt(tag, element, obj); -} - -void NWNX_Data_Array_PushBack_Int(object obj, string tag, int element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_PushBack_Int(tag, element, obj); -} - -void NWNX_Data_Array_PushBack_Obj(object obj, string tag, object element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_PushBack_Obj(tag, element, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Cuts the array off at size 'size'. Elements beyond size are removed. -void NWNX_Data_Array_Resize(int type, object obj, string tag, int size) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Resize(tag, size, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -void NWNX_Data_Array_Shuffle(int type, object obj, string tag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Shuffle(tag, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -int NWNX_Data_Array_Size(int type, object obj, string tag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - return Array_Size(tag, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Sort the array by value according to 'direciton' (ASC or DESC) -// Note that this is a lexical sort, so sorting an array of ints or floats will have -// odd results -void NWNX_Data_Array_Sort(object obj, string tag, string direction) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Sort(tag, direction, TYPE_STRING, obj); -} - -void NWNX_Data_Array_SortAscending(int type, object obj, string tag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_SortAscending(tag, TYPE_STRING, obj); -} - -void NWNX_Data_Array_SortDescending(int type, object obj, string tag) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_SortDescending(tag, TYPE_STRING, obj); -} - -//////////////////////////////////////////////////////////////////////////////// -// Set the value of array index 'index' to a 'element' -// This will quietly eat values if index > array size -void NWNX_Data_Array_Set_Str(object obj, string tag, int index, string element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Set_Str(tag, index, element, obj); -} - -void NWNX_Data_Array_Set_Flt(object obj, string tag, int index, float element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Set_Flt(tag, index, element, obj); -} - -void NWNX_Data_Array_Set_Int(object obj, string tag, int index, int element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Set_Int(tag, index, element, obj); -} - -void NWNX_Data_Array_Set_Obj(object obj, string tag, int index, object element) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); - Array_Set_Obj(tag, index, element, obj); -}