E1L1 objects #712

data/.wolf3d/N3Ddata.cdogscpn/graphics/apple.txt

@@ -0,0 +1,5 @@
+Adapted from CC0 Food Icons
+By bluecarrot16
+https://opengameart.org/content/cc0-food-icons
+
+http://creativecommons.org/publicdomain/zero/1.0/

data/.wolf3d/N3Ddata.cdogscpn/graphics/grapes.txt

@@ -0,0 +1,5 @@
+Adapted from CC0 Food Icons
+By bluecarrot16
+https://opengameart.org/content/cc0-food-icons
+
+http://creativecommons.org/publicdomain/zero/1.0/

data/.wolf3d/N3Ddata.cdogscpn/graphics/orange.txt

@@ -0,0 +1,5 @@
+Adapted from CC0 Food Icons
+By bluecarrot16
+https://opengameart.org/content/cc0-food-icons
+
+http://creativecommons.org/publicdomain/zero/1.0/

data/.wolf3d/N3Ddata.cdogscpn/map_objects.json

@@ -13,14 +13,13 @@
       "Flags": ["Inside", "NoWalls"]
     },
     {
-      "Name": "hanging_skeleton",
+      "Name": "pillar2",
       "Pic": {
         "Type": "Normal",
-        "Pic": "hanging_skeleton"
+        "Pic": "pillar2"
       },
-      "Offset": [-5, -26],
-      "Health": 40,
-      "Flags": ["Inside", "NoWalls"]
+      "Health": 80,
+      "Flags": ["Inside", "OneOrMoreWalls"]
     },
     {
       "Name": "pillar",
@@ -29,7 +28,7 @@
         "Pic": "pillar"
       },
       "Health": 80,
-      "Flags": ["Inside", "NoWalls"]
+      "Flags": ["Inside", "OneOrMoreWalls"]
     },
     {
       "Name": "pillar_brown",
@@ -72,17 +71,6 @@
       "Health": 20,
       "Flags": ["NoWalls"]
     },
