diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_10_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_10_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_10_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_11_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_11_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_11_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_12_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_12_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_12_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_13_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_13_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_13_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_14_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_14_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_14_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_15_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_15_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_15_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_16_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_16_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_16_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_17_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_17_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_17_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_18_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_18_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_18_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_19_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_19_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_19_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_20_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_20_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_20_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_2_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_3_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_3_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_3_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_4_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_4_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_4_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_5_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_5_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_5_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_6_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_6_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_6_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_7_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_7_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_7_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_8_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_8_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_8_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_9_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_9_Inventory.xml new file mode 100644 index 000000000..65086d169 --- /dev/null +++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_9_Inventory.xml @@ -0,0 +1,8 @@ + + + + 0 + 0 + 0 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml b/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml new file mode 100644 index 000000000..65a81e838 --- /dev/null +++ b/gamedir/Data-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 + Devin + 0.75 + 1.25 + 61 + 1 + 5000 + 268435456 + 5000 + 5000 + 0 + 3 + 10 + 0 + 100 + 2 + 3 + 0 + 0 + + + 6 + Howard + 1.0 + 1.0 + 125 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 7 + Sam + 1.0 + 1.0 + 126 + 1 + 3000 + 268435456 + 3000 + 3000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 8 + Frank + 1.0 + 1.0 + 92 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 9 + Herve + 1.0 + 1.0 + 151 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 10 + Peter + 1.0 + 1.0 + 152 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 11 + Alberto + 1.0 + 1.0 + 153 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 12 + Carlo + 1.0 + 1.0 + 154 + 1 + 250 + 536870912 + 250 + 250 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 13 + Micky + 1.0 + 1.4 + 96 + 2 + 10000 + 2415919104 + 10000 + 10000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 14 + Arnie + 0.1 + 0.8 + 128 + 3 + 1500 + 2415919104 + 1500 + 1500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 15 + Fredo + 0.6 + 0.6 + 130 + 3 + 1000 + 2415919104 + 1000 + 1000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 16 + Perko + 1.0 + 0.4 + 74 + 3 + 1000 + 2415919104 + 1000 + 1000 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 17 + Druggist + 1.0 + 1.0 + 112 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 1 + 2 + 0 + 1 + + + 18 + Manny + 1.0 + 1.0 + 155 + 1 + 500 + 536870912 + 500 + 500 + 0 + 1 + 10 + 0 + 100 + 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/gamedir/Data-UB/TableData/NPCInventory/Merchants.xml b/gamedir/Data-UB/TableData/NPCInventory/Merchants.xml new file mode 100644 index 000000000..692a210a2 --- /dev/null +++ b/gamedir/Data-UB/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