RPU v30 changes merged

phobos2077 · Jul 6, 2024 · 9d3972e · 9d3972e
1 parent 4f7eeeb
commit 9d3972e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts_src/maps/vault13.ssl b/scripts_src/maps/vault13.ssl
@@ -63,7 +63,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/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