fly/fgdata
1
0
Fork 0
Code Activity

Changes to permit the (on demand) refuelling tanker to take part in replays.

Browse source
This commit is contained in:
Richard Harrison 2018-07-28 00:29:13 +02:00
parent 588bdcd580
commit f8177dcc11
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Nasal/tanker.nas
View file

@ -1,9 +1,3 @@
if (globals["tanker"] != nil) {
# reload with io.load_nasal(getprop("/sim/fg-root") ~ "/Nasal/tanker.nas");
print("reloading " ~ caller(0)[2]);
var _setlistener = reinit;
reinit();
}
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
var oclock = func(bearing) int(0.5 + geo.normdeg(bearing) / 30) or 12; var oclock = func(bearing) int(0.5 + geo.normdeg(bearing) / 30) or 12;
@ -49,8 +43,11 @@ var identity = {
delete(data, c.getValue() or ""); delete(data, c.getValue() or "");
if ((var c = t.getNode("navaids/tacan/channel-ID")) != nil) if ((var c = t.getNode("navaids/tacan/channel-ID")) != nil)
delete(data, revdata[c.getValue() or ""]); delete(data, revdata[c.getValue() or ""]);
if ((var c = t.getNode("id")) != nil) if ((var c = t.getNode("id")) != nil and c.getValue() != ""){
id_used[c.getValue()] = 1; var v = c.getValue();
if (v != nil and v != "")
id_used[v] = 1;
}
} }
for (var aiid = -2; aiid; aiid -= 1) for (var aiid = -2; aiid; aiid -= 1)
if (!id_used[aiid]) if (!id_used[aiid])
@ -96,9 +93,15 @@ var Tanker = {
m.model = n.getChild("model", i, 1); m.model = n.getChild("model", i, 1);
var n = props.globals.getNode("ai/models", 1); var n = props.globals.getNode("ai/models", 1);
for (var i = 0; 1; i += 1)
if (n.getChild("tanker", i, 0) == nil) for (var i = 0; 1; i += 1){
break; var cn = n.getChild("tanker", i, 0);
if (cn == nil)
break;
if (cn.getNode("id") == nil or cn.getNode("id").getValue() == nil)
break;
}
m.ai = n.getChild("tanker", i, 1); m.ai = n.getChild("tanker", i, 1);
m.ai.getNode("id", 1).setIntValue(aiid); m.ai.getNode("id", 1).setIntValue(aiid);
@ -146,13 +149,26 @@ var Tanker = {
del: func { del: func {
tanker_msg(me.callsign ~ " returns to base"); tanker_msg(me.callsign ~ " returns to base");
me.model.remove(); me.model.remove();
me.ai.remove(); if (me.ai != nil){
me.ai.getChild("id").remove();
}
else
print(me.callsign," has no AI node");
me.ai = nil; # ensure that this tanker stops updating.
delete(Tanker.active, me.callsign); delete(Tanker.active, me.callsign);
}, },
update: func { update: func {
if ( getprop("sim/replay/time") > 0 )
return;
var dt = getprop("sim/time/delta-sec"); var dt = getprop("sim/time/delta-sec");
var alt = me.coord.alt(); var alt = me.coord.alt();
if (me.ai == nil){
print("Tamker ", me.callsign," stops updating");
return;
}
if ((me.interval += dt) >= 5) { if ((me.interval += dt) >= 5) {
me.interval -= 5; me.interval -= 5;
me.headwind = aircraft.wind_speed_from(me.course); me.headwind = aircraft.wind_speed_from(me.course);
@ -420,3 +436,9 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
setlistener("/sim/signals/reinit", reinit, 1); setlistener("/sim/signals/reinit", reinit, 1);
}); });
if (globals["tanker"] != nil) {
# reload with io.load_nasal(getprop("/sim/fg-root") ~ "/Nasal/tanker.nas");
print("reloading " ~ caller(0)[2]);
var _setlistener = reinit;
reinit();
}