moved party function into a shared library, implemented stealth, anim…

…al empathy, pickpocket, and dialogue skill xp closes #630 closes #239
The-Frozen-North · Sep 22, 2023 · 4cdfc06 · 4cdfc06
1 parent d4b9784
commit 4cdfc06
Show file tree

Hide file tree

Showing 35 changed files with 430 additions and 178 deletions.
diff --git a/src/nss/ai_onheartb.nss b/src/nss/ai_onheartb.nss
@@ -57,6 +57,11 @@ void main()
 
     int nCombat = GetIsInCombat(OBJECT_SELF);
 
+    if (!nCombat && !GetHasFeat(FEAT_KEEN_SENSE) && !GetHasFeat(FEAT_BLINDSIGHT_60_FEET))
+    {
+        SetActionMode(OBJECT_SELF, ACTION_MODE_DETECT, TRUE);
+    }
+
     object oPC = GetFirstPC();
 
     int bEnemyPCSeen = FALSE;

diff --git a/src/nss/ai_onspawn.nss b/src/nss/ai_onspawn.nss
@@ -72,6 +72,11 @@ void main()
     //set action matrix
     gsAISetActionMatrix(gsAIGetDefaultActionMatrix());
 
+    if (!GetHasFeat(FEAT_KEEN_SENSE) && !GetHasFeat(FEAT_BLINDSIGHT_60_FEET))
+    {
+        SetActionMode(OBJECT_SELF, ACTION_MODE_DETECT, TRUE);
+    }
+
     //set random facing
     //SetFacing(IntToFloat(Random(360)));
 

diff --git a/src/nss/dlg_adventp1c.nss b/src/nss/dlg_adventp1c.nss
@@ -34,6 +34,7 @@
 #include "inc_adv_assassin"
 #include "inc_ai_combat"
 #include "inc_ctoken"
+#include "inc_xp"
 
 string GenerateInsult(object oPC)
 {
@@ -168,8 +169,10 @@ int StartingConditional()
 
     if (GetScriptParam("pcintimidate") != "")
     {
-        if (GetIsSkillSuccessful(oPC, SKILL_INTIMIDATE, 18 + GetHitDice(OBJECT_SELF)))
+        int nDC = 18 + GetHitDice(OBJECT_SELF);
+        if (GetIsSkillSuccessful(oPC, SKILL_INTIMIDATE, nDC))
         {
+            GiveDialogueSkillXP(oPC, nDC, SKILL_INTIMIDATE);
             sMessage = "You know, I think " + (nAdventurerPartySize > 1 ? "we" : "I") + " might have bitten off a bit more than " + (nAdventurerPartySize > 1 ? "we" : "I") + " can chew this time. Farewell... for now.";
             SetCustomToken(CTOKEN_ADVENTURER_DIALOGUE, sMessage);
             int i;

diff --git a/src/nss/dlg_avista_pers.nss b/src/nss/dlg_avista_pers.nss
@@ -1,6 +1,7 @@
 #include "inc_gold"
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -20,6 +21,7 @@ int StartingConditional()
     }
     else
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "persuade_succeeded");
         TakeGoldFromCreature(nCost, oPC, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_bluf_chk.nss b/src/nss/dlg_bluf_chk.nss
@@ -1,5 +1,6 @@
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -15,6 +16,7 @@ int StartingConditional()
     }
     else
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         return TRUE;
     }

diff --git a/src/nss/dlg_chk_bluf.nss b/src/nss/dlg_chk_bluf.nss
@@ -1,5 +1,7 @@
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
+
 // Bluff against bluff_dc local variable, offer 1 attempt per 15min
 // set script param "dc" to use that instead
 
@@ -26,6 +28,7 @@ int StartingConditional()
         SetTemporaryInt(GetPCPublicCDKey(oPC, TRUE)+GetName(oPC)+"_"+GetTag(OBJECT_SELF)+"_bluf", 1, 900.0);
         return FALSE;
     }
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     IncrementPlayerStatistic(oPC, "bluff_succeeded");
     return TRUE;
 }
diff --git a/src/nss/dlg_chk_blufrob.nss b/src/nss/dlg_chk_blufrob.nss
@@ -1,4 +1,6 @@
 #include "inc_persist"
+#include "inc_xp"
+
 // Bluff against bluff_dc local variable, offer 1 attempt per 15min
 // set script param "dc" to use that instead
 
@@ -19,7 +21,7 @@ int StartingConditional()
     {
         return FALSE;
     }
-
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     int nGold = StringToInt(GetScriptParam("gold"));
 
     GiveGoldToCreature(oPC, nGold);

diff --git a/src/nss/dlg_chk_inti.nss b/src/nss/dlg_chk_inti.nss
@@ -1,4 +1,6 @@
 #include "inc_persist"
+#include "inc_xp"
+
 // Intimidate against intimidate_dc local variable, offer 1 attempt per 15min
 // set script param "dc" to use that instead
 
@@ -21,5 +23,6 @@ int StartingConditional()
         return FALSE;
     }
 
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     return TRUE;
 }
diff --git a/src/nss/dlg_chk_inticrim.nss b/src/nss/dlg_chk_inticrim.nss
@@ -1,3 +1,5 @@
+#include "inc_xp"
+
 //#include "inc_general"
 // DC is 11 + level
 // set script param "dc" to use that instead
