diff --git a/_module/are/cityofbaleas.are.json b/_module/are/cityofbaleas.are.json index e9afe0ed..d87b92d3 100644 --- a/_module/are/cityofbaleas.are.json +++ b/_module/are/cityofbaleas.are.json @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 94 + "value": 95 }, "Width": { "type": "int", diff --git a/_module/dlg/re_cv_commoner.dlg.json b/_module/dlg/re_cv_commoner.dlg.json index dab36b42..e37b294e 100644 --- a/_module/dlg/re_cv_commoner.dlg.json +++ b/_module/dlg/re_cv_commoner.dlg.json @@ -9957,7 +9957,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -9984,7 +9984,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10011,7 +10011,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10038,7 +10038,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10065,7 +10065,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10092,7 +10092,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10119,7 +10119,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10146,7 +10146,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10173,7 +10173,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", @@ -10200,7 +10200,7 @@ "__struct_id": 0, "Key": { "type": "cexostring", - "value": "iDialogue" + "value": "iDialogueNum" }, "Value": { "type": "cexostring", diff --git a/_module/ncs/69_hen_combat.ncs b/_module/ncs/69_hen_combat.ncs index d1327b0a..ab9b5f77 100644 Binary files a/_module/ncs/69_hen_combat.ncs and b/_module/ncs/69_hen_combat.ncs differ diff --git a/_module/ncs/69_hen_conv.ncs b/_module/ncs/69_hen_conv.ncs index 6f963ee3..c25706dc 100644 Binary files a/_module/ncs/69_hen_conv.ncs and b/_module/ncs/69_hen_conv.ncs differ diff --git a/_module/ncs/69_hen_death.ncs b/_module/ncs/69_hen_death.ncs index 43be4f46..bb23168b 100644 Binary files a/_module/ncs/69_hen_death.ncs and b/_module/ncs/69_hen_death.ncs differ diff --git a/_module/ncs/69_hen_percep.ncs b/_module/ncs/69_hen_percep.ncs index 90d10c8b..58d08801 100644 Binary files a/_module/ncs/69_hen_percep.ncs and b/_module/ncs/69_hen_percep.ncs differ diff --git a/_module/ncs/69_hen_spawnin.ncs b/_module/ncs/69_hen_spawnin.ncs index 64cfc8fe..b454ebf9 100644 Binary files a/_module/ncs/69_hen_spawnin.ncs and b/_module/ncs/69_hen_spawnin.ncs differ diff --git a/_module/ncs/69_hench_cancast.ncs b/_module/ncs/69_hench_cancast.ncs index 27581b4e..5aa127c6 100644 Binary files a/_module/ncs/69_hench_cancast.ncs and b/_module/ncs/69_hench_cancast.ncs differ diff --git a/_module/ncs/69_hench_canlvl.ncs b/_module/ncs/69_hench_canlvl.ncs index 1e3b778a..5e5593ea 100644 Binary files a/_module/ncs/69_hench_canlvl.ncs and b/_module/ncs/69_hench_canlvl.ncs differ diff --git a/_module/ncs/69_hench_canwork.ncs b/_module/ncs/69_hench_canwork.ncs index 9298be86..db7b2c5a 100644 Binary files a/_module/ncs/69_hench_canwork.ncs and b/_module/ncs/69_hench_canwork.ncs differ diff --git a/_module/ncs/69_hench_crtrno1.ncs b/_module/ncs/69_hench_crtrno1.ncs index f2d8a930..f349f49f 100644 Binary files a/_module/ncs/69_hench_crtrno1.ncs and b/_module/ncs/69_hench_crtrno1.ncs differ diff --git a/_module/ncs/69_hench_crtrno2.ncs b/_module/ncs/69_hench_crtrno2.ncs index 31da9162..f49aba8f 100644 Binary files a/_module/ncs/69_hench_crtrno2.ncs and b/_module/ncs/69_hench_crtrno2.ncs differ diff --git a/_module/ncs/69_hench_crtrsmn.ncs b/_module/ncs/69_hench_crtrsmn.ncs index ef0f5128..1bcf18e3 100644 Binary files a/_module/ncs/69_hench_crtrsmn.ncs and b/_module/ncs/69_hench_crtrsmn.ncs differ diff --git a/_module/ncs/69_hench_crtruns.ncs b/_module/ncs/69_hench_crtruns.ncs index 3eb87862..69ccf662 100644 Binary files a/_module/ncs/69_hench_crtruns.ncs and b/_module/ncs/69_hench_crtruns.ncs differ diff --git a/_module/ncs/69_hench_crtrye1.ncs b/_module/ncs/69_hench_crtrye1.ncs index 67b79421..f17cb1d4 100644 Binary files a/_module/ncs/69_hench_crtrye1.ncs and b/_module/ncs/69_hench_crtrye1.ncs differ diff --git a/_module/ncs/69_hench_crtrye2.ncs b/_module/ncs/69_hench_crtrye2.ncs index 86ad306d..dcecffc3 100644 Binary files a/_module/ncs/69_hench_crtrye2.ncs and b/_module/ncs/69_hench_crtrye2.ncs differ diff --git a/_module/ncs/69_hench_destobj.ncs b/_module/ncs/69_hench_destobj.ncs index 39220a14..9ee294cc 100644 Binary files a/_module/ncs/69_hench_destobj.ncs and b/_module/ncs/69_hench_destobj.ncs differ diff --git a/_module/ncs/69_hench_didie.ncs b/_module/ncs/69_hench_didie.ncs index c4e2dae7..dddac67a 100644 Binary files a/_module/ncs/69_hench_didie.ncs and b/_module/ncs/69_hench_didie.ncs differ diff --git a/_module/ncs/69_hench_eqmelee.ncs b/_module/ncs/69_hench_eqmelee.ncs index f0560ffc..2f88224a 100644 Binary files a/_module/ncs/69_hench_eqmelee.ncs and b/_module/ncs/69_hench_eqmelee.ncs differ diff --git a/_module/ncs/69_hench_eqrange.ncs b/_module/ncs/69_hench_eqrange.ncs index 9e013df8..e7b5fd8f 100644 Binary files a/_module/ncs/69_hench_eqrange.ncs and b/_module/ncs/69_hench_eqrange.ncs differ diff --git a/_module/ncs/69_hench_eqswap.ncs b/_module/ncs/69_hench_eqswap.ncs index 0a8d2013..e45fb155 100644 Binary files a/_module/ncs/69_hench_eqswap.ncs and b/_module/ncs/69_hench_eqswap.ncs differ diff --git a/_module/ncs/69_hench_fire.ncs b/_module/ncs/69_hench_fire.ncs index f2806828..69ac20b6 100644 Binary files a/_module/ncs/69_hench_fire.ncs and b/_module/ncs/69_hench_fire.ncs differ diff --git a/_module/ncs/69_hench_fired.ncs b/_module/ncs/69_hench_fired.ncs index c7568136..1ed997dc 100644 Binary files a/_module/ncs/69_hench_fired.ncs and b/_module/ncs/69_hench_fired.ncs differ diff --git a/_module/ncs/69_hench_gomelee.ncs b/_module/ncs/69_hench_gomelee.ncs index 3b6c79cd..cd20e419 100644 Binary files a/_module/ncs/69_hench_gomelee.ncs and b/_module/ncs/69_hench_gomelee.ncs differ diff --git a/_module/ncs/69_hench_gorange.ncs b/_module/ncs/69_hench_gorange.ncs index 8369206d..93fb7531 100644 Binary files a/_module/ncs/69_hench_gorange.ncs and b/_module/ncs/69_hench_gorange.ncs differ diff --git a/_module/ncs/69_hench_hasdual.ncs b/_module/ncs/69_hench_hasdual.ncs index c447d261..167c984b 100644 Binary files a/_module/ncs/69_hench_hasdual.ncs and b/_module/ncs/69_hench_hasdual.ncs differ diff --git a/_module/ncs/69_hench_henchxp.ncs b/_module/ncs/69_hench_henchxp.ncs index ea1c41bf..f5711460 100644 Binary files a/_module/ncs/69_hench_henchxp.ncs and b/_module/ncs/69_hench_henchxp.ncs differ diff --git a/_module/ncs/69_hench_hire.ncs b/_module/ncs/69_hench_hire.ncs index eed92a7b..085c42a1 100644 Binary files a/_module/ncs/69_hench_hire.ncs and b/_module/ncs/69_hench_hire.ncs differ diff --git a/_module/ncs/69_hench_identfy.ncs b/_module/ncs/69_hench_identfy.ncs index 2ea70a30..bcd3e24d 100644 Binary files a/_module/ncs/69_hench_identfy.ncs and b/_module/ncs/69_hench_identfy.ncs differ diff --git a/_module/ncs/69_hench_level.ncs b/_module/ncs/69_hench_level.ncs index 2bd20118..849552c4 100644 Binary files a/_module/ncs/69_hench_level.ncs and b/_module/ncs/69_hench_level.ncs differ diff --git a/_module/ncs/69_hench_notevil.ncs b/_module/ncs/69_hench_notevil.ncs index fd613e5f..79e73ad1 100644 Binary files a/_module/ncs/69_hench_notevil.ncs and b/_module/ncs/69_hench_notevil.ncs differ diff --git a/_module/ncs/69_hench_pickup.ncs b/_module/ncs/69_hench_pickup.ncs index ebe20efe..c3a79cef 100644 Binary files a/_module/ncs/69_hench_pickup.ncs and b/_module/ncs/69_hench_pickup.ncs differ diff --git a/_module/ncs/69_hench_quit.ncs b/_module/ncs/69_hench_quit.ncs index 57514320..ca518b02 100644 Binary files a/_module/ncs/69_hench_quit.ncs and b/_module/ncs/69_hench_quit.ncs differ diff --git a/_module/ncs/69_hench_rangeno.ncs b/_module/ncs/69_hench_rangeno.ncs index 46c08814..1418dab5 100644 Binary files a/_module/ncs/69_hench_rangeno.ncs and b/_module/ncs/69_hench_rangeno.ncs differ diff --git a/_module/ncs/69_hench_rangeye.ncs b/_module/ncs/69_hench_rangeye.ncs index f4d73993..9939650b 100644 Binary files a/_module/ncs/69_hench_rangeye.ncs and b/_module/ncs/69_hench_rangeye.ncs differ diff --git a/_module/ncs/69_hench_scout1.ncs b/_module/ncs/69_hench_scout1.ncs index b08abb20..9ebcf906 100644 Binary files a/_module/ncs/69_hench_scout1.ncs and b/_module/ncs/69_hench_scout1.ncs differ diff --git a/_module/ncs/69_hench_scout2.ncs b/_module/ncs/69_hench_scout2.ncs index 55581975..d5ef50bb 100644 Binary files a/_module/ncs/69_hench_scout2.ncs and b/_module/ncs/69_hench_scout2.ncs differ diff --git a/_module/ncs/69_hench_switch.ncs b/_module/ncs/69_hench_switch.ncs index 1844e584..e63bb31d 100644 Binary files a/_module/ncs/69_hench_switch.ncs and b/_module/ncs/69_hench_switch.ncs differ diff --git a/_module/ncs/69_hench_switchn.ncs b/_module/ncs/69_hench_switchn.ncs index f401fef7..6ad5c38a 100644 Binary files a/_module/ncs/69_hench_switchn.ncs and b/_module/ncs/69_hench_switchn.ncs differ diff --git a/_module/ncs/69_hench_whatxp.ncs b/_module/ncs/69_hench_whatxp.ncs index ecf8b796..d45d4cf1 100644 Binary files a/_module/ncs/69_hench_whatxp.ncs and b/_module/ncs/69_hench_whatxp.ncs differ diff --git a/_module/ncs/69_henchscoutno.ncs b/_module/ncs/69_henchscoutno.ncs index 96cec1fd..9d7da327 100644 Binary files a/_module/ncs/69_henchscoutno.ncs and b/_module/ncs/69_henchscoutno.ncs differ diff --git a/_module/ncs/cv_10a_tar_fight.ncs b/_module/ncs/cv_10a_tar_fight.ncs index 2464c9c8..f7b5217c 100644 Binary files a/_module/ncs/cv_10a_tar_fight.ncs and b/_module/ncs/cv_10a_tar_fight.ncs differ diff --git a/_module/ncs/dungeon_enter.ncs b/_module/ncs/dungeon_enter.ncs index 9fc016f0..f1847ee3 100644 Binary files a/_module/ncs/dungeon_enter.ncs and b/_module/ncs/dungeon_enter.ncs differ diff --git a/_module/ncs/henchlvl_assasta.ncs b/_module/ncs/henchlvl_assasta.ncs index 3390b176..81c316ec 100644 Binary files a/_module/ncs/henchlvl_assasta.ncs and b/_module/ncs/henchlvl_assasta.ncs differ diff --git a/_module/ncs/henchlvl_barbta.ncs b/_module/ncs/henchlvl_barbta.ncs index 09d6e385..3c75458c 100644 Binary files a/_module/ncs/henchlvl_barbta.ncs and b/_module/ncs/henchlvl_barbta.ncs differ diff --git a/_module/ncs/henchlvl_bardta.ncs b/_module/ncs/henchlvl_bardta.ncs index f9f5ffa9..ab5cb052 100644 Binary files a/_module/ncs/henchlvl_bardta.ncs and b/_module/ncs/henchlvl_bardta.ncs differ diff --git a/_module/ncs/henchlvl_blackta.ncs b/_module/ncs/henchlvl_blackta.ncs index e58faeb6..2ab187ad 100644 Binary files a/_module/ncs/henchlvl_blackta.ncs and b/_module/ncs/henchlvl_blackta.ncs differ diff --git a/_module/ncs/henchlvl_clercta.ncs b/_module/ncs/henchlvl_clercta.ncs index 81fd882f..e0cffee8 100644 Binary files a/_module/ncs/henchlvl_clercta.ncs and b/_module/ncs/henchlvl_clercta.ncs differ diff --git a/_module/ncs/henchlvl_drgdsta.ncs b/_module/ncs/henchlvl_drgdsta.ncs index 5fe463b7..86e15c15 100644 Binary files a/_module/ncs/henchlvl_drgdsta.ncs and b/_module/ncs/henchlvl_drgdsta.ncs differ diff --git a/_module/ncs/henchlvl_druidta.ncs b/_module/ncs/henchlvl_druidta.ncs index 0d14cb3b..bc55f18a 100644 Binary files a/_module/ncs/henchlvl_druidta.ncs and b/_module/ncs/henchlvl_druidta.ncs differ diff --git a/_module/ncs/henchlvl_dvnchta.ncs b/_module/ncs/henchlvl_dvnchta.ncs index 149849e2..c1d491ab 100644 Binary files a/_module/ncs/henchlvl_dvnchta.ncs and b/_module/ncs/henchlvl_dvnchta.ncs differ diff --git a/_module/ncs/henchlvl_fightta.ncs b/_module/ncs/henchlvl_fightta.ncs index 1a2f9717..da384d6b 100644 Binary files a/_module/ncs/henchlvl_fightta.ncs and b/_module/ncs/henchlvl_fightta.ncs differ diff --git a/_module/ncs/henchlvl_harpeta.ncs b/_module/ncs/henchlvl_harpeta.ncs index 3af1fd62..2860c098 100644 Binary files a/_module/ncs/henchlvl_harpeta.ncs and b/_module/ncs/henchlvl_harpeta.ncs differ diff --git a/_module/ncs/henchlvl_monkta.ncs b/_module/ncs/henchlvl_monkta.ncs index 9117dd8c..bc059134 100644 Binary files a/_module/ncs/henchlvl_monkta.ncs and b/_module/ncs/henchlvl_monkta.ncs differ diff --git a/_module/ncs/henchlvl_palata.ncs b/_module/ncs/henchlvl_palata.ncs index 73d53bc4..adfeec13 100644 Binary files a/_module/ncs/henchlvl_palata.ncs and b/_module/ncs/henchlvl_palata.ncs differ diff --git a/_module/ncs/henchlvl_palemta.ncs b/_module/ncs/henchlvl_palemta.ncs index dd9b9541..1147fc02 100644 Binary files a/_module/ncs/henchlvl_palemta.ncs and b/_module/ncs/henchlvl_palemta.ncs differ diff --git a/_module/ncs/henchlvl_rangeta.ncs b/_module/ncs/henchlvl_rangeta.ncs index 21d0ea32..c1e004c0 100644 Binary files a/_module/ncs/henchlvl_rangeta.ncs and b/_module/ncs/henchlvl_rangeta.ncs differ diff --git a/_module/ncs/henchlvl_rogta.ncs b/_module/ncs/henchlvl_rogta.ncs index e18ab3a2..8a6e875e 100644 Binary files a/_module/ncs/henchlvl_rogta.ncs and b/_module/ncs/henchlvl_rogta.ncs differ diff --git a/_module/ncs/henchlvl_shadota.ncs b/_module/ncs/henchlvl_shadota.ncs index 50f54673..c5cb565b 100644 Binary files a/_module/ncs/henchlvl_shadota.ncs and b/_module/ncs/henchlvl_shadota.ncs differ diff --git a/_module/ncs/henchlvl_shiftta.ncs b/_module/ncs/henchlvl_shiftta.ncs index 27f5868a..535bd106 100644 Binary files a/_module/ncs/henchlvl_shiftta.ncs and b/_module/ncs/henchlvl_shiftta.ncs differ diff --git a/_module/ncs/henchlvl_sorceta.ncs b/_module/ncs/henchlvl_sorceta.ncs index 99c2ea0e..1d2780ce 100644 Binary files a/_module/ncs/henchlvl_sorceta.ncs and b/_module/ncs/henchlvl_sorceta.ncs differ diff --git a/_module/ncs/henchlvl_wizarta.ncs b/_module/ncs/henchlvl_wizarta.ncs index b95d95f6..20f83ae5 100644 Binary files a/_module/ncs/henchlvl_wizarta.ncs and b/_module/ncs/henchlvl_wizarta.ncs differ diff --git a/_module/ncs/henchlvl_wpnmsta.ncs b/_module/ncs/henchlvl_wpnmsta.ncs index bb6aedc8..ce87c35d 100644 Binary files a/_module/ncs/henchlvl_wpnmsta.ncs and b/_module/ncs/henchlvl_wpnmsta.ncs differ diff --git a/_module/ncs/ra_mod_onnui.ncs b/_module/ncs/ra_mod_onnui.ncs index 690fc08c..ac636544 100644 Binary files a/_module/ncs/ra_mod_onnui.ncs and b/_module/ncs/ra_mod_onnui.ncs differ diff --git a/_module/ncs/re_common_spawn.ncs b/_module/ncs/re_common_spawn.ncs index 70631229..401da5f9 100644 Binary files a/_module/ncs/re_common_spawn.ncs and b/_module/ncs/re_common_spawn.ncs differ diff --git a/_module/ncs/rnd_commoner_cv.ncs b/_module/ncs/rnd_commoner_cv.ncs index 8990d669..b40612d5 100644 Binary files a/_module/ncs/rnd_commoner_cv.ncs and b/_module/ncs/rnd_commoner_cv.ncs differ diff --git a/_module/ncs/rnd_rumor_cv.ncs b/_module/ncs/rnd_rumor_cv.ncs index 604dd491..1173e830 100644 Binary files a/_module/ncs/rnd_rumor_cv.ncs and b/_module/ncs/rnd_rumor_cv.ncs differ diff --git a/_module/ncs/sc_ra_rnd_rumors.ncs b/_module/ncs/sc_ra_rnd_rumors.ncs index f051b22c..e61c101d 100644 Binary files a/_module/ncs/sc_ra_rnd_rumors.ncs and b/_module/ncs/sc_ra_rnd_rumors.ncs differ diff --git a/_module/ncs/x2_def_ondisturb.ncs b/_module/ncs/x2_def_ondisturb.ncs index 676d4335..cc5bfffe 100644 Binary files a/_module/ncs/x2_def_ondisturb.ncs and b/_module/ncs/x2_def_ondisturb.ncs differ diff --git a/_module/ncs/x2_mod_def_load.ncs b/_module/ncs/x2_mod_def_load.ncs index 66a21f0a..d74f1541 100644 Binary files a/_module/ncs/x2_mod_def_load.ncs and b/_module/ncs/x2_mod_def_load.ncs differ diff --git a/_module/nss/re_common_spawn.nss b/_module/nss/re_common_spawn.nss index 5959a062..3755b9d4 100644 --- a/_module/nss/re_common_spawn.nss +++ b/_module/nss/re_common_spawn.nss @@ -19,6 +19,11 @@ void main() { + +//:: Set dialog variable for rumor system + SetLocalInt(OBJECT_SELF, "iDialogue", Random(10) + 1); + SetLocalInt(OBJECT_SELF, "iRumor", Random(60) + 1); + // Randomize Skin Tone rnd_skin(OBJECT_SELF); @@ -100,10 +105,6 @@ void main() // DEFAULT GENERIC BEHAVIOR (DO NOT TOUCH) ***************************************************************************************** - SetLocalInt(OBJECT_SELF, "iDialogue", Random(10) + 1); - - SetLocalInt(OBJECT_SELF, "iRumor", Random(60) + 1); - SetListeningPatterns(); // Goes through and sets up which shouts the NPC will listen to. //WalkWayPoints(); // Optional Parameter: void WalkWayPoints(int nRun = FALSE, float fPause = 1.0) // 1. Looks to see if any Way Points in the module have the tag "WP_" + NPC TAG + "_0X", if so walk them diff --git a/_module/nss/rnd_commoner_cv.nss b/_module/nss/rnd_commoner_cv.nss index 11b17073..ce2e9222 100644 --- a/_module/nss/rnd_commoner_cv.nss +++ b/_module/nss/rnd_commoner_cv.nss @@ -1,4 +1,5 @@ void main() { -SetLocalInt(OBJECT_SELF, "iDialogue", Random(10) + 1); + DelayCommand(0.0f, SetLocalInt(OBJECT_SELF, "iDialogue", Random(10) + 1)); + DelayCommand(0.0f, SetLocalInt(OBJECT_SELF, "iRumor", Random(60) + 1)); } diff --git a/_module/nss/rnd_rumor_cv.nss b/_module/nss/rnd_rumor_cv.nss index dd594987..ed3b091c 100644 --- a/_module/nss/rnd_rumor_cv.nss +++ b/_module/nss/rnd_rumor_cv.nss @@ -1,4 +1,4 @@ void main() { - SetLocalInt(OBJECT_SELF, "iRumor", Random(60) + 1); + DelayCommand(0.0f, SetLocalInt(OBJECT_SELF, "iRumor", Random(60) + 1)); } diff --git a/_module/nss/sc_ra_rnd_rumors.nss b/_module/nss/sc_ra_rnd_rumors.nss index ffa5ad50..16588eec 100644 --- a/_module/nss/sc_ra_rnd_rumors.nss +++ b/_module/nss/sc_ra_rnd_rumors.nss @@ -3,10 +3,13 @@ int StartingConditional() { - object oSelf = OBJECT_SELF; - string sParam = GetScriptParam("iRumorNum"); - int nCheck = GetLocalInt(oSelf, "iRumor"); - if (!nCheck) // if no random value yet + object oSelf = OBJECT_SELF; + + string sParam = GetScriptParam("iRumourNum"); + int nCheck = GetLocalInt(oSelf, "iRumor"); + +//:: Set a random value if var doesn't exist + if (!nCheck) SetLocalInt(oSelf, "iRumor", Random(60)+1); int nVal = StringToInt(sParam); @@ -15,5 +18,6 @@ int StartingConditional() DeleteLocalInt(oSelf, "iRumor"); return TRUE; } + return FALSE; } diff --git a/_module/nss/x2_def_ondisturb.nss b/_module/nss/x2_def_ondisturb.nss index 45b3db7a..04e000f5 100644 --- a/_module/nss/x2_def_ondisturb.nss +++ b/_module/nss/x2_def_ondisturb.nss @@ -17,6 +17,6 @@ void main() ExecuteScript("nw_c2_default8", OBJECT_SELF); //:: Execute the PRC NPC OnDisturbed script - ExecuteScript("prc_npc_blocked", OBJECT_SELF); + ExecuteScript("prc_npc_disturb", OBJECT_SELF); } diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index 0751697e..857b4326 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ diff --git a/_module/utc/npc_com_dw_f001.utc.json b/_module/utc/npc_com_dw_f001.utc.json index 7ac3ab3c..d73b288b 100644 --- a/_module/utc/npc_com_dw_f001.utc.json +++ b/_module/utc/npc_com_dw_f001.utc.json @@ -800,5 +800,81 @@ "Wis": { "type": "byte", "value": 10 + }, + "xAppearance_Head": { + "type": "word", + "value": 8 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_Belt": { + "type": "word", + "value": 0 + }, + "xBodyPart_LBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_LHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_LThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Neck": { + "type": "word", + "value": 1 + }, + "xBodyPart_Pelvis": { + "type": "word", + "value": 1 + }, + "xBodyPart_RBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_RFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_RHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_RThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Torso": { + "type": "word", + "value": 1 } } diff --git a/_module/utc/npc_com_hu_m001.utc.json b/_module/utc/npc_com_hu_m001.utc.json index 97257870..0c46130c 100644 --- a/_module/utc/npc_com_hu_m001.utc.json +++ b/_module/utc/npc_com_hu_m001.utc.json @@ -773,5 +773,81 @@ "Wis": { "type": "byte", "value": 12 + }, + "xAppearance_Head": { + "type": "word", + "value": 1 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_Belt": { + "type": "word", + "value": 0 + }, + "xBodyPart_LBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_LHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_LThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Neck": { + "type": "word", + "value": 1 + }, + "xBodyPart_Pelvis": { + "type": "word", + "value": 1 + }, + "xBodyPart_RBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_RFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_RHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_RThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Torso": { + "type": "word", + "value": 1 } } diff --git a/_module/utc/npc_nob_hu_f001.utc.json b/_module/utc/npc_nob_hu_f001.utc.json index d633ebc1..07a740ee 100644 --- a/_module/utc/npc_nob_hu_f001.utc.json +++ b/_module/utc/npc_nob_hu_f001.utc.json @@ -822,5 +822,81 @@ "Wis": { "type": "byte", "value": 12 + }, + "xAppearance_Head": { + "type": "word", + "value": 1 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_Belt": { + "type": "word", + "value": 0 + }, + "xBodyPart_LBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_LHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_LThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Neck": { + "type": "word", + "value": 1 + }, + "xBodyPart_Pelvis": { + "type": "word", + "value": 1 + }, + "xBodyPart_RBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_RFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_RHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_RThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Torso": { + "type": "word", + "value": 1 } }