weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from Pax1601/96-bomb-marker-missing

Browse Source 
Added bomb marker
This commit is contained in:
Pax1601 2023-03-24 20:17:33 +01:00 committed by GitHub
commit 4e6f8c4805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 271 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
client/demo.js
View File

@ -454,7 +454,7 @@ const DEMO_UNIT_DATA = {
},
flightData: {
latitude: 37.075,
longitude: -115.81,
longitude: -115.80,
altitude: 2000,
heading: 0.5,
speed: 300
@ -528,6 +528,92 @@ const DEMO_UNIT_DATA = {
ROE: "None",
reactionToThreat: "None",
}
},
["13"]:{
baseData: {
AI: true,
name: "CVN-75",
unitName: "Olympus 1-11",
groupName: "Group 1",
alive: true,
category: "Bomb",
},
flightData: {
latitude: 37.05,
longitude: -115.8,
altitude: 2000,
heading: 0.5,
speed: 300
},
missionData: {
fuel: 0.5,
flags: {human: false},
ammo: [],
targets: [],
hasTask: true,
coalition: "blue"
},
formationData: {
formation: "Echelon",
isLeader: false,
isWingman: false,
leaderID: null,
wingmen: [],
wingmenIDs: []
},
taskData: {
currentTask: "Example task",
activePath: undefined,
targetSpeed: 400,
targetAltitude: 3000
},
optionsData: {
ROE: "None",
reactionToThreat: "None",
}
},
["14"]:{
baseData: {
AI: true,
name: "CVN-75",
unitName: "Olympus 1-12",
groupName: "Group 1",
alive: true,
category: "Bomb",
},
flightData: {
latitude: 37.05,
longitude: -115.75,
altitude: 2000,
heading: 0.6,
speed: 300
},
missionData: {
fuel: 0.5,
flags: {human: false},
ammo: [],
targets: [],
hasTask: true,
coalition: "red"
},
formationData: {
formation: "Echelon",
isLeader: false,
isWingman: false,
leaderID: null,
wingmen: [],
wingmenIDs: []
},
taskData: {
currentTask: "Example task",
activePath: undefined,
targetSpeed: 400,
targetAltitude: 3000
},
optionsData: {
ROE: "None",
reactionToThreat: "None",
}
}
}

18
client/public/stylesheets/units.css
View File

@ -298,7 +298,7 @@
/* Weapons */
[data-object|="unit-weapon"] {
[data-object|="unit-missile"], [data-object|="unit-bomb"] {
cursor: default;
}
@ -308,16 +308,28 @@
width: var( --unit-missile-marker-width );
}
[data-object|="unit-missile"][data-coalition="blue"] .unit-marker {
background-image: var( --unit-missile-marker-blue-url );
}
[data-object|="unit-missile"][data-coalition="red"] .unit-marker {
background-image: var( --unit-missile-marker-red-url );
}
[data-object|="unit-bomb"] .unit-marker {
background-image: var( --unit-bomb-marker-neutral-url );
height: var( --unit-bomb-marker-height );
width: var( --unit-bomb-marker-width );
}
[data-object|="unit-bomb"][data-coalition="blue"] .unit-marker {
background-image: var( --unit-bomb-marker-blue-url );
}
[data-object|="unit-bomb"][data-coalition="red"] .unit-marker {
background-image: var( --unit-bomb-marker-red-url );
}
/********************************************
* Labels

54
client/public/themes/olympus/images/icon_bomb_blue.svg Normal file
View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="50"
height="50"
viewBox="0 0 50 50"
fill="none"
version="1.1"
id="svg12"
sodipodi:docname="icon_bomb_blue.svg"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs16" />
<sodipodi:namedview
id="namedview14"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="11.766257"
inkscape:cx="22.139581"
inkscape:cy="24.689245"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" />
<path
d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
fill="#3bb9ff"
stroke="#082e44"
stroke-width="1.81059"
id="path2"
sodipodi:nodetypes="zzcczz" />
<path
d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
fill="#082e44"
id="path4"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
<path
d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
fill="#082e44"
id="path4-2"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

54
client/public/themes/olympus/images/icon_bomb_neutral.svg Normal file
View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="50"
height="50"
viewBox="0 0 50 50"
fill="none"
version="1.1"
id="svg12"
sodipodi:docname="icon_bomb_blue.svg"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs16" />
<sodipodi:namedview
id="namedview14"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="11.766257"
inkscape:cx="22.139581"
inkscape:cy="24.689245"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" />
<path
d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
fill="#CFD9E8"
stroke="#082e44"
stroke-width="1.81059"
id="path2"
sodipodi:nodetypes="zzcczz" />
<path
d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
fill="#082e44"
id="path4"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
<path
d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
fill="#082e44"
id="path4-2"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

54
client/public/themes/olympus/images/icon_bomb_red.svg Normal file
View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="50"
height="50"
viewBox="0 0 50 50"
fill="none"
version="1.1"
id="svg12"
sodipodi:docname="icon_bomb_blue.svg"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs16" />
<sodipodi:namedview
id="namedview14"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="11.766257"
inkscape:cx="22.139581"
inkscape:cy="24.689245"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" />
<path
d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
fill="#FF5858"
stroke="#262222"
stroke-width="1.81059"
id="path2"
sodipodi:nodetypes="zzcczz" />
<path
d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
fill="#262222"
id="path4"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
<path
d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
fill="#262222"
id="path4-2"
style="stroke-width:0.928076"
sodipodi:nodetypes="cccc" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

7
client/public/themes/olympus/olympus.css
View File

@ -206,6 +206,13 @@
--unit-missile-marker-neutral-url: url( "/themes/olympus/images/icon_missile_neutral.svg" );
--unit-missile-marker-red-url: url( "/themes/olympus/images/icon_missile_red.svg" );
--unit-bomb-marker-height: 50px;
--unit-bomb-marker-width: 50px;
--unit-bomb-marker-blue-url: url( "/themes/olympus/images/icon_bomb_blue.svg" );
--unit-bomb-marker-neutral-url: url( "/themes/olympus/images/icon_bomb_neutral.svg" );
--unit-bomb-marker-red-url: url( "/themes/olympus/images/icon_bomb_red.svg" );
/*** Context menu ***/
--spawn-aircraft-url: url( "/themes/olympus/images/spawn_aircraft.svg" );