Skip to content

Commit

Permalink
Log walls #712
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed May 17, 2024
1 parent 78a059b commit 470c9fc
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 56 deletions.
Binary file removed data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_eagle.png
View file
Binary file not shown.
0 ...N3Ddata.cdogscpn/graphics/yellow_flag.txt → ...f3d/N3Ddata.cdogscpn/graphics/curtain.txt
View file
File renamed without changes.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/curtain_red.png
View file
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/curtain_yellow.png
View file
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/duck_picture.png
View file
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_portrait.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/.wolf3d/N3Ddata.cdogscpn/graphics/yellow_flag.png
View file
Binary file not shown.
28 changes: 24 additions & 4 deletions data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,20 @@
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "yellow_flag",
"Name": "curtain_yellow",
"Pic": {
"Type": "Normal",
"Pic": "yellow_flag"
"Pic": "curtain_yellow"
},
"Offset": [-7, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "curtain_red",
"Pic": {
"Type": "Normal",
"Pic": "curtain_red"
},
"Offset": [-7, -11],
"Health": 0,
Expand All @@ -276,10 +286,10 @@
"Flags": ["OnWall"]
},
{
"Name": "brick_eagle",
"Name": "noah_portrait",
"Pic": {
"Type": "Normal",
"Pic": "brick_eagle"
"Pic": "noah_portrait"
},
"Offset": [-8, -11],
"Health": 0,
Expand All @@ -295,6 +305,16 @@
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "duck_picture",
"Pic": {
"Type": "Normal",
"Pic": "duck_picture"
},
"Offset": [-7, -10],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "elevator_entrance",
"Pic": {
Expand Down
50 changes: 25 additions & 25 deletions data/.wolf3d/N3Ddata.cdogscpn/missions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"10": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "060effff",
"MaskAlt": "008400ff",
"Style": "steelwood",
"Mask": "623b0cff",
"MaskAlt": "d7981fff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -776,9 +776,9 @@
"7": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "060effff",
"MaskAlt": "008400ff",
"Style": "steelwood",
"Mask": "623b0cff",
"MaskAlt": "d7981fff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -788,9 +788,9 @@
"8": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "ffffffff",
"MaskAlt": "008400ff",
"Style": "steelwood",
"Mask": "623b0cff",
"MaskAlt": "d7981fff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -800,9 +800,9 @@
"9": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "060effff",
"MaskAlt": "008400ff",
"Style": "steelwood",
"Mask": "623b0cff",
"MaskAlt": "d7981fff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -865,14 +865,6 @@
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"StaticItems": [{
"MapObject": "jail_cell",
"Positions": [[9, 2]]
},
{
"MapObject": "jail_cell_skeleton",
"Positions": [[13, 2]]
},
{
"MapObject": "no_sign",
"Positions": [[7, 8],
[1, 12],
Expand All @@ -899,10 +891,6 @@
"MapObject": "wall_vent",
"Positions": [[9, 10]]
},
{
"MapObject": "brick_eagle",
"Positions": [[11, 2]]
},
{
"MapObject": "eagle_portrait",
"Positions": [[3, 4]]
Expand Down Expand Up @@ -1135,12 +1123,24 @@
"Positions": [[3, 2]]
},
{
"MapObject": "yellow_flag",
"MapObject": "curtain_yellow",
"Positions": [[5, 2]]
},
{
"MapObject": "monkey_portrait",
"Positions": [[7, 2]]
},
{
"MapObject": "noah_portrait",
"Positions": [[11, 2]]
},
{
"MapObject": "curtain_red",
"Positions": [[13, 2]]
},
{
"MapObject": "duck_picture",
"Positions": [[15, 2]]
}],
"StaticCharacters": [{
"Index": 0,
Expand Down
93 changes: 66 additions & 27 deletions src/cdogs/map_wolf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ static void TryLoadWallObject(
switch (map->type)
{
case CWMAPTYPE_N3D:
moName = "yellow_flag";
moName = "curtain_yellow";
break;
default:
switch (spearMission)
Expand Down Expand Up @@ -1234,57 +1234,96 @@ static void TryLoadWallObject(
}
break;
case CWWALL_CELL:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "jail_cell";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "wall_goo2";
default:
switch (spearMission)
{
case 1:
moName = "jail_cell";
break;
case 3:
moName = "wall_goo2";
break;
}
break;
}
break;
case CWWALL_GREY_BRICK_EAGLE:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "brick_eagle";
case CWMAPTYPE_N3D:
moName = "noah_portrait";
break;
case 3:
moName = "swastika_relief";
default:
switch (spearMission)
{
case 1:
moName = "brick_eagle";
break;
case 3:
moName = "swastika_relief";
break;
}
break;
}
break;
case CWWALL_CELL_SKELETON:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "jail_cell_skeleton";
break;
case 2:
moName = "wall_light";
case CWMAPTYPE_N3D:
moName = "curtain_red";
break;
case 3:
moName = "map";
default:
switch (spearMission)
{
case 1:
moName = "jail_cell_skeleton";
break;
case 2:
moName = "wall_light";
break;
case 3:
moName = "map";
break;
}
break;
}
break;
case CWWALL_BLUE_BRICK_1:
switch (spearMission)
switch (map->type)
{
case 2:
moName = "ship_light";
case CWMAPTYPE_N3D:
moName = "curtain_red";
break;
case 3:
moName = "eagle_portrait";
default:
switch (spearMission)
{
case 2:
moName = "ship_light";
break;
case 3:
moName = "eagle_portrait";
break;
}
break;
}
break;
case CWWALL_BLUE_BRICK_2:
switch (spearMission)
switch (map->type)
{
case 2:
moName = "hitler_poster";
case CWMAPTYPE_N3D:
moName = "duck_picture";
break;
default:
switch (spearMission)
{
case 2:
moName = "hitler_poster";
break;
}
break;
}
break;
Expand Down

0 comments on commit 470c9fc

Please sign in to comment.