diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml index 1b177cd89..4226a5f45 100644 --- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -20788,12 +20788,15 @@ 95 8 91 - 80 - 100 - 2 - 399 + 80 100 2 + 82 + 100 + 2 + 399 + 100 + 4 1090 100 diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index cec0ee2a9..33ccad40b 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -47624,7 +47624,7 @@ 33554432 2 1 - 16 + 1581 1 149 2 @@ -49175,7 +49175,7 @@ Let there be light! Batteries included. 128 1 - 49 + 1636 2 2 161 @@ -49212,7 +49212,7 @@ Not for sale through BR. 128 1 - 49 + 1637 2 2 161 diff --git a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml index 2ef145d75..3f105d43e 100644 --- a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml @@ -463,7 +463,7 @@ 23 3 - 0 + 2 29 0 0 @@ -483,7 +483,7 @@ 24 3 - 0 + 2 30 0 0 @@ -1823,7 +1823,7 @@ 91 4 - 2 + 4 32 0 0 @@ -1961,7 +1961,7 @@ 0 - 98 + 98 4 1 34 @@ -1981,7 +1981,7 @@ 0 - 99 + 99 3 1 30 @@ -2123,7 +2123,7 @@ 106 4 - 1 + 3 34 0 0 diff --git a/gamedir/Data-1.13/TableData/Lookup/ExplosionType.xml b/gamedir/Data-1.13/TableData/Lookup/ExplosionType.xml index 0234c4a63..0b4b03894 100644 --- a/gamedir/Data-1.13/TableData/Lookup/ExplosionType.xml +++ b/gamedir/Data-1.13/TableData/Lookup/ExplosionType.xml @@ -46,10 +46,10 @@ 11 - ??? + Roof Collapse 12 - ??? + White Smoke \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Lookup/Silhouette.xml b/gamedir/Data-1.13/TableData/Lookup/Silhouette.xml index d08c2e547..f11a76400 100644 --- a/gamedir/Data-1.13/TableData/Lookup/Silhouette.xml +++ b/gamedir/Data-1.13/TableData/Lookup/Silhouette.xml @@ -216,8 +216,12 @@ 53 Throw Knife - + 54 Short Riflex1 + + 55 + Belt Feeder + \ No newline at end of file diff --git a/gamedir/Data-UB/Scripts/intro.lua b/gamedir/Data-UB/Scripts/intro.lua index dcab45803..4980b35a9 100644 --- a/gamedir/Data-UB/Scripts/intro.lua +++ b/gamedir/Data-UB/Scripts/intro.lua @@ -20,10 +20,10 @@ Video = { } IntroType = { - INTRO_HELI_CRASH = 0, - INTRO_BEGINNING = 1, -- set when viewing the intro at the begining of the game - INTRO_ENDING = 2, -- set when viewing the end game video. - INTRO_SPLASH = 3, + INTRO_BEGINNING = 0, -- set when viewing the intro at the begining of the game + INTRO_ENDING = 1, -- set when viewing the end game video. + INTRO_SPLASH = 2, + INTRO_HELI_CRASH = 3, } ScreenTypes = diff --git a/gamedir/Data/Intro/HELI_FLYBY.SMK b/gamedir/Data/Intro/HELI_FLYBY.SMK new file mode 100644 index 000000000..0b649edfc Binary files /dev/null and b/gamedir/Data/Intro/HELI_FLYBY.SMK differ diff --git a/gamedir/Data/Intro/HELI_NOSKY.SMK b/gamedir/Data/Intro/HELI_NOSKY.SMK new file mode 100644 index 000000000..d8b2347c4 Binary files /dev/null and b/gamedir/Data/Intro/HELI_NOSKY.SMK differ diff --git a/gamedir/Data/Intro/HELI_SKY.SMK b/gamedir/Data/Intro/HELI_SKY.SMK new file mode 100644 index 000000000..266ad94ce Binary files /dev/null and b/gamedir/Data/Intro/HELI_SKY.SMK differ diff --git a/gamedir/Data/Intro/OMERTA.SMK b/gamedir/Data/Intro/OMERTA.SMK new file mode 100644 index 000000000..10bcce35a Binary files /dev/null and b/gamedir/Data/Intro/OMERTA.SMK differ diff --git a/gamedir/Data/Intro/PRAGUE.SMK b/gamedir/Data/Intro/PRAGUE.SMK new file mode 100644 index 000000000..7ed923d9f Binary files /dev/null and b/gamedir/Data/Intro/PRAGUE.SMK differ diff --git a/gamedir/Data/Intro/PRAGUE_CR.SMK b/gamedir/Data/Intro/PRAGUE_CR.SMK new file mode 100644 index 000000000..cd45d7696 Binary files /dev/null and b/gamedir/Data/Intro/PRAGUE_CR.SMK differ diff --git a/gamedir/Data/Intro/REBEL_CR.SMK b/gamedir/Data/Intro/REBEL_CR.SMK new file mode 100644 index 000000000..fe31fd2ab Binary files /dev/null and b/gamedir/Data/Intro/REBEL_CR.SMK differ diff --git a/gamedir/Data/Intro/SPLASHSCREEN.SMK b/gamedir/Data/Intro/SPLASHSCREEN.SMK new file mode 100644 index 000000000..66018b02f Binary files /dev/null and b/gamedir/Data/Intro/SPLASHSCREEN.SMK differ diff --git a/gamedir/Data/Intro/TALONSOFTID_ENDHOLD.SMK b/gamedir/Data/Intro/TALONSOFTID_ENDHOLD.SMK new file mode 100644 index 000000000..10000ee70 Binary files /dev/null and b/gamedir/Data/Intro/TALONSOFTID_ENDHOLD.SMK differ diff --git a/gamedir/Data/Intro/THRONE_MIG.SMK b/gamedir/Data/Intro/THRONE_MIG.SMK new file mode 100644 index 000000000..c603e6638 Binary files /dev/null and b/gamedir/Data/Intro/THRONE_MIG.SMK differ diff --git a/gamedir/Data/Intro/THRONE_NOMIG.SMK b/gamedir/Data/Intro/THRONE_NOMIG.SMK new file mode 100644 index 000000000..8c854225b Binary files /dev/null and b/gamedir/Data/Intro/THRONE_NOMIG.SMK differ diff --git a/gamedir/Data/TableData/Lookup/ExplosionType.xml b/gamedir/Data/TableData/Lookup/ExplosionType.xml index 1c9ed1c61..0b4b03894 100644 --- a/gamedir/Data/TableData/Lookup/ExplosionType.xml +++ b/gamedir/Data/TableData/Lookup/ExplosionType.xml @@ -44,4 +44,12 @@ 10 Signal Shell + + 11 + Roof Collapse + + + 12 + White Smoke + \ No newline at end of file