Skip to content

Commit

Permalink
Fixed and unified float events for party members
Browse files Browse the repository at this point in the history
* Sulik, Lenny, Goris, Davin, Miria didn't have the event repeating
like others.
* Now the interval of floats is 60-90 sec for all party members (not
spamming but also not too few).
  • Loading branch information
NovaRain committed Sep 30, 2024
1 parent b66fd8d commit 609cad1
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 253 deletions.
5 changes: 2 additions & 3 deletions scripts_src/brokhill/hcmarcus.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ procedure map_enter_p_proc begin

if (Marcus_In_Party) then begin
Perform_Critter_Float := 1;
//rm_timer_event( self_obj ); - comment out by killap
add_timer_event( self_obj, game_ticks( random(40, 50) ), 1);
flush_add_timer_event_sec(self_obj, random(40, 50), 1);
end
else begin
Perform_Critter_Float := 0;
Expand Down Expand Up @@ -310,7 +309,7 @@ procedure timed_event_p_proc begin
call Node2015;
end
end
add_timer_event( self_obj, game_ticks( random(40, 50) ), 1);
flush_add_timer_event_sec(self_obj, random(60, 90), 1); //edit by killap - was (40,50)
end
end

Expand Down
8 changes: 2 additions & 6 deletions scripts_src/den/dcvic.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ procedure timed_event_p_proc begin
end
end
end
flush_add_timer_event_sec(self_obj, random(15, 30), timed_event_float);
flush_add_timer_event_sec(self_obj, random(60, 90), timed_event_float); //edit by killap - was (15,30)
end
else if (fixed_param == TIMER_ENSURE_ANIM) then begin
if not anim_busy(self_obj) then begin
Expand All @@ -242,7 +242,7 @@ procedure timed_event_p_proc begin
end
end
end
add_timer_event(self_obj, game_ticks(1), TIMER_ENSURE_ANIM);
add_timer_event(self_obj, game_ticks(1), TIMER_ENSURE_ANIM);
end
end

Expand Down Expand Up @@ -310,7 +310,6 @@ procedure push_p_proc begin
end

procedure critter_p_proc begin

//move by killap - would never be run if player was near Vic
if (has_joined_party == false) then begin
/*if (vic_free) then begin
Expand Down Expand Up @@ -452,7 +451,6 @@ procedure Node999 begin
end
procedure Node998 begin
// sets up combat
//set_hostile;
set_local_var(LVAR_Hostile,2);
end
procedure Node996 begin
Expand Down Expand Up @@ -638,8 +636,6 @@ procedure Node010 begin
end
call Node993; //now Vic will go to Mom's if you don't recruit him
end
//NOption(g_grunt,Node994,-003); --commented out by killap - move above
//NOption(195,Node994,004); --commented out by killap - move above
end
procedure Node011 begin
if (node_11) then begin
Expand Down
Loading

0 comments on commit 609cad1

Please sign in to comment.