diff --git a/.gitignore b/.gitignore index 17e6477cf9..5d967ad921 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ *.exe *.int *.log +*.orig +*.rej *.tmp *.zip **/.tmp.ssl diff --git a/data/text/po/sv.po b/data/text/po/sv.po index d3049c3a08..3ce4b9ddd0 100644 --- a/data/text/po/sv.po +++ b/data/text/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-07-10-16:29+0000\n" -"PO-Revision-Date: 2023-09-05 17:44+0000\n" +"PO-Revision-Date: 2024-07-23 06:53+0000\n" "Last-Translator: tygyh \n" "Language-Team: none\n" "Language: sv\n" @@ -318,6 +318,8 @@ msgstr "Det finns dock hopp. Ett litet hopp som få känner till." #: cuts/elder.sve:470 msgid "The old disks speak of an item called the Garden of Eden Creation Kit." msgstr "" +"De gamla disketterna talar om ett föremål som kallas Garden of Eden Creation " +"Kit." #: cuts/elder.sve:570 msgid "It is said it can bring life to the wasteland." @@ -689,7 +691,7 @@ msgstr "Vårt liv ligger i dina händer, Utvalde." #: cuts/elder.sve:1040 msgid "Prove yourself. Find the GECK. Be our salvation." -msgstr "" +msgstr "Bevisa dig själv. Hitta GECK. Bli vår frälsning." #: cuts/intro.sve:460 msgid "A Vault-Tec Presentation" @@ -741,11 +743,11 @@ msgstr "Edens-Lustgårds-Skapande-Kit" #: cuts/intro.sve:1330 msgid "or G.E.C.K." -msgstr "" +msgstr "eller G.E.C.K." #: cuts/intro.sve:1430 msgid "Use the GECK to create the NEW WORLD you've been waiting for..." -msgstr "" +msgstr "Använd GECK för att skapa den NYA VÄRLDEN som du har väntat på..." #: cuts/intro.sve:1520 msgid "*Results may vary" @@ -753,7 +755,7 @@ msgstr "*Resultaten kan variera" #: cuts/intro.sve:1580 msgid "The End. A Vault-Tec Presentation" -msgstr "" +msgstr "Slutet. En presentation av Valv-Tek" #. indexed_txt #: cuts/nar_2.txt:1 @@ -914,6 +916,8 @@ msgid "" "The ghouls of Necropolis learn firsthand the final meaning of dehydration, " "as their city succumbs to the desert sands and the water runs out." msgstr "" +"Ghulerna i Necropolis får på nära håll lära sig vad uttorkning innebär när " +"deras stad dukar under för ökensanden och vattnet tar slut." #. indexed_txt #: cuts/nar_12.txt:2 @@ -926,6 +930,8 @@ msgid "" "The ghouls of Necropolis learn how to maintain the repaired water pump, and" " eventually rediscover many lost secrets of engineering." msgstr "" +"Ghulerna i Necropolis lär sig att underhålla den reparerade vattenpumpen och " +"återupptäcker så småningom många av ingenjörskonstens förlorade hemligheter." #. indexed_txt #: cuts/nar_13.txt:2 @@ -937,6 +943,7 @@ msgstr "De bildar ett företag som säljer denna teknik till andra städer." msgid "" "The mutant attack on Necropolis spares none of the ghoulish inhabitants." msgstr "" +"Mutanternas attack mot Necropolis skonar ingen av de ghuliska invånarna." #. indexed_txt #: cuts/nar_15.txt:2 @@ -997,6 +1004,9 @@ msgid "" "Sands into a respected community which is prosperous for many years, before " "his untimely death at the hands of a Desert Raider." msgstr "" +"Aradesh sörjer sin dräpta dotter Tandi, men till slut bygger han Shady Sands " +"till ett respekterat samhälle som är framgångsrik i många år, innan en " +"Ökenplundrare orsakar hans alltför tidiga död." #. indexed_txt #: cuts/nar_21.txt:1 @@ -1037,6 +1047,8 @@ msgid "" "Shortly afterwards, the Raiders regroup and attack Shady Sands, burning the " "small community to the ground." msgstr "" +"Kort därefter omgrupperar Plundrarna och attackerar Shady Sands och bränner " +"ner det lilla samhället." #. indexed_txt #: cuts/nar_23.txt:1 @@ -1100,6 +1112,8 @@ msgid "" "The Brotherhood of Steel helps the other human outposts drive the mutant " "armies away with minimal loss of life, on both sides of the conflict." msgstr "" +"Stålbrödraskapet hjälper andra människosamhällen att driva mutantarmén bort " +"med få förluster på bägge sidor av konflikten." #. indexed_txt #: cuts/nar_28.txt:2 @@ -1107,6 +1121,8 @@ msgid "" "The advanced technology of the Brotherhood is slowly reintroduced into New " "California, with little disruption or chaos." msgstr "" +"Brödraskapets avancerade teknik återinförs långsamt i Nya Kalifornien, utan " +"större störningar eller kaos." #. indexed_txt #: cuts/nar_28.txt:3 @@ -1114,6 +1130,8 @@ msgid "" "The Brotherhood wisely remains out of the power structure, and becomes a " "major research and development house." msgstr "" +"Brödraskapet håller sig klokt nog utanför maktstrukturen och blir ett stort " +"forsknings- och utvecklingshus." #. indexed_txt #: cuts/nar_29.txt:1 @@ -1121,6 +1139,8 @@ msgid "" "The Brotherhood of Steel, under new leadership after the death of Rhombus, " "becomes an overzealous, techno-religious dictatorship." msgstr "" +"Stålbrödraskapet, under nytt ledarskap efter Rhombus död, blir en " +"övernitisk, teknoreligiös diktatur." #. indexed_txt #: cuts/nar_29.txt:2 @@ -1128,6 +1148,8 @@ msgid "" "In 20 years, the Steel Plague devastates the newly formed New California " "Republic, and starts a Dark Age that could last a thousand years." msgstr "" +"Efter 20 år har Stålplågan krossat den nyligen formerade Nya Kaliforniska " +"Republiken och påbörjar en mörk tidsålder som kan vara i tusen år." #. indexed_txt #: cuts/nar_31.txt:1 @@ -1135,6 +1157,8 @@ msgid "" "The Brotherhood of Steel repels the first wave of a mutant invasion, but a " "traitor in their midst causes the Citadel to fall." msgstr "" +"Stålbrödraskapet slår tillbaka den första attackvågen av en mutantinvasion, " +"men en förrädare mitt ibland dem orsakar Citadellets fall." #. indexed_txt #: cuts/nar_31.txt:2 @@ -1142,6 +1166,8 @@ msgid "" "Fortunately, the advanced technology is mastered slowly by the mutants, and " "they were unable to use it against you." msgstr "" +"Tur nog bemästrar mutanterna den avancerade teknologin långsamt och kunde " +"inte använda den mot dig." #. indexed_txt #: cuts/nar_32.txt:1 @@ -1149,16 +1175,18 @@ msgid "" "With your assistance, Old Harold brings the ghoul population of the Hub into" " equality with the humans." msgstr "" +"Med din assistans kunde Gamle Harold jämställa ghulbefolkingen i Hubben med " +"människorna." #. indexed_txt #: cuts/nar_32.txt:2 msgid "The two sides work together, and the Hub prospers." -msgstr "" +msgstr "De två sidorna arbetar tillsammans, och Hubben blomstrar." #. indexed_txt #: cuts/nar_32.txt:3 msgid "Old Harold is still alive, as far as anyone knows." -msgstr "" +msgstr "Gamle Harold lever fortfarande, såvida någon vet." #. indexed_txt #: cuts/nar_34.txt:1 @@ -1166,6 +1194,8 @@ msgid "" "The Hub disperses before the might of the mutant army and will never " "recover." msgstr "" +"Hubben skingras inför mutantarméns styrka och kommer aldrig att återhämta " +"sig." #. indexed_txt #: cuts/nar_35.txt:1 @@ -1173,11 +1203,13 @@ msgid "" "Thanks to your persistence, the Raiders are destroyed as an effective " "fighting force, and disband." msgstr "" +"Tack vare din envishet har Plundrarna utplånats som en effektiv stridande " +"styrka och upplösts." #. indexed_txt #: cuts/nar_35.txt:2 msgid "None of the Raider survivors are ever heard from again." -msgstr "" +msgstr "Ingen av de överlevande Plundrarna hörs någonsin av igen." #. indexed_txt #: cuts/nar_36.txt:1 @@ -1185,12 +1217,15 @@ msgid "" "The Desert Raiders eventually regroup and manage to terrorize small " "communities in the years following your adventures." msgstr "" +"Ökenplundrarna omgrupperar sig så småningom och lyckas terrorisera små " +"samhällen under åren efter dina äventyr." #. indexed_txt #: cuts/nar_37.txt:1 msgid "" "The Desert Raiders pillage most of the northern parts of New California." msgstr "" +"Ökenplundrarna härjar i större delen av de norra delarna av Nya Kalifornien." #. indexed_txt #: cuts/nar_37.txt:2 @@ -1198,11 +1233,13 @@ msgid "" "They are a scourge that lasts for years, until a rebel army of mutants " "brings them down." msgstr "" +"De är ett gissel som varar i åratal, tills en rebellarmé av mutanter " +"besegrar dem." #. indexed_txt #: cuts/nar_38.txt:1 msgid "Your mission beneath the Mutant Stronghold is successful." -msgstr "" +msgstr "Ditt uppdrag under mutantfästet är framgångsrikt." #. indexed_txt #: cuts/nar_38.txt:2 cuts/nar_39.txt:2 @@ -1241,17 +1278,17 @@ msgstr "" #. indexed_txt #: cuts/nar_44.txt:1 msgid "Interplay Productions presents..." -msgstr "" +msgstr "Interplay Productions presenterar..." #. indexed_txt #: cuts/nar_45.txt:1 msgid "Fallout, a post nuclear role-playing game." -msgstr "" +msgstr "Fallout, ett post-atomärt rollspel." #. indexed_txt #: cuts/nar_46.txt:1 msgid "Fallout, a post nuclear adventure." -msgstr "" +msgstr "Fallout, ett post-atomärt äventyr." #. indexed_txt #: cuts/nar_ar1.txt:1 @@ -56009,10 +56046,8 @@ msgid "" msgstr "" #: dialog/fcdrfung.msg:159 -#, fuzzy -#| msgid "Do you hear me?" msgid "Do you have stimpaks?" -msgstr "Hör du mig?" +msgstr "Har du stimpaks?" #: dialog/fcdrfung.msg:161 msgid "It has been a pleasure doing business with you." @@ -195812,10 +195847,8 @@ msgid "" msgstr "" #: dialog/vckohl.msg:196 -#, fuzzy -#| msgid "Really?" msgid "Really? Used to?" -msgstr "Verkligen?" +msgstr "Är det sant? Brukade du göra det?" #: dialog/vckohl.msg:197 msgid "" diff --git a/data/text/swedish/cuts/elder.sve b/data/text/swedish/cuts/elder.sve index 7f03c82552..82a8a44c68 100644 --- a/data/text/swedish/cuts/elder.sve +++ b/data/text/swedish/cuts/elder.sve @@ -4,11 +4,11 @@ 210:döende brahmin... 310:sjuka barn. 370:Det finns dock hopp. Ett litet hopp som få känner till. -470:The old disks speak of an item called the Garden of Eden Creation Kit. +470:De gamla disketterna talar om ett föremål som kallas Garden of Eden Creation Kit. 570:Det sägs att den kan ge liv åt ödemarken. 670: 765:Detta kommer att bli ditt uppdrag om du visar dig värdig. 840:För att få det beviset måste du först resa till Prövningarnas Tempel. 920:Om du överlever, kom tillbaka till mig så kan vi prata mer. 990:Vårt liv ligger i dina händer, Utvalde. -1040:Prove yourself. Find the GECK. Be our salvation. +1040:Bevisa dig själv. Hitta GECK. Bli vår frälsning. diff --git a/data/text/swedish/cuts/intro.sve b/data/text/swedish/cuts/intro.sve index 0171fdb3eb..4222edff3a 100644 --- a/data/text/swedish/cuts/intro.sve +++ b/data/text/swedish/cuts/intro.sve @@ -9,9 +9,9 @@ 1065:Utan skyddskläder kan extrema ögonskador uppstå! 1190:När du kommer ut ur valvet är du beredd att leva livet på nytt! Med hjälp av... 1255:Edens-Lustgårds-Skapande-Kit -1330:or G.E.C.K. -1430:Use the GECK to create the NEW WORLD you've been waiting for... +1330:eller G.E.C.K. +1430:Använd GECK för att skapa den NYA VÄRLDEN som du har väntat på... 1520:*Resultaten kan variera 1550: -1580:The End. A Vault-Tec Presentation +1580:Slutet. En presentation av Valv-Tek 1645: diff --git a/data/text/swedish/cuts/nar_12.txt b/data/text/swedish/cuts/nar_12.txt index 0b66c3a33a..31ea92c754 100644 --- a/data/text/swedish/cuts/nar_12.txt +++ b/data/text/swedish/cuts/nar_12.txt @@ -1,2 +1,2 @@ -1:The ghouls of Necropolis learn firsthand the final meaning of dehydration, as their city succumbs to the desert sands and the water runs out. +1:Ghulerna i Necropolis får på nära håll lära sig vad uttorkning innebär när deras stad dukar under för ökensanden och vattnet tar slut. 2:Utan sitt vattenrenande kontrollchip överlever de inte. diff --git a/data/text/swedish/cuts/nar_13.txt b/data/text/swedish/cuts/nar_13.txt index a99f877030..58f2556912 100644 --- a/data/text/swedish/cuts/nar_13.txt +++ b/data/text/swedish/cuts/nar_13.txt @@ -1,2 +1,2 @@ -1:The ghouls of Necropolis learn how to maintain the repaired water pump, and eventually rediscover many lost secrets of engineering. +1:Ghulerna i Necropolis lär sig att underhålla den reparerade vattenpumpen och återupptäcker så småningom många av ingenjörskonstens förlorade hemligheter. 2:De bildar ett företag som säljer denna teknik till andra städer. diff --git a/data/text/swedish/cuts/nar_15.txt b/data/text/swedish/cuts/nar_15.txt index 4c0eb63fd2..980549f6ef 100644 --- a/data/text/swedish/cuts/nar_15.txt +++ b/data/text/swedish/cuts/nar_15.txt @@ -1,2 +1,2 @@ -1:The mutant attack on Necropolis spares none of the ghoulish inhabitants. +1:Mutanternas attack mot Necropolis skonar ingen av de ghuliska invånarna. 2:Efter de muterade arméerna avancerar lämnar de en verkligt död stad bakom sig. diff --git a/data/text/swedish/cuts/nar_20.txt b/data/text/swedish/cuts/nar_20.txt index 5b3202d3e5..48a4b3b691 100644 --- a/data/text/swedish/cuts/nar_20.txt +++ b/data/text/swedish/cuts/nar_20.txt @@ -1 +1 @@ -1:Aradesh grieves for his slain daughter, Tandi, but eventually builds Shady Sands into a respected community which is prosperous for many years, before his untimely death at the hands of a Desert Raider. +1:Aradesh sörjer sin dräpta dotter Tandi, men till slut bygger han Shady Sands till ett respekterat samhälle som är framgångsrik i många år, innan en Ökenplundrare orsakar hans alltför tidiga död. diff --git a/data/text/swedish/cuts/nar_22.txt b/data/text/swedish/cuts/nar_22.txt index 65ec605fc7..07590e335f 100644 --- a/data/text/swedish/cuts/nar_22.txt +++ b/data/text/swedish/cuts/nar_22.txt @@ -1,3 +1,3 @@ 1:Med Aradesh död och Tandi försvunnen eller dödad behöver Shady Sands en ny ledare. 2:Efter flera val finner de att de inte kan styras av en enda person och skapar ett vägledande råd. -3:Shortly afterwards, the Raiders regroup and attack Shady Sands, burning the small community to the ground. +3:Kort därefter omgrupperar Plundrarna och attackerar Shady Sands och bränner ner det lilla samhället. diff --git a/data/text/swedish/cuts/nar_28.txt b/data/text/swedish/cuts/nar_28.txt index da50ebbb5d..3a1e293caf 100644 --- a/data/text/swedish/cuts/nar_28.txt +++ b/data/text/swedish/cuts/nar_28.txt @@ -1,3 +1,3 @@ -1:The Brotherhood of Steel helps the other human outposts drive the mutant armies away with minimal loss of life, on both sides of the conflict. -2:The advanced technology of the Brotherhood is slowly reintroduced into New California, with little disruption or chaos. -3:The Brotherhood wisely remains out of the power structure, and becomes a major research and development house. +1:Stålbrödraskapet hjälper andra människosamhällen att driva mutantarmén bort med få förluster på bägge sidor av konflikten. +2:Brödraskapets avancerade teknik återinförs långsamt i Nya Kalifornien, utan större störningar eller kaos. +3:Brödraskapet håller sig klokt nog utanför maktstrukturen och blir ett stort forsknings- och utvecklingshus. diff --git a/data/text/swedish/cuts/nar_29.txt b/data/text/swedish/cuts/nar_29.txt index 499afad2f7..f6c4d8866f 100644 --- a/data/text/swedish/cuts/nar_29.txt +++ b/data/text/swedish/cuts/nar_29.txt @@ -1,2 +1,2 @@ -1:The Brotherhood of Steel, under new leadership after the death of Rhombus, becomes an overzealous, techno-religious dictatorship. -2:In 20 years, the Steel Plague devastates the newly formed New California Republic, and starts a Dark Age that could last a thousand years. +1:Stålbrödraskapet, under nytt ledarskap efter Rhombus död, blir en övernitisk, teknoreligiös diktatur. +2:Efter 20 år har Stålplågan krossat den nyligen formerade Nya Kaliforniska Republiken och påbörjar en mörk tidsålder som kan vara i tusen år. diff --git a/data/text/swedish/cuts/nar_31.txt b/data/text/swedish/cuts/nar_31.txt index 4a81ebf2e5..ef81f8d54f 100644 --- a/data/text/swedish/cuts/nar_31.txt +++ b/data/text/swedish/cuts/nar_31.txt @@ -1,2 +1,2 @@ -1:The Brotherhood of Steel repels the first wave of a mutant invasion, but a traitor in their midst causes the Citadel to fall. -2:Fortunately, the advanced technology is mastered slowly by the mutants, and they were unable to use it against you. +1:Stålbrödraskapet slår tillbaka den första attackvågen av en mutantinvasion, men en förrädare mitt ibland dem orsakar Citadellets fall. +2:Tur nog bemästrar mutanterna den avancerade teknologin långsamt och kunde inte använda den mot dig. diff --git a/data/text/swedish/cuts/nar_32.txt b/data/text/swedish/cuts/nar_32.txt index 57451603be..c79987053e 100644 --- a/data/text/swedish/cuts/nar_32.txt +++ b/data/text/swedish/cuts/nar_32.txt @@ -1,3 +1,3 @@ -1:With your assistance, Old Harold brings the ghoul population of the Hub into equality with the humans. -2:The two sides work together, and the Hub prospers. -3:Old Harold is still alive, as far as anyone knows. +1:Med din assistans kunde Gamle Harold jämställa ghulbefolkingen i Hubben med människorna. +2:De två sidorna arbetar tillsammans, och Hubben blomstrar. +3:Gamle Harold lever fortfarande, såvida någon vet. diff --git a/data/text/swedish/cuts/nar_34.txt b/data/text/swedish/cuts/nar_34.txt index 33b53166ff..ae4bfe36f7 100644 --- a/data/text/swedish/cuts/nar_34.txt +++ b/data/text/swedish/cuts/nar_34.txt @@ -1 +1 @@ -1:The Hub disperses before the might of the mutant army and will never recover. +1:Hubben skingras inför mutantarméns styrka och kommer aldrig att återhämta sig. diff --git a/data/text/swedish/cuts/nar_35.txt b/data/text/swedish/cuts/nar_35.txt index 78106f5645..9d4168a66e 100644 --- a/data/text/swedish/cuts/nar_35.txt +++ b/data/text/swedish/cuts/nar_35.txt @@ -1,2 +1,2 @@ -1:Thanks to your persistence, the Raiders are destroyed as an effective fighting force, and disband. -2:None of the Raider survivors are ever heard from again. +1:Tack vare din envishet har Plundrarna utplånats som en effektiv stridande styrka och upplösts. +2:Ingen av de överlevande Plundrarna hörs någonsin av igen. diff --git a/data/text/swedish/cuts/nar_36.txt b/data/text/swedish/cuts/nar_36.txt index d5a7a63fd5..1e54e25ca7 100644 --- a/data/text/swedish/cuts/nar_36.txt +++ b/data/text/swedish/cuts/nar_36.txt @@ -1 +1 @@ -1:The Desert Raiders eventually regroup and manage to terrorize small communities in the years following your adventures. +1:Ökenplundrarna omgrupperar sig så småningom och lyckas terrorisera små samhällen under åren efter dina äventyr. diff --git a/data/text/swedish/cuts/nar_37.txt b/data/text/swedish/cuts/nar_37.txt index 9f19db0e5c..ee1eccf388 100644 --- a/data/text/swedish/cuts/nar_37.txt +++ b/data/text/swedish/cuts/nar_37.txt @@ -1,2 +1,2 @@ -1:The Desert Raiders pillage most of the northern parts of New California. -2:They are a scourge that lasts for years, until a rebel army of mutants brings them down. +1:Ökenplundrarna härjar i större delen av de norra delarna av Nya Kalifornien. +2:De är ett gissel som varar i åratal, tills en rebellarmé av mutanter besegrar dem. diff --git a/data/text/swedish/cuts/nar_38.txt b/data/text/swedish/cuts/nar_38.txt index d6baee6c21..d06bb703b0 100644 --- a/data/text/swedish/cuts/nar_38.txt +++ b/data/text/swedish/cuts/nar_38.txt @@ -1,2 +1,2 @@ -1:Your mission beneath the Mutant Stronghold is successful. +1:Ditt uppdrag under mutantfästet är framgångsrikt. 2:Your actions today will influence the outside world for years to come. diff --git a/data/text/swedish/cuts/nar_44.txt b/data/text/swedish/cuts/nar_44.txt index d938786bd3..21bcbe1299 100644 --- a/data/text/swedish/cuts/nar_44.txt +++ b/data/text/swedish/cuts/nar_44.txt @@ -1 +1 @@ -1:Interplay Productions presents... +1:Interplay Productions presenterar... diff --git a/data/text/swedish/cuts/nar_45.txt b/data/text/swedish/cuts/nar_45.txt index d710ab8534..aa6227d9f7 100644 --- a/data/text/swedish/cuts/nar_45.txt +++ b/data/text/swedish/cuts/nar_45.txt @@ -1 +1 @@ -1:Fallout, a post nuclear role-playing game. +1:Fallout, ett post-atomärt rollspel. diff --git a/data/text/swedish/cuts/nar_46.txt b/data/text/swedish/cuts/nar_46.txt index 2238270d77..eae9d8224c 100644 --- a/data/text/swedish/cuts/nar_46.txt +++ b/data/text/swedish/cuts/nar_46.txt @@ -1 +1 @@ -1:Fallout, a post nuclear adventure. +1:Fallout, ett post-atomärt äventyr. diff --git a/data/text/swedish/cuts_female/elder.sve b/data/text/swedish/cuts_female/elder.sve index 7f03c82552..82a8a44c68 100644 --- a/data/text/swedish/cuts_female/elder.sve +++ b/data/text/swedish/cuts_female/elder.sve @@ -4,11 +4,11 @@ 210:döende brahmin... 310:sjuka barn. 370:Det finns dock hopp. Ett litet hopp som få känner till. -470:The old disks speak of an item called the Garden of Eden Creation Kit. +470:De gamla disketterna talar om ett föremål som kallas Garden of Eden Creation Kit. 570:Det sägs att den kan ge liv åt ödemarken. 670: 765:Detta kommer att bli ditt uppdrag om du visar dig värdig. 840:För att få det beviset måste du först resa till Prövningarnas Tempel. 920:Om du överlever, kom tillbaka till mig så kan vi prata mer. 990:Vårt liv ligger i dina händer, Utvalde. -1040:Prove yourself. Find the GECK. Be our salvation. +1040:Bevisa dig själv. Hitta GECK. Bli vår frälsning. diff --git a/data/text/swedish/cuts_female/intro.sve b/data/text/swedish/cuts_female/intro.sve index 0171fdb3eb..4222edff3a 100644 --- a/data/text/swedish/cuts_female/intro.sve +++ b/data/text/swedish/cuts_female/intro.sve @@ -9,9 +9,9 @@ 1065:Utan skyddskläder kan extrema ögonskador uppstå! 1190:När du kommer ut ur valvet är du beredd att leva livet på nytt! Med hjälp av... 1255:Edens-Lustgårds-Skapande-Kit -1330:or G.E.C.K. -1430:Use the GECK to create the NEW WORLD you've been waiting for... +1330:eller G.E.C.K. +1430:Använd GECK för att skapa den NYA VÄRLDEN som du har väntat på... 1520:*Resultaten kan variera 1550: -1580:The End. A Vault-Tec Presentation +1580:Slutet. En presentation av Valv-Tek 1645: diff --git a/data/text/swedish/cuts_female/nar_12.txt b/data/text/swedish/cuts_female/nar_12.txt index 0b66c3a33a..31ea92c754 100644 --- a/data/text/swedish/cuts_female/nar_12.txt +++ b/data/text/swedish/cuts_female/nar_12.txt @@ -1,2 +1,2 @@ -1:The ghouls of Necropolis learn firsthand the final meaning of dehydration, as their city succumbs to the desert sands and the water runs out. +1:Ghulerna i Necropolis får på nära håll lära sig vad uttorkning innebär när deras stad dukar under för ökensanden och vattnet tar slut. 2:Utan sitt vattenrenande kontrollchip överlever de inte. diff --git a/data/text/swedish/cuts_female/nar_13.txt b/data/text/swedish/cuts_female/nar_13.txt index a99f877030..58f2556912 100644 --- a/data/text/swedish/cuts_female/nar_13.txt +++ b/data/text/swedish/cuts_female/nar_13.txt @@ -1,2 +1,2 @@ -1:The ghouls of Necropolis learn how to maintain the repaired water pump, and eventually rediscover many lost secrets of engineering. +1:Ghulerna i Necropolis lär sig att underhålla den reparerade vattenpumpen och återupptäcker så småningom många av ingenjörskonstens förlorade hemligheter. 2:De bildar ett företag som säljer denna teknik till andra städer. diff --git a/data/text/swedish/cuts_female/nar_15.txt b/data/text/swedish/cuts_female/nar_15.txt index 4c0eb63fd2..980549f6ef 100644 --- a/data/text/swedish/cuts_female/nar_15.txt +++ b/data/text/swedish/cuts_female/nar_15.txt @@ -1,2 +1,2 @@ -1:The mutant attack on Necropolis spares none of the ghoulish inhabitants. +1:Mutanternas attack mot Necropolis skonar ingen av de ghuliska invånarna. 2:Efter de muterade arméerna avancerar lämnar de en verkligt död stad bakom sig. diff --git a/data/text/swedish/cuts_female/nar_20.txt b/data/text/swedish/cuts_female/nar_20.txt index 5b3202d3e5..48a4b3b691 100644 --- a/data/text/swedish/cuts_female/nar_20.txt +++ b/data/text/swedish/cuts_female/nar_20.txt @@ -1 +1 @@ -1:Aradesh grieves for his slain daughter, Tandi, but eventually builds Shady Sands into a respected community which is prosperous for many years, before his untimely death at the hands of a Desert Raider. +1:Aradesh sörjer sin dräpta dotter Tandi, men till slut bygger han Shady Sands till ett respekterat samhälle som är framgångsrik i många år, innan en Ökenplundrare orsakar hans alltför tidiga död. diff --git a/data/text/swedish/cuts_female/nar_22.txt b/data/text/swedish/cuts_female/nar_22.txt index 65ec605fc7..07590e335f 100644 --- a/data/text/swedish/cuts_female/nar_22.txt +++ b/data/text/swedish/cuts_female/nar_22.txt @@ -1,3 +1,3 @@ 1:Med Aradesh död och Tandi försvunnen eller dödad behöver Shady Sands en ny ledare. 2:Efter flera val finner de att de inte kan styras av en enda person och skapar ett vägledande råd. -3:Shortly afterwards, the Raiders regroup and attack Shady Sands, burning the small community to the ground. +3:Kort därefter omgrupperar Plundrarna och attackerar Shady Sands och bränner ner det lilla samhället. diff --git a/data/text/swedish/cuts_female/nar_28.txt b/data/text/swedish/cuts_female/nar_28.txt index da50ebbb5d..3a1e293caf 100644 --- a/data/text/swedish/cuts_female/nar_28.txt +++ b/data/text/swedish/cuts_female/nar_28.txt @@ -1,3 +1,3 @@ -1:The Brotherhood of Steel helps the other human outposts drive the mutant armies away with minimal loss of life, on both sides of the conflict. -2:The advanced technology of the Brotherhood is slowly reintroduced into New California, with little disruption or chaos. -3:The Brotherhood wisely remains out of the power structure, and becomes a major research and development house. +1:Stålbrödraskapet hjälper andra människosamhällen att driva mutantarmén bort med få förluster på bägge sidor av konflikten. +2:Brödraskapets avancerade teknik återinförs långsamt i Nya Kalifornien, utan större störningar eller kaos. +3:Brödraskapet håller sig klokt nog utanför maktstrukturen och blir ett stort forsknings- och utvecklingshus. diff --git a/data/text/swedish/cuts_female/nar_29.txt b/data/text/swedish/cuts_female/nar_29.txt index 499afad2f7..f6c4d8866f 100644 --- a/data/text/swedish/cuts_female/nar_29.txt +++ b/data/text/swedish/cuts_female/nar_29.txt @@ -1,2 +1,2 @@ -1:The Brotherhood of Steel, under new leadership after the death of Rhombus, becomes an overzealous, techno-religious dictatorship. -2:In 20 years, the Steel Plague devastates the newly formed New California Republic, and starts a Dark Age that could last a thousand years. +1:Stålbrödraskapet, under nytt ledarskap efter Rhombus död, blir en övernitisk, teknoreligiös diktatur. +2:Efter 20 år har Stålplågan krossat den nyligen formerade Nya Kaliforniska Republiken och påbörjar en mörk tidsålder som kan vara i tusen år. diff --git a/data/text/swedish/cuts_female/nar_31.txt b/data/text/swedish/cuts_female/nar_31.txt index 4a81ebf2e5..ef81f8d54f 100644 --- a/data/text/swedish/cuts_female/nar_31.txt +++ b/data/text/swedish/cuts_female/nar_31.txt @@ -1,2 +1,2 @@ -1:The Brotherhood of Steel repels the first wave of a mutant invasion, but a traitor in their midst causes the Citadel to fall. -2:Fortunately, the advanced technology is mastered slowly by the mutants, and they were unable to use it against you. +1:Stålbrödraskapet slår tillbaka den första attackvågen av en mutantinvasion, men en förrädare mitt ibland dem orsakar Citadellets fall. +2:Tur nog bemästrar mutanterna den avancerade teknologin långsamt och kunde inte använda den mot dig. diff --git a/data/text/swedish/cuts_female/nar_32.txt b/data/text/swedish/cuts_female/nar_32.txt index 57451603be..c79987053e 100644 --- a/data/text/swedish/cuts_female/nar_32.txt +++ b/data/text/swedish/cuts_female/nar_32.txt @@ -1,3 +1,3 @@ -1:With your assistance, Old Harold brings the ghoul population of the Hub into equality with the humans. -2:The two sides work together, and the Hub prospers. -3:Old Harold is still alive, as far as anyone knows. +1:Med din assistans kunde Gamle Harold jämställa ghulbefolkingen i Hubben med människorna. +2:De två sidorna arbetar tillsammans, och Hubben blomstrar. +3:Gamle Harold lever fortfarande, såvida någon vet. diff --git a/data/text/swedish/cuts_female/nar_34.txt b/data/text/swedish/cuts_female/nar_34.txt index 33b53166ff..ae4bfe36f7 100644 --- a/data/text/swedish/cuts_female/nar_34.txt +++ b/data/text/swedish/cuts_female/nar_34.txt @@ -1 +1 @@ -1:The Hub disperses before the might of the mutant army and will never recover. +1:Hubben skingras inför mutantarméns styrka och kommer aldrig att återhämta sig. diff --git a/data/text/swedish/cuts_female/nar_35.txt b/data/text/swedish/cuts_female/nar_35.txt index 78106f5645..9d4168a66e 100644 --- a/data/text/swedish/cuts_female/nar_35.txt +++ b/data/text/swedish/cuts_female/nar_35.txt @@ -1,2 +1,2 @@ -1:Thanks to your persistence, the Raiders are destroyed as an effective fighting force, and disband. -2:None of the Raider survivors are ever heard from again. +1:Tack vare din envishet har Plundrarna utplånats som en effektiv stridande styrka och upplösts. +2:Ingen av de överlevande Plundrarna hörs någonsin av igen. diff --git a/data/text/swedish/cuts_female/nar_36.txt b/data/text/swedish/cuts_female/nar_36.txt index d5a7a63fd5..1e54e25ca7 100644 --- a/data/text/swedish/cuts_female/nar_36.txt +++ b/data/text/swedish/cuts_female/nar_36.txt @@ -1 +1 @@ -1:The Desert Raiders eventually regroup and manage to terrorize small communities in the years following your adventures. +1:Ökenplundrarna omgrupperar sig så småningom och lyckas terrorisera små samhällen under åren efter dina äventyr. diff --git a/data/text/swedish/cuts_female/nar_37.txt b/data/text/swedish/cuts_female/nar_37.txt index 9f19db0e5c..ee1eccf388 100644 --- a/data/text/swedish/cuts_female/nar_37.txt +++ b/data/text/swedish/cuts_female/nar_37.txt @@ -1,2 +1,2 @@ -1:The Desert Raiders pillage most of the northern parts of New California. -2:They are a scourge that lasts for years, until a rebel army of mutants brings them down. +1:Ökenplundrarna härjar i större delen av de norra delarna av Nya Kalifornien. +2:De är ett gissel som varar i åratal, tills en rebellarmé av mutanter besegrar dem. diff --git a/data/text/swedish/cuts_female/nar_38.txt b/data/text/swedish/cuts_female/nar_38.txt index d6baee6c21..d06bb703b0 100644 --- a/data/text/swedish/cuts_female/nar_38.txt +++ b/data/text/swedish/cuts_female/nar_38.txt @@ -1,2 +1,2 @@ -1:Your mission beneath the Mutant Stronghold is successful. +1:Ditt uppdrag under mutantfästet är framgångsrikt. 2:Your actions today will influence the outside world for years to come. diff --git a/data/text/swedish/cuts_female/nar_44.txt b/data/text/swedish/cuts_female/nar_44.txt index d938786bd3..21bcbe1299 100644 --- a/data/text/swedish/cuts_female/nar_44.txt +++ b/data/text/swedish/cuts_female/nar_44.txt @@ -1 +1 @@ -1:Interplay Productions presents... +1:Interplay Productions presenterar... diff --git a/data/text/swedish/cuts_female/nar_45.txt b/data/text/swedish/cuts_female/nar_45.txt index d710ab8534..aa6227d9f7 100644 --- a/data/text/swedish/cuts_female/nar_45.txt +++ b/data/text/swedish/cuts_female/nar_45.txt @@ -1 +1 @@ -1:Fallout, a post nuclear role-playing game. +1:Fallout, ett post-atomärt rollspel. diff --git a/data/text/swedish/cuts_female/nar_46.txt b/data/text/swedish/cuts_female/nar_46.txt index 2238270d77..eae9d8224c 100644 --- a/data/text/swedish/cuts_female/nar_46.txt +++ b/data/text/swedish/cuts_female/nar_46.txt @@ -1 +1 @@ -1:Fallout, a post nuclear adventure. +1:Fallout, ett post-atomärt äventyr. diff --git a/data/text/swedish/dialog/fcdrfung.msg b/data/text/swedish/dialog/fcdrfung.msg index 0192af954a..f33deda291 100644 --- a/data/text/swedish/dialog/fcdrfung.msg +++ b/data/text/swedish/dialog/fcdrfung.msg @@ -42,7 +42,7 @@ {141}{}{I'll pay.} {142}{}{Glöm det.} {158}{}{What? You do not have the money? How do you expect me to survive if you ask me for free healing?} -{159}{}{Do you have stimpaks?} +{159}{}{Har du stimpaks?} {160}{}{No thanks.} {161}{}{It has been a pleasure doing business with you.} {162}{}{Tack.} diff --git a/data/text/swedish/dialog/vckohl.msg b/data/text/swedish/dialog/vckohl.msg index 884935a5eb..c0a20c2225 100644 --- a/data/text/swedish/dialog/vckohl.msg +++ b/data/text/swedish/dialog/vckohl.msg @@ -103,7 +103,7 @@ {193}{}{! Well done! Bravo!} {194}{}{Oh, I will for sure! I wish there were more people who did, too.} {195}{}{I certainly share the sentiment! It's been a while since I've seen someone who's the least bit interested. I used to know a trader shared the passion though...} -{196}{}{Really? Used to?} +{196}{}{Är det sant? Brukade du göra det?} {197}{}{Well, it's nice to know there's more of us. Mind if I ask you about something else?} {198}{}{Well, I hope there's more of us out there. Thank you very much and goodbye!} {199}{}{Yes, he'd come around to the courtyard to trade alcoholic beverages, but he'd come in to buy books from me. I wouldn't even charge him, but he insisted. He said his people back home loved them.} diff --git a/scripts_src/brokhill/hidocbox.ssl b/scripts_src/brokhill/hidocbox.ssl index 7f763da35d..577d5ef9b0 100644 --- a/scripts_src/brokhill/hidocbox.ssl +++ b/scripts_src/brokhill/hidocbox.ssl @@ -55,7 +55,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 200, 750, 100) check_restock_item(PID_FIRST_AID_KIT, 0, 1, 25) check_restock_item(PID_HEALING_POWDER, 0, 3, 40) diff --git a/scripts_src/brokhill/hijacbox.ssl b/scripts_src/brokhill/hijacbox.ssl index 2ac3e49b3b..63ad10577f 100644 --- a/scripts_src/brokhill/hijacbox.ssl +++ b/scripts_src/brokhill/hijacbox.ssl @@ -48,7 +48,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 200, 1250, 100) check_restock_item(PID_BUFFOUT, 0, 3, 25) check_restock_item(PID_HEALING_POWDER, 1, 2, 80) diff --git a/scripts_src/brokhill/hilbox.ssl b/scripts_src/brokhill/hilbox.ssl index d46415c5ff..6312ea8d6d 100644 --- a/scripts_src/brokhill/hilbox.ssl +++ b/scripts_src/brokhill/hilbox.ssl @@ -50,7 +50,7 @@ procedure map_enter_p_proc begin if (map_var(MVAR_Liz_Dead) == 0) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 100, 300, 100) check_restock_item(PID_ROPE, 1, 5, 100) check_restock_item(PID_FLARE, 2, 10, 100) diff --git a/scripts_src/brokhill/hioutbox.ssl b/scripts_src/brokhill/hioutbox.ssl index 918668aa08..f4342043cf 100644 --- a/scripts_src/brokhill/hioutbox.ssl +++ b/scripts_src/brokhill/hioutbox.ssl @@ -48,7 +48,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 100, 500, 100) check_restock_item(PID_223_FMJ, 0, 3, 25) check_restock_item(PID_45_CALIBER_AMMO, 0, 2, 25) diff --git a/scripts_src/den/diflibox.ssl b/scripts_src/den/diflibox.ssl index f7b75eb07f..712b695c92 100644 --- a/scripts_src/den/diflibox.ssl +++ b/scripts_src/den/diflibox.ssl @@ -42,7 +42,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(55, 61) - self_caps); check_restock_item(PID_JET, 0, 1, 100) check_restock_item(PID_CATS_PAW, 0, 1, 100) diff --git a/scripts_src/den/diflkbox.ssl b/scripts_src/den/diflkbox.ssl index 9848ffac5f..b10baa73d8 100644 --- a/scripts_src/den/diflkbox.ssl +++ b/scripts_src/den/diflkbox.ssl @@ -64,7 +64,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 148, 3512, 100) check_restock_item(PID_LEATHER_ARMOR, 1, 1, 80) check_restock_item(PID_KNIFE, 1, 2, 100) diff --git a/scripts_src/den/dimetbox.ssl b/scripts_src/den/dimetbox.ssl index 49ed2e404b..8145f7c0de 100644 --- a/scripts_src/den/dimetbox.ssl +++ b/scripts_src/den/dimetbox.ssl @@ -55,7 +55,7 @@ procedure map_enter_p_proc begin destroy_object(the_box_to_kill); end - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(5, 250) - self_caps); check_restock_item(PID_SPEAR, 0, 7, 100) check_restock_item(PID_KNIFE, 0, 11, 100) diff --git a/scripts_src/den/dimombox.ssl b/scripts_src/den/dimombox.ssl index 29f9a3d8f1..aeae632362 100644 --- a/scripts_src/den/dimombox.ssl +++ b/scripts_src/den/dimombox.ssl @@ -41,7 +41,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(110, 125) - self_caps); check_restock_item(PID_STIMPAK, 0, 2, 90) check_restock_item(PID_CROWBAR, 1, 1, 40) diff --git a/scripts_src/den/dismibox.ssl b/scripts_src/den/dismibox.ssl index 5b36b46303..039f3dffc3 100644 --- a/scripts_src/den/dismibox.ssl +++ b/scripts_src/den/dismibox.ssl @@ -40,7 +40,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOX_OF_NOODLES, 0, 1, 100) check_restock_item(PID_BEER, 0, 6, 100) check_restock_item(PID_SUPER_TOOL_KIT, 1, 1, 40) diff --git a/scripts_src/den/ditubbox.ssl b/scripts_src/den/ditubbox.ssl index 588c568a3a..777f940f55 100644 --- a/scripts_src/den/ditubbox.ssl +++ b/scripts_src/den/ditubbox.ssl @@ -41,7 +41,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(151, 161) - self_caps); check_restock_item(PID_JET, 5, 10, 100) check_restock_item(PID_PSYCHO, 0, 2, 100) diff --git a/scripts_src/gecko/giperbox.ssl b/scripts_src/gecko/giperbox.ssl index 314215c7f8..e78990e156 100644 --- a/scripts_src/gecko/giperbox.ssl +++ b/scripts_src/gecko/giperbox.ssl @@ -46,7 +46,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 500, 1000, 100) check_restock_item(PID_RAD_X, 0, 1, 100) check_restock_item(PID_RADAWAY, 0, 1, 100) diff --git a/scripts_src/headers/itempid.h b/scripts_src/headers/itempid.h index 8990c291bf..20695060a7 100644 --- a/scripts_src/headers/itempid.h +++ b/scripts_src/headers/itempid.h @@ -572,4 +572,71 @@ #define PID_FLYING_ELECTRICITY_BOLT (83886091) +/****************************************************************** +*************** RP *************** +******************************************************************/ +#define PID_BUCKET (534) // added by killap - expansion pack (Primitive Tribe) +#define PID_FISH (535) // added by killap - expansion pack (Primitive Tribe) +#define PID_FISH2 (536) // added by killap - expansion pack (Primitive Tribe) +#define PID_ABBEY_MISSING_BOOK (537) // added by killap - expansion pack (Abbey) +#define PID_ABBEY_TECHMANUAL1 (538) // added by killap - expansion pack (Abbey) +#define PID_ABBEY_TECHMANUAL2 (539) // added by killap - expansion pack (Abbey) +#define PID_ABBEY_TECHMANUAL3 (540) // added by killap - expansion pack (Abbey) +#define PID_CHINESE_ARMY_MANUAL (541) // added by killap - expansion pack (Abbey) +#define PID_ABBEY_BOOZE (542) // added by killap - expansion pack (Abbey) +#define PID_ANNA_DIARY (543) // added by killap - expansion pack (Den) +#define PID_EPA_BOTANY_HOLODISK (544) // added by killap - expansion pack (EPA) +#define EXPIRED_GECK (545) // added by killap - expansion pack (Hub Stash) +#define PID_OLD_COIN (546) // added by killap - expansion pack (Hub Stash) +#define PID_OLD_WATCH (547) // added by killap - expansion pack (Hub Stash) +#define PID_CIGARETTE (548) // added by killap - expansion pack (Hub Stash) +#define PID_GAS_MASK (549) // added by killap - expansion pack (EPA) +#define PID_TOASTER (550) // epa cont +#define PID_EPA_SYRINGE (551) +#define PID_DOG_FOOD (552) +#define PID_BUG_SPRAY (553) +#define PID_ENVIRONMENTAL_ARMOUR (554) +#define PID_EPA_PAMPHLET (555) +#define PID_DRUGS (556) +#define PID_SECURITY_ROOMS_KEY_CARD (557) +#define PID_RACK (558) +#define PID_EPA_KEYS (559) +#define PID_RANDOM_CHEMICALS (560) +#define PID_ARROYO_SEEDS (561) +#define PID_PLANT_SPRAY (562) +#define PID_RADIO_DYNAMITE (563) +#define PID_RADIO_DYNAMITE_TRIGGER (564) +#define PID_PAPER (565) +#define PID_EXPERIMENTAL_SEEDS (566) +#define PID_DRILL (567) +#define PID_ACTIVE_RADIO_DYNAMITE (568) +#define PID_POP_ROCKS (569) +#define PID_SHAMPOO (570) +#define PID_K9_KEVLAR (571) +#define PID_HUMAN_EAR (572) +#define PID_ERSI (573) +#define PID_LIGHTSABER_GREEN (574) +#define PID_BLASTER (575) +#define PID_LIGHTSABER_RED (576) +#define PID_BIG_VENT (577) +#define PID_SUB_LOCKER1 (578) +#define PID_SUB_LOCKER2 (579) +#define PID_SHI_SUB_CODE_CHART (580) +#define PID_DEAD_TRIBAL1 (581) +#define PID_DEAD_TRIBAL2 (582) +#define PID_EPA_SPORE_SPIKE (583) +#define PID_DEAD_VAULT_DWELLER1 (584) +#define PID_DEAD_VAULT_DWELLER2 (585) +#define PID_DEAD_TRIBAL3 (586) +#define PID_DEAD_TRIBAL4 (587) +#define PID_K9_KEVLAR_WEARABLE (588) +#define PID_MUTANT_ARMOR (589) +#define PID_MUTANT_ARMOR_WEARABLE (590) +#define PID_SMALL_SCORPION_TAIL (591) +#define PID_DR_SHENG_PLANT_SEED (592) +#define PID_VAULT_BOXER_MALE_NORMAL (593) +#define PID_VAULT_BOXER_MALE_LONG_HAIR (594) +#define PID_VAULT_BOXER_MALE_BALD (595) +#define PID_FAKE_HEART_PILLS (596) + #endif // _ITEMPID_H_DEFINED diff --git a/scripts_src/headers/rpu.h b/scripts_src/headers/rpu.h index 8dd93ab87d..2cc1a59c63 100644 --- a/scripts_src/headers/rpu.h +++ b/scripts_src/headers/rpu.h @@ -67,71 +67,3 @@ end // NPC critter fid offset. Add this to the fids (artfid) when using obj_art_fid #define NPC_ARTFID_WEAPON_OFFSET 4096 #endif // RPU_DEFINE_H - -// rpu items -#ifndef RPU_ITEMPID_H -#define RPU_ITEMPID_H -#define PID_BUCKET (534) // added by killap - expansion pack (Primitive Tribe) -#define PID_FISH (535) // added by killap - expansion pack (Primitive Tribe) -#define PID_FISH2 (536) // added by killap - expansion pack (Primitive Tribe) -#define PID_ABBEY_MISSING_BOOK (537) // added by killap - expansion pack (Abbey) -#define PID_ABBEY_TECHMANUAL1 (538) // added by killap - expansion pack (Abbey) -#define PID_ABBEY_TECHMANUAL2 (539) // added by killap - expansion pack (Abbey) -#define PID_ABBEY_TECHMANUAL3 (540) // added by killap - expansion pack (Abbey) -#define PID_CHINESE_ARMY_MANUAL (541) // added by killap - expansion pack (Abbey) -#define PID_ABBEY_BOOZE (542) // added by killap - expansion pack (Abbey) -#define PID_ANNA_DIARY (543) // added by killap - expansion pack (Den) -#define PID_EPA_BOTANY_HOLODISK (544) // added by killap - expansion pack (EPA) -#define EXPIRED_GECK (545) // added by killap - expansion pack (Hub Stash) -#define PID_OLD_COIN (546) // added by killap - expansion pack (Hub Stash) -#define PID_OLD_WATCH (547) // added by killap - expansion pack (Hub Stash) -#define PID_CIGARETTE (548) // added by killap - expansion pack (Hub Stash) -#define PID_GAS_MASK (549) // added by killap - expansion pack (EPA) -#define PID_TOASTER (550) // epa cont -#define PID_EPA_SYRINGE (551) -#define PID_DOG_FOOD (552) -#define PID_BUG_SPRAY (553) -#define PID_ENVIRONMENTAL_ARMOUR (554) -#define PID_EPA_PAMPHLET (555) -#define PID_DRUGS (556) -#define PID_SECURITY_ROOMS_KEY_CARD (557) -#define PID_RACK (558) -#define PID_EPA_KEYS (559) -#define PID_RANDOM_CHEMICALS (560) -#define PID_ARROYO_SEEDS (561) -#define PID_PLANT_SPRAY (562) -#define PID_RADIO_DYNAMITE (563) -#define PID_RADIO_DYNAMITE_TRIGGER (564) -#define PID_PAPER (565) -#define PID_EXPERIMENTAL_SEEDS (566) -#define PID_DRILL (567) -#define PID_ACTIVE_RADIO_DYNAMITE (568) -#define PID_POP_ROCKS (569) -#define PID_SHAMPOO (570) -#define PID_K9_KEVLAR (571) -#define PID_HUMAN_EAR (572) -#define PID_ERSI (573) -#define PID_LIGHTSABER_GREEN (574) -#define PID_BLASTER (575) -#define PID_LIGHTSABER_RED (576) -#define PID_BIG_VENT (577) -#define PID_SUB_LOCKER1 (578) -#define PID_SUB_LOCKER2 (579) -#define PID_SHI_SUB_CODE_CHART (580) -#define PID_DEAD_TRIBAL1 (581) -#define PID_DEAD_TRIBAL2 (582) -#define PID_EPA_SPORE_SPIKE (583) -#define PID_DEAD_VAULT_DWELLER1 (584) -#define PID_DEAD_VAULT_DWELLER2 (585) -#define PID_DEAD_TRIBAL3 (586) -#define PID_DEAD_TRIBAL4 (587) -#define PID_K9_KEVLAR_WEARABLE (588) -#define PID_MUTANT_ARMOR (589) -#define PID_MUTANT_ARMOR_WEARABLE (590) -#define PID_SMALL_SCORPION_TAIL (591) -#define PID_DR_SHENG_PLANT_SEED (592) -#define PID_VAULT_BOXER_MALE_NORMAL (593) -#define PID_VAULT_BOXER_MALE_LONG_HAIR (594) -#define PID_VAULT_BOXER_MALE_BALD (595) -#define PID_FAKE_HEART_PILLS (596) -#endif // RPU_ITEMPID_H diff --git a/scripts_src/headers/upu.h b/scripts_src/headers/upu.h index 98fe92b296..18c958d303 100644 --- a/scripts_src/headers/upu.h +++ b/scripts_src/headers/upu.h @@ -166,7 +166,7 @@ procedure check_title_bad(variable title) begin end // call before restock -procedure move_critical_items begin +procedure move_quest_items begin if wipe_inventory != 1 then return 0; variable tmp_box := create_object(PID_FOOTLOCKER_CLEAN_LEFT, 5, 0); variable pid; @@ -216,7 +216,21 @@ procedure move_critical_items begin PID_VIC_WATER_FLASK, PID_WESTIN_HOLO, PID_YELLOW_PASS_KEY, - PID_YELLOW_REACTOR_KEYCARD + PID_YELLOW_REACTOR_KEYCARD, + + // RPU + // repurposed vanilla items + PID_MOTIVATOR, // Abbey + PID_HEART_PILLS, // Cassidy & Abbey + // RP added + PID_BUCKET, // Umbra tribe + PID_ABBEY_MISSING_BOOK, // Abbey + PID_EPA_BOTANY_HOLODISK, // Abbey + PID_EXPERIMENTAL_SEEDS, // SanFran/Dr.Sheng + PID_ERSI, // EPA companion + PID_DR_SHENG_PLANT_SEED, // SanFran/Dr.Sheng + PID_FAKE_HEART_PILLS + // end RPU ]; foreach pid in pids begin if (obj_is_carrying_obj_pid(self_obj, pid) > 0) then begin diff --git a/scripts_src/klamath/kibbox.ssl b/scripts_src/klamath/kibbox.ssl index ac11bd143f..8333eea875 100644 --- a/scripts_src/klamath/kibbox.ssl +++ b/scripts_src/klamath/kibbox.ssl @@ -61,7 +61,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 150, 225, 100) check_restock_item(PID_LEATHER_ARMOR, 1, 1, 100) check_restock_item(PID_HEALING_POWDER, 2, 4, 100) diff --git a/scripts_src/klamath/kidbox.ssl b/scripts_src/klamath/kidbox.ssl index 90a535cc3d..9e18bca42e 100644 --- a/scripts_src/klamath/kidbox.ssl +++ b/scripts_src/klamath/kidbox.ssl @@ -63,7 +63,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 65, 65, 100) check_restock_item(PID_MEAT_JERKY, 45, 45, 100) check_restock_item(PID_BRASS_KNUCKLES, 1, 1, 100) diff --git a/scripts_src/klamath/kisbox.ssl b/scripts_src/klamath/kisbox.ssl index 528074c46e..9b2c703ead 100644 --- a/scripts_src/klamath/kisbox.ssl +++ b/scripts_src/klamath/kisbox.ssl @@ -62,7 +62,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 125, 250, 100) check_restock_item(PID_LEATHER_JACKET, 1, 1, 100) check_restock_item(PID_KNIFE, 1, 2, 100) diff --git a/scripts_src/modoc/mibalbox.ssl b/scripts_src/modoc/mibalbox.ssl index 3aad8f196c..3ed80b8afa 100644 --- a/scripts_src/modoc/mibalbox.ssl +++ b/scripts_src/modoc/mibalbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 475, 525, 100) check_restock_item(PID_LEATHER_ARMOR, 1, 1, 100) check_restock_item(PID_LEATHER_JACKET, 1, 1, 100) diff --git a/scripts_src/modoc/migribox.ssl b/scripts_src/modoc/migribox.ssl index a9005cf723..bb43c3f776 100644 --- a/scripts_src/modoc/migribox.ssl +++ b/scripts_src/modoc/migribox.ssl @@ -45,7 +45,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 95, 105, 100) check_restock_item(PID_MEAT_JERKY, 15, 20, 100) call restore_critical_items(tmp_box); diff --git a/scripts_src/ncr/scdusty.ssl b/scripts_src/ncr/scdusty.ssl index b9b622b5fc..6ed7b928b4 100644 --- a/scripts_src/ncr/scdusty.ssl +++ b/scripts_src/ncr/scdusty.ssl @@ -103,7 +103,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin ndebug("Should have restocked"); - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOOZE, 10, 20, 100) check_restock_item(PID_BEER, 20, 30, 100) check_restock_item(PID_NUKA_COLA, 10, 20, 100) diff --git a/scripts_src/ncr/sidtbl.ssl b/scripts_src/ncr/sidtbl.ssl index 0a95a1a4d6..261700aebd 100644 --- a/scripts_src/ncr/sidtbl.ssl +++ b/scripts_src/ncr/sidtbl.ssl @@ -153,7 +153,7 @@ procedure map_enter_p_proc begin //Tools & ammo if (self_tile == DUPPO_TBL_1) then begin - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); check_restock_item(PID_DESERT_EAGLE, 1, 3, 100) check_restock_item(PID_HUNTING_RIFLE, 1, 3, 100) check_restock_item(PID_SHOTGUN, 1, 3, 100) @@ -179,7 +179,7 @@ procedure map_enter_p_proc begin //Weapons if (self_tile == DUPPO_TBL_2) then begin - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); check_restock_item(PID_9MM_AMMO, 1, 5, 100) check_restock_item(PID_BBS, 10, 20, 100) check_restock_item(PID_5MM_JHP, 5, 10, 100) diff --git a/scripts_src/ncr/simbox.ssl b/scripts_src/ncr/simbox.ssl index 22c79ba273..a5963bbb56 100644 --- a/scripts_src/ncr/simbox.ssl +++ b/scripts_src/ncr/simbox.ssl @@ -67,7 +67,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_IGUANA_ON_A_STICK, 10, 100, 100) check_restock_item(PID_MEAT_ON_A_STICK, 25, 30, 100) //moved here from scmikey check_restock_item(PID_BOTTLE_CAPS, 50, 100, 100) //moved here from scmikey diff --git a/scripts_src/ncr/sishelf1.ssl b/scripts_src/ncr/sishelf1.ssl index 07ddae3749..6fea9571b1 100644 --- a/scripts_src/ncr/sishelf1.ssl +++ b/scripts_src/ncr/sishelf1.ssl @@ -196,7 +196,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin ndebug("first restock shelf 1"); - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_44_MAGNUM_JHP, 7, 10, 40) check_restock_item(PID_BBS, 30, 50, 10) check_restock_item(PID_AVENGER_MINIGUN, 0, 1, 100) diff --git a/scripts_src/ncr/sishelf2.ssl b/scripts_src/ncr/sishelf2.ssl index b34c11bae8..6adb923c5c 100644 --- a/scripts_src/ncr/sishelf2.ssl +++ b/scripts_src/ncr/sishelf2.ssl @@ -196,7 +196,7 @@ procedure map_enter_p_proc begin if (buster_obj != -1 and buster_obj) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); //Common check_restock_item(PID_KNIFE, 1, 5, 100) check_restock_item(PID_CLUB, 1, 5, 100) diff --git a/scripts_src/ncr/sishelf3.ssl b/scripts_src/ncr/sishelf3.ssl index a839629280..b3594eb903 100644 --- a/scripts_src/ncr/sishelf3.ssl +++ b/scripts_src/ncr/sishelf3.ssl @@ -194,7 +194,7 @@ procedure map_enter_p_proc begin if (buster_obj and buster_obj != -1) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_LEATHER_JACKET, 1, 3, 100) check_restock_item(PID_LEATHER_ARMOR, 1, 3, 100) check_restock_item(PID_METAL_ARMOR, 1, 1, 100) diff --git a/scripts_src/newreno/nceldrid.ssl b/scripts_src/newreno/nceldrid.ssl index 1b77451ace..f1b9a352eb 100644 --- a/scripts_src/newreno/nceldrid.ssl +++ b/scripts_src/newreno/nceldrid.ssl @@ -937,6 +937,8 @@ procedure Node026 begin if (made_man_set == false) then begin adj_eldridge_barter(-20); // Seraph's Fix: changed '20' to '-20' set_made_man_set; + // Ensure that first time special inventory has 223 pistol. + give_pid_qty(new_reno_eldridge_box_2, PID_223_PISTOL, 1) end Reply(530); NOption(386, Node975, 004); diff --git a/scripts_src/newreno/nibisbox.ssl b/scripts_src/newreno/nibisbox.ssl index 1d64e9b23f..ae075caad2 100644 --- a/scripts_src/newreno/nibisbox.ssl +++ b/scripts_src/newreno/nibisbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_MUTATED_FRUIT, 1, 2, 100) check_restock_item(PID_JET, 2, 10, 100) check_restock_item(PID_BEER, 1, 5, 100) diff --git a/scripts_src/newreno/nieldbox.ssl b/scripts_src/newreno/nieldbox.ssl index d7d3adb9e0..6ae961cb53 100644 --- a/scripts_src/newreno/nieldbox.ssl +++ b/scripts_src/newreno/nieldbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_SPRINGER_RIFLE, 1, 2, 100) check_restock_item(PID_44_MAGNUM_REVOLVER, 1, 1, 100) check_restock_item(PID_10MM_PISTOL, 1, 2, 100) diff --git a/scripts_src/newreno/nieldbx2.ssl b/scripts_src/newreno/nieldbx2.ssl index dfa33b2ec1..36bb87c133 100644 --- a/scripts_src/newreno/nieldbx2.ssl +++ b/scripts_src/newreno/nieldbx2.ssl @@ -47,10 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); - if (map_first_run) then begin - give_pid_qty(self_obj, PID_223_PISTOL, 1) - end + variable tmp_box = move_quest_items(); check_restock_item(PID_ASSAULT_RIFLE, 1, 1, 25) check_restock_item(PID_COMBAT_SHOTGUN, 1, 1, 25) check_restock_item(PID_ROCKET_LAUNCHER, 1, 1, 25) diff --git a/scripts_src/newreno/niethbox.ssl b/scripts_src/newreno/niethbox.ssl index bd69c10aaa..6b710d1ffd 100644 --- a/scripts_src/newreno/niethbox.ssl +++ b/scripts_src/newreno/niethbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(1,12) - self_caps); check_restock_item(PID_NUKA_COLA, 1, 1, 100) check_restock_item(PID_FLOWER, 1, 1, 100) diff --git a/scripts_src/newreno/nijulbox.ssl b/scripts_src/newreno/nijulbox.ssl index 0bdd918a63..966d232f17 100644 --- a/scripts_src/newreno/nijulbox.ssl +++ b/scripts_src/newreno/nijulbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_JET, 1, 7, 100) check_restock_item(PID_STIMPAK, 1, 5, 100) call restore_critical_items(tmp_box); diff --git a/scripts_src/newreno/nimorbox.ssl b/scripts_src/newreno/nimorbox.ssl index da4cb34d31..57bb826cc7 100644 --- a/scripts_src/newreno/nimorbox.ssl +++ b/scripts_src/newreno/nimorbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_MUTATED_FRUIT, 1, 2, 100) check_restock_item(PID_JET, 10, 20, 100) check_restock_item(PID_BEER, 1, 5, 100) diff --git a/scripts_src/newreno/nirenbox.ssl b/scripts_src/newreno/nirenbox.ssl index d17b3dfdc8..c832dc19ce 100644 --- a/scripts_src/newreno/nirenbox.ssl +++ b/scripts_src/newreno/nirenbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); self_caps_adjust(random(250,500) - self_caps); check_restock_item(PID_JET, 5, 10, 100) check_restock_item(PID_ANTIDOTE, 1, 5, 100) diff --git a/scripts_src/newreno/nisalbox.ssl b/scripts_src/newreno/nisalbox.ssl index f30daea693..2adc2fc010 100644 --- a/scripts_src/newreno/nisalbox.ssl +++ b/scripts_src/newreno/nisalbox.ssl @@ -47,7 +47,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_MUTATED_FRUIT, 1, 2, 100) check_restock_item(PID_JET, 2, 10, 100) check_restock_item(PID_BEER, 1, 5, 100) diff --git a/scripts_src/newreno/nitrybox.ssl b/scripts_src/newreno/nitrybox.ssl index f663140d45..738f1ecd37 100644 --- a/scripts_src/newreno/nitrybox.ssl +++ b/scripts_src/newreno/nitrybox.ssl @@ -48,7 +48,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_SMALL_ENERGY_CELL, 2, 2, 100) check_restock_item(PID_MICRO_FUSION_CELL, 2, 2, 100) call restore_critical_items(tmp_box); diff --git a/scripts_src/redding/ricshbox.ssl b/scripts_src/redding/ricshbox.ssl index 3c8bb1861a..03424a11d3 100644 --- a/scripts_src/redding/ricshbox.ssl +++ b/scripts_src/redding/ricshbox.ssl @@ -51,7 +51,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); set_local_var(LVAR_Restock_Time, (game_time + (2*ONE_GAME_WEEK))); check_restock_item(PID_BOTTLE_CAPS,1000,5000,100) call restore_critical_items(tmp_box); diff --git a/scripts_src/sanfran/fcdrfung.ssl b/scripts_src/sanfran/fcdrfung.ssl index a17db79d32..5114819b89 100644 --- a/scripts_src/sanfran/fcdrfung.ssl +++ b/scripts_src/sanfran/fcdrfung.ssl @@ -143,7 +143,7 @@ procedure map_enter_p_proc begin restock_fix if (game_time > local_var(LVAR_Restock_Time)) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_STIMPAK, 5, 7, 100) check_restock_item(PID_FIRST_AID_KIT, 1, 3, 60) check_restock_item(PID_RADAWAY, 1, 3, 60) diff --git a/scripts_src/sanfran/figuntbl.ssl b/scripts_src/sanfran/figuntbl.ssl index 2ed612cb78..0405b8a731 100644 --- a/scripts_src/sanfran/figuntbl.ssl +++ b/scripts_src/sanfran/figuntbl.ssl @@ -151,7 +151,7 @@ procedure map_enter_p_proc begin if (local_var(LVAR_Restock_Time) < game_time) then begin if (self_tile == TABLE_1) then begin //Armor table ndebug("table 1 set"); - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); //Used to be on Table 3 check_restock_item(PID_BOTTLE_CAPS, 1000, 2000, 100) check_restock_item(PID_FLAMER, 1, 2, 60) @@ -184,7 +184,7 @@ procedure map_enter_p_proc begin call restore_critical_items(tmp_box); end else if (self_tile == TABLE_2) then begin //Ammo table ndebug("table 2 set"); - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); //Used to be on table 3 check_restock_item(PID_HK_CAWS, 1, 5, 40) check_restock_item(PID_HK_P90C, 1, 2, 55) diff --git a/scripts_src/sanfran/filaotbl.ssl b/scripts_src/sanfran/filaotbl.ssl index 94316f23a4..ce4bd12db7 100644 --- a/scripts_src/sanfran/filaotbl.ssl +++ b/scripts_src/sanfran/filaotbl.ssl @@ -148,7 +148,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin if (self_tile == TABLE_1) then begin //Armor table - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); //used to be table 3 check_restock_item(PID_ROCKET_LAUNCHER, 1, 2, 40) @@ -176,7 +176,7 @@ procedure map_enter_p_proc begin call restore_critical_items(tmp_box); end else if (self_tile == TABLE_2) then begin //Ammo table - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); //used to be table 4 check_restock_item(PID_CROWBAR, 1, 1, 100) diff --git a/scripts_src/sanfran/fitguntb.ssl b/scripts_src/sanfran/fitguntb.ssl index 4901b3819d..ca7eb96722 100644 --- a/scripts_src/sanfran/fitguntb.ssl +++ b/scripts_src/sanfran/fitguntb.ssl @@ -148,7 +148,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin if (self_tile == TABLE_1) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 300, 436, 80) check_restock_item(PID_SPIKED_KNUCKLES, 1, 3, 80) check_restock_item(PID_MEGA_POWER_FIST, 1, 1, 100) diff --git a/scripts_src/sanfran/fitmertb.ssl b/scripts_src/sanfran/fitmertb.ssl index 72035f9d46..4bbc30fbc6 100644 --- a/scripts_src/sanfran/fitmertb.ssl +++ b/scripts_src/sanfran/fitmertb.ssl @@ -150,7 +150,7 @@ procedure map_enter_p_proc begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin if (self_tile == TABLE_1) then begin - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 300, 436, 80) check_restock_item(PID_STIMPAK, 10, 20, 80) check_restock_item(PID_FIRST_AID_KIT, 1, 2, 60) @@ -161,7 +161,7 @@ procedure map_enter_p_proc begin check_restock_item(PID_MEAT_JERKY, 4, 5, 45) call restore_critical_items(tmp_box); end else if (self_tile == TABLE_2) then begin - tmp_box := move_critical_items(); + tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 300, 436, 80) check_restock_item(PID_BIG_BOOK_OF_SCIENCE, 1, 2, 40) check_restock_item(PID_DEANS_ELECTRONICS, 2, 3, 30) diff --git a/scripts_src/valtcity/vidarbox.ssl b/scripts_src/valtcity/vidarbox.ssl index 6d6a06043c..9d06c5a66b 100644 --- a/scripts_src/valtcity/vidarbox.ssl +++ b/scripts_src/valtcity/vidarbox.ssl @@ -48,7 +48,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 100, 500, 100) check_restock_item(PID_CROWBAR, 1, 1, 100) check_restock_item(PID_SLEDGEHAMMER, 1, 1, 100) diff --git a/scripts_src/valtcity/vifarbox.ssl b/scripts_src/valtcity/vifarbox.ssl index 33f34773dd..6d0a6aac54 100644 --- a/scripts_src/valtcity/vifarbox.ssl +++ b/scripts_src/valtcity/vifarbox.ssl @@ -48,7 +48,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 100, 500, 100) check_restock_item(PID_STIMPAK, 2, 8, 100) check_restock_item(PID_ANTIDOTE, 1, 3, 100) diff --git a/scripts_src/valtcity/viharbox.ssl b/scripts_src/valtcity/viharbox.ssl index aba7bacdb8..0c258a2352 100644 --- a/scripts_src/valtcity/viharbox.ssl +++ b/scripts_src/valtcity/viharbox.ssl @@ -51,7 +51,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 150, 390, 100) check_restock_item(PID_KNIFE, 1, 3, 100) check_restock_item(PID_CROWBAR, 1, 2, 100) diff --git a/scripts_src/valtcity/viranbox.ssl b/scripts_src/valtcity/viranbox.ssl index 02211cc74a..d464df6a54 100644 --- a/scripts_src/valtcity/viranbox.ssl +++ b/scripts_src/valtcity/viranbox.ssl @@ -46,7 +46,7 @@ procedure map_enter_p_proc begin if (is_loading_game == false) then begin restock_fix if (local_var(LVAR_Restock_Time) < game_time) then begin - variable tmp_box := move_critical_items(); + variable tmp_box := move_quest_items(); check_restock_item(PID_BOTTLE_CAPS, 200, 600, 100) check_restock_item(PID_BIG_BOOK_OF_SCIENCE, 1, 2, 75) check_restock_item(PID_DEANS_ELECTRONICS, 1, 1, 75)