Skip to content

Commit

Permalink
Grey wood #712
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed May 18, 2024
1 parent 470c9fc commit 398f586
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 45 deletions.
Binary file removed data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.png
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions data/.wolf3d/N3Ddata.cdogscpn/graphics/brick_color.txt
View file

This file was deleted.

Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/lattice.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/lattice_broken.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/wood_color.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.
24 changes: 22 additions & 2 deletions data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,30 @@
"Flags": ["Inside", "OnWall"]
},
{
"Name": "brick_color",
"Name": "wood_color",
"Pic": {
"Type": "Normal",
"Pic": "brick_color"
"Pic": "wood_color"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["OnWall"]
},
{
"Name": "lattice",
"Pic": {
"Type": "Normal",
"Pic": "lattice"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["OnWall"]
},
{
"Name": "lattice_broken",
"Pic": {
"Type": "Normal",
"Pic": "lattice_broken"
},
"Offset": [-8, -11],
"Health": 0,
Expand Down
42 changes: 23 additions & 19 deletions data/.wolf3d/N3Ddata.cdogscpn/missions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"11": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "060effff",
"MaskAlt": "008400ff",
"Style": "steelwood",
"Mask": "434343ff",
"MaskAlt": "484847ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -69,8 +69,8 @@
"Name": "wall",
"Type": "Wall",
"Style": "steelwood",
"Mask": "bb8e37ff",
"MaskAlt": "9c682aff",
"Mask": "434343ff",
"MaskAlt": "484847ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -81,8 +81,8 @@
"Name": "wall",
"Type": "Wall",
"Style": "steelwood",
"Mask": "bb8e37ff",
"MaskAlt": "9c682aff",
"Mask": "434343ff",
"MaskAlt": "484847ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -93,8 +93,8 @@
"Name": "wall",
"Type": "Wall",
"Style": "steelwood",
"Mask": "bb8e37ff",
"MaskAlt": "9c682aff",
"Mask": "434343ff",
"MaskAlt": "484847ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -814,7 +814,7 @@
"0,3,1,4,1,5,1,6,2,7,0,8,0,9,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0",
"0,11,0,12,0,13,0,14,0,15,0,16,0,17,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,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,1,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,19,0,20,0,21,0,22,0,23,0,24,0,25,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,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,27,0,28,0,29,0,30,0,31,0,32,0,33,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
Expand All @@ -841,7 +841,7 @@
"0,0,0,0,256,0,1024,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,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,256,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,256,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,1024,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",
Expand Down Expand Up @@ -891,10 +891,6 @@
"MapObject": "wall_vent",
"Positions": [[9, 10]]
},
{
"MapObject": "eagle_portrait",
"Positions": [[3, 4]]
},
{
"MapObject": "elevator_entrance",
"Positions": [[9, 4]]
Expand Down Expand Up @@ -935,10 +931,6 @@
"MapObject": "swastika_blue",
"Positions": [[7, 10]]
},
{
"MapObject": "brick_color",
"Positions": [[11, 10]]
},
{
"MapObject": "hitler_poster",
"Positions": [[1, 14]]
Expand Down Expand Up @@ -1141,6 +1133,18 @@
{
"MapObject": "duck_picture",
"Positions": [[15, 2]]
},
{
"MapObject": "wood_color",
"Positions": [[1, 4]]
},
{
"MapObject": "lattice_broken",
"Positions": [[3, 4]]
},
{
"MapObject": "jail_cell_broken",
"Positions": [[7, 4]]
}],
"StaticCharacters": [{
"Index": 0,
Expand Down
10 changes: 10 additions & 0 deletions data/map_objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1695,6 +1695,16 @@
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "jail_cell_broken",
"Pic": {
"Type": "Normal",
"Pic": "jail_cell_broken"
},
"Offset": [-6, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "no_sign",
"Pic": {
Expand Down
Binary file added graphics/jail_cell_broken.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.
70 changes: 50 additions & 20 deletions src/cdogs/map_wolf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1328,24 +1328,32 @@ static void TryLoadWallObject(
}
break;
case CWWALL_WOOD_EAGLE:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "eagle_portrait";
break;
case 2:
moName = "swastika_relief";
case CWMAPTYPE_N3D:
moName = "wood_color";
break;
case 3:
moName = "swastika_relief";
default:
switch (spearMission)
{
case 1:
moName = "eagle_portrait";
break;
case 2:
moName = "swastika_relief";
break;
case 3:
moName = "swastika_relief";
break;
}
break;
}
break;
case CWWALL_WOOD_HITLER:
switch (map->type)
{
case CWMAPTYPE_N3D:
moName = "monkey_portrait";
moName = "lattice_broken";
break;
default:
switch (spearMission)
Expand All @@ -1361,18 +1369,33 @@ static void TryLoadWallObject(
}
break;
case CWWALL_WOOD:
switch (spearMission)
switch (map->type)
{
case 2:
moName = "wall_light";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "hitler_poster";
default:
switch (spearMission)
{
case 2:
moName = "wall_light";
break;
case 3:
moName = "hitler_poster";
break;
}
break;
}
break;
case CWWALL_ENTRANCE:
moName = "elevator_entrance";
switch (map->type)
{
case CWMAPTYPE_N3D:
moName = "jail_cell_broken";
break;
default:
moName = "elevator_entrance";
break;
}
break;
case CWWALL_STEEL_SIGN:
switch (spearMission)
Expand Down Expand Up @@ -1685,13 +1708,20 @@ static void TryLoadWallObject(
}
break;
case CWWALL_MULTICOLOR_BRICK:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "brick_color";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "jail_cell";
default:
switch (spearMission)
{
case 1:
moName = "brick_color";
break;
case 3:
moName = "jail_cell";
break;
}
break;
}
break;
Expand Down

0 comments on commit 398f586

Please sign in to comment.