-    {
-      "Name": "urn",
-      "Pic": {
-        "Type": "Normal",
-        "Pic": "urn"
-      },
-      "Size": [10, 8],
-      "Offset": [-5, -8],
-      "Health": 30,
-      "Flags": ["Inside", "OneOrMoreWalls", "FreeInFront"]
-    },
     {
       "Name": "knives",
       "Pic": {
@@ -94,14 +82,14 @@
       "Flags": ["Inside", "OneOrMoreWalls"]
     },
     {
-      "Name": "pots",
+      "Name": "beam",
       "Pic": {
         "Type": "Normal",
-        "Pic": "pots"
+        "Pic": "beam"
       },
       "Offset": [-8, -13],
       "Health": 0,
-      "Flags": ["Inside", "OneOrMoreWalls"]
+      "Flags": ["Inside"]
     },
     {
       "Name": "gibbet_bloody",
@@ -153,17 +141,6 @@
       "Health": 40,
       "Flags": ["Inside", "NoWalls"]
     },
-    {
-      "Name": "basket",
-      "Pic": {
-        "Type": "Normal",
-        "Pic": "basket"
-      },
-      "Size": [6, 6],
-      "Offset": [-3, -8],
-      "Health": 0,
-      "Flags": ["Inside", "OneOrMoreWalls", "FreeInFront"]
-    },
     {
       "Name": "well",
       "Pic": {
@@ -180,16 +157,16 @@
         "Pic": "well_water"
       },
       "Health": 80,
-      "Flags": ["Outside", "NoWalls"]
+      "Flags": ["Inside", "OneOrMoreWalls"]
     },
     {
-      "Name": "well_blood",
+      "Name": "well_feed",
       "Pic": {
         "Type": "Normal",
-        "Pic": "well_blood"
+        "Pic": "well_feed"
       },
       "Health": 80,
-      "Flags": ["Outside", "NoWalls"]
+      "Flags": ["Inside", "OneOrMoreWalls"]
     },
     {
       "Name": "pool_blood",
@@ -232,6 +209,15 @@
       "Health": 40,
       "Flags": ["Inside", "OneOrMoreWalls", "FreeInFront"]
     },
+    {
+      "Name": "cage",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "cage"
+      },
+      "Health": 100,
+      "Flags": ["Inside", "OneOrMoreWalls"]
+    },
     {
       "Name": "truck",
       "Pic": {
@@ -259,16 +245,6 @@
       "Health": 0,
       "DrawBelow": true
     },
-    {
-      "Name": "spotlight",
-      "Pic": {
-        "Type": "Normal",
-        "Pic": "spotlight"
-      },
-      "Health": 0,
-      "DrawBelow": true,
-      "Flags": ["Inside", "NoWalls"]
-    },
     {
       "Name": "shadow",
       "Pic": {

data/.wolf3d/N3Ddata.cdogscpn/missions.json

@@ -993,20 +993,10 @@
 			"MapObject": "rod_light",
 			"Positions": [[23, 1]]
 		},
-		{
-			"MapObject": "spotlight",
-			"Positions": [[25, 1],
-			[23, 1],
-			[30, 9]]
-		},
 		{
 			"MapObject": "chandelier",
 			"Positions": [[25, 1]]
 		},
-		{
-			"MapObject": "hanging_skeleton",
-			"Positions": [[27, 1]]
-		},
 		{
 			"MapObject": "shadow",
 			"Positions": [[27, 1],
@@ -1039,10 +1029,6 @@
 			"MapObject": "plant_brown",
 			"Positions": [[23, 3]]
 		},
-		{
-			"MapObject": "urn",
-			"Positions": [[25, 3]]
-		},
 		{
 			"MapObject": "knives",
 			"Positions": [[27, 3]]
@@ -1075,10 +1061,6 @@
 			"MapObject": "bed",
 			"Positions": [[25, 5]]
 		},
-		{
-			"MapObject": "basket",
-			"Positions": [[27, 5]]
-		},
 		{
 			"MapObject": "gibs",
 			"Positions": [[17, 9]]
@@ -1119,10 +1101,6 @@
 			"MapObject": "bones3",
 			"Positions": [[19, 11]]
 		},
-		{
-			"MapObject": "pots",
-			"Positions": [[20, 11]]
-		},
 		{
 			"MapObject": "cowskull_pillar",
 			"Positions": [[21, 11]]
@@ -1131,10 +1109,6 @@
 			"MapObject": "stove",
 			"Positions": [[22, 11]]
 		},
-		{
-			"MapObject": "well_blood",
-			"Positions": [[23, 11]]
-		},
 		{
 			"MapObject": "spears",
 			"Positions": [[25, 11]]
@@ -1162,6 +1136,10 @@
 		{
 			"MapObject": "ghost_corpse",
 			"Positions": [[14, 21]]
+		},
+		{
+			"MapObject": "cage",
+			"Positions": [[25, 7]]
 		}],
 		"StaticCharacters": [{
 			"Index": 0,
@@ -1355,10 +1333,6 @@
 			"Pickup": "dogfood",
 			"Positions": [[31, 1]]
 		},
-		{
-			"Pickup": "meal",
-			"Positions": [[29, 5]]
-		},
 		{
 			"Pickup": "health",
 			"Positions": [[31, 5]]
@@ -1379,10 +1353,6 @@
 			"Pickup": "cross",
 			"Positions": [[23, 7]]
 		},
-		{
-			"Pickup": "chalice",
-			"Positions": [[25, 7]]
-		},
 		{
 			"Pickup": "chest",
 			"Positions": [[27, 7]]

data/.wolf3d/N3Ddata.cdogscpn/pickups.json

@@ -14,10 +14,10 @@
       "Sound": "health_small"
     },
     {
-      "Name": "meal",
+      "Name": "small_bandage",
       "Pic": {
         "Type": "Normal",
-        "Pic": "meal"
+        "Pic": "bandage"
       },
       "Effects": [{
         "Type": "Health",
@@ -26,10 +26,10 @@
       "Sound": "health_small"
     },
     {
-      "Name": "medkit",
+      "Name": "large_bandage",
       "Pic": {
         "Type": "Normal",
-        "Pic": "health"
+        "Pic": "bandage_big"
       },
       "Effects": [{
         "Type": "Health",
@@ -69,10 +69,58 @@
       "Sound": "pickup_cross"
     },
     {
-      "Name": "chalice",
+      "Name": "grapes",
       "Pic": {
         "Type": "Normal",
-        "Pic": "chalice"
+        "Pic": "grapes"
+      },
+      "Effects": [{
+        "Type": "Score",
+        "Score": 500
+      }],
+      "Sound": "pickup_chalice"
+    },
+    {
+      "Name": "orange",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "orange"
+      },
+      "Effects": [{
+        "Type": "Score",
+        "Score": 500
+      }],
+      "Sound": "pickup_chalice"
+    },
+    {
+      "Name": "apple",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "apple"
+      },
+      "Effects": [{
+        "Type": "Score",
+        "Score": 500
+      }],
+      "Sound": "pickup_chalice"
+    },
+    {
+      "Name": "banana",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "banana"
+      },
+      "Effects": [{
+        "Type": "Score",
+        "Score": 500
+      }],
+      "Sound": "pickup_chalice"
+    },
+    {
+      "Name": "scroll",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "scroll"
       },
       "Effects": [{
         "Type": "Score",