Skip to content

Commit

Permalink
Cosmetic changes to match map-update-v2 better
Browse files Browse the repository at this point in the history
  • Loading branch information
@burner1024
burner1024 committed Aug 29, 2024
1 parent 6e94d51 commit 64c07c8
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 22 deletions.
3 changes: 1 addition & 2 deletions scripts_src/epa/epac6.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,7 @@ begin
give_xp(500);
end

procedure Node001a
begin
procedure Node001a begin
call Node001;
end

Expand Down
7 changes: 0 additions & 7 deletions scripts_src/epa/epai41.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,18 @@ end
procedure use_p_proc begin
if (Cyberdog_In_Party) then begin
add_timer_event(Cyberdog_Ptr,game_ticks(0),40893);
//party_member_hide(Cyberdog_Ptr, hidden_cyberdog_bit)
end if (Robobrain_In_Party) then begin
add_timer_event(Robobrain_Ptr,game_ticks(0),40893);
//party_member_hide(Robobrain_Ptr, hidden_robobrain_bit)
end if (Robobrain_Chimp_In_Party) then begin
add_timer_event(Robobrain_Chimp_Ptr,game_ticks(0),40893);
//party_member_hide(Robobrain_Chimp_Ptr, hidden_robobrain_chimp_bit)
end if (Robobrain_Abnormal_In_Party) then begin
add_timer_event(Robobrain_Abnormal_Ptr,game_ticks(0),40893);
//party_member_hide(Robobrain_Abnormal_Ptr, hidden_robobrain_abnormal_bit)
end if (Robobrain_Human_In_Party) then begin
add_timer_event(Robobrain_Human_Ptr,game_ticks(0),40893);
//party_member_hide(Robobrain_Human_Ptr, hidden_robobrain_human_bit)
end if (K9_In_Party) then begin
add_timer_event(K9_Ptr,game_ticks(0),40893);
//party_member_hide(K9_Ptr, hidden_k9_bit)
end if (Dogmeat_In_Party) then begin
add_timer_event(Dogmeat_Ptr,game_ticks(0),40893);
//party_member_hide(Dogmeat_Ptr, hidden_dogmeat_bit)
end

end
Expand Down
4 changes: 2 additions & 2 deletions scripts_src/sierra/wsemit1a.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ procedure damage_p_proc begin
destroy_object(Field_Ptr);
Field_Ptr:=0;
if (Field_Pid == PID_NS_FORCE_FIELD) then begin
ndebug("Make NW Pain Field.");
create_object_sid(PID_NS_PAIN_FIELD,Field_Hex,Field_Elev,CUR_FIELD_SCRIPT);
ndebug("Make NW Pain Field.");
create_object_sid(PID_NS_PAIN_FIELD,Field_Hex,Field_Elev,CUR_FIELD_SCRIPT);
end
else begin
ndebug("Make EW Pain Field.");
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld1a.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
2 changes: 1 addition & 1 deletion scripts_src/sierra/wsfeld1c.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ procedure map_enter_p_proc begin
end
end
//end added

procedure map_update_p_proc begin
if self_exists then begin
FIELD_PTR:=self_obj;
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld1d.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
2 changes: 0 additions & 2 deletions scripts_src/sierra/wsfeld1e.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,11 @@ end
//end added

procedure map_update_p_proc begin

if self_exists then begin
FIELD_PTR:=self_obj;
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld2a.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld2b.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld2d.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld3a.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/sierra/wsfeld3b.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ procedure map_update_p_proc begin
end

if (global_var(GVAR_SIERRA_BASE_POWER) == 0) then begin // power on

if (self_exists and (map_var(FIELD_STATUS) != FIELD_DAMAGED)) then begin
if (self_pid == PID_NS_PAIN_FIELD) then begin
FIELD_PTR:=create_object_sid(PID_NS_FORCE_FIELD,self_tile,self_elevation,CUR_SCRIPT);
Expand Down
1 change: 0 additions & 1 deletion scripts_src/valtcity/vcgenvil.ssl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ procedure map_enter_p_proc begin
end
set_self_team(TEAM_VAULT_VILLAGERS);
//set_local_var(7, tile_num(self_obj));
//if ((tile_num(self_obj) == 24311) and (tile_num(self_obj) != 23900)) then
if ( (local_var(LVAR_Home_Tile) == 21306) or (local_var(LVAR_Home_Tile) == 20303) or (local_var(LVAR_Home_Tile) == 19284) or (local_var(LVAR_Home_Tile) == 18883) ) then
add_timer_event(self_obj, 50, 1);
//if (global_var(GVAR_VAULT_VILLAGE) == 5) then
Expand Down

0 comments on commit 64c07c8

Please sign in to comment.