Skip to content

Commit

Permalink
Noah flag #712
Browse files Browse the repository at this point in the history
  • Loading branch information
cxong committed May 25, 2024
1 parent 753347f commit d26fae3
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 118 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Derived from Dawnblocker Ortho
By Buch
http://opengameart.org/content/dawnblocker-ortho
http://creativecommons.org/publicdomain/zero/1.0/
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/noah_flag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,16 @@
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "curtain_blue",
"Pic": {
"Type": "Normal",
"Pic": "curtain_blue"
},
"Offset": [-7, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "monkey_portrait",
"Pic": {
Expand Down Expand Up @@ -305,6 +315,16 @@
"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": {
Expand Down Expand Up @@ -346,10 +366,10 @@
"Flags": ["OnWall"]
},
{
"Name": "coat_of_arms_flag",
"Name": "noah_flag",
"Pic": {
"Type": "Normal",
"Pic": "coat_of_arms_flag"
"Pic": "noah_flag"
},
"Offset": [-7, -11],
"Health": 0,
Expand Down
57 changes: 31 additions & 26 deletions data/.wolf3d/N3Ddata.cdogscpn/missions.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@
"21": {
"Name": "wall",
"Type": "Wall",
"Style": "rock",
"Mask": "b801b6ff",
"Style": "brick2",
"Mask": "f09817ff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -201,7 +201,7 @@
"Name": "wall",
"Type": "Wall",
"Style": "brick2",
"Mask": "fc2c04ff",
"Mask": "f09817ff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -212,8 +212,8 @@
"23": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"Style": "brick2",
"Mask": "747474ff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -224,8 +224,8 @@
"24": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"Style": "brick2",
"Mask": "747474ff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -236,9 +236,9 @@
"25": {
"Name": "wall",
"Type": "Wall",
"Style": "steelwood",
"Mask": "bb8e37ff",
"MaskAlt": "9c682aff",
"Style": "wood",
"Mask": "ffaf61ff",
"MaskAlt": "bbbbbbff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -248,9 +248,9 @@
"26": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "ffffffff",
"MaskAlt": "008400ff",
"Style": "wood",
"Mask": "ffaf61ff",
"MaskAlt": "bbbbbbff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -894,24 +894,13 @@
"MapObject": "swastika_wreath",
"Positions": [[9, 14]]
},
{
"MapObject": "coat_of_arms_flag",
"Positions": [[7, 6]]
},
{
"MapObject": "elevator_interior",
"Positions": [[11, 6],
[9, 6],
[7, 16]]
},
{
"MapObject": "iron_cross",
"Positions": [[13, 6]]
"Positions": [[7, 16]]
},
{
"MapObject": "cobble_moss",
"Positions": [[15, 6],
[3, 8]]
"Positions": [[3, 8]]
},
{
"MapObject": "hitler_glass",
Expand Down Expand Up @@ -1147,6 +1136,22 @@
{
"MapObject": "naamah_portrait",
"Positions": [[3, 6]]
},
{
"MapObject": "brick_color",
"Positions": [[5, 6]]
},
{
"MapObject": "noah_flag",
"Positions": [[7, 6]]
},
{
"MapObject": "curtain_blue",
"Positions": [[11, 6]]
},
{
"MapObject": "green_relief",
"Positions": [[15, 6]]
}],
"StaticCharacters": [{
"Index": 0,
Expand Down
Loading

0 comments on commit d26fae3

Please sign in to comment.