From dab6c6ed93d504ae1a98c59e1bf46a6734280bfc Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 29 Aug 2013 11:57:12 +0000 Subject: [PATCH] - UB Improvements / Cleanup (by Jazz) o Deleted unused Inventory XML files git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1744 4f8fa57e-7814-0410-bad4-adc449f26b7c --- .../TableData/NPCInventory/BettyInventory.xml | 268 ----- .../TableData/NPCInventory/Merchants.xml | 1016 ----------------- .../TableData/NPCInventory/RaulInventory.xml | 748 ------------ 3 files changed, 2032 deletions(-) delete mode 100644 gamedir/Data-UB/TableData/NPCInventory/BettyInventory.xml delete mode 100644 gamedir/Data-UB/TableData/NPCInventory/Merchants.xml delete mode 100644 gamedir/Data-UB/TableData/NPCInventory/RaulInventory.xml diff --git a/gamedir/Data-UB/TableData/NPCInventory/BettyInventory.xml b/gamedir/Data-UB/TableData/NPCInventory/BettyInventory.xml deleted file mode 100644 index 22340751e..000000000 --- a/gamedir/Data-UB/TableData/NPCInventory/BettyInventory.xml +++ /dev/null @@ -1,268 +0,0 @@ - - - - 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/gamedir/Data-UB/TableData/NPCInventory/Merchants.xml b/gamedir/Data-UB/TableData/NPCInventory/Merchants.xml deleted file mode 100644 index 692a210a2..000000000 --- a/gamedir/Data-UB/TableData/NPCInventory/Merchants.xml +++ /dev/null @@ -1,1016 +0,0 @@ - - -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/gamedir/Data-UB/TableData/NPCInventory/RaulInventory.xml b/gamedir/Data-UB/TableData/NPCInventory/RaulInventory.xml deleted file mode 100644 index 0f977fff7..000000000 --- a/gamedir/Data-UB/TableData/NPCInventory/RaulInventory.xml +++ /dev/null @@ -1,748 +0,0 @@ - - - - 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 - 1 - - - 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