Restore old pickups (#421)

data/pickups.json

@@ -4,73 +4,121 @@
     {
       "Name": "folder",
       "Pic": "folder",
-      "OldPic": 218,
+      "Type": "Score"
+    },
+    {
+      "Name": "folder2",
+      "Pic": "folder2",
+      "Type": "Score"
+    },
+    {
+      "Name": "chip1",
+      "Pic": "chip1",
+      "Type": "Score"
+    },
+    {
+      "Name": "chip2",
+      "Pic": "chip2",
+      "Type": "Score"
+    },
+    {
+      "Name": "chip3",
+      "Pic": "chip3",
       "Type": "Score"
     },
     {
       "Name": "disk1",
       "Pic": "disk1",
-      "OldPic": 219,
       "Type": "Score"
     },
     {
       "Name": "disk2",
       "Pic": "disk2",
-      "OldPic": 220,
       "Type": "Score"
     },
     {
       "Name": "disk3",
       "Pic": "disk3",
-      "OldPic": 221,
       "Type": "Score"
     },
     {
       "Name": "blueprint",
       "Pic": "blueprint",
-      "OldPic": 504,
+      "Type": "Score"
+    },
+    {
+      "Name": "starmap",
+      "Pic": "starmap",
+      "Type": "Score"
+    },
+    {
+      "Name": "bd",
+      "Pic": "bd",
       "Type": "Score"
     },
     {
       "Name": "cd",
       "Pic": "cd",
-      "OldPic": 505,
       "Type": "Score"
     },
     {
       "Name": "bag",
       "Pic": "bag",
-      "OldPic": 506,
+      "Type": "Score"
+    },
+    {
+      "Name": "sack",
+      "Pic": "sack",
       "Type": "Score"
     },
     {
       "Name": "holo",
       "Pic": "holo",
-      "OldPic": 507,
+      "Type": "Score"
+    },
+    {
+      "Name": "plasma_globe",
+      "Pic": "plasma_globe",
       "Type": "Score"
     },
     {
       "Name": "bottle",
       "Pic": "bottle",
-      "OldPic": 508,
+      "Type": "Score"
+    },
+    {
+      "Name": "bottle2",
+      "Pic": "bottle2",
       "Type": "Score"
     },
     {
       "Name": "radio",
       "Pic": "radio",
-      "OldPic": 509,
+      "Type": "Score"
+    },
+    {
+      "Name": "radio2",
+      "Pic": "radio2",
       "Type": "Score"
     },
     {
       "Name": "circuit",
       "Pic": "circuit",
-      "OldPic": 510,
+      "Type": "Score"
+    },
+    {
+      "Name": "pci_card",
+      "Pic": "pci_card",
       "Type": "Score"
     },
     {
       "Name": "paper",
       "Pic": "paper",
-      "OldPic": 511,
+      "Type": "Score"
+    },
+    {
+      "Name": "paper2",
+      "Pic": "paper2",
       "Type": "Score"
     },
     {
@@ -191,4 +239,4 @@
       "Key": "red"
     }
   ]
-}
+}

graphics/originals.txt

@@ -16,8 +16,10 @@ blood0.png
 blood1.png
 blood2.png
 bloodstain.png
+blueprint.png
 bone_blood.png
 bookshelf.png
+bottle.png
 box.png
 box_metal_green.png
 box_metal_green_wreck.png
@@ -31,16 +33,26 @@ bullet_ball.png
 bulletmarks.png
 cabinet.png
 cabinet_wreck.png
+cd.png
 chair.png
 chair_wreck.png
 column.png
+disk1.png
+disk2.png
+disk3.png
 egg.png
 egg_wreck.png
+folder.png
 goo.png
+holo.png
+paper.png
+pci_card.png
 plant.png
 plant_wreck.png
+radio.png
 rocket.png
 rocket_wreck.png
+sack.png
 safe.png
 safe_wreck.png
 scratch.png

src/cdogs/pickup_class.c

@@ -78,11 +78,11 @@ PickupClass *IntPickupClass(const int i)
 		"disk3",
 		"blueprint",
 		"cd",
-		"bag",
+		"sack",
 		"holo",
 		"bottle",
 		"radio",
-		"circuit",
+		"pci_card",
 		"paper"
 	};
 #define PICKUPS_COUNT (sizeof(pickupItems)/sizeof(const char *))