Skip to content

Commit

Permalink
Loading
Loading status checks…
Misc cleanup and sync with RPU
Browse files Browse the repository at this point in the history
  • Loading branch information
@burner1024
burner1024 committed Apr 20, 2024
1 parent 3e0e6f7 commit 2042f2e
Showing 3 changed files with 13 additions and 21 deletions.
14 changes: 7 additions & 7 deletions data/data/worldmap.txt
View file
Original file line number Diff line number Diff line change
@@ -367,8 +367,8 @@ type_00=ratio:50%, pid:16777424, Item:49, Item:284, Item:7, Item:(0-10)41, Scrip
type_01=ratio:50%, pid:16777426, Item:273, Item:4, Item:(0-10)41, Script:622 ; Female Nomad w/ Healing Powder and Knife
type_02=pid:16777268, If (Rand(10%)), Script:1129 ; Male Orphan
type_03=pid:16777269, If (Rand(15%)), Script:1129 ; Female Orphan
team_num=129 ; TEAM_RND_NOMAD
position=cone, spacing:2
team_num=129 ; TEAM_RND_NOMAD

[Encounter: ARROK_Molerats]
type_00=ratio:85%, pid:16777326, Script:617 ; Molerats
@@ -400,7 +400,7 @@ position=huddle, spacing:5
;type_00=pid:16777248, Item:4(wielded), Item:40, Item:(1-3)273, Script:624 ; Melee Thug (Bandit Leader) w/ Sledgehammer, Stim, Healing Powder
type_00=ratio:33%, pid:16777285, Item:7(wielded), Item:(0-10)41, Script:624 ; Weak Melee Guard (male) w/ Crowbar
type_01=ratio:33%, pid:16777428, Item:4(wielded), Item:(0-10)41, Script:624 ; Bandit (male) w/ Knife
type_02=ratio:33%, pid:16777429, Item:280(wielded), Item:(0-10)41, Script:624 ; Bandit (female) w/ Club
type_02=ratio:33%, pid:16777429, Item:280(wielded), Item:(0-10)41, Script:624 ; Bandit (female) w/ Sharp Spear
;type_04=ratio:25%, pid:16777429, Item:7(wielded), Item:(0-10)41, Script:624 ;Bandit (female) w/ Spear
type_05=Dead, pid:16777272, Distance:7 ; Dead Bad Merchant
type_06=Dead, pid:16777287, Distance:8 ; Dead Male Weak Gun Guard
@@ -723,7 +723,7 @@ position=huddle, spacing:2
type_00=pid:16777450, Item:6(wielded), Item:(0-20)41, Script:1116 ; Bootlegger male w/ Super Sledgehammer
type_01=ratio:25%, pid:16777450, Item:6(wielded), Item:(0-20)41, Script:505 ; Bootlegger male w/ Sledgehammer
type_02=ratio:25%, pid:16777450, Item:354(wielded), Item:(0-20)41, Script:505 ; Bootlegger male w/ Pancor Jackhammer
type_03=ratio:25%, pid:16777451, Item:332(wielded), Item:(0-20)41, Script:505 ; Bootlegger female w/ Grease Gun; was rifle (10) - killap
type_03=ratio:25%, pid:16777451, Item:332(wielded), Item:(0-20)41, Script:505 ; Bootlegger female w/ Grease Gun
type_04=ratio:25%, pid:16777451, Item:22(wielded), Item:(0-20)41, Script:505 ; Bootlegger female w/ 14mm
type_05=pid:33555432, Distance:14, If (Rand(10%)) ; Still
position=huddle, spacing:2
@@ -761,14 +761,14 @@ type_00=ratio:100%, pid:16777298, Script:632
position=Surrounding

