diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.png deleted file mode 100644 index 93e4b6313..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.txt deleted file mode 100644 index b935fc5be..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_box.txt +++ /dev/null @@ -1,4 +0,0 @@ -140 Military Icons Set (fixed) -by AngryMeteor.com -https://opengameart.org/content/140-military-icons-set-fixed -http://creativecommons.org/licenses/by/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.png deleted file mode 100644 index 7d880d8a5..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.txt deleted file mode 100644 index 76b2e9f37..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.txt +++ /dev/null @@ -1,4 +0,0 @@ -Derived from Dawnblocker Ortho -By Buch -http://opengameart.org/content/dawnblocker-ortho -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/candle_14x30.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/candle_14x30.png new file mode 100644 index 000000000..0981394dc Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/candle_14x30.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/cowskull_pillar.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/cowskull_pillar.png deleted file mode 100644 index c801f9cd9..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/cowskull_pillar.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dead_guard.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/dead_guard.png deleted file mode 100644 index aada6392e..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dead_guard.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.png deleted file mode 100644 index f6bc09af9..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.txt deleted file mode 100644 index f240e6c0e..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/dogfood.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from RPG item set by Jetrel -https://opengameart.org/node/4531 - -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/eagle_portrait.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/eagle_portrait.png deleted file mode 100644 index b5b1a4052..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/eagle_portrait.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_entrance.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_entrance.png deleted file mode 100644 index 29a907c30..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_entrance.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_interior.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_interior.png deleted file mode 100644 index 7bb7590e6..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/elevator_interior.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.png deleted file mode 100644 index fdf6c9d81..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.txt deleted file mode 100644 index 25aca62e6..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/flag.txt +++ /dev/null @@ -1,5 +0,0 @@ -Adapted from Kyrodian Legends Overworld Props -By Midi -https://web.archive.org/web/20150319200042/http://opengameart.org/content/kyrodian-legends-overworld-props - -http://creativecommons.org/licenses/by/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_bloody.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_bloody.png deleted file mode 100644 index c3faa54a5..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_bloody.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_skulls.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_skulls.png deleted file mode 100644 index a0706dfd9..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/gibbet_skulls.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.png deleted file mode 100644 index d8a368178..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.txt deleted file mode 100644 index f5e9d072e..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/grass.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from Flowers by SpiderDave -https://opengameart.org/content/flowers - -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hanging_skeleton.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hanging_skeleton.png deleted file mode 100644 index 601020f81..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hanging_skeleton.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_glass.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_glass.png deleted file mode 100644 index 6af81742b..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_glass.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_poster.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_poster.png deleted file mode 100644 index 09168ddfa..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_poster.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/iron_cross.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/iron_cross.png deleted file mode 100644 index 53de337dd..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/iron_cross.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.png deleted file mode 100644 index 9101aeabe..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.txt deleted file mode 100644 index 45b47f876..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/knives.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from Kitchen Assets for #LetsCookJam -By Bluerobin2 -https://opengameart.org/content/kitchen-assets-for-letscookjam -http://creativecommons.org/licenses/by/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/panel.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/panel.png deleted file mode 100644 index 74dec2975..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/panel.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle.png deleted file mode 100644 index ecf812bd8..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle_16x31.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle_16x31.png new file mode 100644 index 000000000..fb68189d2 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar_candle_16x31.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pool_blood.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/pool_blood.png deleted file mode 100644 index 92269385f..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pool_blood.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.png deleted file mode 100644 index 629933dc6..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.txt deleted file mode 100644 index fbd3f3f22..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_blue.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from Misc. Dark Fantasy Scenery Sprites by Gwes -http://opengameart.org/content/misc-dark-fantasy-scenery-sprites - -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.png deleted file mode 100644 index 38a5e8899..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.txt deleted file mode 100644 index 75fc03958..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/skull_pillar.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from Dungeon Crawl 32x32 tiles by Chris Hamons (maintainer) -https://opengameart.org/content/dungeon-crawl-32x32-tiles - -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/spears.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/spears.png deleted file mode 100644 index 207fd9ac6..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/spears.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/spotlight.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/spotlight.png deleted file mode 100644 index 0f40c6997..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/spotlight.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.png deleted file mode 100644 index 4a77fd765..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.txt deleted file mode 100644 index adddea063..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/stove.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from [LPC] House Insides by Lanea Zimmerman (AKA Sharm) -https://opengameart.org/content/lpc-house-insides - -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_blue.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_blue.png deleted file mode 100644 index 2956b160b..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_blue.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_wreath.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_wreath.png deleted file mode 100644 index 4d41be7c8..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/swastika_wreath.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.png deleted file mode 100644 index c9a491914..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.txt deleted file mode 100644 index 71fa2c686..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/truck.txt +++ /dev/null @@ -1,4 +0,0 @@ -Adapted from Post-apocalyptic 16x16 tileset [update1] -By CobraLad -https://opengameart.org/content/post-apocalyptic-16x16-tileset-update1 -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.png deleted file mode 100644 index f8369e1fe..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.txt b/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.txt deleted file mode 100644 index fb09194ea..000000000 --- a/data/.wolf3d/N3Ddata.cdogscpn/graphics/well.txt +++ /dev/null @@ -1,4 +0,0 @@ -Roguelike Dungeon/World Tiles -by Joe Williamson (@JoeCreates) -https://opengameart.org/content/roguelike-dungeonworld-tiles -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json index b0dbecfeb..9b2e7615d 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json @@ -43,8 +43,9 @@ { "Name": "pillar_candle", "Pic": { - "Type": "Normal", - "Pic": "pillar_candle" + "Type": "AnimatedRandom", + "Sprites": "pillar_candle", + "TicksPerFrame": 6 }, "Health": 80, "Flags": ["Inside", "NoWalls"] @@ -71,38 +72,6 @@ "FootstepSound": "footsteps/water", "FootprintMask": "00000099" }, - { - "Name": "skull_pillar", - "Pic": { - "Type": "Normal", - "Pic": "skull_pillar" - }, - "Size": [8, 6], - "Offset": [-8, -14], - "Health": 20, - "Flags": ["NoWalls"] - }, - { - "Name": "cowskull_pillar", - "Pic": { - "Type": "Normal", - "Pic": "cowskull_pillar" - }, - "Size": [8, 6], - "Offset": [-8, -14], - "Health": 20, - "Flags": ["NoWalls"] - }, - { - "Name": "knives", - "Pic": { - "Type": "Normal", - "Pic": "knives" - }, - "Offset": [-5, -13], - "Health": 0, - "Flags": ["Inside", "OneOrMoreWalls"] - }, { "Name": "beam", "Pic": { @@ -114,25 +83,16 @@ "Flags": ["Inside"] }, { - "Name": "gibbet_bloody", + "Name": "candle", "Pic": { - "Type": "Normal", - "Pic": "gibbet_bloody" + "Type": "AnimatedRandom", + "Sprites": "candle", + "TicksPerFrame": 6 }, - "Offset": [-7, -33], + "Offset": [-7, -29], "Health": 40, "Flags": ["Inside", "NoWalls"] }, - { - "Name": "suit_of_armor", - "Pic": { - "Type": "Normal", - "Pic": "suit_of_armor" - }, - "Offset": [-7, -20], - "Health": 60, - "Flags": ["Inside", "OneOrMoreWalls", "FreeInFront"] - }, { "Name": "birdcage", "Pic": { @@ -142,26 +102,6 @@ "Offset": [-7, -33], "Health": 40 }, - { - "Name": "gibbet_skeleton", - "Pic": { - "Type": "Normal", - "Pic": "gibbet_skeleton" - }, - "Offset": [-7, -33], - "Health": 40, - "Flags": ["Inside", "NoWalls"] - }, - { - "Name": "gibbet_skulls", - "Pic": { - "Type": "Normal", - "Pic": "gibbet_skulls" - }, - "Offset": [-7, -33], - "Health": 40, - "Flags": ["Inside", "NoWalls"] - }, { "Name": "water_trough", "Pic": { @@ -189,47 +129,6 @@ "Health": 80, "Flags": ["Inside", "OneOrMoreWalls"] }, - { - "Name": "pool_blood", - "Pic": { - "Type": "Normal", - "Pic": "pool_blood" - }, - "Offset": [-8, -6], - "Health": 0, - "DrawBelow": true - }, - { - "Name": "flag", - "Pic": { - "Type": "Normal", - "Pic": "flag" - }, - "Size": [6, 4], - "Offset": [-4, -21], - "Health": 40, - "Flags": ["Inside", "OneOrMoreWalls"] - }, - { - "Name": "stove", - "Pic": { - "Type": "Normal", - "Pic": "stove" - }, - "Offset": [-8, -21], - "Health": 60, - "Flags": ["Inside", "OnWall", "FreeInFront"] - }, - { - "Name": "spears", - "Pic": { - "Type": "Normal", - "Pic": "spears" - }, - "Offset": [-7, -20], - "Health": 40, - "Flags": ["Inside", "OneOrMoreWalls", "FreeInFront"] - }, { "Name": "cage", "Pic": { @@ -239,33 +138,6 @@ "Health": 100, "Flags": ["Inside", "OneOrMoreWalls"] }, - { - "Name": "truck", - "Pic": { - "Type": "Normal", - "Pic": "truck" - }, - "Health": 100, - "Flags": ["Outside"] - }, - { - "Name": "grass", - "Pic": { - "Type": "Normal", - "Pic": "grass" - }, - "Health": 0, - "Flags": ["Outside"] - }, - { - "Name": "dead_guard", - "Pic": { - "Type": "Normal", - "Pic": "dead_guard" - }, - "Health": 0, - "DrawBelow": true - }, { "Name": "shadow", "Pic": { @@ -336,26 +208,6 @@ "Health": 0, "Flags": ["Inside", "OnWall"] }, - { - "Name": "brick_color", - "Pic": { - "Type": "Normal", - "Pic": "brick_color" - }, - "Offset": [-8, -11], - "Health": 0, - "Flags": ["OnWall"] - }, - { - "Name": "eagle_portrait", - "Pic": { - "Type": "Normal", - "Pic": "eagle_portrait" - }, - "Offset": [-7, -10], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, { "Name": "duck_picture", "Pic": { @@ -366,26 +218,6 @@ "Health": 0, "Flags": ["Inside", "OnWall"] }, - { - "Name": "elevator_entrance", - "Pic": { - "Type": "Normal", - "Pic": "elevator_entrance" - }, - "Offset": [-5, -9], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, - { - "Name": "swastika_wreath", - "Pic": { - "Type": "Normal", - "Pic": "swastika_wreath" - }, - "Offset": [-5, -11], - "Health": 0, - "Flags": ["OnWall"] - }, { "Name": "noah_flag", "Pic": { @@ -396,26 +228,6 @@ "Health": 0, "Flags": ["OnWall"] }, - { - "Name": "elevator_interior", - "Pic": { - "Type": "Normal", - "Pic": "elevator_interior" - }, - "Offset": [-6, -11], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, - { - "Name": "iron_cross", - "Pic": { - "Type": "Normal", - "Pic": "iron_cross" - }, - "Offset": [-7, -11], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, { "Name": "wood_slime", "Pic": { @@ -426,36 +238,6 @@ "Health": 0, "Flags": ["Outside", "OnWall"] }, - { - "Name": "hitler_glass", - "Pic": { - "Type": "Normal", - "Pic": "hitler_glass" - }, - "Offset": [-6, -11], - "Health": 0, - "Flags": ["OnWall"] - }, - { - "Name": "skull_blue", - "Pic": { - "Type": "Normal", - "Pic": "skull_blue" - }, - "Offset": [-3, -9], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, - { - "Name": "swastika_blue", - "Pic": { - "Type": "Normal", - "Pic": "swastika_blue" - }, - "Offset": [-3, -8], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, { "Name": "wood_color", "Pic": { @@ -506,36 +288,6 @@ "Health": 0, "Flags": ["OnWall"] }, - { - "Name": "panel", - "Pic": { - "Type": "Normal", - "Pic": "panel" - }, - "Offset": [-6, -10], - "Health": 0, - "Flags": ["OnWall"] - }, - { - "Name": "hitler_poster", - "Pic": { - "Type": "Normal", - "Pic": "hitler_poster" - }, - "Offset": [-5, -10], - "Health": 0, - "Flags": ["OnWall"] - }, - { - "Name": "stone_color", - "Pic": { - "Type": "Normal", - "Pic": "stone_color" - }, - "Offset": [-8, -11], - "Health": 0, - "Flags": ["Inside", "OnWall"] - }, { "Name": "ghost_corpse", "Type": "ActorSpawner", diff --git a/data/.wolf3d/N3Ddata.cdogscpn/pickups.json b/data/.wolf3d/N3Ddata.cdogscpn/pickups.json index 085b6fdff..9d68f51a1 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/pickups.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/pickups.json @@ -1,18 +1,6 @@ { "Version": 3, "Pickups": [ - { - "Name": "dogfood", - "Pic": { - "Type": "Normal", - "Pic": "dogfood" - }, - "Effects": [{ - "Type": "Health", - "Health": 4 - }], - "Sound": "pickup" - }, { "Name": "small_bandage", "Pic": { diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c index db5b71e26..6e572adf9 100644 --- a/src/cdogs/map_wolf.c +++ b/src/cdogs/map_wolf.c @@ -1438,16 +1438,6 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: { - const TileClass *tcBelow = - MissionStaticGetTileClass(m, levelSize, vBelow); - if (tcBelow == NULL) - { - break; - } - if (tcBelow->Type == TILE_CLASS_FLOOR) - { - moName = "elevator_interior"; - } // Elevators only occur on east/west tiles for (int dx = -1; dx <= 1; dx += 2) { @@ -1582,17 +1572,7 @@ static void TryLoadWallObject( { case CWMAPTYPE_N3D: break; - default: { - const TileClass *tcBelow = - MissionStaticGetTileClass(m, levelSize, vBelow); - if (tcBelow == NULL) - { - break; - } - if (tcBelow->Type == TILE_CLASS_FLOOR) - { - moName = "elevator_interior"; - } + default: // Elevators only occur on east/west tiles for (int dx = -1; dx <= 1; dx += 2) { @@ -1655,7 +1635,6 @@ static void TryLoadWallObject( } } } - } break; } case CWWALL_DEAD_ELEVATOR: @@ -2421,15 +2400,19 @@ static void LoadEntity( } break; case CWENT_UTENSILS_BROWN_CAGE_BLOODY_BONES: - if (map->type == CWMAPTYPE_SOD) + switch (map->type) { + case CWMAPTYPE_N3D: + MissionStaticTryAddItem(&m->u.Static, StrMapObject("candle"), v); + break; + case CWMAPTYPE_SOD: MissionStaticTryAddItem( &m->u.Static, StrMapObject("gibbet_bloody"), v); MissionStaticTryAddItem(&m->u.Static, StrMapObject("shadow"), v); - } - else - { + break; + default: MissionStaticTryAddItem(&m->u.Static, StrMapObject("knives"), v); + break; } break; case CWENT_ARMOR: @@ -2443,6 +2426,7 @@ static void LoadEntity( &m->u.Static, StrMapObject("suit_of_armor"), v); break; } + break; case CWENT_CAGE: switch (map->type) { @@ -2509,15 +2493,15 @@ static void LoadEntity( case CWENT_BED_CAGE_SKULLS: switch (map->type) { + case CWMAPTYPE_N3D: + MissionStaticTryAddPickup( + &m->u.Static, StrPickupClass("small_feed_box"), v); + break; case CWMAPTYPE_SOD: MissionStaticTryAddItem( &m->u.Static, StrMapObject("gibbet_skulls"), v); MissionStaticTryAddItem(&m->u.Static, StrMapObject("shadow"), v); break; - case CWMAPTYPE_N3D: - MissionStaticTryAddPickup( - &m->u.Static, StrPickupClass("small_feed_box"), v); - break; default: MissionStaticTryAddItem(&m->u.Static, StrMapObject("bed"), v); break; @@ -2763,6 +2747,8 @@ static void LoadEntity( case CWENT_UTENSILS_BLUE_COW_SKULL: switch (map->type) { + case CWMAPTYPE_N3D: + break; case CWMAPTYPE_SOD: switch (spearMission) @@ -2779,11 +2765,6 @@ static void LoadEntity( break; } break; - case CWMAPTYPE_N3D: - MissionStaticTryAddItem( - &m->u.Static, StrMapObject("table_lab"), v); - // TODO: wrong object - break; default: MissionStaticTryAddItem(&m->u.Static, StrMapObject("pots"), v); break;