@@ -21,5 +23,6 @@ int StartingConditional()
         return FALSE;
     }
     //IncrementPlayerStatistic(oPC, "intimidate_succeeded");
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     return TRUE;
 }
diff --git a/src/nss/dlg_chk_pers.nss b/src/nss/dlg_chk_pers.nss
@@ -1,5 +1,7 @@
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
+
 // Persuade against persuade_dc local variable, offer 1 attempt per 15min
 // set script param "dc" to use that instead
 
@@ -22,6 +24,7 @@ int StartingConditional()
         SetTemporaryInt(GetPCPublicCDKey(oPC, TRUE)+GetName(oPC)+"_"+GetTag(OBJECT_SELF)+"_pers", 1, 900.0);
         return FALSE;
     }
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     IncrementPlayerStatistic(oPC, "persuade_succeeded");
     return TRUE;
 }
diff --git a/src/nss/dlg_chk_perscrim.nss b/src/nss/dlg_chk_perscrim.nss
@@ -1,4 +1,5 @@
 #include "inc_general"
+#include "inc_xp"
 // DC is 13 + level
 // set script param "dc" to use that instead
 
@@ -20,6 +21,7 @@ int StartingConditional()
         IncrementPlayerStatistic(oPC, "persuade_failed");
         return FALSE;
     }
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     IncrementPlayerStatistic(oPC, "persuade_succeeded");
     return TRUE;
 }
diff --git a/src/nss/dlg_divine_pers.nss b/src/nss/dlg_divine_pers.nss
@@ -1,6 +1,7 @@
 #include "inc_gold"
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -21,6 +22,7 @@ int StartingConditional()
     }
     else
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "persuade_succeeded");
         TakeGoldFromCreature(nCost, oPC, TRUE);
         location lLocation = GetLocation(GetObjectByTag(GetLocalString(OBJECT_SELF, "warden_tele_wp")));

diff --git a/src/nss/dlg_ferry_pers.nss b/src/nss/dlg_ferry_pers.nss
@@ -1,6 +1,7 @@
 #include "inc_gold"
 #include "inc_persist"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -21,6 +22,7 @@ int StartingConditional()
     }
     else
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         TakeGoldFromCreature(nCost, oPC, TRUE);
         IncrementPlayerStatistic(oPC, "persuade_succeeded");
         IncrementPlayerStatistic(oPC, "gold_spent_on_ferries", nCost);

diff --git a/src/nss/dlg_q_chk_advb.nss b/src/nss/dlg_q_chk_advb.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -10,6 +11,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, nTarget, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb1.nss b/src/nss/dlg_q_chk_advb1.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 1, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb2.nss b/src/nss/dlg_q_chk_advb2.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 2, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb3.nss b/src/nss/dlg_q_chk_advb3.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 3, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb4.nss b/src/nss/dlg_q_chk_advb4.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 4, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb5.nss b/src/nss/dlg_q_chk_advb5.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 5, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb6.nss b/src/nss/dlg_q_chk_advb6.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 6, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb7.nss b/src/nss/dlg_q_chk_advb7.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 7, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb8.nss b/src/nss/dlg_q_chk_advb8.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 8, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_q_chk_advb9.nss b/src/nss/dlg_q_chk_advb9.nss
@@ -1,4 +1,5 @@
 #include "inc_quest"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -9,6 +10,7 @@ int StartingConditional()
     AdjustAlignment(oPC, ALIGNMENT_CHAOTIC, BLUFF_CHAOS_SHIFT, FALSE);
     if(GetIsSkillSuccessful(oPC, nSkill, nDC))
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
         IncrementPlayerStatistic(oPC, "bluff_succeeded");
         AdvanceQuest(OBJECT_SELF, oPC, 9, TRUE);
         return TRUE;

diff --git a/src/nss/dlg_rob_intim.nss b/src/nss/dlg_rob_intim.nss
@@ -1,4 +1,5 @@
 #include "inc_persist"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -16,6 +17,8 @@ int StartingConditional()
     }
     else
     {
+        GiveDialogueSkillXP(oPC, nDC, nSkill);
+
         int nGold = StringToInt(GetScriptParam("gold"));
 
         GiveGoldToCreature(oPC, nGold);

diff --git a/src/nss/dlg_ship_pers1.nss b/src/nss/dlg_ship_pers1.nss
@@ -1,6 +1,7 @@
 #include "inc_persist"
 #include "inc_ship"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -15,7 +16,7 @@ int StartingConditional()
         IncrementPlayerStatistic(oPC, "persuade_failed");
         return FALSE;
     }
-
+    GiveDialogueSkillXP(oPC, nDC, nSkill);    
     IncrementPlayerStatistic(oPC, "persuade_succeeded");
     PayShipAndTravel(OBJECT_SELF, GetPCSpeaker(), 1, TRUE);
 

diff --git a/src/nss/dlg_ship_pers2.nss b/src/nss/dlg_ship_pers2.nss
@@ -1,6 +1,7 @@
 #include "inc_persist"
 #include "inc_ship"
 #include "inc_general"
+#include "inc_xp"
 
 int StartingConditional()
 {
@@ -15,6 +16,7 @@ int StartingConditional()
         IncrementPlayerStatistic(oPC, "persuade_failed");
         return FALSE;
     }
+    GiveDialogueSkillXP(oPC, nDC, nSkill);
     IncrementPlayerStatistic(oPC, "persuade_succeeded");
     PayShipAndTravel(OBJECT_SELF, GetPCSpeaker(), 2, TRUE);