From 2b7d9a05a72509549e853376126471902ec87808 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 29 Aug 2013 11:56:11 +0000 Subject: [PATCH] - UB Improvements / Cleanup (by Jazz) o added the lacking items of UB to files "the "Data\TableData\Items\Items.xml". o Necessary "Hand Cannon" were moved to the task Raul, to files H11_0_ExtraItems_xxx.xml. o The instruction Morrisa will be generated after destruction of Morrisa automatically. o All scripts lua were modified for UB git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1743 4f8fa57e-7814-0410-bad4-adc449f26b7c --- .../Inventory/MercStartingGear25.xml | 6 +- .../Map/H11_0_ExtraItems_Experienced.xml | 19 + .../TableData/Map/H11_0_ExtraItems_Expert.xml | 18 + .../TableData/Map/H11_0_ExtraItems_Insane.xml | 18 + .../TableData/Map/H11_0_ExtraItems_Novice.xml | 18 + .../TableData/NPCInventory/BettyInventory.xml | 268 ++ .../TableData/NPCInventory/Merchants.xml | 1016 ++++++++ .../TableData/NPCInventory/RaulInventory.xml | 748 ++++++ .../Inventory/MercStartingGear25.xml | 2320 ++++++++++++++++- .../Map/H11_0_ExtraItems_Experienced.xml | 19 + .../TableData/Map/H11_0_ExtraItems_Expert.xml | 18 + .../TableData/Map/H11_0_ExtraItems_Insane.xml | 18 + .../TableData/Map/H11_0_ExtraItems_Novice.xml | 18 + .../TableData/NPCInventory/BettyInventory.xml | 268 ++ .../TableData/NPCInventory/Merchants.xml | 1016 ++++++++ .../TableData/NPCInventory/RaulInventory.xml | 678 +++++ Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI | 24 +- Data-UB/Maps/H11.DAT | Bin 358459 -> 358251 bytes Data-UB/Scripts/ExplosionControl.lua | 20 +- Data-UB/Scripts/GameInit.lua | 242 +- Data-UB/Scripts/InitStrategicLayer.lua | 16 +- Data-UB/Scripts/Overhead.lua | 166 +- Data-UB/Scripts/Quests.lua | 35 + Data-UB/Scripts/intro.lua | 2 +- Data-UB/Scripts/strategicmap.lua | 39 +- Data/BigItems/GUN367.STI | Bin 0 -> 2206 bytes Data/BigItems/GUN368.STI | Bin 0 -> 2403 bytes Data/BigItems/P2item78.sti | Bin 0 -> 2274 bytes Data/BigItems/P2item79.sti | Bin 0 -> 2274 bytes Data/BigItems/P2item80.sti | Bin 0 -> 2274 bytes Data/BigItems/P2item81.sti | Bin 0 -> 2583 bytes Data/BigItems/P2item82.sti | Bin 0 -> 2006 bytes Data/BigItems/P2item83.sti | Bin 0 -> 1986 bytes Data/BigItems/P2item84.sti | Bin 0 -> 1574 bytes Data/BigItems/P2item85.sti | Bin 0 -> 1503 bytes Data/BigItems/P2item86.sti | Bin 0 -> 2564 bytes Data/Interface/MDGUNS.STI | Bin 190856 -> 212651 bytes Data/Interface/MDP2ITEMS.STI | Bin 32343 -> 39394 bytes Data/TableData/Items/AmmoStrings.xml | 5 + Data/TableData/Items/Items.xml | 243 +- Data/TableData/Items/Magazines.xml | 9 +- Data/TableData/Items/Weapons.xml | 42 + Data/tilesets/0/SMGUNS.STI | Bin 66281 -> 74502 bytes Data/tilesets/0/SMP2ITEMS.STI | Bin 11929 -> 13923 bytes 44 files changed, 6994 insertions(+), 315 deletions(-) create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Experienced.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Expert.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Insane.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Novice.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/BettyInventory.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/Merchants.xml create mode 100644 Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/RaulInventory.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Experienced.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Expert.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Insane.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Novice.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/BettyInventory.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/Merchants.xml create mode 100644 Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/RaulInventory.xml create mode 100644 Data/BigItems/GUN367.STI create mode 100644 Data/BigItems/GUN368.STI create mode 100644 Data/BigItems/P2item78.sti create mode 100644 Data/BigItems/P2item79.sti create mode 100644 Data/BigItems/P2item80.sti create mode 100644 Data/BigItems/P2item81.sti create mode 100644 Data/BigItems/P2item82.sti create mode 100644 Data/BigItems/P2item83.sti create mode 100644 Data/BigItems/P2item84.sti create mode 100644 Data/BigItems/P2item85.sti create mode 100644 Data/BigItems/P2item86.sti diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/Inventory/MercStartingGear25.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/Inventory/MercStartingGear25.xml index efec942d5..d4e780a94 100644 --- a/Data-UB/AddOns/Data-UB-1.13/TableData/Inventory/MercStartingGear25.xml +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/Inventory/MercStartingGear25.xml @@ -6248,9 +6248,9 @@ 0 0 1 - 1362 - 100 - 1 + 0 + 0 + 0 1 116 100 diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Experienced.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Experienced.xml new file mode 100644 index 000000000..8b66b9e83 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Experienced.xml @@ -0,0 +1,19 @@ + + + + + + 1354 + 3 + 100 + 5366 + 1 + + + 1352 + 1 + 100 + 5366 + 1 + + diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Expert.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Expert.xml new file mode 100644 index 000000000..080212e4b --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Expert.xml @@ -0,0 +1,18 @@ + + + + + 1354 + 3 + 100 + 5366 + 1 + + + 1352 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Insane.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Insane.xml new file mode 100644 index 000000000..080212e4b --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Insane.xml @@ -0,0 +1,18 @@ + + + + + 1354 + 3 + 100 + 5366 + 1 + + + 1352 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Novice.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Novice.xml new file mode 100644 index 000000000..080212e4b --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/Map/H11_0_ExtraItems_Novice.xml @@ -0,0 +1,18 @@ + + + + + 1354 + 3 + 100 + 5366 + 1 + + + 1352 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/BettyInventory.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/BettyInventory.xml new file mode 100644 index 000000000..22340751e --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/BettyInventory.xml @@ -0,0 +1,268 @@ + + + + 0 + 1356 + 0 + + + 1 + 1357 + 0 + + + 2 + 1358 + 0 + + + 3 + 201 + 5 + + + 4 + 202 + 3 + + + 5 + 216 + 1 + + + 6 + 183 + 1 + + + 7 + 315 + 1 + + + 8 + 257 + 1 + + + 9 + 37 + 2 + + + 10 + 38 + 3 + + + 11 + 54 + 1 + + + 12 + 161 + 2 + + + 13 + 176 + 3 + + + 14 + 176 + 3 + + + 15 + 188 + 1 + + + 16 + 212 + 3 + + + 17 + 213 + 1 + + + 18 + 211 + 3 + + + 19 + 210 + 2 + + + 20 + 205 + 2 + + + 21 + 214 + 5 + + + 22 + 64 + 1 + + + 23 + 220 + 3 + + + 24 + 243 + 1 + + + 25 + 304 + 1 + + + 26 + 304 + 1 + + + 27 + 204 + 4 + + + 28 + 203 + 3 + + + 29 + 203 + 3 + + + 30 + 266 + 1 + + + 31 + 267 + 1 + + + 32 + 267 + 1 + + + 33 + 318 + 1 + + + 34 + 264 + 1 + + + 35 + 265 + 1 + + + 36 + 309 + 1 + + + 37 + 316 + 2 + + + 38 + 322 + 3 + + + 39 + 146 + 5 + + + 40 + 146 + 5 + + + 41 + 194 + 2 + + + 42 + 269 + 3 + + + 43 + 320 + 1 + + + 44 + 256 + 2 + + + 45 + 255 + 2 + + + 46 + 245 + 2 + + + 47 + 269 + 1 + + + 48 + 1359 + 0 + + + 49 + 1360 + 0 + + + 50 + 1353 + 0 + + + 51 + 1355 + 0 + + + 52 + 1361 + 0 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/Merchants.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/Merchants.xml new file mode 100644 index 000000000..692a210a2 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/Merchants.xml @@ -0,0 +1,1016 @@ + + +ubShopKeeperID must be of enum NPCIDs +{ + BIFF = 40, + HAYWIRE, + GASKET, + RAZOR, + FLO, + GUMPY, + LARRY_NORMAL, + LARRY_DRUNK, + COUGAR, + NUMB, + BUBBA, +#ifdef JA2UB + MIGUEL = 58, //Ja25: Was 57 +#else + MIGUEL = 57, +#endif + CARLOS, + IRA, + DIMITRI, + + DEVIN, // 61 + ROBOT, + HAMOUS, + SLAY, +#ifdef JA2UB +// RPC65, +#else + RPC65, +#endif + DYNAMO, + SHANK, + IGGY, + VINCE, + CONRAD, + + RPC71, // 71 + MADDOG, + DARREL, + PERKO, + QUEEN, + AUNTIE, + ENRICO, //GABBY, //ENRICO, + CARMEN, + JOE, + STEVE, + + RAT, // 81 + ANNIE, + CHRIS, + BOB, + BRENDA, + KINGPIN, + DARREN, + MARIA, + ANGEL, + JOEY, + + TONY, // 91 + FRANK, + SPIKE, + DAMON, + KYLE, + MICKY, + SKYRIDER, + PABLO, + SAL, + FATHER, + + FATIMA, // 101 + WARDEN, + GORDON, + GABBY, //ENRICO, //GABBY, + ERNEST, + FRED, + MADAME, + YANNI, + MARTHA, + TIFFANY, + + T_REX, // 111 + DRUGGIST, // ELGIN + JAKE, + PACOS, + GERARD, + SKIPPER, + HANS, + JOHN, + MARY, + GENERAL, + + SERGEANT, // 121 + ARMAND, + LORA, + FRANZ, + HOWARD, + SAM, + ELDIN, + ARNIE, + TINA, + FREDO, + + WALTER, // 131 + JENNY, + BILLY, + BREWSTER, + ELLIOT, + DEREK, + OLIVER, + WALDO, + DOREEN, + JIM, + + JACK, // 141 + OLAF, + RAY, + OLGA, + TYRONE, + MADLAB, + KEITH, + MATT, + MIKE, + DARYL, + + HERVE, // 151 + PETER, + ALBERTO, + CARLO, + MANNY, + OSWALD, + CALVIN, + CARL, + SPECK, + + PROF_HUMMER, + + PROF_ELDERODO, // 161 + PROF_ICECREAM, + PROF_HELICOPTER, + NPC164, +#ifdef JA2UB + NPC165, + NPC166, + NPC167, + NPC168, + NPC169, +#else + GASTON, + STOGIE, + TEX, + BIGGENS, + NPC169, +#endif + NPC170 = NPC169 + 84, +} ; + +ubTypeOfArmsDealer must be of enum +{ + ARMS_DEALER_BUYS_SELLS = 0, + ARMS_DEALER_SELLS_ONLY, + ARMS_DEALER_BUYS_ONLY, + ARMS_DEALER_REPAIRS, +}; + +uiFlags must be of +#define ARMS_DEALER_ONLY_USED_ITEMS 0x08000000 // 134217728 +#define ARMS_DEALER_GIVES_CHANGE 0x10000000 // 268435456 //The arms dealer will give the required change when doing a transaction +#define ARMS_DEALER_ACCEPTS_GIFTS 0x20000000 // 536870912 //The arms dealer is the kind of person who will accept gifts +#define ARMS_DEALER_SOME_USED_ITEMS 0x40000000 // 1073741824 //The arms dealer can have used items in his inventory +#define ARMS_DEALER_HAS_NO_INVENTORY 0x80000000 // 2147483648 //The arms dealer does not carry any inventory +--> + + + 0 + Tony + 0.75 + 1.25 + 91 + 0 + 15000 + 1342177280 + 15000 + 15000 + 0 + 1 + 10 + 1 + 10 + 2 + 3 + 0 + 0 + + + 1 + Franz + 1.0 + 1.5 + 124 + 0 + 5000 + 1342177280 + 5000 + 5000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 2 + Keith + 0.75 + 1.0 + 147 + 0 + 1500 + 402653184 + 1500 + 1500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 3 + Jake + 0.8 + 1.1 + 113 + 0 + 2500 + 402653184 + 2500 + 2500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 4 + Gabby + 1.0 + 1.0 + 104 + 0 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 5 + Howard + 1.0 + 1.0 + 125 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 6 + Sam + 1.0 + 1.0 + 126 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 7 + Frank + 1.0 + 1.0 + 92 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 8 + Herve + 1.0 + 1.0 + 151 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 9 + Peter + 1.0 + 1.0 + 152 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 10 + Alberto + 1.0 + 1.0 + 153 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 11 + Carlo + 1.0 + 1.0 + 154 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 12 + Micky + 1.0 + 1.4 + 96 + 2 + 10000 + 2415919104 + 10000 + 10000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 13 + Arnie + 0.1 + 0.8 + 128 + 3 + 1500 + 2415919104 + 1500 + 1500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 14 + Fredo + 0.6 + 0.6 + 130 + 3 + 1000 + 2415919104 + 1000 + 1000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 15 + Raul + 0.8 + 1.8 + 74 + 0 + 20000 + 1342177280 + 1000 + 1000 + 0 + 1 + 10 + 0 + 10 + 1 + 2 + 0 + 1 + + + 16 + Druggist + 1.0 + 1.0 + 112 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 17 + Manny + 1.0 + 1.0 + 155 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 18 + Betty + 0.75 + 1.25 + 73 + 0 + 10000 + 1342177280 + 1000 + 1000 + 0 + 1 + 10 + 0 + 10 + 1 + 2 + 0 + 1 + + + 19 + Tina + 1.0 + 1.0 + 129 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 20 + additional dealer 1 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 21 + additional dealer 2 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 22 + additional dealer 3 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 23 + additional dealer 4 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 24 + additional dealer 5 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 25 + additional dealer 6 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 26 + additional dealer 7 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 27 + additional dealer 8 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 28 + additional dealer 9 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 29 + additional dealer 10 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 30 + additional dealer 11 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 31 + additional dealer 12 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 32 + additional dealer 13 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 33 + additional dealer 14 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 34 + additional dealer 15 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 35 + additional dealer 16 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 36 + additional dealer 17 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 37 + additional dealer 18 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 38 + additional dealer 19 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 39 + additional dealer 20 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/RaulInventory.xml b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/RaulInventory.xml new file mode 100644 index 000000000..b3dbfb6ad --- /dev/null +++ b/Data-UB/AddOns/Data-UB-1.13/TableData/NPCInventory/RaulInventory.xml @@ -0,0 +1,748 @@ + + + + 0 + 55 + 0 + + + 1 + 65 + 0 + + + 2 + 56 + 0 + + + 3 + 1 + 0 + + + 4 + 2 + 1 + + + 5 + 3 + 0 + + + 6 + 4 + 0 + + + 7 + 5 + 0 + + + 8 + 6 + 0 + + + 9 + 7 + 1 + + + 10 + 8 + 0 + + + 11 + 9 + 1 + + + 12 + 10 + 1 + + + 13 + 11 + 0 + + + 14 + 12 + 1 + + + 15 + 13 + 0 + + + 16 + 14 + 0 + + + 17 + 16 + 0 + + + 18 + 17 + 0 + + + 19 + 18 + 0 + + + 20 + 19 + 0 + + + 21 + 20 + 1 + + + 22 + 21 + 0 + + + 23 + 22 + 0 + + + 24 + 23 + 1 + + + 25 + 24 + 1 + + + 26 + 25 + 0 + + + 27 + 26 + 0 + + + 28 + 27 + 0 + + + 29 + 29 + 0 + + + 30 + 28 + 0 + + + 31 + 34 + 1 + + + 32 + 35 + 0 + + + 33 + 36 + 1 + + + 34 + 31 + 0 + + + 35 + 32 + 0 + + + 36 + 40 + 0 + + + 37 + 51 + 1 + + + 38 + 41 + 1 + + + 39 + 30 + 1 + + + 40 + 33 + 1 + + + 41 + 15 + 1 + + + 42 + 61 + 1 + + + 43 + 71 + 0 + + + 44 + 72 + 0 + + + 45 + 73 + 0 + + + 46 + 74 + 0 + + + 47 + 75 + 0 + + + 48 + 76 + 0 + + + 49 + 77 + 0 + + + 50 + 78 + 0 + + + 51 + 79 + 0 + + + 52 + 80 + 0 + + + 53 + 81 + 0 + + + 54 + 82 + 0 + + + 55 + 83 + 0 + + + 56 + 84 + 0 + + + 57 + 85 + 0 + + + 58 + 86 + 0 + + + 59 + 87 + 0 + + + 60 + 88 + 0 + + + 61 + 89 + 0 + + + 62 + 90 + 0 + + + 63 + 91 + 0 + + + 64 + 92 + 0 + + + 65 + 93 + 0 + + + 66 + 94 + 0 + + + 67 + 95 + 0 + + + 68 + 96 + 0 + + + 69 + 97 + 0 + + + 70 + 98 + 0 + + + 71 + 99 + 0 + + + 72 + 100 + 0 + + + 73 + 101 + 0 + + + 74 + 102 + 0 + + + 75 + 103 + 0 + + + 76 + 104 + 5 + + + 77 + 105 + 6 + + + 78 + 106 + 3 + + + 79 + 107 + 0 + + + 80 + 108 + 0 + + + 81 + 109 + 5 + + + 82 + 110 + 3 + + + 83 + 111 + 3 + + + 84 + 112 + 1 + + + 85 + 113 + 1 + + + 86 + 114 + 5 + + + 87 + 147 + 2 + + + 88 + 148 + 2 + + + 89 + 149 + 2 + + + 90 + 150 + 2 + + + 91 + 140 + 2 + + + 92 + 37 + 3 + + + 93 + 38 + 6 + + + 94 + 49 + 1 + + + 95 + 54 + 1 + + + 96 + 207 + 3 + + + 97 + 208 + 3 + + + 98 + 241 + 2 + + + 99 + 209 + 3 + + + 100 + 244 + 3 + + + 101 + 131 + 2 + + + 102 + 132 + 2 + + + 103 + 133 + 3 + + + 104 + 134 + 6 + + + 105 + 135 + 4 + + + 106 + 146 + 2 + + + 107 + 151 + 2 + + + 108 + 116 + 3 + + + 109 + 117 + 3 + + + 110 + 118 + 0 + + + 111 + 119 + 0 + + + 112 + 120 + 0 + + + 113 + 66 + 0 + + + 114 + 67 + 0 + + + 115 + 68 + 0 + + + 116 + 69 + 0 + + + 117 + 330 + 1 + + + 118 + 331 + 1 + + + 119 + 332 + 1 + + + 120 + 334 + 1 + + + 121 + 335 + 0 + + + 122 + 1352 + 0 + + + 123 + 1354 + 0 + + + 124 + 176 + 0 + + + 125 + 164 + 0 + + + 126 + 167 + 0 + + + 127 + 173 + 0 + + + 128 + 180 + 0 + + + 129 + 177 + 0 + + + 130 + 170 + 0 + + + 131 + 161 + 0 + + + 132 + 1353 + 0 + + + 133 + 1007 + 1 + + + 134 + 592 + 1 + + + 135 + 948 + 1 + + + 136 + 949 + 1 + + + 137 + 950 + 1 + + + 138 + 207 + 1 + + + 139 + 999 + 1 + + + 140 + 1000 + 1 + + + 141 + 1003 + 1 + + + 142 + 1004 + 1 + + + 143 + 1030 + 1 + + + 144 + 1006 + 1 + + + 145 + 1012 + 1 + + + 146 + 1029 + 1 + + + 147 + 1005 + 1 + + + 148 + 333 + 0 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Inventory/MercStartingGear25.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Inventory/MercStartingGear25.xml index fa298ab0b..ea53b41a0 100644 --- a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Inventory/MercStartingGear25.xml +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Inventory/MercStartingGear25.xml @@ -5,6 +5,7 @@ Barry 0 + -1 176 1 97 @@ -68,12 +69,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 1 Blood 0 + -1 176 1 98 @@ -137,12 +151,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 2 Lynx 0 + -1 177 1 94 @@ -206,12 +233,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 3 Grizzly 0 + -1 176 1 99 @@ -275,12 +315,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 4 Vicki 0 + -1 176 1 99 @@ -344,12 +397,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 5 Trevor 0 + -1 0 1 0 @@ -413,12 +479,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 6 Grunty 0 + -1 176 1 98 @@ -482,12 +561,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 7 Ivan 0 + -1 176 1 99 @@ -551,12 +643,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 8 Steroid 0 + -1 0 1 0 @@ -620,12 +725,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 9 Igor 0 + -1 176 1 98 @@ -689,12 +807,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 10 Shadow 0 + -1 176 1 99 @@ -758,12 +889,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 11 Red 0 + -1 176 1 91 @@ -827,12 +971,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 12 Reaper 0 + -1 176 1 97 @@ -896,12 +1053,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 13 Fidel 0 + -1 176 1 98 @@ -965,12 +1135,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 14 Fox 0 + -1 176 1 98 @@ -1034,12 +1217,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 15 Sidney 0 + -1 177 1 99 @@ -1103,12 +1299,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 16 Gus 0 + -1 177 1 100 @@ -1172,12 +1381,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 17 Buns 0 + -1 176 1 100 @@ -1241,12 +1463,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 18 Ice 0 + -1 176 1 100 @@ -1310,12 +1545,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 19 Spider 0 + -1 176 1 90 @@ -1379,12 +1627,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 20 Cliff 0 + -1 176 1 95 @@ -1448,12 +1709,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 21 Bull 0 + -1 0 1 0 @@ -1517,12 +1791,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 22 Hitman 0 + -1 176 1 99 @@ -1586,12 +1873,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 23 Buzz 0 + -1 176 1 94 @@ -1655,12 +1955,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 24 Raider 0 + -1 176 1 100 @@ -1724,12 +2037,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 25 Raven 0 + -1 176 1 87 @@ -1793,12 +2119,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 26 Static 0 + -1 176 1 100 @@ -1862,12 +2201,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 27 Len 0 + -1 177 1 98 @@ -1931,12 +2283,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 28 Danny 0 + -1 176 1 91 @@ -2000,12 +2365,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 29 Magic 0 + -1 177 1 100 @@ -2069,12 +2447,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 30 Stephen 0 + -1 176 1 99 @@ -2138,12 +2529,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 31 Scully 0 + -1 177 1 99 @@ -2207,12 +2611,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 32 Malice 0 + -1 176 1 93 @@ -2276,12 +2693,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 33 Dr. Q 0 + -1 176 1 90 @@ -2345,12 +2775,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 34 Nails 0 + -1 177 1 99 @@ -2414,12 +2857,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 35 Thor 0 + -1 176 1 99 @@ -2483,12 +2939,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 36 Scope 0 + -1 177 1 93 @@ -2552,12 +3021,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 37 Wolf 0 + -1 176 1 98 @@ -2621,12 +3103,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 38 MD 0 + -1 176 1 93 @@ -2690,12 +3185,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 39 Meltdown 0 + -1 0 1 0 @@ -2759,12 +3267,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 40 Biff 0 + -1 176 1 79 @@ -2828,12 +3349,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 41 Haywire 0 + -1 176 1 100 @@ -2897,12 +3431,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 42 Gasket 0 + -1 176 1 100 @@ -2966,12 +3513,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 43 Razor 0 + -1 0 1 0 @@ -3035,12 +3595,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 44 Flo 0 + -1 176 1 100 @@ -3104,12 +3677,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 45 Gumpy 0 + -1 176 1 97 @@ -3173,12 +3759,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 46 Larry 0 + -1 176 1 91 @@ -3242,12 +3841,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 47 Larry 0 + -1 0 1 0 @@ -3311,12 +3923,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 48 Cougar 0 + -1 176 1 98 @@ -3380,12 +4005,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 49 Numb 0 + -1 176 1 100 @@ -3449,12 +4087,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 50 Bubba 0 + -1 176 1 100 @@ -3518,12 +4169,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 51 PGmale1 0 + -1 0 1 0 @@ -3587,12 +4251,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 52 PGmale2 0 + -1 0 1 0 @@ -3656,12 +4333,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 53 PGmale3 0 + -1 0 1 0 @@ -3725,12 +4415,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 54 PGLady1 0 + -1 0 1 0 @@ -3794,12 +4497,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 55 PGLady2 0 + -1 0 1 0 @@ -3863,12 +4579,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 56 PGLady3 0 + -1 0 1 0 @@ -3932,12 +4661,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 57 PGmale4 0 + -1 0 1 0 @@ -4001,12 +4743,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 58 Gaston 0 + -1 177 1 91 @@ -4070,12 +4825,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 59 Stogie 0 + -1 176 1 92 @@ -4139,12 +4907,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 60 Manuel 0 + -1 0 1 0 @@ -4208,12 +4989,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 61 Biggins 0 + -1 177 1 90 @@ -4277,12 +5071,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 62 John 0 + -1 176 1 92 @@ -4346,12 +5153,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 63 Robot 0 + -1 181 1 100 @@ -4415,12 +5235,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 64 Tex 0 + -1 0 1 0 @@ -4484,12 +5317,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 65 Terry 0 + -1 176 1 94 @@ -4553,12 +5399,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 66 Dynamo 0 + -1 0 1 0 @@ -4622,12 +5481,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 67 Shank 0 + -1 0 1 0 @@ -4691,12 +5563,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 68 Iggy 0 + -1 177 1 98 @@ -4760,12 +5645,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 69 Vince 0 + -1 0 1 0 @@ -4829,12 +5727,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 70 Conrad 0 + -1 0 1 0 @@ -4898,12 +5809,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 71 RPC71 0 + -1 0 1 0 @@ -4967,12 +5891,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 72 Maddog 0 + -1 0 1 0 @@ -5036,12 +5973,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 73 Betty 0 + -1 0 1 0 @@ -5105,12 +6055,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 74 Raul 0 + -1 181 1 100 @@ -5174,12 +6137,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 75 Morris 0 + -1 181 1 100 @@ -5196,9 +6172,9 @@ 0 0 1 - 1362 - 100 - 1 + 0 + 0 + 0 1 116 100 @@ -5243,12 +6219,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 76 Jerry 0 + -1 0 1 0 @@ -5312,12 +6301,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 77 Rudy 0 + -1 0 1 0 @@ -5381,12 +6383,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 78 Carmen 0 + -1 0 1 0 @@ -5450,12 +6465,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 79 Joe 0 + -1 180 1 100 @@ -5519,12 +6547,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 80 Steve 0 + -1 0 1 0 @@ -5588,12 +6629,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 81 Rat 0 + -1 0 1 0 @@ -5657,12 +6711,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 82 Annie 0 + -1 177 1 100 @@ -5726,12 +6793,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 83 Chris 0 + -1 177 1 100 @@ -5795,12 +6875,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 84 Bob 0 + -1 0 1 0 @@ -5864,12 +6957,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 85 Brenda 0 + -1 0 1 0 @@ -5933,12 +7039,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 86 Kingpin 0 + -1 177 1 100 @@ -6002,12 +7121,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 87 Darren 0 + -1 177 1 100 @@ -6071,12 +7203,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 88 Maria 0 + -1 0 1 0 @@ -6140,12 +7285,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 89 Angel 0 + -1 0 1 0 @@ -6209,12 +7367,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 90 Joey 0 + -1 0 1 0 @@ -6278,12 +7449,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 91 Tony 0 + -1 177 1 100 @@ -6347,12 +7531,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 92 Frank 0 + -1 0 1 0 @@ -6416,12 +7613,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 93 Spike 0 + -1 176 1 100 @@ -6485,12 +7695,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 94 Damon 0 + -1 177 1 100 @@ -6554,12 +7777,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 95 0 + -1 0 1 0 @@ -6623,12 +7859,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 96 Micky 0 + -1 177 1 100 @@ -6692,12 +7941,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 97 Skyrider 0 + -1 0 1 0 @@ -6761,12 +8023,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 98 Pablo 0 + -1 0 1 0 @@ -6830,12 +8105,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 99 Sal 0 + -1 0 1 0 @@ -6899,12 +8187,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 100 Father 0 + -1 0 1 0 @@ -6968,12 +8269,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 101 Fatima 0 + -1 0 1 0 @@ -7037,12 +8351,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 102 Warden 0 + -1 176 1 100 @@ -7106,12 +8433,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 103 Gordon 0 + -1 0 1 0 @@ -7175,12 +8515,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 104 Gabby 0 + -1 0 1 0 @@ -7244,12 +8597,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 105 Ernest 0 + -1 0 1 0 @@ -7313,12 +8679,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 106 Fred 0 + -1 0 1 0 @@ -7382,12 +8761,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 107 Madame 0 + -1 0 1 0 @@ -7451,12 +8843,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 108 Yanni 0 + -1 0 1 0 @@ -7520,12 +8925,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 109 Martha 0 + -1 0 1 0 @@ -7589,12 +9007,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 110 Joe 0 + -1 0 1 0 @@ -7658,12 +9089,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 111 Jasmin 0 + -1 180 1 100 @@ -7727,12 +9171,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 112 Charlie 0 + -1 177 1 100 @@ -7796,12 +9253,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 113 Jake 0 + -1 0 1 0 @@ -7865,12 +9335,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 114 Pacos 0 + -1 0 1 0 @@ -7934,12 +9417,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 115 Dave 0 + -1 0 1 0 @@ -8003,12 +9499,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 116 Skipper 0 + -1 0 1 0 @@ -8072,12 +9581,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 117 Hans 0 + -1 176 1 100 @@ -8141,12 +9663,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 118 John 0 + -1 0 1 0 @@ -8210,12 +9745,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 119 Mary 0 + -1 0 1 0 @@ -8279,12 +9827,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 120 General 0 + -1 177 1 100 @@ -8348,12 +9909,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 121 Sergeant 0 + -1 177 1 97 @@ -8417,12 +9991,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 122 Armand 0 + -1 0 1 0 @@ -8486,12 +10073,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 123 Lora 0 + -1 0 1 0 @@ -8555,12 +10155,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 124 Franz 0 + -1 0 1 0 @@ -8624,12 +10237,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 125 Howard 0 + -1 0 1 0 @@ -8693,12 +10319,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 126 Sam 0 + -1 0 1 0 @@ -8762,12 +10401,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 127 Eldin 0 + -1 0 1 0 @@ -8831,12 +10483,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 128 Arnie 0 + -1 0 1 0 @@ -8900,12 +10565,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 129 Tina 0 + -1 0 1 0 @@ -8969,12 +10647,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 130 Fredo 0 + -1 0 1 0 @@ -9038,12 +10729,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 131 Walter 0 + -1 0 1 0 @@ -9107,12 +10811,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 132 Jenny 0 + -1 0 1 0 @@ -9176,12 +10893,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 133 Billy 0 + -1 177 1 100 @@ -9245,12 +10975,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 134 Brewster 0 + -1 0 1 0 @@ -9314,12 +11057,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 135 Elliot 0 + -1 0 1 0 @@ -9383,12 +11139,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 136 Derek 0 + -1 0 1 0 @@ -9452,12 +11221,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 137 Oliver 0 + -1 0 1 0 @@ -9521,12 +11303,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 138 Waldo 0 + -1 0 1 0 @@ -9590,12 +11385,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 139 Doreen 0 + -1 0 1 0 @@ -9659,12 +11467,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 140 Jim 0 + -1 177 1 100 @@ -9728,12 +11549,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 141 Jack 0 + -1 177 1 88 @@ -9797,12 +11631,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 142 Olaf 0 + -1 180 1 100 @@ -9866,12 +11713,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 143 Ray 0 + -1 177 1 98 @@ -9935,12 +11795,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 144 Olga 0 + -1 180 1 100 @@ -10004,12 +11877,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 145 Tyrone 0 + -1 177 1 81 @@ -10073,12 +11959,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 146 Madlab 0 + -1 0 1 0 @@ -10142,12 +12041,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 147 Keith 0 + -1 0 1 0 @@ -10211,12 +12123,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 148 Matt 0 + -1 0 1 0 @@ -10280,12 +12205,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 149 Mike 0 + -1 181 1 100 @@ -10349,12 +12287,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 150 Daryl 0 + -1 0 1 0 @@ -10418,12 +12369,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 151 Herve 0 + -1 0 1 0 @@ -10487,12 +12451,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 152 Peter 0 + -1 0 1 0 @@ -10556,12 +12533,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 153 Alberto 0 + -1 0 1 0 @@ -10625,12 +12615,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 154 Carlo 0 + -1 0 1 0 @@ -10694,12 +12697,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 155 Manny 0 + -1 0 1 0 @@ -10763,12 +12779,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 156 Oswald 0 + -1 0 1 0 @@ -10832,12 +12861,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 157 Calvin 0 + -1 0 1 0 @@ -10901,12 +12943,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 158 Carl 0 + -1 0 1 0 @@ -10970,12 +13025,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 159 Speck 0 + -1 0 1 0 @@ -11039,12 +13107,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 160 Hummer 0 + -1 0 1 0 @@ -11108,12 +13189,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 161 El Dorado 0 + -1 0 1 0 @@ -11177,12 +13271,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 162 Truck 0 + -1 0 1 0 @@ -11246,12 +13353,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 163 0 + -1 0 1 0 @@ -11315,12 +13435,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 164 0 + -1 0 1 0 @@ -11384,12 +13517,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 165 0 + -1 0 1 0 @@ -11453,12 +13599,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 166 0 + -1 0 1 0 @@ -11522,12 +13681,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 167 0 + -1 0 1 0 @@ -11591,12 +13763,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 168 0 + -1 0 1 0 @@ -11660,12 +13845,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 169 0 + -1 0 1 0 @@ -11729,12 +13927,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 170 Monk 0 + -1 176 1 98 @@ -11798,12 +14009,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 171 Brain 0 + -1 177 1 100 @@ -11867,12 +14091,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 172 Scream 0 + -1 176 1 95 @@ -11936,12 +14173,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 173 Henning 0 + -1 177 1 98 @@ -12005,12 +14255,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 174 Lucky 0 + -1 176 1 99 @@ -12074,12 +14337,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 175 Laura 0 + -1 177 1 93 @@ -12143,12 +14419,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 176 Grace 0 + -1 176 1 98 @@ -12212,12 +14501,25 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + 177 Rudolf 0 + -1 176 1 99 @@ -12281,5 +14583,17 @@ 0 0 + + -1 + + + -1 + + + -1 + + + -1 + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Experienced.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Experienced.xml new file mode 100644 index 000000000..b3cb0a1b6 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Experienced.xml @@ -0,0 +1,19 @@ + + + + + + 338 + 3 + 100 + 5366 + 1 + + + 336 + 1 + 100 + 5366 + 1 + + diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Expert.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Expert.xml new file mode 100644 index 000000000..273588ca0 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Expert.xml @@ -0,0 +1,18 @@ + + + + + 338 + 3 + 100 + 5366 + 1 + + + 336 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Insane.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Insane.xml new file mode 100644 index 000000000..273588ca0 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Insane.xml @@ -0,0 +1,18 @@ + + + + + 338 + 3 + 100 + 5366 + 1 + + + 336 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Novice.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Novice.xml new file mode 100644 index 000000000..273588ca0 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/Map/H11_0_ExtraItems_Novice.xml @@ -0,0 +1,18 @@ + + + + + 338 + 3 + 100 + 5366 + 1 + + + 336 + 1 + 100 + 5366 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/BettyInventory.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/BettyInventory.xml new file mode 100644 index 000000000..0905fc08d --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/BettyInventory.xml @@ -0,0 +1,268 @@ + + + + 0 + 340 + 0 + + + 1 + 341 + 0 + + + 2 + 342 + 0 + + + 3 + 201 + 5 + + + 4 + 202 + 3 + + + 5 + 216 + 1 + + + 6 + 183 + 1 + + + 7 + 315 + 1 + + + 8 + 257 + 1 + + + 9 + 37 + 2 + + + 10 + 38 + 3 + + + 11 + 54 + 1 + + + 12 + 161 + 2 + + + 13 + 176 + 3 + + + 14 + 176 + 3 + + + 15 + 188 + 1 + + + 16 + 212 + 3 + + + 17 + 213 + 1 + + + 18 + 211 + 3 + + + 19 + 210 + 2 + + + 20 + 205 + 2 + + + 21 + 214 + 5 + + + 22 + 64 + 1 + + + 23 + 220 + 3 + + + 24 + 243 + 1 + + + 25 + 304 + 1 + + + 26 + 304 + 1 + + + 27 + 204 + 4 + + + 28 + 203 + 3 + + + 29 + 203 + 3 + + + 30 + 266 + 1 + + + 31 + 267 + 1 + + + 32 + 267 + 1 + + + 33 + 318 + 1 + + + 34 + 264 + 1 + + + 35 + 265 + 1 + + + 36 + 309 + 1 + + + 37 + 316 + 2 + + + 38 + 322 + 3 + + + 39 + 146 + 5 + + + 40 + 146 + 5 + + + 41 + 194 + 2 + + + 42 + 269 + 3 + + + 43 + 320 + 1 + + + 44 + 256 + 2 + + + 45 + 255 + 2 + + + 46 + 245 + 2 + + + 47 + 269 + 1 + + + 48 + 343 + 0 + + + 49 + 344 + 0 + + + 50 + 337 + 0 + + + 51 + 339 + 0 + + + 52 + 335 + 0 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/Merchants.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/Merchants.xml new file mode 100644 index 000000000..692a210a2 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/Merchants.xml @@ -0,0 +1,1016 @@ + + +ubShopKeeperID must be of enum NPCIDs +{ + BIFF = 40, + HAYWIRE, + GASKET, + RAZOR, + FLO, + GUMPY, + LARRY_NORMAL, + LARRY_DRUNK, + COUGAR, + NUMB, + BUBBA, +#ifdef JA2UB + MIGUEL = 58, //Ja25: Was 57 +#else + MIGUEL = 57, +#endif + CARLOS, + IRA, + DIMITRI, + + DEVIN, // 61 + ROBOT, + HAMOUS, + SLAY, +#ifdef JA2UB +// RPC65, +#else + RPC65, +#endif + DYNAMO, + SHANK, + IGGY, + VINCE, + CONRAD, + + RPC71, // 71 + MADDOG, + DARREL, + PERKO, + QUEEN, + AUNTIE, + ENRICO, //GABBY, //ENRICO, + CARMEN, + JOE, + STEVE, + + RAT, // 81 + ANNIE, + CHRIS, + BOB, + BRENDA, + KINGPIN, + DARREN, + MARIA, + ANGEL, + JOEY, + + TONY, // 91 + FRANK, + SPIKE, + DAMON, + KYLE, + MICKY, + SKYRIDER, + PABLO, + SAL, + FATHER, + + FATIMA, // 101 + WARDEN, + GORDON, + GABBY, //ENRICO, //GABBY, + ERNEST, + FRED, + MADAME, + YANNI, + MARTHA, + TIFFANY, + + T_REX, // 111 + DRUGGIST, // ELGIN + JAKE, + PACOS, + GERARD, + SKIPPER, + HANS, + JOHN, + MARY, + GENERAL, + + SERGEANT, // 121 + ARMAND, + LORA, + FRANZ, + HOWARD, + SAM, + ELDIN, + ARNIE, + TINA, + FREDO, + + WALTER, // 131 + JENNY, + BILLY, + BREWSTER, + ELLIOT, + DEREK, + OLIVER, + WALDO, + DOREEN, + JIM, + + JACK, // 141 + OLAF, + RAY, + OLGA, + TYRONE, + MADLAB, + KEITH, + MATT, + MIKE, + DARYL, + + HERVE, // 151 + PETER, + ALBERTO, + CARLO, + MANNY, + OSWALD, + CALVIN, + CARL, + SPECK, + + PROF_HUMMER, + + PROF_ELDERODO, // 161 + PROF_ICECREAM, + PROF_HELICOPTER, + NPC164, +#ifdef JA2UB + NPC165, + NPC166, + NPC167, + NPC168, + NPC169, +#else + GASTON, + STOGIE, + TEX, + BIGGENS, + NPC169, +#endif + NPC170 = NPC169 + 84, +} ; + +ubTypeOfArmsDealer must be of enum +{ + ARMS_DEALER_BUYS_SELLS = 0, + ARMS_DEALER_SELLS_ONLY, + ARMS_DEALER_BUYS_ONLY, + ARMS_DEALER_REPAIRS, +}; + +uiFlags must be of +#define ARMS_DEALER_ONLY_USED_ITEMS 0x08000000 // 134217728 +#define ARMS_DEALER_GIVES_CHANGE 0x10000000 // 268435456 //The arms dealer will give the required change when doing a transaction +#define ARMS_DEALER_ACCEPTS_GIFTS 0x20000000 // 536870912 //The arms dealer is the kind of person who will accept gifts +#define ARMS_DEALER_SOME_USED_ITEMS 0x40000000 // 1073741824 //The arms dealer can have used items in his inventory +#define ARMS_DEALER_HAS_NO_INVENTORY 0x80000000 // 2147483648 //The arms dealer does not carry any inventory +--> + + + 0 + Tony + 0.75 + 1.25 + 91 + 0 + 15000 + 1342177280 + 15000 + 15000 + 0 + 1 + 10 + 1 + 10 + 2 + 3 + 0 + 0 + + + 1 + Franz + 1.0 + 1.5 + 124 + 0 + 5000 + 1342177280 + 5000 + 5000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 2 + Keith + 0.75 + 1.0 + 147 + 0 + 1500 + 402653184 + 1500 + 1500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 3 + Jake + 0.8 + 1.1 + 113 + 0 + 2500 + 402653184 + 2500 + 2500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 4 + Gabby + 1.0 + 1.0 + 104 + 0 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 5 + Howard + 1.0 + 1.0 + 125 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 6 + Sam + 1.0 + 1.0 + 126 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 7 + Frank + 1.0 + 1.0 + 92 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 8 + Herve + 1.0 + 1.0 + 151 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 9 + Peter + 1.0 + 1.0 + 152 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 10 + Alberto + 1.0 + 1.0 + 153 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 11 + Carlo + 1.0 + 1.0 + 154 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 12 + Micky + 1.0 + 1.4 + 96 + 2 + 10000 + 2415919104 + 10000 + 10000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 13 + Arnie + 0.1 + 0.8 + 128 + 3 + 1500 + 2415919104 + 1500 + 1500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 14 + Fredo + 0.6 + 0.6 + 130 + 3 + 1000 + 2415919104 + 1000 + 1000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 15 + Raul + 0.8 + 1.8 + 74 + 0 + 20000 + 1342177280 + 1000 + 1000 + 0 + 1 + 10 + 0 + 10 + 1 + 2 + 0 + 1 + + + 16 + Druggist + 1.0 + 1.0 + 112 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 17 + Manny + 1.0 + 1.0 + 155 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 18 + Betty + 0.75 + 1.25 + 73 + 0 + 10000 + 1342177280 + 1000 + 1000 + 0 + 1 + 10 + 0 + 10 + 1 + 2 + 0 + 1 + + + 19 + Tina + 1.0 + 1.0 + 129 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 20 + additional dealer 1 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 21 + additional dealer 2 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 22 + additional dealer 3 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 23 + additional dealer 4 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 24 + additional dealer 5 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 25 + additional dealer 6 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 26 + additional dealer 7 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 27 + additional dealer 8 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 28 + additional dealer 9 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 29 + additional dealer 10 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 30 + additional dealer 11 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 31 + additional dealer 12 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 32 + additional dealer 13 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 33 + additional dealer 14 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 34 + additional dealer 15 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 35 + additional dealer 16 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 36 + additional dealer 17 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 37 + additional dealer 18 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 38 + additional dealer 19 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 39 + additional dealer 20 + 1.0 + 1.0 + 255 + 0 + 800 + 268435456 + 800 + 800 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/RaulInventory.xml b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/RaulInventory.xml new file mode 100644 index 000000000..81a501c54 --- /dev/null +++ b/Data-UB/AddOns/Data-UB-Vanilla/TableData/NPCInventory/RaulInventory.xml @@ -0,0 +1,678 @@ + + + + 0 + 55 + 0 + + + 1 + 65 + 0 + + + 2 + 56 + 0 + + + 3 + 1 + 0 + + + 4 + 2 + 1 + + + 5 + 3 + 0 + + + 6 + 4 + 0 + + + 7 + 5 + 0 + + + 8 + 6 + 0 + + + 9 + 7 + 1 + + + 10 + 8 + 0 + + + 11 + 9 + 1 + + + 12 + 10 + 1 + + + 13 + 11 + 0 + + + 14 + 12 + 1 + + + 15 + 13 + 0 + + + 16 + 14 + 0 + + + 17 + 16 + 0 + + + 18 + 17 + 0 + + + 19 + 18 + 0 + + + 20 + 19 + 0 + + + 21 + 20 + 1 + + + 22 + 21 + 0 + + + 23 + 22 + 0 + + + 24 + 23 + 1 + + + 25 + 24 + 1 + + + 26 + 25 + 0 + + + 27 + 26 + 0 + + + 28 + 27 + 0 + + + 29 + 29 + 0 + + + 30 + 28 + 0 + + + 31 + 34 + 1 + + + 32 + 35 + 0 + + + 33 + 36 + 1 + + + 34 + 31 + 0 + + + 35 + 32 + 0 + + + 36 + 40 + 0 + + + 37 + 51 + 1 + + + 38 + 41 + 1 + + + 39 + 30 + 1 + + + 40 + 33 + 1 + + + 41 + 15 + 1 + + + 42 + 61 + 1 + + + 43 + 71 + 0 + + + 44 + 72 + 0 + + + 45 + 73 + 0 + + + 46 + 74 + 0 + + + 47 + 75 + 0 + + + 48 + 76 + 0 + + + 49 + 77 + 0 + + + 50 + 78 + 0 + + + 51 + 79 + 0 + + + 52 + 80 + 0 + + + 53 + 81 + 0 + + + 54 + 82 + 0 + + + 55 + 83 + 0 + + + 56 + 84 + 0 + + + 57 + 85 + 0 + + + 58 + 86 + 0 + + + 59 + 87 + 0 + + + 60 + 88 + 0 + + + 61 + 89 + 0 + + + 62 + 90 + 0 + + + 63 + 91 + 0 + + + 64 + 92 + 0 + + + 65 + 93 + 0 + + + 66 + 94 + 0 + + + 67 + 95 + 0 + + + 68 + 96 + 0 + + + 69 + 97 + 0 + + + 70 + 98 + 0 + + + 71 + 99 + 0 + + + 72 + 100 + 0 + + + 73 + 101 + 0 + + + 74 + 102 + 0 + + + 75 + 103 + 0 + + + 76 + 104 + 5 + + + 77 + 105 + 6 + + + 78 + 106 + 3 + + + 79 + 107 + 0 + + + 80 + 108 + 0 + + + 81 + 109 + 5 + + + 82 + 110 + 3 + + + 83 + 111 + 3 + + + 84 + 112 + 1 + + + 85 + 113 + 1 + + + 86 + 114 + 5 + + + 87 + 147 + 2 + + + 88 + 148 + 2 + + + 89 + 149 + 2 + + + 90 + 150 + 2 + + + 91 + 140 + 2 + + + 92 + 37 + 3 + + + 93 + 38 + 6 + + + 94 + 49 + 1 + + + 95 + 54 + 1 + + + 96 + 207 + 3 + + + 97 + 208 + 3 + + + 98 + 241 + 2 + + + 99 + 209 + 3 + + + 100 + 244 + 3 + + + 101 + 131 + 2 + + + 102 + 132 + 2 + + + 103 + 133 + 3 + + + 104 + 134 + 6 + + + 105 + 135 + 4 + + + 106 + 146 + 2 + + + 107 + 151 + 2 + + + 108 + 116 + 3 + + + 109 + 117 + 3 + + + 110 + 118 + 0 + + + 111 + 119 + 0 + + + 112 + 120 + 0 + + + 113 + 66 + 0 + + + 114 + 67 + 0 + + + 115 + 68 + 0 + + + 116 + 69 + 0 + + + 117 + 330 + 1 + + + 118 + 331 + 1 + + + 119 + 332 + 1 + + + 120 + 334 + 1 + + + 121 + 335 + 0 + + + 122 + 336 + 0 + + + 123 + 338 + 0 + + + 124 + 176 + 0 + + + 125 + 164 + 0 + + + 126 + 167 + 0 + + + 127 + 173 + 0 + + + 128 + 180 + 0 + + + 129 + 177 + 0 + + + 130 + 170 + 0 + + + 131 + 161 + 0 + + + 132 + 337 + 0 + + + 133 + 207 + 1 + + + 134 + 333 + 0 + + \ No newline at end of file diff --git a/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI b/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI index 897a936a6..dc9f0a731 100644 --- a/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI +++ b/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI @@ -271,19 +271,19 @@ BOBBY_SITE_ACCESSED = FALSE [Unfinished Business Items] -TEX_MOVIE_ATTACK_CLYDESDALES = 1356 -TEX_MOVIE_WILD_EAST = 1357 -TEX_MOVIE_HAVE_HONDA = 1358 -LAPTOP_TRANSMITTER = 1355 -CHE_GUEVARA_CANTEEN = 1359 -MERC_WRISTWATCH = 1360 -SAM_GARVER_COMBAT_KNIFE = 1353 -MERC_UMBRELLA_OLD = 336 -MORRIS_INSTRUCTION_NOTE = 1362 -HAND_CANNON = 1352 +TEX_MOVIE_ATTACK_CLYDESDALES = 340 +TEX_MOVIE_WILD_EAST = 341 +TEX_MOVIE_HAVE_HONDA = 342 +LAPTOP_TRANSMITTER = 339 +CHE_GUEVARA_CANTEEN = 343 +MERC_WRISTWATCH = 344 +SAM_GARVER_COMBAT_KNIFE = 337 +MERC_UMBRELLA_OLD = 345 +MORRIS_INSTRUCTION_NOTE = 346 +HAND_CANNON = 336 HARTFORD_6_SHOOTER = 66 -MERC_UMBRELLA = 336 -CLIP_CANNON_BALL = 1354 +MERC_UMBRELLA = 345 +CLIP_CANNON_BALL = 338 BARRETT_UB = 335 CALICO_960_UB = 69 PSG1_UB = 334 diff --git a/Data-UB/Maps/H11.DAT b/Data-UB/Maps/H11.DAT index f49f8bf7c06dd9e4425a03b561a59a1009430be7..3def4a9e0bcf00912227c475eb384dd16130b4e3 100644 GIT binary patch delta 1509 zcmZux-Afcv6u;x{jAO3b+)8&%x9(tH_9;QRL4}fqEK%Bb(zn`HTe2czP+_FeLr7ju zwLKWtL(z*5GQm7Vk3kPX`43c&VbKTl6hWPH@6NVc&2V?;{?6~5-#KT_oo8RGKYp%` zGWMXQ_KLyS2FBRK91ojfT8yp_S)hE5skWNAM9~@16P6V7vZ;lJNqIVwC#nL1Qjz=~dJdK6 zMKK8?)Urlg4#^Wiws%7$>r}>BTN=OqYTAhkGdQyTmOdoK|Ymrt< zktTq5Oq!%`L+j;cDSAQf8S~zDE;KbN`EB4`M_@8p4li3*!lFa*ATwp^8G~bo2~z25 z_M^b{F3cPqmLeJKNA*6c-{u^AlQFg!SKgZvx`-5?J8U`DN(NoGGVrcp7(bpY@^X>n zYOl@{e!h%vNhJf(^t?bfQBkCjPr~_A2ANsV+fm>>xBk@gmn-i&1zzu(Ah27QZz<9s zGu`n0^yV0e6%Ppp$4egy;?1Nd>s&;lYJ`foo57nXfSo=^5#`K&NKbgL3IozuT!>&`Xs38`wzppfsLxg7!V2N z779f29}uGOz5!_3S6>vPsLvTs4sNpZFWX43lVUHn>J+@&x?ee{nAboK`$_`qm;Bn_ zgNQMn7_hk6#=&kJnH{+?J7VA}!xi#pN5WGnqsl+?I$UNLKmE*`@Q*~q3hOrX;Gf_B zIsB#+$|2O@-;bD2of4|XrxNCePzmlobj@VA1S0C{+?_siiN9f)x!V4Zaq3riiT`}< kKf$Kgn-eSl<@?uqlzm+B8|h^zW&i*H delta 1627 zcmb7EU1$_n6uvh*H?zsEo4wJ^ZhkhoK|}ouMxos;v?WWUgr&5J+8=}eNnGu!Y!FdU zNih*0N~o7p+&}}d4;5ef5T<1wq)$cg!M}w*6>ROBMAI6OJ`@R_b7v>+MqfI^9cIq? z&iT%F=G^<_@7T>}u?S<=dYdnB#@=R(?JH&iLd~hkZ2`eVu{R((=TsZ#qPY0GbzZAq zE6g{!BU86RA)C=%!vwQUfL68eXh+bAept(;jY-K#D@;HwyI|mG6GU@Lt52ZRcL_0c zGfW^5gLvTiE(EM`u5GX3t8Es+n*fx`W*v+{=3G*%2+};=ltKfVjLQQVqzUkY5-i1f zSOO09Z2;9jzllaWwuK9- zGood3l@Bm1T25o+8M{o1MG&Bwy@d(iVeYd|yBT54lxYU!z^pK3LFRl)t5MK9r<^|qTZCuT@>`HYdto+h!|lvQ zX#XPNS7uxzQ?P#znM}DJ`UgMsDwOt(YnArDC%x~8_c!bDPsUk0E?++ubQU45jIb`$ zN)AuAamb-@xN;y}5v35MNXA(hJm{8XET#<&L~@NjZ?dj}p7-mZi`mCuvLfQ z&ksH|0Vd}~(BrP5K>b=?TserC;|7P0R1gPy!^Hf=<@pJYs|HuVou9CN%r;0YinD*$ zkoc_N#YewcNj!?I)tqfxBIEydHm;297sdMvR?8|(cAGY+@w?OatQyXj-0$vN|0U^w z!>iW9$B6s=g7u)1zDic9B7jK;q>)g>Uu{rn# u=ffpyox9NeTC%^kikXeCs|sosztv5 diff --git a/Data-UB/Scripts/ExplosionControl.lua b/Data-UB/Scripts/ExplosionControl.lua index 132dfb9bc..36deed14b 100644 --- a/Data-UB/Scripts/ExplosionControl.lua +++ b/Data-UB/Scripts/ExplosionControl.lua @@ -323,12 +323,12 @@ end -- BIGGENS BOMBS if ActionID == 25 then - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then + if ( UB_ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then - HavePersonAtGridnoStop( sGridNo ) + UB_HavePersonAtGridnoStop( sGridNo ) -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 17 ) + TriggerNPCRecord( UB_GetBiggensID() , 17 ) -- get id from UB_Options.ini end @@ -337,12 +337,12 @@ end -- BIGGENS WARNING if ActionID == 26 then - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then + if ( UB_ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then - HavePersonAtGridnoStop( sGridNo ) + UB_HavePersonAtGridnoStop( sGridNo ) -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 16 ) + TriggerNPCRecord( UB_GetBiggensID() , 16 ) -- get id from UB_Options.ini end @@ -351,14 +351,14 @@ end -- SEE FORTIFIED DOOR if ActionID == 27 then - HandleSeeingFortifiedDoor( sGridNo ) + UB_HandleSeeingFortifiedDoor( sGridNo ) end -- OPEN FORTIFED DOOR if ActionID == 28 then - HandleSwitchToOpenFortifiedDoor( sGridNo ) + UB_HandleSwitchToOpenFortifiedDoor( sGridNo ) end @@ -368,12 +368,12 @@ if ActionID == 29 then -- if the player is in the power plant if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then - HandleSeeingPowerGenFan( sGridNo ) + UB_HandleSeeingPowerGenFan( sGridNo ) elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then -- The player is hitting the switch to launch the missles - HandlePlayerHittingSwitchToLaunchMissles() + UB_HandlePlayerHittingSwitchToLaunchMissles() end end diff --git a/Data-UB/Scripts/GameInit.lua b/Data-UB/Scripts/GameInit.lua index 7313c040c..1b0fd481c 100644 --- a/Data-UB/Scripts/GameInit.lua +++ b/Data-UB/Scripts/GameInit.lua @@ -404,35 +404,36 @@ ShopID = { } local function AddTexsVideosToBettysInventory() - GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, itemTEX_MOVIE_ATTACK_CLYDESDALES, 1 ) -- Attack of the Clydesdales - GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, itemTEX_MOVIE_WILD_EAST, 1 ) -- Wild, Wild East - GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, itemTEX_MOVIE_HAVE_HONDA, 1 ) -- Have Honda, Will Travel + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, UB_itemTEX_MOVIE_ATTACK_CLYDESDALES, 1 ) -- Attack of the Clydesdales + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, UB_itemTEX_MOVIE_WILD_EAST, 1 ) -- Wild, Wild East + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, UB_itemTEX_MOVIE_HAVE_HONDA, 1 ) -- Have Honda, Will Travel end function InitStrategicLayer() - InitialHeliCrash(iniINGAMEHELICRASH) + UB_InitialHeliCrash(UB_iniINGAMEHELICRASH) - if ( iniJERRY == true ) then - InitialProfile ( Profil.JerryMilo, iniDEFAULT_ARRIVAL_SECTOR_X, iniDEFAULT_ARRIVAL_SECTOR_Y,0, iniJERRYGRIDNO ) + if ( UB_iniJERRY == true ) then + AddProfileToMap (UB_GetJerryID(),iniDEFAULT_ARRIVAL_SECTOR_X,iniDEFAULT_ARRIVAL_SECTOR_Y,0,UB_iniJERRYGRIDNO) -- get id from UB_Options.ini + --InitialProfile ( UB_GetJerryID(), iniDEFAULT_ARRIVAL_SECTOR_X, iniDEFAULT_ARRIVAL_SECTOR_Y,0, UB_iniJERRYGRIDNO ) end - InitialJerryQuotes(iniJERRYQUOTES) - InitialLaptopQuest(iniLAPTOP_QUEST) + UB_InitialJerryQuotes(iniJERRYQUOTES) + UB_InitialLaptopQuest(iniLAPTOP_QUEST) - InitialHeliGridNo1(iniINITIALHELIGRIDNO1) - InitialHeliGridNo2(iniINITIALHELIGRIDNO2) - InitialHeliGridNo3(iniINITIALHELIGRIDNO3) - InitialHeliGridNo4(iniINITIALHELIGRIDNO4) - InitialHeliGridNo5(iniINITIALHELIGRIDNO5) - InitialHeliGridNo6(iniINITIALHELIGRIDNO6) - InitialHeliGridNo7(iniINITIALHELIGRIDNO7) + UB_InitialHeliGridNo1(iniINITIALHELIGRIDNO1) + UB_InitialHeliGridNo2(iniINITIALHELIGRIDNO2) + UB_InitialHeliGridNo3(iniINITIALHELIGRIDNO3) + UB_InitialHeliGridNo4(iniINITIALHELIGRIDNO4) + UB_InitialHeliGridNo5(iniINITIALHELIGRIDNO5) + UB_InitialHeliGridNo6(iniINITIALHELIGRIDNO6) + UB_InitialHeliGridNo7(iniINITIALHELIGRIDNO7) -- get DEFAULT_ARRIVAL_SECTOR_X and DEFAULT_ARRIVAL_SECTOR_Y from UB_Options.ini SetDefaultArrivalSector( iniDEFAULT_ARRIVAL_SECTOR_X, iniDEFAULT_ARRIVAL_SECTOR_Y ) -- get NEW_MERC_ARRIVAL_LOCATION from UB_Options.ini - InternalLocateGridNo( iniNEW_MERC_ARRIVAL_LOCATION ) + UB_InternalLocateGridNo( iniNEW_MERC_ARRIVAL_LOCATION ) end @@ -444,7 +445,7 @@ local ubNumElites = 0 local Test = false local JohnKulbaText = true -if ( RandomManuelText == true ) then +if ( UB_RandomManuelText == true ) then -- Miguel is dead Dead = math.random(1, 2) @@ -478,13 +479,13 @@ if ( RandomManuelText == true ) then end -- Random John or Tex -if ( enabledJohnAndTex == false) then +if ( UB_enabledJohnAndTex == false) then ran = math.random(1, 2) if ( ran == 1 ) then - if ( JohnKulbaText == true ) then + if ( UB_JohnKulbaText == true ) then -- Mary is dead MaryDead = math.random(1, 2) if ( MaryDead == 1 ) then @@ -493,37 +494,42 @@ ran = math.random(1, 2) end --John is available - Ja25JohnKulbaIsInGame (true) + UB_JohnKulbaIsInGame (true) --Tex is not available SetFactFalse( Facts.FACT_TEX_IS_IN_GAME_AND_ALIVE_IN_STORE ) - Ja25JohnKulbaInitialSectorY (SectorY.MAP_ROW_I) + UB_JohnKulbaInitialSectorY (SectorY.MAP_ROW_I) -- Randomly choose John's starting sector if( math.random(1, 100 ) < 50 ) then - Ja25JohnKulbaInitialSectorX (10) + UB_JohnKulbaInitialSectorX (10) + AddProfileToMap (UB_GetJohnID(),10,9,0,10503) -- get id from UB_Options.ini else - Ja25JohnKulbaInitialSectorX (11) + UB_JohnKulbaInitialSectorX (11) + AddProfileToMap (UB_GetJohnID(),11,9,0,17674) -- get id from UB_Options.ini end + else --John is not available - Ja25JohnKulbaIsInGame (false) + UB_JohnKulbaIsInGame (false) -- added video to Betty Shop - if ( Ja25CheckJohnKulbaIsInGame() == false ) then + if ( UB_CheckJohnKulbaIsInGame() == false ) then AddTexsVideosToBettysInventory() end --Tex is available SetFactTrue( Facts.FACT_TEX_IS_IN_GAME_AND_ALIVE_IN_STORE ) + + AddProfileToMap (UB_GetTexID(),10,9,0,12890) -- get id from UB_Options.ini end -- John and Tex in game -elseif ( enabledJohnAndTex == true) then +elseif ( UB_enabledJohnAndTex == true) then - if ( JohnKulbaText == true ) then + if ( UB_JohnKulbaText == true ) then -- Mary is dead MaryDead = math.random(1, 2) if ( MaryDead == 1 ) then @@ -532,328 +538,356 @@ elseif ( enabledJohnAndTex == true) then end --John is available - Ja25JohnKulbaIsInGame (true) + UB_JohnKulbaIsInGame (true) - Ja25JohnKulbaInitialSectorY (SectorY.MAP_ROW_I) + UB_JohnKulbaInitialSectorY (SectorY.MAP_ROW_I) --Randomly choose John's starting sector - if( math.random(1, 100 ) < 50 ) then - Ja25JohnKulbaInitialSectorX (10) - else - Ja25JohnKulbaInitialSectorX (11) - end + if( math.random(1, 100 ) < 50 ) then + UB_JohnKulbaInitialSectorX (10) + AddProfileToMap (UB_GetJohnID(),10,9,0,10503) -- get id from UB_Options.ini + else + UB_JohnKulbaInitialSectorX (11) + AddProfileToMap (UB_GetJohnID(),11,9,0,17674) -- get id from UB_Options.ini + end -- added video to Betty Shop AddTexsVideosToBettysInventory() --Tex is available SetFactTrue( Facts.FACT_TEX_IS_IN_GAME_AND_ALIVE_IN_STORE ) + + AddProfileToMap (UB_GetTexID(),10,9,0,12890) -- get id from UB_Options.ini end +-- Add UB profiles +AddProfileToMap (UB_GetManuelID(),9,9,0,15758) -- get id from UB_Options.ini +AddProfileToMap (UB_GetBiggensID(),13,9,0,14824) -- get id from UB_Options.ini +AddProfileToMap (UB_GetBettyID(),10,9,0,12897) -- get id from UB_Options.ini +AddProfileToMap (UB_GetRaulID(),11,9,0,10630) -- get id from UB_Options.ini +AddProfileToMap (UB_GetMorrisID(),15,12,3,14752) -- get id from UB_Options.ini +AddProfileToMap (UB_GetRudyID(),13,10,0,18320) -- get id from UB_Options.ini + +-- Add test UB profiles +--[[ +AddProfileToMap (UB_GetManuelID(),7,8,0,15108) -- get id from UB_Options.ini +AddProfileToMap (UB_GetBiggensID(),7,8,0,15107) -- get id from UB_Options.ini +AddProfileToMap (UB_GetJohnID(),7,8,0,15106) -- get id from UB_Options.ini +AddProfileToMap (UB_GetTexID(),7,8,0,15105) -- get id from UB_Options.ini +AddProfileToMap (UB_GetGastonID(),7,8,0,15104) -- get id from UB_Options.ini +AddProfileToMap (UB_GetJerryID(),7,8,0,15103) -- get id from UB_Options.ini +AddProfileToMap (UB_GetPgmale4ID(),7,8,0,15102) -- get id from UB_Options.ini +AddProfileToMap (UB_GetBettyID(),7,8,0,15101) -- get id from UB_Options.ini +AddProfileToMap (UB_GetRaulID(),7,8,0,15109) -- get id from UB_Options.ini +AddProfileToMap (UB_GetMorrisID(),7,8,0,15110) -- get id from UB_Options.ini +AddProfileToMap (UB_GetRudyID(),7,8,0,15111) -- get id from UB_Options.ini +]] + + -- Added enemy to sector if ( Test == false ) then -- H7 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 end - SetNumberJa25EnemiesInSurfaceSector( 7, 8, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 7, 8, ubNumAdmins, ubNumTroops, ubNumElites ) -- H8 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 6 + math.random( 1, 4 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 13 + math.random( 1, 3 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 16 + math.random( 1, 6 ) ubNumElites = 2 + math.random( 1,2 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 19 + math.random( 1, 9 ) ubNumElites = 2 + math.random( 1, 2 ) end - SetNumberJa25EnemiesInSurfaceSector( 8,8, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 8,8, ubNumAdmins, ubNumTroops, ubNumElites ) -- Guard Post -- H9 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 5 ) ubNumElites = 1 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 16 + math.random( 1, 4 ) ubNumElites = 1 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 19 + math.random( 1, 4 ) ubNumElites = 3 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 19 + math.random( 1, 6 ) ubNumElites = 3 + math.random( 1, 2 ) end - SetNumberJa25EnemiesInSurfaceSector( 9,8, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 9,8, ubNumAdmins, ubNumTroops, ubNumElites ) -- H10 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 6 + math.random( 1, 5 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 9 + math.random( 1, 3 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 4 ) ubNumElites = 2 + math.random( 1, 4 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 4 ) ubNumElites = 2 + math.random( 1, 4 ) end - SetNumberJa25EnemiesInSurfaceSector( 10,8, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 10,8, ubNumAdmins, ubNumTroops, ubNumElites ) -- H11 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 6 + math.random( 1, 3 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 8 + math.random( 1, 3 ) ubNumElites = 2 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 4 ) ubNumElites = 4 + math.random( 1, 3 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 4 ) ubNumElites = 2 + math.random( 1, 3 ) end - SetNumberJa25EnemiesInSurfaceSector( 11,8, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 11,8, ubNumAdmins, ubNumTroops, ubNumElites ) -- I9 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 6 + math.random( 1, 5 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 9 + math.random( 1, 4 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 4 ) ubNumElites = 2 + math.random( 1, 4 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 6 ) ubNumElites = 2 + math.random( 1, 4 ) end - SetNumberJa25EnemiesInSurfaceSector( 9,9, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 9,9, ubNumAdmins, ubNumTroops, ubNumElites ) -- First part of town -- I10 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 13 + math.random( 1, 6 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 16 + math.random( 1, 4 ) ubNumElites = 1 + math.random( 1, 3 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 14 + math.random( 1, 4 ) ubNumElites = 5 + math.random( 1, 3 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 4 ) ubNumElites = 5 + math.random( 1, 3 ) end - SetNumberJa25EnemiesInSurfaceSector( 10,9, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 10,9, ubNumAdmins, ubNumTroops, ubNumElites ) -- Second part of town -- I11 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 14 + math.random( 1, 7 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 16 + math.random( 1, 5 ) ubNumElites = 2 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 14 + math.random( 1, 4 ) ubNumElites = 5 + math.random( 1, 4 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 17 + math.random( 1, 4 ) ubNumElites = 5 + math.random( 1, 4 ) end - SetNumberJa25EnemiesInSurfaceSector( 11,9, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 11,9, ubNumAdmins, ubNumTroops, ubNumElites ) -- I12 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 8 + math.random( 1, 6 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 12 + math.random( 1, 5 ) ubNumElites = 2 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 12 + math.random( 1, 6 ) ubNumElites = 3 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 6 ) ubNumElites = 3 + math.random( 1, 2 ) end - SetNumberJa25EnemiesInSurfaceSector( 12,9, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 12,9, ubNumAdmins, ubNumTroops, ubNumElites ) -- Abandoned mine -- I13 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 0 ubNumElites = 0 end - SetNumberJa25EnemiesInSurfaceSector( 13,9, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 13,9, ubNumAdmins, ubNumTroops, ubNumElites ) -- J11 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 6 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 3 ) ubNumElites = 3 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 11 + math.random( 1, 5 ) ubNumElites = 6 + math.random( 1, 3 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 20 + math.random( 1, 5 ) ubNumElites = 6 + math.random( 1, 3 ) end - SetNumberJa25EnemiesInSurfaceSector( 11,10, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 11,10, ubNumAdmins, ubNumTroops, ubNumElites ) -- J12 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 12 + math.random( 1, 4 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 10 + math.random( 1, 4 ) ubNumElites = 1 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 11 + math.random( 1, 3 ) ubNumElites = 3 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 21 + math.random( 1, 3 ) ubNumElites = 3 + math.random( 1, 2 ) end - SetNumberJa25EnemiesInSurfaceSector( 12,10, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 12,10, ubNumAdmins, ubNumTroops, ubNumElites ) -- Power Generator, Ground Level -- J13 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 15 + math.random( 1, 6 ) ubNumElites = 1 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 16 + math.random( 1, 5 ) ubNumElites = 5 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 18 + math.random( 1, 4 ) ubNumElites = 6 + math.random( 1, 3 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 18 + math.random( 1, 4 ) ubNumElites = 7 + math.random( 1, 3 ) end - SetNumberJa25EnemiesInSurfaceSector( 13,10, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 13,10, ubNumAdmins, ubNumTroops, ubNumElites ) -- Complex, Ground Level -- K15 - if ( difficultyLevel == DIF_LEVEL_EASY ) then + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then ubNumAdmins = 0 ubNumTroops = 14 + math.random( 1, 5 ) ubNumElites = 0 - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then ubNumAdmins = 0 ubNumTroops = 18 + math.random( 1, 3 ) ubNumElites = 4 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then ubNumAdmins = 0 ubNumTroops = 17 + math.random( 1, 3 ) ubNumElites = 8 + math.random( 1, 2 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then ubNumAdmins = 0 ubNumTroops = 17 + math.random( 1, 3 ) ubNumElites = 8 + math.random( 1, 2 ) end - SetNumberJa25EnemiesInSurfaceSector( 15,11, ubNumAdmins, ubNumTroops, ubNumElites ) + UB_SetNumberJa25EnemiesInSurfaceSector( 15,11, ubNumAdmins, ubNumTroops, ubNumElites ) end -- init hospital variables diff --git a/Data-UB/Scripts/InitStrategicLayer.lua b/Data-UB/Scripts/InitStrategicLayer.lua index e435f00ba..9860e9890 100644 --- a/Data-UB/Scripts/InitStrategicLayer.lua +++ b/Data-UB/Scripts/InitStrategicLayer.lua @@ -8,14 +8,14 @@ local DIF_LEVEL_INSANE = 4 function InitStrategicLayer () -- I10 BloodCats - if ( difficultyLevel == DIF_LEVEL_EASY ) then - SetNumberOfJa25BloodCatsInSector ( 10, 9, 3, 5 ) - elseif ( difficultyLevel == DIF_LEVEL_MEDIUM ) then - SetNumberOfJa25BloodCatsInSector ( 10, 9, 4, 5 ) - elseif ( difficultyLevel == DIF_LEVEL_HARD ) then - SetNumberOfJa25BloodCatsInSector ( 10, 9, 5, 5 ) - elseif ( difficultyLevel == DIF_LEVEL_INSANE ) then - SetNumberOfJa25BloodCatsInSector ( 10, 9, 5, 5 ) + if ( newDIFFICULTY_LEVEL == DIF_LEVEL_EASY ) then + UB_SetNumberOfJa25BloodCatsInSector ( 10, 9, 3, 5 ) + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_MEDIUM ) then + UB_SetNumberOfJa25BloodCatsInSector ( 10, 9, 4, 5 ) + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_HARD ) then + UB_SetNumberOfJa25BloodCatsInSector ( 10, 9, 5, 5 ) + elseif ( newDIFFICULTY_LEVEL == DIF_LEVEL_INSANE ) then + UB_SetNumberOfJa25BloodCatsInSector ( 10, 9, 5, 5 ) end end \ No newline at end of file diff --git a/Data-UB/Scripts/Overhead.lua b/Data-UB/Scripts/Overhead.lua index 97470ae74..cc8bc3816 100644 --- a/Data-UB/Scripts/Overhead.lua +++ b/Data-UB/Scripts/Overhead.lua @@ -161,165 +161,23 @@ SectorY = MAP_ROW_P = 16, } --- JA2 Remove - ---[[ --- local function -local function HandleJohnArrival( ID ) - - local ID2 = nil - local sDist - - if ( not ID ) then - ID = FindSoldierByProfileID (Profil.JOHN) - if ( not ID ) then - return - end - end - - if ( PythSpacesAway( ID,8228) < 40 ) then - - if ( CheckFact( Facts.FACT_MARY_ALIVE, 0 ) == true ) then - ID2 = FindSoldierByProfileID( Profil.MARY ) - if ( ID2 ) then - if ( PythSpacesAway( ID, GetNPCGridNo(ID2) ) > 8 ) then - -- Too far away! - return - end - end - end - - SetFactTrue( Facts.FACT_MARY_OR_JOHN_ARRIVED ) - ActionStopMerc(ID) - - -- If Mary is alive/dead - if ( ID2 ) then - ActionStopMerc(ID2) - TriggerNPCRecord( ID, 13 ) - else - TriggerNPCRecord( ID, 12 ) - end - - end - -end --- end local function - --- local function -local function HandleMaryArrival( ID ) - - local sDist - - if ( not ID ) then - ID = FindSoldierByProfileID (Profil.MARY) - if ( not ID ) then - return - end - end - - if ( CheckFact( Facts.FACT_JOHN_ALIVE,0) == true ) then - return - --new requirements: player close by - elseif ( PythSpacesAway( ID,8228) < 40 ) then - - if ( not TileIsOutOfBounds ( ClosestPC( ID, sDist )) and sDist > NPC_TALK_RADIUS * 2 ) then - --too far away - return - end - - SetFactTrue( Facts.FACT_MARY_OR_JOHN_ARRIVED ) - ActionStopMerc(ID) - TriggerNPCRecord( ID, 13 ) - end - -end -]] --- end local function - function HandleAtNewGridNo( ProfileId ) --- Ja2 Remove ---[[ + if ( FindSoldierByProfileID (UB_GetTexID()) == UB_GetTexID() ) then + SetKeyProfile (UB_GetTexID(),true) + end + + if ( FindSoldierByProfileID (UB_GetBettyID()) == UB_GetBettyID() ) then + SetKeyProfile (UB_GetBettyID(),true) + end + + + + TeamSoldier = FindSoldierTeam (ProfileId) if ( TeamSoldier == Team.OUR_TEAM ) then -- Team - -- Kingping expecting visit from player (Sector D5) - -- The fact has to be TRUE. If FALSE then Kingpin attack the player. - if ( CheckFact( 98 ) == false ) then - if ( NPCInRoomRange( ProfileId, 30, 39 ) == true and gWorldSectorX == 5 and gWorldSectorY == SectorY.MAP_ROW_D and gWorldSectorZ == 0 )then - - for iLoop = GetTacticalStatusFirstID(Team.CIV_TEAM),GetTacticalStatusLastID(Team.CIV_TEAM) do - if ( CheckMercPtrsInSector (iLoop) == true and CheckMercPtrsInActive(iLoop) == true and CheckMercPtrsInCivilianGroup (iLoop) == 2 ) then - for aimLoop=GetTacticalStatusFirstID(Team.OUR_TEAM),GetTacticalStatusLastID(Team.OUR_TEAM) do - if ( CheckMercPtrsID1SeenID2(iLoop,aimLoop) == SEEN_CURRENTLY ) then - MakeMercPtrsHostile( iLoop ) - end - end - end - end - - if ( CheckCombatMode == false ) then - EnterTeamCombatMode(Team.CIV_TEAM) - end - - end - end - - if ( WhatKindOfMercAmI (ProfileId) == What.MERC_TYPE__EPC ) then -- what EPC - - -- Skyrider - if ( ProfileId == Profil.SKYRIDER and CheckNPCSectorBool( Profil.SKYRIDER, 13, SectorY.MAP_ROW_B, 0 ) == true and PythSpacesAway( Profil.SKYRIDER,8842 ) < 11 ) then - ActionStopMerc(Profil.SKYRIDER) - SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER ) - TriggerNPCRecord( Profil.SKYRIDER, 15 ) - SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter - - -- Mary & John - elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then - - -- Mary - if ( ProfileId == Profil.MARY ) then - HandleMaryArrival( Profil.MARY ) - -- John - elseif ( ProfileId == Profil.JOHN ) then - HandleJohnArrival( Profil.JOHN ) - end - - -- Maria - elseif ( ProfileId == Profil.MARIA and CheckNPCSectorBool( Profil.MARIA, 6, SectorY.MAP_ROW_C, 0) == true and CheckFact(Facts.FACT_MARIA_ESCORTED_AT_LEATHER_SHOP,Profil.MARIA) == true ) then - - if ( NPCInRoom( Profil.ANGEL, 2 ) == true ) then - TriggerNPCRecord( Profil.ANGEL, 12 ) - end - -- Joey - elseif ( ProfileId == Profil.JOEY and CheckNPCSectorBool( Profil.JOEY, 8, SectorY.MAP_ROW_G, 0) == true and CheckFact(Facts.FACT_JOEY_NEAR_MARTHA,0) == true ) then - ActionStopMerc(Profil.JOEY) - TriggerNPCRecord( Profil.JOEY, 9 ) - end - - -- Drassen stuff for John & Mary - elseif ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == pQuest.QUESTINPROGRESS and ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then - - if ( CheckFact( Facts.FACT_JOHN_ALIVE ) == true ) then - HandleJohnArrival( nil ) - else - HandleMaryArrival( nil ) - end - - elseif ( TeamSoldier == Team.CIV_TEAM and ProfileId ~= NO_PROFILE and CheckSoldierNeutral( ProfileId ) == true ) then - - if ( ProfileId == Profil.JIM or ProfileId == Profil.JACK or ProfileId == Profil.OLAF or ProfileId == Profil.RAY or ProfileId == Profil.OLGA or ProfileId == Profil.TYRONE ) then - - if ( not TileIsOutOfBounds( ClosestPC( ProfileId, sDesiredMercDist )) ) then - if ( sDesiredMercDist <= NPC_TALK_RADIUS * 2 ) then - CancelAIAction ( ProfileId ) - AddToShouldBecomeHostileOrSayQuoteList( GetPlayerMercID(ProfileId) ) - end - end - end - - end -- End what EPC end -- End team -]] + end \ No newline at end of file diff --git a/Data-UB/Scripts/Quests.lua b/Data-UB/Scripts/Quests.lua index a3de62d46..75b583858 100644 --- a/Data-UB/Scripts/Quests.lua +++ b/Data-UB/Scripts/Quests.lua @@ -39,6 +39,28 @@ nQuests = -- max Quests 254 } +ShopID = { + ARMS_DEALER_TONY = 0, + ARMS_DEALER_FRANZ = 1, + ARMS_DEALER_KEITH = 2, + ARMS_DEALER_JAKE = 3, + ARMS_DEALER_GABBY = 4, + ARMS_DEALER_HOWARD = 5, + ARMS_DEALER_SAM = 6, + ARMS_DEALER_FRANK = 7, + ARMS_DEALER_BAR_BRO_1 = 8, + ARMS_DEALER_BAR_BRO_2 = 9, + ARMS_DEALER_BAR_BRO_3 = 10, + ARMS_DEALER_BAR_BRO_4 = 11, + ARMS_DEALER_MICKY = 12, + ARMS_DEALER_ARNIE = 13, + ARMS_DEALER_FREDO = 14, + ARMS_DEALER_RAUL = 15, -- Raul UB + ARMS_DEALER_ELGIN = 16, + ARMS_DEALER_MANNY = 17, + ARMS_DEALER_BETTY = 18, -- Betty UB +} + qStatus = { QUESTNOTSTARTED = 0, QUESTINPROGRESS = 1, @@ -65,6 +87,15 @@ nFacts = { local NO_PROFILE = 200 +-- UB function +local function AddLaptopTransmitterToBettysInventory() + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, UB_itemLAPTOP_TRANSMITTER, 1 ) -- Laptop transmitter + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, 216, 1 ) + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, 202, 2 ) + GuaranteeAtLeastXItemsOfIndex( ShopID.ARMS_DEALER_BETTY, 201, 2 ) +end +-- End UB + function InternalStartQuest( ubQuest, sSectorX, sSectorY, fUpdateHistory ) if ( CheckQuest(ubQuest) == qStatus.QUESTNOTSTARTED ) then @@ -145,6 +176,10 @@ function InternalEndQuest( ubQuest, sSectorX, sSectorY, fUpdateHistory ) GiveQuestRewardPoint( sSectorX, sSectorY, 25, NO_PROFILE ) elseif ( ubQuest == nQuests.QUEST_ESCORT_SHANK ) then GiveQuestRewardPoint( sSectorX, sSectorY, 5, NO_PROFILE ) + -- UB + elseif ( ubQuest == nQuests.QUEST_GET_RID_BLOODCATS_AT_BETTYS ) then + AddLaptopTransmitterToBettysInventory() + -- end UB else GiveQuestRewardPoint( sSectorX, sSectorY, 4, NO_PROFILE ) end diff --git a/Data-UB/Scripts/intro.lua b/Data-UB/Scripts/intro.lua index 95a9d2b05..dcab45803 100644 --- a/Data-UB/Scripts/intro.lua +++ b/Data-UB/Scripts/intro.lua @@ -80,7 +80,7 @@ function PrepareToExitIntroScreen() SetIntroExitScreen ( ScreenTypes.GAME_SCREEN ) SetCurrentWorldSector( iniDEFAULT_END_SECTOR_X, iniDEFAULT_END_SECTOR_Y, iniDEFAULT_END_SECTOR_Z ) - EnterTacticalInFinalSector() + UB_EnterTacticalInFinalSector() -- Dont leave tactical SetEnteringMapScreen (false) diff --git a/Data-UB/Scripts/strategicmap.lua b/Data-UB/Scripts/strategicmap.lua index 927af8844..51ad951ab 100644 --- a/Data-UB/Scripts/strategicmap.lua +++ b/Data-UB/Scripts/strategicmap.lua @@ -186,6 +186,11 @@ local gsRobotGridNo function HandleQuestCodeOnSectorEntry( sNewSectorX, sNewSectorY, bNewSectorZ ) + if ( sNewSectorX == 10 and sNewSectorY == 9 and bNewSectorZ == 0 ) then + SetKeyProfile (UB_GetTexID(),true) + SetKeyProfile (UB_GetBettyID(),true) + end + end function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) @@ -216,49 +221,49 @@ local pSoldier if ( sOldSectorX == 7 and sOldSectorY == SectorY.MAP_ROW_H and bOldSectorZ == 0 ) then -- remove Jerry from the map - SetCharacterSectorX( 76, 0) - SetCharacterSectorY( 76, 0) + SetCharacterSectorX( UB_GetJerryID(), 0) + SetCharacterSectorY( UB_GetJerryID(), 0) end -- if the player is leaving a sector with Tex in it - if ( sOldSectorX == CheckCharacterSectorX(64) and sOldSectorY == CheckCharacterSectorY(64) and bOldSectorZ == 0 and CheckLastDateSpokenTot( 64 ) > 0 ) then + if ( sOldSectorX == CheckCharacterSectorX(UB_GetTexID()) and sOldSectorY == CheckCharacterSectorY(UB_GetTexID()) and bOldSectorZ == 0 and CheckLastDateSpokenTot( UB_GetTexID() ) > 0 ) then - pSoldier = FindSoldierByProfileID( 64 ) -- TEX + pSoldier = FindSoldierByProfileID( UB_GetTexID() ) -- TEX -- if the npc isnt on the players team AND the player has never spoken to them - if ( pSoldier == nil and CheckLastDateSpokenTot( 64 ) > 0 ) then + if ( pSoldier == nil and CheckLastDateSpokenTot( UB_GetTexID() ) > 0 ) then --remove Tex from the map - SetCharacterSectorX( 64, 0) - SetCharacterSectorY( 64, 0) + SetCharacterSectorX( UB_GetTexID(), 0) + SetCharacterSectorY( UB_GetTexID(), 0) end end -- if the player is leaving a sector with John kulba in it - if ( sOldSectorX == CheckCharacterSectorX(62) and sOldSectorY == CheckCharacterSectorY(62) and bOldSectorZ == 0 and CheckLastDateSpokenTot( 62 ) > 0 ) then + if ( sOldSectorX == CheckCharacterSectorX(UB_GetJohnID()) and sOldSectorY == CheckCharacterSectorY(UB_GetJohnID()) and bOldSectorZ == 0 and CheckLastDateSpokenTot( UB_GetJohnID() ) > 0 ) then - pSoldier = FindSoldierByProfileID( 62 ) -- John + pSoldier = FindSoldierByProfileID( UB_GetJohnID() ) -- John -- if the npc isnt on the players team AND the player has never spoken to them - if ( pSoldier == nil and CheckLastDateSpokenTot( 62 ) > 0 ) then + if ( pSoldier == nil and CheckLastDateSpokenTot( UB_GetJohnID() ) > 0 ) then --remove Tex from the map - SetCharacterSectorX( 62, 0) - SetCharacterSectorY( 62, 0) + SetCharacterSectorX( UB_GetJohnID(), 0) + SetCharacterSectorY( UB_GetJohnID(), 0) end end -- if the player is leaving a sector with Manuel in it - if ( sOldSectorX == CheckCharacterSectorX(60) and sOldSectorY == CheckCharacterSectorY(60) and bOldSectorZ == 0 and CheckLastDateSpokenTot( 60 ) > 0 ) then + if ( sOldSectorX == CheckCharacterSectorX(UB_GetManuelID()) and sOldSectorY == CheckCharacterSectorY(UB_GetManuelID()) and bOldSectorZ == 0 and CheckLastDateSpokenTot( UB_GetManuelID() ) > 0 ) then - pSoldier = FindSoldierByProfileID( 60 ) -- John + pSoldier = FindSoldierByProfileID( UB_GetManuelID() ) -- Manuel -- if the npc isnt on the players team AND the player has never spoken to them - if ( pSoldier == nil and CheckLastDateSpokenTot( 60 ) > 0 ) then + if ( pSoldier == nil and CheckLastDateSpokenTot( UB_GetManuelID() ) > 0 ) then --remove Tex from the map - SetCharacterSectorX( 60, 0) - SetCharacterSectorY( 60, 0) + SetCharacterSectorX( UB_GetManuelID(), 0) + SetCharacterSectorY( UB_GetManuelID(), 0) end end diff --git a/Data/BigItems/GUN367.STI b/Data/BigItems/GUN367.STI new file mode 100644 index 0000000000000000000000000000000000000000..492ca7fe969813d6a9f5c2fe3b87699855561b77 GIT binary patch literal 2206 zcmZuxe@qj37XNn9b$SM<9!OPw6~rf5nl4^h3>{HxttTS7vUqqxnZlKJyDf-F zi=GFkyR1Lrc5}DKaoRn>b0aZ#iMd>IfvHo*Zo;;mq^i%(` ze&2k*^ZmZhd++<+n;tS(8TPM4NE8vpAcExFJ4k|HU>LTvyZrd+`tA0j0-^sPR8J73 z9Bar)mC0qDJF<&6D{6{2)$7&$`zvG$a=TVb8ERYh)?R5g+HCb|s_E#lrjJZ5zK>h= zt+umPXH%nRV8HX|t2dh5z6W3VZJ&)!Og!|AOe7}4pFK<@lgW|r4-$!l`(g3<;$qR7 z%;RObXVew7YOP#No%^M!$=yn|4!GMdf8x10eDm)8ul_ZjT$D+W8e*1Vlmc77TKc{` zqdaGw0?CnFzA<~_q3moznUBeFIgaZ|yu7rul~PyY8mE3|y@{-@eD84O?qBWR?cVqP z@xum%p3)Ng+D{xjw#P(LrlvzjYY!Yd(|Gdt%_nUwXUO{2Bej;s<~CE4&E~dsoOHC% zU6)+l?ykOi+rY){!JC%`hpt`ojreX}9=`ke@IUX5|Ksof{^rr6a5$U{Cs(a{S1Em0 zwdQAOsj2(2QgheKNQJDqP<9OlLn(|VjLUp7}U4UzfHJWO2`-j@?nyrLRqs2)*sn_c%eg6^t zj%`(qRJD2Ep1tqYIQJYd8xP{7>9@xZ)z#Ih_4OTaOa1X1?TvaW zX4aM>If=^;6mG1@%RY?fl;-Cu^7Aq_3@JK#De^~)t3-hg&EIW8r7)L{^tgK*VEY`~_*yNz@ zK004wwE$SwYOyW@-ar8``9Cl)^L(=A+&Jnj14Ymj1lGzf!)j%C#=^YOo)pyyqDD6} z6ApikdR02%TOG?*VI6D-Z|8a5P7p-6gCQ6ONTMH@Ef#`E0|rp;q26*q(CJvdKgqM8 zuYwg=-$sQxnMy=JTrv)86rOGef8=N>fNamSl~ehL>?gu5u}%RZ8S#^4BN%OW)hGddwhO= z-s|=HQ7`fTsR5d%MVEmj!(xysLEynFVefcSxlHxmM!mb1$}DyT1OA9WFh~$>FfVfh z!KFyy2#BHH1*6I5OOcB3&d-;46hF?!0WJ_nl#E28BpDSq-U6NfV5#e%m0n|V(xL=E zq6aPzh(@9=>HN!=^Ybqa27}S)`_ecY1xQ^kskEoZ8FlqYVZ8(r%sZyIP)N+>YoHs3 z5TuHLNTC`W2@+i%(OK!NOSA=Wx|~jDBovJ$5{X#M zdssVbvDgDjyB&5xLeO-fP)G@)<+P$Hm(!Jipd%5{R3g?nJslw*KL)onM}t;qDro1C zuNtl?epQg!CD<*Kn72!(16P57*lJuf8h7@j3{mqDG7gK!9 z9f{Q=vGz)c^IPn8xF*EGY2#jlF+H7n5sNy=X+UIJyiO!Sa@uFFE_lz)yrEe=xIG*e zS=xAsQLJ7%l_CWis8544GSV4|hOZkb!@vw0l}vixv08supcU&kn=&*+Q7JEaVkGAP z51ihPWYm3+9%X51S|sE6g;{cH$^Zxc2Js}ASqW)~J;hTDR0?(b zud1;zf5WZs(c`r)j+}m)LS6ggZPh)MYRoUMM&HPs(J9B%zNNi;sxkR@Xgby9c>I*| sHK+ja9$pQD8&TX^V^{S6+ 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 literal 0 HcmV?d00001 diff --git a/Data/BigItems/P2item81.sti b/Data/BigItems/P2item81.sti new file mode 100644 index 0000000000000000000000000000000000000000..ec5fe8e9d98127714a7013729583bd38c1c4ed13 GIT binary patch literal 2583 zcmY+Fe@qi;8pmHYTW5BAGt`x8ixpZB=^#I>ZFS0~=(cN9s;-KqDqTgbS56olxH?_C zgWd`V=z++gfFs9x$C=!1j%;$b&3PBR<8q`wHU)ACA^aiGKO{9VS@&W#Ylu1Td0X$Y z_dq){&-;9y@ALk6rbpfO>gYOz@CTb7KFO@l-a=Uj{z;Nddoy1@y#Ik)htR(fs$*G; ziu`yBrBEp@?$YSD>74qlbv8rSM`nf2VydikRUc^Ff8dt?a3D};aQRMneV^1cj)t0S zO@S-?CEuCO-rmmN+!^tSqksD1cY)gzk;tRY2a)B-!tF=PsZ{F0!uMHOS+n22e*XG( z(R$^{^1Sl~^8rJp%HaCUQ{xkxTur@VOaDNpG%kJl)faycr(P?vkO68|kS-mmmcR3% zDrd)*jXI=4D%EDq=A#-7TdXBjjEZ4w7G_6TS(D4KhcRBV?XIh_?AudSyJzo@_wE%B zet5FBT4!@rvIkpE9q~G9EUp^g(Gv#_dC#9YebawB(0JZb*L3UvcgEjb;|m1DKnhg2OHViH4t^`pK1x zjbc6D6Kt{71x~qxJ?Ac6^ncd!NypEcu61-?yLGjzg}dPsdoOq0x*Qtr?i>ERd!(sz zba?dF<0Iouy$`@9#wWtz32`+1hu??A2ah6;BE1u{soCYxNNRaG^?doc3L!>;EDA)T zECuyF~Bdy0y7l@%50^?S+~ z#=z{}T5`CeG_SCn-Co|nmhUxId~B{TY%^SO8G`$F8jQvxMx*t8*!fuCnSqQ@Cqp>JE*X{so zUj++^^DUs11>vAJFUDd#&!NE`6d+aUQdS*|KEXrHTs-JlV;Dvh=jSdovn&v?#ZYLG z;{}07zc5e~Wl!OfWX-X7hr_Y9)C%&$yB!G#6BrV#9O^eY0kdNWtRu*AE3Z}r zj(e%}|1rb4y1!Wpw#L~6K_oaVWfeGd(?ruwDu6LD&czZdt!>em-L1)O&^BmtfgBrh zRli&UcZd)ZywwU~Ja-lKnIxLd6iLK6j^km4U|zysr>3Uz8Z`d1%CXYy>X%Pf+8z@G z%K?Yw+EK4blAPb-H4i{S3(Es){q4kA|3AQ{u%@yWz*niK1hK@zK@>)hBH*JHbAM!8CbRS(}|*^6j&BqMgTu^3p@H6J0lZ+-@p;7zh#6MEStL z*x23d`?*l*lvbP90E)GxgVisIe-Q~DPP70tcMbJmkWLE{L@2>??4sq&44wPdmPo6Cqw8$+X}N)R6|=ZonP?WeNE_iP4ZkX+C@RUw_dIGsnx&&>aKCUVMA#Xt1On;L@ON9ML0IlpjJ}g`;ggA()GUZ zL$Gkzrv_oz9k*K=TuZ-yWYFNyesNYWmwzYlq}`79gS&}LcG60PA5KpGj|5Q+N`uv6 znu0!$vuwM(V-{mcr^NI9$Ox|n%1TP!No*NSC>TfyjCL+zt%M#Hl(#~I3&P|>{ubH^ zMXKqfosvAD__<(0T$th^}pS!oquLr=4<2KCJU*N$??n(%{_zwd0xuo*P8n#S|n4LV{mwnywFL zfb{yiA)KO|&UEHG=z0-6xbfCXIMj`kLvEi>4VfXaGn4ZU>dS{f$?b(ea7&Up+%Oqd z<0qO1S%Diy{hD+L-e4&c5>|WgIEm{TL4zA9yOWmEdnmc{&Yz!DdoU`Yp$!xaq(>$j h3*d}kKtlI^MA066+R`5QnR=I2=QT_|1dJO+{{d=)r$qn& literal 0 HcmV?d00001 diff --git a/Data/BigItems/P2item82.sti b/Data/BigItems/P2item82.sti new file mode 100644 index 0000000000000000000000000000000000000000..53df8b37b1f0c50df3bb0fc41d639f101f139504 GIT binary patch literal 2006 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 ADF6Tf literal 0 HcmV?d00001 diff --git a/Data/BigItems/P2item84.sti b/Data/BigItems/P2item84.sti new file mode 100644 index 0000000000000000000000000000000000000000..fa8b23a6555d091c6e87c8e7256af2ef23118c39 GIT binary patch literal 1574 zcmYk5eM}Q)9LJwloyDg0=qMgqUXHi+QQnS%KCMC6DHklDQc$6Y!0K?)s<^sGyo$5E z@}j{h(FtS3C1d?+H-z*aZ0 zcA9nEI^}fxJr2*ff8gFkXnJ<~+4CpAEF?B56<~>HO5Bb#l$bUn0`NqeF?oQvi z`{2=|nYo$id$Z5Jn*I6t!cRZ``rC^atE;Pt)x`Gg@0ruyD^K5{*Xf#f>2k6t8$O*^#wFK2z?a;>AIF560Bd59jm4|yB^=-|3_H8s%7Io*M_bLTqFe{%NYn^*h&-IvGk0O#_ZZNp>d2Cw$r8n`BY z<{1`4!}kLt1KvAs|M<|z{h{lVqjx929-Z=pW+rF8nVp*TjL(raKRds$Fz=sP`2OjF ze{OMUacO)$oCvSYEG5>~60g@@(*QsU*eIX@DoV4Jp)?$=$uMZmdL2sFS$FN^C<@XP z$55`~_x0%+Em;|vnZ}}QV?(a7#*~?3+_kTWwn6%M!Jg_|(@B_JnwP`m8(=ZIp zFzxyI7t8W3IfWJG!rG#u{iQ_(7E5g@ge*Kzxc5YPNlrl-+E;cSmDO3x&s3MQ#q3Q7 ziyJFhtF^^ytvP7Dbg*i#rMjN2K4w1vHp!K0$$zI3s6i<(fRLJR45+)K0rhb02ngy# z$n#i;g#`i2e~2KkGZxn>cteztf-#m+5Tq+%UKGCu%Ypz?P>jqL$- zNi?WVi-lBaKm|n=4w7$3RK zZhd7~)g4T2eYFzW@>CxUfRSzbHvOMbam%TiR{=1(gUoc%Xy^J0SsT;nr>7?;53fXn O;Py7X{?&Rk1pWnmNkp&! literal 0 HcmV?d00001 diff --git a/Data/BigItems/P2item85.sti b/Data/BigItems/P2item85.sti new file mode 100644 index 0000000000000000000000000000000000000000..e1af51f4ea1f27fc2409015e42d918936e7f5188 GIT binary patch literal 1503 zcmYjQT~HHO6ut?HOE7V<1UBm>5Pq}D-x|;a$3j=JAua+TRE)BPjoq!pA7~uJMy!Dl zA(J#X2B8?M5HoG9TYoB3$du`Hro)2|&h#Y@JTQIB`Z|YC-BP$ zpuSvZ)|c8D+IONJ*O}@X8Z0er|8aIoXm`2nw8e4iwBw4kKXTQ{I9=B-4Lkb0fq?hn z^sK`j`QgzwuCTPay5fzkuCFG-E9=Q*GM0EFlgVDa*?hgZS(c;jsn(vO>sh*ipe;8( zusYmMi!0?%t#p>uh z#kQS3*Vp^G(Cg|yXRs$8R5 zjp+yrML747?-jw`Vpu^I(CR|5uEFn8j6QD-2AOo~d2i;_FC`26vrJGQdAvKo+HC10&a zR+H=N$=B>V@m~emr8IEn!;TS_;xx2F~R7zux(vZK4!EuVf869pfe@B&*+o8$L z%Tt#XsLh4y!!S>)&fix?m?)yHWKVq|?4k;)inO|-!d$Wl)9DDEuDiJSLUplTTUuLD z+E`Y0psK7yuWziPD4IH0y0^WiQd?4O+*d6ctD6ipXX%E^(Pt*f=x8GEd6#0!FKd^j39%Aa1nSiNhk=S_zZYc36y_)pShaC5eQhRx3%uJn$=m?VLs~G5+h(r;cw?8P9m4$q9;R= z;&b4Z;?3J6Bs40I!$}zz0=HE`tHg5>zr>Sb973O5kU}7=@=bHdByt()OVFF~wZMnK z9YxT}N%^SEk8ediX?_aKD1M)ga$G)2Cr7t0FFh2LBBZR}qu-%T*TJK_*X zn=k3x2(xW%Y?xU~jf43NQXsuM&Hs|DKZSY0yj&oCJHs1D&dRcgOL=6_1LkGIq%xeY zfwr6d2?2t~*>hoY*orVK2p;fVmX%G1x4_fPFsd#Hqu|*#|Atu@1J5(oQfT>JE~EjP Gz2F~x8T#4) literal 0 HcmV?d00001 diff --git a/Data/BigItems/P2item86.sti b/Data/BigItems/P2item86.sti new file mode 100644 index 0000000000000000000000000000000000000000..e91f6537dbbec37831672f2bab569659db045e3e GIT binary patch literal 2564 zcmchWZ%i6z9LEn_>~#(9Y(Y;&;8c{Wf}SVJ(OBKJ8a=Tp;#90ohtnzjgTq)ms;?Gl2dt*^(TQA>f0es1SyI`ZyI%M*rA%wJ?FTO$JA=7b`Fv zo2^$H%852ZnUkefu9-1{sk2(ScH4A^ZDXR_>vd9`YjDVQ$37jr>t@~F#oP0)F@GT7 z|L*H;moNC!v+uo|;b?TpdnuF24qhe?lSzH9YS^TiqRckRic{Ru z2X>dw&A9_U&*LxsJE5KDd(VE0B$Aj6p@3%$#a@Y9i@*w!vv=^5!6YPB<*-PJp2 z>l&IG8~tKp)H^-JINklW8)FkU?Jlp^=bagyo4$2#?Xv~ny=A92u)46mv$p=#lPAI5 z;LhXF^KU}G?nQq2`S(9xyokkOiCE&yne2+Q+10u4<|q`M`3g+|#t_&*^A3}YCjNV2r5t;T3ESNEH!5|TF1 zbPH4Wk+qJlvNY0Gl3^K^WjS`GpRKRGGRCzyI$Jv~x6QY9Il6mD#{OuycVJ+EVx2Q! zm+bJiXN$XOCzd>SmOpntSoS~IxWD4L zvF7px7FISE?ruF?-}?69w%Z@v3O)^Ohunc((88f`Bog)oBR~ES@$K$M_oIRELE<1D zj3(mo#9{mpM-UQ27z{xX8HT=u>|HUzmSuw>?u&@ z<*D?=sy3~vQJtqzMBjC$x>;Ww3wRd>g(oes+?NnsJV_>il%#Ly73Zy>r&lC zgSmw=U$ZtKN$|iX{dcMmJ)#Gf^zBWO$$=DnJ19u9&r6T{z8=ua@ zPO4j`H%azt-Jmz&5cq5Gztk<$NoGVS@39jEoBA*625$sFNp<75&u^Xo%N#$zlCZHUe*NgQw7&u7UJ)1o literal 0 HcmV?d00001 diff --git a/Data/Interface/MDGUNS.STI b/Data/Interface/MDGUNS.STI index 405733748ad99793fd04d8fc71cba49310919833..b027869620241f49489db433fa4929df566b29c9 100644 GIT binary patch delta 13884 zcmeI3O>7%Q6vroVy2MRFQfDVw|jPY(JXo&t};2NZrpVXwk13b!fTzQ<-Y}Khnjr!L4$7=H zX5l<}r?ck?`xfrmwoJklSurdVzg(`#SGt~T!FYiOssgK6Yl>*stJHARaCF7dPnG`1 z(anKw4s=(g#}RstqX%H>IZ)4GuhT_cF6ygNC!f?2l9fnSB0Y|TOj3YJIw$Fz#vEv{ zhDNz)c#y_bX%*-P*-i$4yTOg4j0-I0w!2;UZcS8A4E_}WS?1Sb9 z$MXpv#}_q%YvG~S=Lfy{&<`OqbT&FPumS8+69^6unk^bFY)zV>ytfb@ou2|Whi#f@ z$5K{v=JPY5{OH2rDzML5(Q_{U%iI?$U&eub?nMm6Mi)(|2dUQ$d>DGi;OMxK6~`7^cYAF*M6HG9$WhE=-a(tjqG~1FJrDZPn^br zc1rHUZ2H*J;39rmt!TU^?8Iy;qU(ADJs3^~BTZmHsaXsMqs5ZTo15DS47OGeL|KpB Gy8Q>ZeCpo- delta 53 zcmZ4em#5=0w`_2Tv*-O}28J6KnHWGo1Bf3mHZUb-tlUH<1q=0DFy-urd&!G}A)BxLE2M7E#f@4qvjj*tu?zxn39oe4Yo7@?7L z^vC1_68-)L{f8U0b%UGxlV-VG?%Z@;td+^$}F?9t$83%}{VE!4nb(%I8Z}obe z)a#aIAuIl-4dC&N5Vc(rQ3~LY4?y9ZQune+K0+=9Lud0UlxKP<$!%z2!@mcwy1nV%mMrQ%U}ra0voQq42F;cHo5jP7(x!n z_zy7$?3){cx10mE+)4~D2gLfr5OYAh|3&y^8$unx_}|_XzQr7{U$-fIi*>-p-QlfG z;ajW&Htu|0`(f~w_5&Dyd;*xn{r_8d$Buz)xIZlP~^#yu~s{; zWgi^XB0wZL$`Xj6wD+iJWN`dgiiPtC*=QepVv(&q zUC(xya`IxMi)6^rNWjOx=Rv}UA8 zP17`^9iOz8H2yT@scAJMT8j=1?xs9zvAJd*Mu+J7Ku@3ZqHEM5?&9H$nA*OWP`_`v z&X~mp_5<`^EP%XGp}XMr(QV^t8`CSDf5ByY-tMl?cKzJ}Vp*Q2cr@^QFGb3{|D9|f zd2WgX)TmaghEc_fraQ>@M)&BD7xOH`Mk{CX+c6FV07Jnx*(*xYx7J)IEQPS=Luw24w3Vto7&^2xIHk7C%PjEV!f z9KdQ6Zuef+J=HXYzR(Z4T|CUoL416Ax*DsYY<`dW6rXI^B=>+PnwFf#$Hv9Q_D(OS zcWou8!xo{y%k3B={9^UETIOHnsKPirB2E^dT|O4b4ivjI?e4MXp zaT#6RCXeKC9+X$(7~pgA#T~J3jBJg`_1hww6R=-cSy(|gu-h%H6!t~eo`goDu~KND zxw(9o$_RJYnmJpO(sNum-WbI?*&UwDa*WkchO@_m@+o%dguB}~E^En+p8 z1-nH%oup)*Xj+F0v00!>zLPXHRnywa2_k5{s8rR}e5kGFOK2TWJC&l5=jdO=1w8{; zxtn;^g||4hMYl`40Tq;(bl@uPU;(=0d zJ%)y+VK4Ha3!W%Mj+{qA;y}HPhh!fxG20O zpI=-EdHjRb^LQh3+a{y zWOo7<4a3IlB_0+jF0%ORQ50Dxe-eKaapnfuaCLLYU0A-+Kw!o6Dq_Rla*7EG+p_#g zvDe7jLNsN%#+b?t^bQohM)(Gl8tHU8%ggv9+H&WOhEW!WJGSKdLB^tFL}vuo4>*Gi e!nC|$N3OyR4+pCyT@!rEonQO_<1OLWh2;M-(<{aR delta 45 wcmaE~nd$l;M%myHXV1wl3=GT57{EXSNIqa}U}9ioU~u0kJDGj+29D)r05SOta{vGU diff --git a/Data/TableData/Items/AmmoStrings.xml b/Data/TableData/Items/AmmoStrings.xml index c63635c11..1d99abe8d 100644 --- a/Data/TableData/Items/AmmoStrings.xml +++ b/Data/TableData/Items/AmmoStrings.xml @@ -235,4 +235,9 @@ .30-06 .30-06 + + 47 + Cannon Ball + Cannon Ball + \ No newline at end of file diff --git a/Data/TableData/Items/Items.xml b/Data/TableData/Items/Items.xml index 3a8d5adce..a7aeadaf7 100644 --- a/Data/TableData/Items/Items.xml +++ b/Data/TableData/Items/Items.xml @@ -9244,7 +9244,6 @@ 1 335 3 - 1 55 129 9 @@ -9271,6 +9270,226 @@ 336 + Hand Mortar + Hand Mortar + Just your standard 18th century hand mortar with a stubby brass barrel and JOURSON engraved on the lock. Worth a fortune on the collector's market. + Hand Mortar + Not for sale through BR. + 2 + 1 + 336 + 3 + 367 + 24 + 6 + 500 + 2 + -4 + -4 + 1 + 1 + 1 + 1 + 1 + 1 + 10 + 100.0 + + + + + + 337 + Garver Knife + Sam Garver Combat Knife + This limited edition, Sam Garver combat knife, is authenticated with a serial number and signed by Sam himself. It's galvanized steel blade and gator-skinned elegance have made it a highly sought-after collectable. + Sam Garver Combat Knife + Not for sale through BR. + 4 + 1 + 337 + 4 + 2 + 85 + 9 + 2 + 24 + 350 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 28 + 100.0 + + + + + + 338 + Cannon Ball + Cannon Ball + A hand-crafted cast-iron projectile for a hand mortar. + Cannon Ball + Not for sale through BR. + 1024 + 1 + 61 + 368 + 25 + 8 + 10 + 5 + 2 + 1 + 1 + 1 + 100.0 + + + + + + 339 + Transmitter + Laptop Transmitter + This satellite transmitter enables a laptop computer to connect to the Internet from anywhere in the world. N.B. Works with operating system other than Windows. + Laptop Transmitter + Not for sale through BR. + 268435456 + 1 + 2 + 81 + 1 + 1 + 18 + 100 + 5 + 1 + 1 + 1 + 100.0 + + + + + + 340 + Video + Attack of the Clydesdales + A sushi-western classic. All Hell breaks loose in a small mid-western town when a full-team of eight Clydesdales knock over the beer wagon and get into the suds. + Attack of the Clydesdales + Not for sale through BR. + 268435456 + 1 + 2 + 78 + 1 + 8 + 21 + 20 + 100.0 + + + + + + 341 + Video + Wild, Wild East + Not to be confused with the American film Wild, Wild West, which was a dud, this Sushi-western, starring Will Smithero and Tex Colburn, is a hilarious romp through time. + Wild, Wild East + Not for sale through BR. + 268435456 + 1 + 2 + 79 + 1 + 8 + 21 + 20 + 100.0 + + + + + + 342 + Video + Have Honda, Will Travel + Perhaps one of the greatest films ever directed by Francis Honda Copella, this sushi-western replaces the horse as a means of travel with raw sub-compact horsepower. + Have Honda, Will Travel + Not for sale through BR. + 268435456 + 1 + 2 + 80 + 1 + 8 + 21 + 20 + 100.0 + + + + + + 343 + Canteen + Che Guevara Canteen + This rebel essential is made from hand-crafted tin and enclosed in insulated Mayan wool. Filled to capacity with fresh spring water from the French Alps, no guerrilla campaign would be complete without one. + Che Guevara Canteen + Not for sale through BR. + 268435456 + 1 + 2 + 82 + 10 + 4 + 22 + 25 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 344 + Wrist Watch + MERC Wrist Watch + This is a timepiece like no other. An official M.E.R.C. wristwatch with Flo, in the skimpiest of bikinis, showing you the exact time with her limbs. It's even water resistant, so she'll never fog up. + MERC Wrist Watch + Not for sale through BR. + 268435456 + 1 + 2 + 83 + 1 + 8 + 11 + 50 + 2 + -4 + 1 + 1 + 1 + 100.0 + + + + + + 345 Umbrella MERC Umbrella From formal wear to fatigues, this highly versatile umbrella will accompany you anywhere in style. It is also extremely durable; boasting a teflon-treated cloth guaranteed to withstand hail and sleet. @@ -9278,7 +9497,7 @@ Not for sale through BR. 4 1 - 336 + 346 4 2 84 @@ -9301,4 +9520,24 @@ + + 346 + Instructions + Morris' Launch Instructions + The note contains origin and destination coordinates as well as precise instructions to launch missiles. It includes a number of towns in Arulco and the launch facility in Tracona. + Morris' Launch Instructions + Not for sale through BR. + 268435456 + 1 + 2 + 86 + 1 + 8 + 10 + 1 + 100.0 + + + + \ No newline at end of file diff --git a/Data/TableData/Items/Magazines.xml b/Data/TableData/Items/Magazines.xml index 25db925a5..5a9fe799c 100644 --- a/Data/TableData/Items/Magazines.xml +++ b/Data/TableData/Items/Magazines.xml @@ -424,6 +424,13 @@ 0 0 0 - 0 + 0 + + + 61 + 47 + 1 + 1 + 1 \ No newline at end of file diff --git a/Data/TableData/Items/Weapons.xml b/Data/TableData/Items/Weapons.xml index 9b66a40a1..d4fce2c06 100644 --- a/Data/TableData/Items/Weapons.xml +++ b/Data/TableData/Items/Weapons.xml @@ -2258,6 +2258,48 @@ 336 + Hand Mortar + 5 + 8 + 47 + 11 + 7.57 + 30 + 50 + 23 + 4 + 1 + 100 + 200 + 100 + 90 + 30 + 146 + 103 + 109 + 157 + 20 + 20 + 7 + 480 + 11 + 4000 + 5000 + 1200 + + + 337 + Sam Garver Combat Knife + 6 + 14 + 20 + 7 + 200 + 2 + 7 + + + 345 MERC Umbrella 6 10.46 diff --git a/Data/tilesets/0/SMGUNS.STI b/Data/tilesets/0/SMGUNS.STI index 6712ddae498d486b9096bb187dbffd6802ff8644..fe3cad6da6124165ade2fbfeb1c15953a1e1e1ee 100644 GIT binary patch delta 5498 zcmeI0J8Tm{5QfM0u{nn*5-H+Kks{Gbgn|OeNSnfil_p7tprK5Oea?_m-&ve~(#&~#^|y;tGfG8y z1av10v~(%YKsS#AFh;ik%~H)pUcat)bEk_XQ!)`yqZJoun{qynTU2q;ZnYwg-=<&) z?Sp~=?vlc2p$yz32Xk#~P>=@h$8*~$?ZVphu^)*&3hWtc|0MQ*X{!QTZrP&Jmd^Hq zU~gXbera#f)+_kmCd~e}=XW|$BLdZifiP6csMzYcF$^85P&eiyROtE$Yg%co=Z#^$ zHUb@$84+oN6C+Fzx@|4D<8f9 delta 54 zcmZoW#`3b2MK(CZ+0#^sfx+@M0~lxk$p?%LObm<+4DK6cCyP&R@>QI^ij|RjbBz@5 FYXEcS4etN| diff --git a/Data/tilesets/0/SMP2ITEMS.STI b/Data/tilesets/0/SMP2ITEMS.STI index 3928fc6b102a9efb4d10480f5a3c84dd6c1dcd34..83e44a9a507e64a2f92e9301e5a74a2c66a3f2a1 100644 GIT binary patch delta 1845 zcmchX&uSA<7{$*dnLlDh6h=zgENr1xYeBLT3bSw}E>)}x!EMDy7;?QcZQ3SNon{nq z=?e&^8+`=Vt_HGDx+<=GfrH;ov*?W!wZzO~xWDhu+;czfoOe$SpEvG5xO4aI72seM z!)ICE-<%f}IKZQijlx$)OTee&BranX@2}bXSXxfzFI~6!%NXk$cK-H?%|C^kqy0R1 z3X3+z z6TK?I6#FjwAQSXt5y#Zn_n7Cy)vI%4j#eyy>^#XVLr!Va=mv}tW)e#rY3_KGs+c?2 z@l9D4a~JJ^63t?;gROwAtR-P~p;AeNQWJ9zNx*Qp9bZEG4CiwBXbz80&7y}I=R&@Q zu8?mq8R6>8$|oaSO@HK;a5eprTN79Ra#<|plM$|_a?4K_uBLL!t&v+3SAY0FPggz} z;R^rBSpHJ@!tchSYvN>LYYufK>}#jE7c5>pdu*ZT2Fpb`+bA~b^U8QvM~v+2nwX+? zx%Q0QM&hzL7_g1h<@%sW?T8z1`n)Q^QY>{#Tw+j4tZj@rGZCMCanvKx*%s5SF)oSS lDy0`47HZ~C?Ca;m2hF{ciGe`gc delta 43 ucmaEyGc#5;IK