Merge branch 'master' into pixote-map-update

NovaRain · Jun 10, 2024 · 8b07c72 · 8b07c72
2 parents ef49b63 + 72161c4
commit 8b07c72
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/scripts_src/headers/exppoint.h b/scripts_src/headers/exppoint.h
@@ -487,7 +487,8 @@
  a message informing the player how many
  points he received.
 ***************************************/
-#define give_xp(x)                              give_exp_points(x);             \
-                                                display_msg(g_mstr(100) + (x + ((x * 5 / 100) * dude_perk(PERK_swift_learner))) + g_mstr(101))
+#define calc_actual_xp_gain(x)                  (x + ((x * 5 / 100) * dude_perk(PERK_swift_learner)))
+#define give_xp(x)                              give_exp_points(x); \
+                                                display_msg(g_mstr(100) + calc_actual_xp_gain(x) + g_mstr(101))
 
 #endif // EXPPOINT_H
diff --git a/scripts_src/klamath/kcsmiley.ssl b/scripts_src/klamath/kcsmiley.ssl
@@ -180,7 +180,7 @@ procedure leave_player begin
       floater(300);
       set_global_var(GVAR_SMILEY_STATUS, SMILEY_RETURNED);
       set_local_var(LVAR_Follow_Dude, 0);
-      display_msg(mstr(320) + EXP_KC_SAVE_SMILEY + mstr(330));
+      display_msg(mstr(320) + calc_actual_xp_gain(EXP_KC_SAVE_SMILEY) + mstr(330));
       give_exp_points(EXP_KC_SAVE_SMILEY);
       KC_REP_ADJUST(8)
       inc_general_rep(REP_BONUS_KC_SAVE_SMILEY);
@@ -409,7 +409,7 @@ procedure Node940 begin
 end
 
 //procedure Node950 begin
-//   display_msg(mstr(110) + EXP_STILL_SUCCESS + mstr(111));
+//   display_msg(mstr(110) + calc_actual_xp_gain(EXP_STILL_SUCCESS) + mstr(111));
 //   set_global_var(GVAR_STILL_STATUS, STILL_SUCCESS);
 //   give_exp_points(EXP_STILL_SUCCESS);
    //place springer in inventory + 10 rocks

diff --git a/scripts_src/klamath/kstill.ssl b/scripts_src/klamath/kstill.ssl
@@ -119,7 +119,7 @@ procedure use_obj_on_p_proc begin
                    display_msg(mstr(130));
                 end
                 else begin
-                   display_msg(mstr(110) + EXP_KC_STILL_SUCCESS + mstr(111));
+                   display_msg(mstr(110) + calc_actual_xp_gain(EXP_KC_STILL_SUCCESS) + mstr(111));
                    set_global_var(GVAR_STILL_STATUS, STILL_SUCCESS);
                    give_exp_points(EXP_KC_STILL_SUCCESS);
                    KC_REP_ADJUST(5)

diff --git a/scripts_src/main/obj_dude.ssl b/scripts_src/main/obj_dude.ssl
@@ -305,11 +305,10 @@ procedure map_update_p_proc begin
    if (self_obj) then begin
       if (self_item(PID_GECK) and not global_var(GVAR_GAVE_GECK_EXP)) then begin
          set_global_var(GVAR_GAVE_GECK_EXP, 1);
-         display_msg(mstr(150) + EXP_GOT_GECK + mstr(151));
+         display_msg(mstr(150) + calc_actual_xp_gain(EXP_GOT_GECK) + mstr(151));
          give_exp_points(EXP_GOT_GECK);
       end
    end
-
 end
 
 

diff --git a/scripts_src/maps/vault13.ssl b/scripts_src/maps/vault13.ssl
@@ -61,7 +61,7 @@ procedure map_enter_p_proc begin
 
    if (map_var(MVAR_Gave_V13_Xp) == 0) then begin
       set_map_var(MVAR_Gave_V13_Xp, 1);
-      display_msg(mstr(101) + EXP_FOUND_V13 + mstr(102));
+      display_msg(mstr(101) + calc_actual_xp_gain(EXP_FOUND_V13) + mstr(102));
       give_exp_points(EXP_FOUND_V13);
    end
    if (VAULT13_SEQ) then begin

