Skip to content

Commit

Permalink
Update to RWR
Browse files Browse the repository at this point in the history
  • Loading branch information
@NikolaiVChr
NikolaiVChr committed Mar 28, 2019
1 parent 471f6ed commit fc22de5
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 22 deletions.
11 changes: 8 additions & 3 deletions Mirage-2000/Nasal/RADAR/radar2.nas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,16 +1233,21 @@ var RWR_APG = {
}
if (me.show == 1) {
me.threat = 0;
if (me.u.get_model() != "missile_frigate" and me.u.get_model() != "buk-m2") {
if (me.u.get_model() != "missile_frigate" and me.u.get_model() != "fleet" and me.u.get_model() != "buk-m2") {
me.threat += ((180-me.dev)/180)*0.30;
me.spd = (60-me.u.get_Speed())/60;
me.threat -= me.spd>0?me.spd:0;
} elsif (me.u.get_model == "missile_frigate") {
} elsif (me.u.get_model == "missile_frigate" or me.u.get_model == "fleet") {
me.threat += 0.30;
} else {
me.threat += 0.30;
}
me.danger = me.u.get_model() == "missile_frigate"?75:(me.u.get_model() == "buk-m2"?35:50);
me.danger = 50;
if (me.u.get_model() == "missile_frigate" or me.u.get_model() == "fleet") {
me.danger = 75
} elsif (me.u.get_model() == "buk-m2") {
me.danger = 35;
}
me.threat += ((me.danger-me.rn)/me.danger)>0?((me.danger-me.rn)/me.danger)*0.60:0;
me.clo = me.u.get_closure_rate_from_Coord(me.MyCoord);
me.threat += me.clo>0?(me.clo/500)*0.10:0;
Expand Down
68 changes: 49 additions & 19 deletions Mirage-2000/Nasal/rwr.nas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,37 +164,66 @@ RWRCanvas = {
rwr.AIRCRAFT_EAGLE = "15";
rwr.AIRCRAFT_TOMCAT = "14";
rwr.AIRCRAFT_BUK = "11";
rwr.AIRCRAFT_MIG = "21";
rwr.AIRCRAFT_MIG21 = "21";
rwr.AIRCRAFT_MIG29 = "29";
rwr.AIRCRAFT_SU27 = "27";
rwr.AIRCRAFT_MIRAGE = "20";
rwr.AIRCRAFT_FALCON = "16";
rwr.AIRCRAFT_WARTHOG = "10";
rwr.AIRCRAFT_FRIGATE = "SH";
#rwr.AIRCRAFT_TANKER = "KC";
rwr.AIRCRAFT_AWACS = "S";
rwr.AIRCRAFT_UNKNOWN = "U";
rwr.AIRCRAFT_AI = "AI";
rwr.lookupType = {
"f-14b": rwr.AIRCRAFT_TOMCAT, #guess
"F-14D": rwr.AIRCRAFT_TOMCAT, #guess
"F-15C": rwr.AIRCRAFT_EAGLE, #low end of sources
"F-15D": rwr.AIRCRAFT_EAGLE, #low end of sources
"F-16": rwr.AIRCRAFT_FALCON, #guess
"JA37-Viggen": rwr.AIRCRAFT_VIGGEN, #guess
"AJ37-Viggen": rwr.AIRCRAFT_VIGGEN, #guess
"AJS37-Viggen": rwr.AIRCRAFT_VIGGEN, #guess
"JA37Di-Viggen": rwr.AIRCRAFT_VIGGEN, #guess
"f-14b": rwr.AIRCRAFT_TOMCAT,
"F-14D": rwr.AIRCRAFT_TOMCAT,
"F-15C": rwr.AIRCRAFT_EAGLE,
"F-15D": rwr.AIRCRAFT_EAGLE,
"F-16": rwr.AIRCRAFT_FALCON,
# "YF-16": rwr.AIRCRAFT_FALCON,
"JA37-Viggen": rwr.AIRCRAFT_VIGGEN,
"AJ37-Viggen": rwr.AIRCRAFT_VIGGEN,
"AJS37-Viggen": rwr.AIRCRAFT_VIGGEN,
"JA37Di-Viggen": rwr.AIRCRAFT_VIGGEN,
"m2000-5": rwr.AIRCRAFT_MIRAGE,
"m2000-5B": rwr.AIRCRAFT_MIRAGE,
"MiG-21bis": rwr.AIRCRAFT_MIG,
"buk-m2": rwr.AIRCRAFT_BUK, #estimated with blender
"missile_frigate": rwr.AIRCRAFT_FRIGATE, #estimated with blender
"MiG-21bis": rwr.AIRCRAFT_MIG21,
"buk-m2": rwr.AIRCRAFT_BUK,
"missile_frigate": rwr.AIRCRAFT_FRIGATE,
"frigate": rwr.AIRCRAFT_FRIGATE,
"fleet": rwr.AIRCRAFT_FRIGATE,
# "KC-137R": rwr.AIRCRAFT_TANKER,
# "KC-137R-RT": rwr.AIRCRAFT_TANKER,
# "707-TT": rwr.AIRCRAFT_TANKER,
# "KC-30A": rwr.AIRCRAFT_TANKER,
# "Voyager-KC": rwr.AIRCRAFT_TANKER,
# "KC-10A": rwr.AIRCRAFT_TANKER,
# "KC-10A-GE": rwr.AIRCRAFT_TANKER,
"EC-137R": rwr.AIRCRAFT_AWACS,
"RC-137R": rwr.AIRCRAFT_AWACS,
"E-8R": rwr.AIRCRAFT_AWACS,
"EC-137D": rwr.AIRCRAFT_AWACS,
"gci": rwr.AIRCRAFT_AWACS,
"AI": rwr.AIRCRAFT_AI,
#misc threatening aircraft:
"MiG-29":"29",
"ch53e":"53",
"MQ-9":"9",
"QF-4E":"F4",
"B1-B":"B1",
"A-10":"10",
"MiG-29": rwr.AIRCRAFT_MIG29,
"SU-27": rwr.AIRCRAFT_SU27,
# "ch53e":"53",
# "MQ-9":"9",
# "QF-4E":"F4",
# "B1-B":"B1",
"A-10": rwr.AIRCRAFT_WARTHOG,
"A-10-model": rwr.AIRCRAFT_WARTHOG,
# "truck":"TR",
"Typhoon":"EF",
"f16":"16",
"Mig-28":"28",
# "Tu-95MR":"95",
# "Tu-160-Blackjack":"BJ",
# "AN-225-Mrija":"AN",
"Su-15":"SU",
"Jaguar-GR3":"JG",
};
rwr.shownList = [];
return rwr;
Expand Down Expand Up @@ -224,6 +253,7 @@ RWRCanvas = {
}
if (me.typ == nil) {
me.typ = me.AIRCRAFT_UNKNOWN;
continue;
me.unk = 1;
}
#print("show "~me.i~" "~me.typ~" "~contact[0].get_model()~" "~contact[1]);
Expand Down

0 comments on commit fc22de5

Please sign in to comment.