diff --git a/scripts_src/epa/epac6.ssl b/scripts_src/epa/epac6.ssl index 2648be3918..bdd88e5da9 100644 --- a/scripts_src/epa/epac6.ssl +++ b/scripts_src/epa/epac6.ssl @@ -399,8 +399,7 @@ begin give_xp(500); end -procedure Node001a -begin +procedure Node001a begin call Node001; end diff --git a/scripts_src/epa/epai41.ssl b/scripts_src/epa/epai41.ssl index 5ad7ff3bbb..723bb12a29 100644 --- a/scripts_src/epa/epai41.ssl +++ b/scripts_src/epa/epai41.ssl @@ -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 diff --git a/scripts_src/sierra/wsemit1a.ssl b/scripts_src/sierra/wsemit1a.ssl index 76b68fcff0..3f14163a24 100644 --- a/scripts_src/sierra/wsemit1a.ssl +++ b/scripts_src/sierra/wsemit1a.ssl @@ -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."); diff --git a/scripts_src/sierra/wsfeld1a.ssl b/scripts_src/sierra/wsfeld1a.ssl index 82ff90151c..5da94d4d62 100644 --- a/scripts_src/sierra/wsfeld1a.ssl +++ b/scripts_src/sierra/wsfeld1a.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld1c.ssl b/scripts_src/sierra/wsfeld1c.ssl index dba3f075d8..c1ebb4bd3f 100644 --- a/scripts_src/sierra/wsfeld1c.ssl +++ b/scripts_src/sierra/wsfeld1c.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld1d.ssl b/scripts_src/sierra/wsfeld1d.ssl index da3a6c414a..5bd9738919 100644 --- a/scripts_src/sierra/wsfeld1d.ssl +++ b/scripts_src/sierra/wsfeld1d.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld1e.ssl b/scripts_src/sierra/wsfeld1e.ssl index 50da786dc1..8430d2fa2c 100644 --- a/scripts_src/sierra/wsfeld1e.ssl +++ b/scripts_src/sierra/wsfeld1e.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld2a.ssl b/scripts_src/sierra/wsfeld2a.ssl index ffe67b13c0..ba1252ad5b 100644 --- a/scripts_src/sierra/wsfeld2a.ssl +++ b/scripts_src/sierra/wsfeld2a.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld2b.ssl b/scripts_src/sierra/wsfeld2b.ssl index 7e6d7506ea..087b3c65aa 100644 --- a/scripts_src/sierra/wsfeld2b.ssl +++ b/scripts_src/sierra/wsfeld2b.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld2d.ssl b/scripts_src/sierra/wsfeld2d.ssl index 78d2bc1f20..9ea587b4b5 100644 --- a/scripts_src/sierra/wsfeld2d.ssl +++ b/scripts_src/sierra/wsfeld2d.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld3a.ssl b/scripts_src/sierra/wsfeld3a.ssl index b815a53777..4ff8b3c065 100644 --- a/scripts_src/sierra/wsfeld3a.ssl +++ b/scripts_src/sierra/wsfeld3a.ssl @@ -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); diff --git a/scripts_src/sierra/wsfeld3b.ssl b/scripts_src/sierra/wsfeld3b.ssl index 16537742b2..38c21a87fb 100644 --- a/scripts_src/sierra/wsfeld3b.ssl +++ b/scripts_src/sierra/wsfeld3b.ssl @@ -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); diff --git a/scripts_src/valtcity/vcgenvil.ssl b/scripts_src/valtcity/vcgenvil.ssl index 790a4dac43..cc95c1f6b0 100644 --- a/scripts_src/valtcity/vcgenvil.ssl +++ b/scripts_src/valtcity/vcgenvil.ssl @@ -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