diff --git a/_module/dlg/x0_skill_ctrap.dlg.json b/_module/dlg/x0_skill_ctrap.dlg.json index 920bd79..6c5db9c 100644 --- a/_module/dlg/x0_skill_ctrap.dlg.json +++ b/_module/dlg/x0_skill_ctrap.dlg.json @@ -115151,7 +115151,7 @@ "__struct_id": 0, "Active": { "type": "resref", - "value": "dm_reads_line" + "value": "" }, "ConditionParams": { "type": "list", @@ -115208,7 +115208,7 @@ "__struct_id": 3, "Active": { "type": "resref", - "value": "dm_reads_line" + "value": "" }, "ConditionParams": { "type": "list", @@ -115341,7 +115341,7 @@ "__struct_id": 10, "Active": { "type": "resref", - "value": "dm_reads_line" + "value": "" }, "ConditionParams": { "type": "list", @@ -121041,7 +121041,7 @@ "__struct_id": 0, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121060,7 +121060,7 @@ "__struct_id": 1, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121079,7 +121079,7 @@ "__struct_id": 2, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121098,7 +121098,7 @@ "__struct_id": 3, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121117,7 +121117,7 @@ "__struct_id": 4, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121136,7 +121136,7 @@ "__struct_id": 5, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121155,7 +121155,7 @@ "__struct_id": 6, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121174,7 +121174,7 @@ "__struct_id": 7, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121193,7 +121193,7 @@ "__struct_id": 8, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", @@ -121212,7 +121212,7 @@ "__struct_id": 9, "Active": { "type": "resref", - "value": "fake_conditional" + "value": "" }, "ConditionParams": { "type": "list", diff --git a/_module/ncs/gc_ac_is_ok.ncs b/_module/ncs/gc_ac_is_ok.ncs index b1306c9..2825c7a 100644 Binary files a/_module/ncs/gc_ac_is_ok.ncs and b/_module/ncs/gc_ac_is_ok.ncs differ diff --git a/_module/ncs/gc_dmg_bonus_ok.ncs b/_module/ncs/gc_dmg_bonus_ok.ncs index 7b71c3d..e6b6272 100644 Binary files a/_module/ncs/gc_dmg_bonus_ok.ncs and b/_module/ncs/gc_dmg_bonus_ok.ncs differ diff --git a/_module/ncs/gc_is_a_wpn.ncs b/_module/ncs/gc_is_a_wpn.ncs index 3b49055..dda1164 100644 Binary files a/_module/ncs/gc_is_a_wpn.ncs and b/_module/ncs/gc_is_a_wpn.ncs differ diff --git a/_module/ncs/gc_is_meleewpn.ncs b/_module/ncs/gc_is_meleewpn.ncs index 0df863f..c2efbf9 100644 Binary files a/_module/ncs/gc_is_meleewpn.ncs and b/_module/ncs/gc_is_meleewpn.ncs differ diff --git a/_module/ncs/gc_mascrits_ok.ncs b/_module/ncs/gc_mascrits_ok.ncs index 4a94da3..4f91343 100644 Binary files a/_module/ncs/gc_mascrits_ok.ncs and b/_module/ncs/gc_mascrits_ok.ncs differ diff --git a/_module/ncs/gc_regen_ok.ncs b/_module/ncs/gc_regen_ok.ncs index 7102855..06f7220 100644 Binary files a/_module/ncs/gc_regen_ok.ncs and b/_module/ncs/gc_regen_ok.ncs differ diff --git a/_module/ncs/gc_vamp_regn_ok.ncs b/_module/ncs/gc_vamp_regn_ok.ncs index bced430..ea38944 100644 Binary files a/_module/ncs/gc_vamp_regn_ok.ncs and b/_module/ncs/gc_vamp_regn_ok.ncs differ diff --git a/_module/ncs/idcust_righthand.ncs b/_module/ncs/idcust_righthand.ncs index 279a87a..a77bff6 100644 Binary files a/_module/ncs/idcust_righthand.ncs and b/_module/ncs/idcust_righthand.ncs differ diff --git a/_module/nss/gc_ac_is_ok.nss b/_module/nss/gc_ac_is_ok.nss index d428a4b..9efcecc 100644 --- a/_module/nss/gc_ac_is_ok.nss +++ b/_module/nss/gc_ac_is_ok.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -42,11 +44,27 @@ int StartingConditional() nType== BASE_ITEM_DART || nType== BASE_ITEM_SHURIKEN || nType== BASE_ITEM_THROWINGAXE || - nType == BASE_ITEM_HEAVYCROSSBOW || - nType == BASE_ITEM_LIGHTCROSSBOW || - nType == BASE_ITEM_LONGBOW || - nType == BASE_ITEM_SHORTBOW || - nType == BASE_ITEM_SLING) + nType== BASE_ITEM_HEAVYCROSSBOW || + nType== BASE_ITEM_LIGHTCROSSBOW || + nType== BASE_ITEM_LONGBOW || + nType== BASE_ITEM_SHORTBOW || + nType== BASE_ITEM_SLING || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) //If it's a weapon don't show the line! return FALSE; diff --git a/_module/nss/gc_dmg_bonus_ok.nss b/_module/nss/gc_dmg_bonus_ok.nss index 868acc0..0de72f2 100644 --- a/_module/nss/gc_dmg_bonus_ok.nss +++ b/_module/nss/gc_dmg_bonus_ok.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -44,7 +46,22 @@ int StartingConditional() nType== BASE_ITEM_DART || nType== BASE_ITEM_SHURIKEN || nType== BASE_ITEM_THROWINGAXE || - + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE || //Bows & X-Bows cannot have damage! //nType == BASE_ITEM_HEAVYCROSSBOW || //nType == BASE_ITEM_LIGHTCROSSBOW || diff --git a/_module/nss/gc_is_a_wpn.nss b/_module/nss/gc_is_a_wpn.nss index 138e1de..d4fd419 100644 --- a/_module/nss/gc_is_a_wpn.nss +++ b/_module/nss/gc_is_a_wpn.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -45,7 +47,23 @@ int StartingConditional() nType == BASE_ITEM_LIGHTCROSSBOW || nType == BASE_ITEM_LONGBOW || nType == BASE_ITEM_SHORTBOW || - nType == BASE_ITEM_SLING) + nType == BASE_ITEM_SLING || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) return TRUE; diff --git a/_module/nss/gc_is_meleewpn.nss b/_module/nss/gc_is_meleewpn.nss index c1f28eb..ca2ca7f 100644 --- a/_module/nss/gc_is_meleewpn.nss +++ b/_module/nss/gc_is_meleewpn.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -38,7 +40,23 @@ int StartingConditional() nType== BASE_ITEM_WHIP || nType== BASE_ITEM_DART || nType== BASE_ITEM_SHURIKEN || - nType== BASE_ITEM_THROWINGAXE) + nType== BASE_ITEM_THROWINGAXE || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) return TRUE; diff --git a/_module/nss/gc_mascrits_ok.nss b/_module/nss/gc_mascrits_ok.nss index ed0e63a..3250ae8 100644 --- a/_module/nss/gc_mascrits_ok.nss +++ b/_module/nss/gc_mascrits_ok.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -39,11 +41,27 @@ int StartingConditional() nType== BASE_ITEM_DART || nType== BASE_ITEM_SHURIKEN || nType== BASE_ITEM_THROWINGAXE || - nType == BASE_ITEM_HEAVYCROSSBOW || - nType == BASE_ITEM_LIGHTCROSSBOW || - nType == BASE_ITEM_LONGBOW || - nType == BASE_ITEM_SHORTBOW || - nType == BASE_ITEM_SLING) + nType== BASE_ITEM_HEAVYCROSSBOW || + nType== BASE_ITEM_LIGHTCROSSBOW || + nType== BASE_ITEM_LONGBOW || + nType== BASE_ITEM_SHORTBOW || + nType== BASE_ITEM_SLING || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) return TRUE; diff --git a/_module/nss/gc_regen_ok.nss b/_module/nss/gc_regen_ok.nss index d960164..976ff8b 100644 --- a/_module/nss/gc_regen_ok.nss +++ b/_module/nss/gc_regen_ok.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -29,11 +31,27 @@ int StartingConditional() nType== BASE_ITEM_TOWERSHIELD || nType== BASE_ITEM_TRIDENT || nType== BASE_ITEM_TWOBLADEDSWORD || - nType == BASE_ITEM_HEAVYCROSSBOW || - nType == BASE_ITEM_LIGHTCROSSBOW || - nType == BASE_ITEM_LONGBOW || - nType == BASE_ITEM_SHORTBOW || - nType == BASE_ITEM_SLING) + nType== BASE_ITEM_HEAVYCROSSBOW || + nType== BASE_ITEM_LIGHTCROSSBOW || + nType== BASE_ITEM_LONGBOW || + nType== BASE_ITEM_SHORTBOW || + nType== BASE_ITEM_SLING || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) //If it's a weapon or amor show the line! return TRUE; diff --git a/_module/nss/gc_vamp_regn_ok.nss b/_module/nss/gc_vamp_regn_ok.nss index d6f2e71..a637fe6 100644 --- a/_module/nss/gc_vamp_regn_ok.nss +++ b/_module/nss/gc_vamp_regn_ok.nss @@ -1,3 +1,5 @@ +#include "prc_misc_const" + int StartingConditional() { object oPC = GetPCSpeaker(); @@ -41,7 +43,23 @@ int StartingConditional() nType== BASE_ITEM_BULLET || nType== BASE_ITEM_DART || nType== BASE_ITEM_SHURIKEN || - nType== BASE_ITEM_THROWINGAXE) + nType== BASE_ITEM_THROWINGAXE || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE) return TRUE; diff --git a/_module/nss/idcust_righthand.nss b/_module/nss/idcust_righthand.nss index bf2cd6c..7e90a89 100644 --- a/_module/nss/idcust_righthand.nss +++ b/_module/nss/idcust_righthand.nss @@ -1,46 +1,64 @@ +#include "prc_misc_const" + int StartingConditional() { object oPlayer = GetPCSpeaker(); object oItem = GetItemInSlot( INVENTORY_SLOT_RIGHTHAND, oPlayer); - int iItemtype = GetBaseItemType( oItem); + int nType = GetBaseItemType( oItem); //weapons - if( iItemtype == BASE_ITEM_BASTARDSWORD || - iItemtype == BASE_ITEM_BATTLEAXE || - iItemtype == BASE_ITEM_CLUB || - iItemtype == BASE_ITEM_DAGGER || - iItemtype == BASE_ITEM_DART || - iItemtype == BASE_ITEM_DIREMACE || - iItemtype == BASE_ITEM_DOUBLEAXE || - iItemtype == BASE_ITEM_DWARVENWARAXE || - iItemtype == BASE_ITEM_GREATAXE || - iItemtype == BASE_ITEM_GREATSWORD || - iItemtype == BASE_ITEM_HALBERD || - iItemtype == BASE_ITEM_HANDAXE || - iItemtype == BASE_ITEM_HEAVYCROSSBOW || - iItemtype == BASE_ITEM_HEAVYFLAIL || - iItemtype == BASE_ITEM_KAMA || - iItemtype == BASE_ITEM_KATANA || - iItemtype == BASE_ITEM_KUKRI || - iItemtype == BASE_ITEM_LIGHTCROSSBOW || - iItemtype == BASE_ITEM_LIGHTFLAIL || - iItemtype == BASE_ITEM_LIGHTHAMMER || - iItemtype == BASE_ITEM_LIGHTMACE || - iItemtype == BASE_ITEM_LONGBOW || - iItemtype == BASE_ITEM_LONGSWORD || - iItemtype == BASE_ITEM_MAGICSTAFF || - iItemtype == BASE_ITEM_MORNINGSTAR || - iItemtype == BASE_ITEM_QUARTERSTAFF || - iItemtype == BASE_ITEM_RAPIER || - iItemtype == BASE_ITEM_SCIMITAR || - iItemtype == BASE_ITEM_SCYTHE || - iItemtype == BASE_ITEM_SHORTBOW || - iItemtype == BASE_ITEM_SHORTSPEAR || - iItemtype == BASE_ITEM_SHORTSWORD || - iItemtype == BASE_ITEM_SICKLE || - iItemtype == BASE_ITEM_SLING || - iItemtype == BASE_ITEM_TWOBLADEDSWORD || - iItemtype ==BASE_ITEM_WARHAMMER + if( nType== BASE_ITEM_BASTARDSWORD || + nType== BASE_ITEM_BATTLEAXE || + nType== BASE_ITEM_CLUB || + nType== BASE_ITEM_DAGGER || + nType== BASE_ITEM_DART || + nType== BASE_ITEM_DIREMACE || + nType== BASE_ITEM_DOUBLEAXE || + nType== BASE_ITEM_DWARVENWARAXE || + nType== BASE_ITEM_GREATAXE || + nType== BASE_ITEM_GREATSWORD || + nType== BASE_ITEM_HALBERD || + nType== BASE_ITEM_HANDAXE || + nType== BASE_ITEM_HEAVYCROSSBOW || + nType== BASE_ITEM_HEAVYFLAIL || + nType== BASE_ITEM_KAMA || + nType== BASE_ITEM_KATANA || + nType== BASE_ITEM_KUKRI || + nType== BASE_ITEM_LIGHTCROSSBOW || + nType== BASE_ITEM_LIGHTFLAIL || + nType== BASE_ITEM_LIGHTHAMMER || + nType== BASE_ITEM_LIGHTMACE || + nType== BASE_ITEM_LONGBOW || + nType== BASE_ITEM_LONGSWORD || + nType== BASE_ITEM_MAGICSTAFF || + nType== BASE_ITEM_MORNINGSTAR || + nType== BASE_ITEM_QUARTERSTAFF || + nType== BASE_ITEM_RAPIER || + nType== BASE_ITEM_SCIMITAR || + nType== BASE_ITEM_SCYTHE || + nType== BASE_ITEM_SHORTBOW || + nType== BASE_ITEM_SHORTSPEAR || + nType== BASE_ITEM_SHORTSWORD || + nType== BASE_ITEM_SICKLE || + nType== BASE_ITEM_SLING || + nType== BASE_ITEM_TWOBLADEDSWORD || + nType==BASE_ITEM_WARHAMMER || + nType== BASE_ITEM_LIGHT_LANCE || + nType== BASE_ITEM_HEAVY_PICK || + nType== BASE_ITEM_LIGHT_PICK || + nType== BASE_ITEM_SAI || + nType== BASE_ITEM_NUNCHAKU || + nType== BASE_ITEM_FALCHION || + nType== BASE_ITEM_SAP || + nType== BASE_ITEM_KATAR || + nType== BASE_ITEM_HEAVY_MACE || + nType== BASE_ITEM_MAUL || + nType== BASE_ITEM_DOUBLE_SCIMITAR || + nType== BASE_ITEM_GOAD || + nType== BASE_ITEM_EAGLE_CLAW || + nType== BASE_ITEM_ELVEN_LIGHTBLADE || + nType== BASE_ITEM_ELVEN_THINBLADE || + nType== BASE_ITEM_ELVEN_COURTBLADE ) //then { return TRUE; diff --git a/_release/Underworld 2 [PRC8-CEP3].7z b/_release/Underworld 2 [PRC8-CEP3].7z index c0cd844..794bffd 100644 Binary files a/_release/Underworld 2 [PRC8-CEP3].7z and b/_release/Underworld 2 [PRC8-CEP3].7z differ