[Encounter: RED_Homesteaders]
type_00=ratio:25%, pid:16777436, Item:8(wielded), Item:(0-20)41, Script:786 ; Homesteader male w/ 10MM Pistol
type_01=ratio:25%, pid:16777436, Item:160(wielded), Item:(0-20)41, Script:786 ; Homesteader male w/ Cattle Prod
type_02=ratio:25%, pid:16777437, Item:9(wielded), Item:(0-20)41, Script:787 ; Homesteader female w/ SMG
type_00=ratio:25%, pid:16777436, Item:8(wielded), Item:(0-20)41, Script:786 ; Homesteader male w/ 10MM Pistol
type_01=ratio:25%, pid:16777436, Item:160(wielded), Item:(0-20)41, Script:786 ; Homesteader male w/ Cattle Prod
type_02=ratio:25%, pid:16777437, Item:9(wielded), Item:(0-20)41, Script:787 ; Homesteader female w/ SMG
type_03=ratio:25%, pid:16777437, Item:352(wielded), Item:(0-20)41, Script:787 ; Homesteader female w/ H&K G11
position=huddle, spacing:2

[Encounter: RDRC_Broken_Hills_Caravan]
type_00=pid:16777277, Item:9(wielded), Item:(0-40)41, Script:779 ; Master Trader female w/ SMG
type_00=pid:16777277, Item:9(wielded), Item:(0-40)41, Script:779 ; Master Trader female w/ SMG
type_01=ratio:50%, pid:16777264, Item:12(wielded), Item:(0-30)41, Script:259 ; Big Gun Guard male w/ Minigun
type_02=ratio:50%, pid:16777265, Item:12(wielded), Item:(0-30)41, Script:259 ; Big Gun Guard female w/ Minigun
position=huddle, spacing:2
4 changes: 2 additions & 2 deletions scripts_src/headers/scripts.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 1998-2003 Interplay Entertainment Corp. All rights reserved.
Copyright 1998-2003 Interplay Entertainment Corp. All rights reserved.
*/

#ifndef SCRIPTS_H
@@ -60,7 +60,7 @@
#define SCRIPT_DCJOEY (41) // DCJoey ; Special thug in the Den
#define SCRIPT_DCFLICK (42) // DCFlick ; Kwik N Save store owner in the Den
#define SCRIPT_DCG1GRD (43) // DCG1GRD ; Gang 1 Guard in the Den
//#define SCRIPT_DCPETEY (44) // DCPetey ; Petey, the alley addict in the Den
#define SCRIPT_DCPETEY (44) // DCPetey ; Petey, the alley addict in the Den
#define SCRIPT_DCSMITTY (45) // DCSmitty ; Smitty the junkyard guy in the Den
#define SCRIPT_DCMETZGE (46) // DCMetzge ; Metzger the Slaver in the Den
#define SCRIPT_DCSLAVER (47) // DCSlaver ; Regular Slaver in the Den
16 changes: 4 additions & 12 deletions scripts_src/main/nhmyron.ssl
View file
Original file line number Diff line number Diff line change
@@ -614,7 +614,6 @@ procedure talk_p_proc begin
set_gave_stuff;
end
nr_add_timer_event_rand(self_obj, 25, 45, float_param);

end

procedure destroy_p_proc begin
@@ -667,16 +666,12 @@ procedure Node988 begin
end
procedure Node985 begin
variable tmp;
// *** put this in only if the expansion pack --unlocked by killap
/*if (EPA_visible_on_map == false) then begin
mark_EPA_on_map
end else*/ if (stash_found == false) then begin
if (stash_found == false) then begin
set_stash_know;
end else if (expand_carry_limit == false) then begin
set_expand_carry_limit;
tmp := get_critter_extra_stat(self_obj, STAT_carry_amt) + 10; //added by killap - requires Timeslip's compiler and dlls
set_critter_extra_stat(self_obj, STAT_carry_amt, tmp); //added by killap - requires Timeslip's compiler and dlls
//set_critter_stat(self_obj, STAT_carry_amt, 10); //altered by Seraph/killap
tmp := get_critter_extra_stat(self_obj, STAT_carry_amt) + 10;
set_critter_extra_stat(self_obj, STAT_carry_amt, tmp);
end
end
procedure Node984 begin
@@ -1313,10 +1308,7 @@ procedure Node141 begin
prev_node := 141;
end
procedure Node142 begin
// *** put this in only if expansion pack --unlocked by killap
/*if (EPA_visible_on_map == false) then begin
Reply(1020);
end else*/ if (stash_found == false) then begin
if (stash_found == false) then begin
set_stash_know;
Reply(1021);
end else begin

0 comments on commit 2042f2e

Please sign in to comment.