diff --git a/scripts_src/ncr/scenlone.ssl b/scripts_src/ncr/scenlone.ssl
@@ -246,7 +246,7 @@ procedure destroy_p_proc begin
    set_mss(MSS_ELRON_DEAD);
    set_global_var(GVAR_NCR_KILL_ELRON_QST, 2);
    //give_exp_points(EXP_MERK_HUB_DEAD);
-   //display_msg(mstr(218) + EXP_MERK_HUB_DEAD + mstr(219));
+   //display_msg(mstr(218) + calc_actual_xp_gain(EXP_MERK_HUB_DEAD) + mstr(219));
 
    //set_merk_status(MERK_STATUS_PLEASED);
 

diff --git a/scripts_src/ncr/scmerk.ssl b/scripts_src/ncr/scmerk.ssl
@@ -1216,7 +1216,7 @@ procedure Node5051a begin
       give_xp(EXP_MERK_GET_PAPERS);
 
       //give_exp_points(EXP_MERK_GET_PAPERS);
-      //display_msg(mstr(271) + EXP_MERK_GET_PAPERS + mstr(272));
+      //display_msg(mstr(271) + calc_actual_xp_gain(EXP_MERK_GET_PAPERS) + mstr(272));
    end
    if (merk_seed_status(MSS_DR_HENRY_DEAD)) then
       call Node050;

diff --git a/scripts_src/ncr/scofjack.ssl b/scripts_src/ncr/scofjack.ssl
@@ -175,7 +175,7 @@ procedure timed_event_p_proc begin
       if (global_var(GVAR_NCR_MIRA_STATE) == MJOBTAKEN) then begin
          set_global_var(GVAR_NCR_MIRA_STATE, MJOBJACKEDWHACKED);
          give_exp_points(EXP_MIRA_JACK_DEAD);
-         display_msg(mstr(161) + EXP_MIRA_JACK_DEAD + mstr(162));
+         display_msg(mstr(161) + calc_actual_xp_gain(EXP_MIRA_JACK_DEAD) + mstr(162));
       end else begin
          set_global_var(GVAR_NCR_MIRA_STATE, MJACKDEAD);
       end
@@ -298,7 +298,7 @@ procedure destroy_p_proc begin
    if (global_var(GVAR_NCR_MIRA_STATE) == MJOBTAKEN) then begin
       set_global_var(GVAR_NCR_MIRA_STATE, MJOBJACKEDWHACKED);
       give_exp_points(EXP_MIRA_JACK_DEAD);
-      display_msg(mstr(161) + EXP_MIRA_JACK_DEAD + mstr(162));
+      display_msg(mstr(161) + calc_actual_xp_gain(EXP_MIRA_JACK_DEAD) + mstr(162));
    end else begin
       set_global_var(GVAR_NCR_MIRA_STATE, MJACKDEAD);
    end
@@ -473,6 +473,7 @@ procedure warp_proc begin
    fadeout(1);
    if (tile_contains_pid_obj(14485, 0, PID_LOCKER_CLEAN_LEFT)) then //was 14085 and PID_LOCKER_RUSTY_RIGHT - killap
       move_obj_inven_to_obj(self_obj, tile_contains_pid_obj(14485, 0, PID_LOCKER_CLEAN_LEFT)); //was 14085 and PID_LOCKER_RUSTY_RIGHT - killap
+
    move_to(self_obj, JACK_JAIL_TILE, 0);
    fadein(1);
 end

diff --git a/scripts_src/ncr/simserum.ssl b/scripts_src/ncr/simserum.ssl
@@ -57,7 +57,7 @@ procedure use_obj_on_p_proc begin
          give_xp(EXP_DOCHENRY_MUTA_TEST);
 
          //give_exp_points(EXP_DOCHENRY_MUTA_TEST);
-         //display_msg(mstr(101) + EXP_DOCHENRY_MUTA_TEST + mstr(102));
+         //display_msg(mstr(101) + calc_actual_xp_gain(EXP_DOCHENRY_MUTA_TEST) + mstr(102));
       end
       rm_obj_from_inven(source_obj, self_obj);
       add_obj_to_inven(target_obj, self_obj);