From 5c7080a7742037e90b9183e22a1b68244b89d69c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 3 Jul 2014 04:47:50 +0400 Subject: [PATCH] Added proc to imitate movement of stars. Changes icon state and throws all unanchored items in space. Added var denoting which direction is fore of the ship. Adjusting speed now applies movement effect on ship's zlevel. Added working engines system. Only defined type currently is thermal engine. Acceleration is now based on total thrust and ship's mass. Added engine control console. Changed shuttle control console to use custom interface to pick destinations. Shuttles can now go between any types of sectors, not just ship->sector. Shuttles cannot return to base if they are too far on overmap. Moved helm computer to NanoUI. Helm computer now stores navigation data records instead of polling info from actual overmap objects every time. Metaobjects now can define if sector is well known, in which case it will be automatically added to helm computer records on creation. Can add and delete records. --- code/WorkInProgress/Chinsky/overmap/README.dm | 39 +- .../Chinsky/overmap/_defines.dm | 35 ++ code/WorkInProgress/Chinsky/overmap/helm.dm | 161 --------- .../WorkInProgress/Chinsky/overmap/sectors.dm | 22 +- .../overmap/ships/computers/engine_control.dm | 99 +++++ .../Chinsky/overmap/ships/computers/helm.dm | 174 +++++++++ .../overmap/ships/computers/shuttle.dm | 139 +++++++ .../Chinsky/overmap/ships/engines/engine.dm | 60 ++++ .../Chinsky/overmap/ships/engines/thermal.dm | 99 +++++ .../Chinsky/overmap/ships/ship.dm | 105 ++++++ icons/effects/effects.dmi | Bin 196425 -> 198251 bytes icons/obj/ship_engine.dmi | Bin 0 -> 817 bytes maps/overmap/bearcat/bearcat.dm | 5 + maps/overmap/bearcat/bearcat.dmm | 56 +-- maps/overmap/example_sector1.dmm | 41 ++- maps/overmap/example_sector2.dmm | 339 +++++++++--------- maps/overmap/examples.dm | 3 + nano/templates/engines_control.tmpl | 84 +++++ nano/templates/helm.tmpl | 119 ++++++ .../shuttle_control_console_exploration.tmpl | 74 ++++ 20 files changed, 1254 insertions(+), 400 deletions(-) create mode 100644 code/WorkInProgress/Chinsky/overmap/_defines.dm delete mode 100644 code/WorkInProgress/Chinsky/overmap/helm.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm create mode 100644 code/WorkInProgress/Chinsky/overmap/ships/ship.dm create mode 100644 icons/obj/ship_engine.dmi create mode 100644 maps/overmap/examples.dm create mode 100644 nano/templates/engines_control.tmpl create mode 100644 nano/templates/helm.tmpl create mode 100644 nano/templates/shuttle_control_console_exploration.tmpl diff --git a/code/WorkInProgress/Chinsky/overmap/README.dm b/code/WorkInProgress/Chinsky/overmap/README.dm index 79bff8f1c92..d11ea1fdee2 100644 --- a/code/WorkInProgress/Chinsky/overmap/README.dm +++ b/code/WorkInProgress/Chinsky/overmap/README.dm @@ -58,11 +58,15 @@ Currently no modifications were made to interface to display availability of lan Guide to how make new sector ************************************************************* 0.Map -Remember to put a helm console on ship maps. -Remember to define shuttle areas - both for sectors and ships. +Remember to define shuttle areas if you want sector be accessible via shuttles. Currently there are no other ways to reach sectors from ships. In examples, 4x6 shuttle area is used. In case of shuttle area being too big, it will apear in bottom left corner of it. +Remember to put a helm console and engine control console on ship maps. +Ships need engines to move. Currently there are only thermal engines. +Thermal engines are just a unary atmopheric machine, like a vent. They need high-pressure gas input to produce more thrust. + + 1.Metaobject All vars needed for it to work could be set directly in map editor, so in most cases you won't have to define new in code. Remember to set landing_area var for sectors. @@ -76,24 +80,31 @@ Remember to place one on the actual shuttle too, or it won't be able to return f Remember to set landing_type var to ship-side shuttle area type. shuttle_tag can be set to custom name (it shows up in console interface) -4.Tick map in and compile. +5.Engines +Actual engines could be any type of machinery, as long as it creates a ship_engine datum for itself. + +6.Tick map in and compile. Sector should appear on overmap (in random place if you didn't set mapx,mapy) TODO: -sector-to-ship shuttles. -ship-ship interactions -helm console interface: - current coordinates - list of known locations - autopilot - manual control more mechanics to moving ship: - overmap movement delay - engine objects - 'moving stars' effect + actually working engine objects + unary atmospheric machinery + give more thrust the more pressure gas has + ships have mass var, which is used to caalculate how much acceleration those engines give better space travel / stragglers handling shuttle console: - showing if shuttle has nowhere to be sent to + checking occupied pad or not with docking controllers ?landing pad size detection +non-zlevel overmap objects + field generator + meteor fields + speed-based chance for a rock in the ship + debris fields + speed-based chance of + debirs in the ship + a drone + EMP + nebulaes */ \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/_defines.dm b/code/WorkInProgress/Chinsky/overmap/_defines.dm new file mode 100644 index 00000000000..dfc0881ed53 --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/_defines.dm @@ -0,0 +1,35 @@ +//Zlevel where overmap objects should be +#define OVERMAP_ZLEVEL 1 +//How far from the edge of overmap zlevel could randomly placed objects spawn +#define OVERMAP_EDGE 7 + +//list used to track which zlevels are being 'moved' by the proc below +var/list/moving_levels = list() +//Proc to 'move' stars in spess +//yes it looks ugly, but it should only fire when state actually change. +//null direction stops movement +proc/toggle_move_stars(zlevel, direction) + if(!zlevel) + return + + var/gen_dir = null + if(direction & (NORTH|SOUTH)) + gen_dir += "ns" + else if(direction & (EAST|WEST)) + gen_dir += "ew" + if(!direction) + gen_dir = null + + if (moving_levels["zlevel"] != gen_dir) + moving_levels["zlevel"] = gen_dir + for(var/turf/space/S in world) + if(S.z == zlevel) + spawn(0) + var/turf/T = S + if(!gen_dir) + T.icon_state = "[((T.x + T.y) ^ ~(T.x * T.y) + T.z) % 25]" + else + T.icon_state = "speedspace_[gen_dir]_[rand(1,15)]" + for(var/atom/movable/AM in T) + if (!AM.anchored) + AM.throw_at(get_step(T,reverse_direction(direction)), 5, 1) \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/helm.dm b/code/WorkInProgress/Chinsky/overmap/helm.dm deleted file mode 100644 index 8d5600b1907..00000000000 --- a/code/WorkInProgress/Chinsky/overmap/helm.dm +++ /dev/null @@ -1,161 +0,0 @@ -/obj/machinery/computer/helm - name = "helm control console" - icon_state = "id" - var/obj/effect/map/ship/linked //connected overmap object - var/autopilot = 0 - var/manual_control = 0 - var/dx //desitnation - var/dy //coordinates - var/ship_last_move = 0 - var/ship_move_delay = 10 - - -/obj/machinery/computer/helm/initialize() - linked = map_sectors["[z]"] - if (!linked) - testing("Helm console at level [z] was unable to find a corresponding overmap object.") - else - testing("Helm console at level [z] found a corresponding overmap object '[linked.name]'.") - -/obj/machinery/computer/helm/process() - ..() - if (autopilot && dx && dy && world.time > ship_last_move + ship_move_delay) - ship_last_move = world.time - var/turf/T = locate(dx,dy,1) - if (T) - step_towards(linked,T) - return - -/obj/machinery/computer/helm/relaymove(var/mob/user, direction) - if(manual_control && linked) - if (world.time > ship_last_move + ship_move_delay) - linked.relaymove(user,direction) - ship_last_move = world.time - return 1 - -/obj/machinery/computer/helm/check_eye(var/mob/user as mob) - if (!manual_control) - return null - if (!get_dist(user, src) > 1 || user.blinded || !linked ) - return null - user.reset_view(linked) - return 1 - -/obj/machinery/computer/helm/attack_hand(var/mob/user as mob) - if(..()) - user.unset_machine() - manual_control = 0 - return - - if(!isAI(user)) - user.set_machine(src) - - var/dat = "" - if(!linked) - dat = "
Could not get navigation data!
" - else - dat += "" - dat += "
Current sector:[linked.current_sector ? linked.current_sector.name : "Deep Space"]" - dat += "
Sector information:[linked.current_sector ? linked.current_sector.desc : "Not Available"]" - dat += "
Current coordinates:\[[linked.x], [linked.y]\]" - dat += "
Current destination:" - if (dx && dy) - dat += "\[[dx], " - dat += "[dy]\]" - else - dat += "None" - dat += "
" - - dat += "

" - - dat += "Known locations:
" - dat += "" - for (var/lvl in map_sectors) - var/obj/effect/map/sector/S = map_sectors[lvl] - if (istype(S)) - dat += "" - dat += "
[S.name]:\[[S.x], [S.y]\]Plot course
" - - dat += "


" - - dat += "" - dat += "
Autopilot:[autopilot ? "Engaged" : "Disengaged"]Reset desetination" - dat += "
Manual control:[manual_control ? "Engaged" : "Disengaged"]" - dat += "
" - user << browse("Helm Control[dat]", "window=helm") - onclose(user, "helm") - return - - -/obj/machinery/computer/helm/Topic(href, href_list) - if(..()) - return - - if (!linked) - return - - if (href_list["setx"]) - var/newx = input("Input new destiniation x coordinate", "Coordinate input", dx) as num|null - if (newx) - dx = Clamp(newx, 1, world.maxx) - - if (href_list["sety"]) - var/newy = input("Input new destiniation y coordinate", "Coordinate input", dy) as num|null - if (newy) - dy = Clamp(newy, 1, world.maxy) - - if (href_list["x"] && href_list["y"]) - dx = text2num(href_list["x"]) - dy = text2num(href_list["y"]) - - if (href_list["reset"]) - dx = 0 - dy = 0 - - if (href_list["apilot"]) - autopilot = !autopilot - - if (href_list["manual"]) - manual_control = !manual_control - autopilot = 0 - - add_fingerprint(usr) - updateUsrDialog() - -//Shuttle controller computer for shuttles going from ship to sectors - -/obj/machinery/computer/shuttle_control/explore - name = "exploration shuttle console" - shuttle_tag = "Exploration" - req_access = list() - var/landing_type //area for shuttle ship-side - -/obj/machinery/computer/shuttle_control/explore/initialize() - ..() - shuttle_tag = "[shuttle_tag]-[z]" - if(!shuttle_controller.shuttles[shuttle_tag]) - var/datum/shuttle/ferry/shuttle = new() - shuttle.warmup_time = 10 - shuttle.area_station = locate(landing_type) - shuttle.area_offsite = shuttle.area_station - shuttle_controller.shuttles[shuttle_tag] = shuttle - shuttle_controller.process_shuttles += shuttle - testing("Exploration shuttle '[shuttle_tag]' at zlevel [z] successfully added.") - -/obj/machinery/computer/shuttle_control/explore/proc/update_destination() - if(shuttle_controller.shuttles[shuttle_tag]) - var/obj/effect/map/ship/S = map_sectors["[z]"] - if (!istype(S)) - return - var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] - if(S && S.current_sector) - var/obj/effect/map/M = S.current_sector - shuttle.area_offsite = M.shuttle_landing - testing("Shuttle controller now sends shuttle to [M]") - else - shuttle.area_offsite = shuttle.area_station - shuttle_controller.shuttles[shuttle_tag] = shuttle - -/obj/machinery/computer/shuttle_control/explore/attack_hand(user as mob) - update_destination() - ..() \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/sectors.dm b/code/WorkInProgress/Chinsky/overmap/sectors.dm index 9c80cfc2ac2..9e1635a9602 100644 --- a/code/WorkInProgress/Chinsky/overmap/sectors.dm +++ b/code/WorkInProgress/Chinsky/overmap/sectors.dm @@ -1,4 +1,4 @@ -#define OVERMAP_ZLEVEL 1 + //=================================================================================== //Hook for building overmap //=================================================================================== @@ -29,6 +29,7 @@ var/global/list/map_sectors = list() var/zlevel var/mapx //coordinates on the var/mapy //overmap zlevel + var/known = 1 /obj/effect/mapinfo/New() tag = "sector[z]" @@ -43,9 +44,6 @@ var/global/list/map_sectors = list() name = "generic ship" obj_type = /obj/effect/map/ship -/obj/effect/mapinfo/ship/relaymove(var/mob/user, direction) - step(src,direction) - //=================================================================================== //Overmap object representing zlevel @@ -57,17 +55,19 @@ var/global/list/map_sectors = list() icon_state = "sheet-plasteel" var/map_z = 0 var/area/shuttle/shuttle_landing + var/always_known = 1 /obj/effect/map/New(var/obj/effect/mapinfo/data) map_z = data.zlevel name = data.name + always_known = data.known if (data.icon != 'icons/mob/screen1.dmi') icon = data.icon icon_state = data.icon_state if(data.desc) desc = data.desc - var/new_x = data.mapx ? data.mapx : rand(2,world.maxx-2) - var/new_y = data.mapy ? data.mapy : rand(2,world.maxy-2) + var/new_x = data.mapx ? data.mapx : rand(OVERMAP_EDGE, world.maxx - OVERMAP_EDGE) + var/new_y = data.mapy ? data.mapy : rand(OVERMAP_EDGE, world.maxy - OVERMAP_EDGE) loc = locate(new_x, new_y, OVERMAP_ZLEVEL) if(data.landing_area) @@ -93,13 +93,3 @@ var/global/list/map_sectors = list() name = "generic sector" desc = "Sector with some stuff in it." anchored = 1 - -/obj/effect/map/ship - name = "generic ship" - desc = "Space faring vessel." - icon_state = "sheet-sandstone" - density = 1 - var/obj/effect/map/current_sector - -/obj/effect/map/ship/relaymove(mob/user, direction) - step(src,direction) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm new file mode 100644 index 00000000000..07d6a4579be --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm @@ -0,0 +1,99 @@ +//Engine control and monitoring console + +/obj/machinery/computer/engines + name = "engines control console" + icon_state = "id" + var/state = "status" + var/list/engines = list() + var/obj/effect/map/ship/linked + +/obj/machinery/computer/engines/initialize() + linked = map_sectors["[z]"] + if (linked) + if (!linked.eng_control) + linked.eng_control = src + testing("Engines console at level [z] found a corresponding overmap object '[linked.name]'.") + else + testing("Engines console at level [z] was unable to find a corresponding overmap object.") + + for(var/datum/ship_engine/E in engines) + if (E.zlevel == z && !(E in engines)) + engines += E + +/obj/machinery/computer/engines/attack_hand(var/mob/user as mob) + if(..()) + user.unset_machine() + return + + if(!isAI(user)) + user.set_machine(src) + + ui_interact(user) + +/obj/machinery/computer/engines/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) + if(!linked) + return + + var/data[0] + data["state"] = state + + var/list/enginfo[0] + for(var/datum/ship_engine/E in engines) + var/list/rdata[0] + rdata["eng_type"] = E.name + rdata["eng_on"] = E.is_on() + rdata["eng_thrust"] = E.get_thrust() + rdata["eng_thrust_limiter"] = round(E.get_thrust_limit()*100) + rdata["eng_status"] = E.get_status() + rdata["eng_reference"] = "\ref[E]" + enginfo.Add(list(rdata)) + + data["engines_info"] = enginfo + + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + if (!ui) + ui = new(user, src, ui_key, "engines_control.tmpl", "[linked.name] Engines Control", 380, 530) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/computer/engines/Topic(href, href_list) + if(..()) + return + + if(href_list["state"]) + state = href_list["state"] + + if(href_list["engine"]) + if(href_list["set_limit"]) + var/datum/ship_engine/E = locate(href_list["engine"]) + var/newlim = input("Input new thrust limit (0..100)", "Thrust limit", E.get_thrust_limit()) as num + var/limit = Clamp(newlim/100, 0, 1) + if(E) + E.set_thrust_limit(limit) + + if(href_list["limit"]) + var/datum/ship_engine/E = locate(href_list["engine"]) + var/limit = Clamp(E.get_thrust_limit() + text2num(href_list["limit"]), 0, 1) + if(E) + E.set_thrust_limit(limit) + + if(href_list["toggle"]) + var/datum/ship_engine/E = locate(href_list["engine"]) + if(E) + E.toggle() + + add_fingerprint(usr) + updateUsrDialog() + +/obj/machinery/computer/engines/proc/burn() + if(engines.len == 0) + return 0 + var/res = 0 + for(var/datum/ship_engine/E in engines) + res |= E.burn() + return res + +/obj/machinery/computer/engines/proc/get_total_thrust() + for(var/datum/ship_engine/E in engines) + . += E.get_thrust() diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm new file mode 100644 index 00000000000..f81e569abcf --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm @@ -0,0 +1,174 @@ +/obj/machinery/computer/helm + name = "helm control console" + icon_state = "id" + var/state = "status" + var/obj/effect/map/ship/linked //connected overmap object + var/autopilot = 0 + var/manual_control = 0 + var/list/known_sectors = list() + var/dx //desitnation + var/dy //coordinates + +/obj/machinery/computer/helm/initialize() + linked = map_sectors["[z]"] + if (linked) + if(!linked.nav_control) + linked.nav_control = src + testing("Helm console at level [z] found a corresponding overmap object '[linked.name]'.") + else + testing("Helm console at level [z] was unable to find a corresponding overmap object.") + + for(var/level in map_sectors) + var/obj/effect/map/sector/S = map_sectors["[level]"] + if (istype(S) && S.always_known) + var/datum/data/record/R = new() + R.fields["name"] = S.name + R.fields["x"] = S.x + R.fields["y"] = S.y + known_sectors += R + +/obj/machinery/computer/helm/process() + ..() + if (autopilot && dx && dy) + var/turf/T = locate(dx,dy,1) + if(linked.loc == T) + if(linked.is_still()) + autopilot = 0 + else + linked.decelerate() + + var/brake_path = linked.get_brake_path() + + if(get_dist(linked.loc, T) > brake_path) + linked.accelerate(get_dir(linked.loc, T)) + else + linked.decelerate() + + return + +/obj/machinery/computer/helm/relaymove(var/mob/user, direction) + if(manual_control && linked) + linked.relaymove(user,direction) + return 1 + +/obj/machinery/computer/helm/check_eye(var/mob/user as mob) + if (!manual_control) + return null + if (!get_dist(user, src) > 1 || user.blinded || !linked ) + return null + user.reset_view(linked) + return 1 + +/obj/machinery/computer/helm/attack_hand(var/mob/user as mob) + if(..()) + user.unset_machine() + manual_control = 0 + return + + if(!isAI(user)) + user.set_machine(src) + + ui_interact(user) + +/obj/machinery/computer/helm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) + if(!linked) + return + + var/data[0] + data["state"] = state + + data["sector"] = linked.current_sector ? linked.current_sector.name : "Deep Space" + data["sector_info"] = linked.current_sector ? linked.current_sector.desc : "Not Available" + data["s_x"] = linked.x + data["s_y"] = linked.y + data["dest"] = dy && dx + data["d_x"] = dx + data["d_y"] = dy + data["speed"] = linked.get_speed() + data["accel"] = round(linked.get_acceleration()) + data["heading"] = linked.get_heading() ? dir2angle(linked.get_heading()) : 0 + data["autopilot"] = autopilot + data["manual_control"] = manual_control + + var/list/locations[0] + for (var/datum/data/record/R in known_sectors) + var/list/rdata[0] + rdata["name"] = R.fields["name"] + rdata["x"] = R.fields["x"] + rdata["y"] = R.fields["y"] + rdata["reference"] = "\ref[R]" + locations.Add(list(rdata)) + + data["locations"] = locations + + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + if (!ui) + ui = new(user, src, ui_key, "helm.tmpl", "[linked.name] Helm Control", 380, 530) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/computer/helm/Topic(href, href_list) + if(..()) + return + + if (!linked) + return + + if (href_list["add"]) + var/datum/data/record/R = new() + var/sec_name = input("Input naviation entry name", "New navigation entry", "Sector #[known_sectors.len]") as text + if(!sec_name) + sec_name = "Sector #[known_sectors.len]" + R.fields["name"] = sec_name + switch(href_list["add"]) + if("current") + R.fields["x"] = linked.x + R.fields["y"] = linked.y + if("new") + var/newx = input("Input new entry x coordinate", "Coordinate input", linked.x) as num + R.fields["x"] = Clamp(newx, 1, world.maxx) + var/newy = input("Input new entry y coordinate", "Coordinate input", linked.y) as num + R.fields["y"] = Clamp(newy, 1, world.maxy) + known_sectors += R + + if (href_list["remove"]) + var/datum/data/record/R = locate(href_list["remove"]) + known_sectors.Remove(R) + + if (href_list["setx"]) + var/newx = input("Input new destiniation x coordinate", "Coordinate input", dx) as num|null + if (newx) + dx = Clamp(newx, 1, world.maxx) + + if (href_list["sety"]) + var/newy = input("Input new destiniation y coordinate", "Coordinate input", dy) as num|null + if (newy) + dy = Clamp(newy, 1, world.maxy) + + if (href_list["x"] && href_list["y"]) + dx = text2num(href_list["x"]) + dy = text2num(href_list["y"]) + + if (href_list["reset"]) + dx = 0 + dy = 0 + + if (href_list["move"]) + var/ndir = text2num(href_list["move"]) + linked.relaymove(usr, ndir) + + if (href_list["brake"]) + linked.decelerate() + + if (href_list["apilot"]) + autopilot = !autopilot + + if (href_list["manual"]) + manual_control = !manual_control + + if (href_list["state"]) + state = href_list["state"] + add_fingerprint(usr) + updateUsrDialog() + diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm new file mode 100644 index 00000000000..c63ad2d763a --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm @@ -0,0 +1,139 @@ +//Shuttle controller computer for shuttles going between sectors +/datum/shuttle/ferry/var/range = 0 //how many overmap tiles can shuttle go, for picking destinatiosn and returning. +/obj/machinery/computer/shuttle_control/explore + name = "exploration shuttle console" + shuttle_tag = "Exploration" + req_access = list() + var/landing_type //area for shuttle ship-side + var/obj/effect/map/destination //current destination + var/obj/effect/map/home //current destination + +/obj/machinery/computer/shuttle_control/explore/initialize() + ..() + home = map_sectors["[z]"] + shuttle_tag = "[shuttle_tag]-[z]" + if(!shuttle_controller.shuttles[shuttle_tag]) + var/datum/shuttle/ferry/shuttle = new() + shuttle.warmup_time = 10 + shuttle.area_station = locate(landing_type) + shuttle.area_offsite = shuttle.area_station + shuttle_controller.shuttles[shuttle_tag] = shuttle + shuttle_controller.process_shuttles += shuttle + testing("Exploration shuttle '[shuttle_tag]' at zlevel [z] successfully added.") + +//Sets destination to new sector. Can be null. +/obj/machinery/computer/shuttle_control/explore/proc/update_destination(var/obj/effect/map/D) + destination = D + if(destination && shuttle_controller.shuttles[shuttle_tag]) + var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] + shuttle.area_offsite = destination.shuttle_landing + testing("Shuttle controller [shuttle_tag] now sends shuttle to [destination]") + shuttle_controller.shuttles[shuttle_tag] = shuttle + +//Gets all sectors with landing zones in shuttle's range +/obj/machinery/computer/shuttle_control/explore/proc/get_possible_destinations() + var/list/res = list() + var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] + for (var/obj/effect/map/S in orange(shuttle.range, home)) + if(S.shuttle_landing) + res += S + return res + +//Checks if current destination is still reachable +/obj/machinery/computer/shuttle_control/explore/proc/check_destination() + var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] + return shuttle && destination && get_dist(home, destination) <= shuttle.range + +/obj/machinery/computer/shuttle_control/explore/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) + var/data[0] + var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] + if (!istype(shuttle)) + return + + //If we are already there, or can't reach place anymore, reset destination + if(!shuttle.location && !check_destination()) + destination = null + + //check if shuttle can fly at all + var/can_go = !isnull(destination) + var/current_destination = destination ? destination.name : "None" + //shuttle doesn't need destination set to return home, as long as it's in range. + if(shuttle.location) + current_destination = "Return" + var/area/offsite = shuttle.area_offsite + var/obj/effect/map/cur_loc = map_sectors["[offsite.z]"] + can_go = (get_dist(home,cur_loc) <= shuttle.range) + + //disable picking locations if there are none, or shuttle is already off-site + var/list/possible_d = get_possible_destinations() + var/can_pick = !shuttle.location && possible_d.len + + var/shuttle_state + switch(shuttle.moving_status) + if(SHUTTLE_IDLE) shuttle_state = "idle" + if(SHUTTLE_WARMUP) shuttle_state = "warmup" + if(SHUTTLE_INTRANSIT) shuttle_state = "in_transit" + + var/shuttle_status + switch (shuttle.process_state) + if(IDLE_STATE) + if (shuttle.in_use) + shuttle_status = "Busy." + else if (!shuttle.location) + shuttle_status = "Standing-by at station." + else + shuttle_status = "Standing-by at offsite location." + if(WAIT_LAUNCH) + shuttle_status = "Shuttle has recieved command and will depart shortly." + if(WAIT_ARRIVE) + shuttle_status = "Proceeding to destination." + if(WAIT_FINISH) + shuttle_status = "Arriving at destination now." + + data = list( + "destination_name" = current_destination, + "can_pick" = can_pick, + "shuttle_status" = shuttle_status, + "shuttle_state" = shuttle_state, + "has_docking" = shuttle.docking_controller? 1 : 0, + "docking_status" = shuttle.docking_controller? shuttle.docking_controller.get_docking_status() : null, + "docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null, + "can_launch" = can_go && shuttle.can_launch(), + "can_cancel" = can_go && shuttle.can_cancel(), + "can_force" = can_go && shuttle.can_force(), + ) + + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + + if (!ui) + ui = new(user, src, ui_key, "shuttle_control_console_exploration.tmpl", "[shuttle_tag] Shuttle Control", 470, 310) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/computer/shuttle_control/explore/Topic(href, href_list) + if(..()) + return + + usr.set_machine(src) + src.add_fingerprint(usr) + + var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] + if (!istype(shuttle)) + return + + if(href_list["pick"]) + var/obj/effect/map/self = map_sectors["[z]"] + if(self) + var/list/possible_d = get_possible_destinations() + var/obj/effect/map/D + if(possible_d.len) + D = input("Choose shuttle destination", "Shuttle Destination") as null|anything in possible_d + update_destination(D) + + if(href_list["move"]) + shuttle.launch(src) + if(href_list["force"]) + shuttle.force_launch(src) + else if(href_list["cancel"]) + shuttle.cancel_launch(src) \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm b/code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm new file mode 100644 index 00000000000..80690aa84dc --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/engines/engine.dm @@ -0,0 +1,60 @@ +//Engine component object + +var/list/ship_engines = list() +/datum/ship_engine + var/name = "ship engine" + var/obj/machinery/engine //actual engine object + var/zlevel = 0 + +/datum/ship_engine/New(var/obj/machinery/holder) + engine = holder + zlevel = holder.z + for(var/obj/machinery/computer/engines/E in machines) + if (E.z == zlevel && !(src in E.engines)) + E.engines += src + break + +//Tries to fire the engine. If successfull, returns 1 +/datum/ship_engine/proc/burn() + if(!engine) + die() + return 1 + +//Returns status string for this engine +/datum/ship_engine/proc/get_status() + if(!engine) + die() + return "All systems nominal" + +/datum/ship_engine/proc/get_thrust() + if(!engine) + die() + return 100 + +//Sets thrust limiter, a number between 0 and 1 +/datum/ship_engine/proc/set_thrust_limit(var/new_limit) + if(!engine) + die() + return 1 + +/datum/ship_engine/proc/get_thrust_limit() + if(!engine) + die() + return 1 + +/datum/ship_engine/proc/is_on() + if(!engine) + die() + return 1 + +/datum/ship_engine/proc/toggle() + if(!engine) + die() + return 1 + +/datum/ship_engine/proc/die() + for(var/obj/machinery/computer/engines/E in machines) + if (E.z == zlevel) + E.engines -= src + break + del(src) \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm b/code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm new file mode 100644 index 00000000000..b26e7216389 --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/engines/thermal.dm @@ -0,0 +1,99 @@ +//Thermal nozzle engine +/datum/ship_engine/thermal + name = "thermal engine" + +/datum/ship_engine/thermal/get_status() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + return "Fuel pressure: [E.air_contents.return_pressure()]" + +/datum/ship_engine/thermal/get_thrust() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + if(!is_on()) + return 0 + var/pressurized_coef = E.air_contents.return_pressure()/E.effective_pressure + return round(E.thrust_limit * E.nominal_thrust * pressurized_coef) + +/datum/ship_engine/thermal/burn() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + return E.burn() + +/datum/ship_engine/thermal/set_thrust_limit(var/new_limit) + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + E.thrust_limit = new_limit + +/datum/ship_engine/thermal/get_thrust_limit() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + return E.thrust_limit + +/datum/ship_engine/thermal/is_on() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + return E.on + +/datum/ship_engine/thermal/toggle() + ..() + var/obj/machinery/atmospherics/unary/engine/E = engine + E.on = !E.on + +//Actual thermal nozzle engine object + +/obj/machinery/atmospherics/unary/engine + name = "engine nozzle" + desc = "Simple thermal nozzle, uses heated gast to propell the ship." + icon = 'icons/obj/ship_engine.dmi' + icon_state = "nozzle" + var/on = 1 + var/thrust_limit = 1 //Value between 1 and 0 to limit the resulting thrust + var/nominal_thrust = 3000 + var/effective_pressure = 3000 + var/datum/ship_engine/thermal/controller + +/obj/machinery/atmospherics/unary/engine/initialize() + ..() + controller = new(src) + +/obj/machinery/atmospherics/unary/engine/Del() + ..() + controller.die() + +/obj/machinery/atmospherics/unary/engine/proc/burn() + if (!on) + return + if(air_contents.temperature > 0) + var/transfer_moles = 100 * air_contents.volume/max(air_contents.temperature * R_IDEAL_GAS_EQUATION, 0,01) + transfer_moles = round(thrust_limit * transfer_moles, 0.01) + if(transfer_moles > air_contents.total_moles) + on = !on + return 0 + + var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) + + loc.assume_air(removed) + if(air_contents.temperature > PHORON_MINIMUM_BURN_TEMPERATURE) + var/exhaust_dir = reverse_direction(dir) + var/turf/T = get_step(src,exhaust_dir) + if(T) + new/obj/effect/engine_exhaust(T,exhaust_dir,air_contents.temperature) + return 1 + +//Exhaust effect +/obj/effect/engine_exhaust + name = "engine exhaust" + icon = 'icons/effects/effects.dmi' + icon_state = "exhaust" + anchored = 1 + + New(var/turf/nloc, var/ndir, var/temp) + dir = ndir + ..(nloc) + + if(nloc) + nloc.hotspot_expose(temp,125) + + spawn(20) + loc = null \ No newline at end of file diff --git a/code/WorkInProgress/Chinsky/overmap/ships/ship.dm b/code/WorkInProgress/Chinsky/overmap/ships/ship.dm new file mode 100644 index 00000000000..b080c41b071 --- /dev/null +++ b/code/WorkInProgress/Chinsky/overmap/ships/ship.dm @@ -0,0 +1,105 @@ +/obj/effect/map/ship + name = "generic ship" + desc = "Space faring vessel." + icon_state = "sheet-sandstone" + var/vessel_mass = 9000 //tonnes, random number + var/default_delay = 60 + var/list/speed = list(0,0) + var/last_burn = 0 + var/list/last_movement = list(0,0) + var/fore_dir = NORTH + + var/obj/effect/map/current_sector + var/obj/machinery/computer/helm/nav_control + var/obj/machinery/computer/engines/eng_control + +/obj/effect/map/ship/initialize() + for(var/obj/machinery/computer/engines/E in machines) + if (E.z == map_z) + eng_control = E + break + for(var/obj/machinery/computer/helm/H in machines) + if (H.z == map_z) + nav_control = H + break + processing_objects.Add(src) + +/obj/effect/map/ship/relaymove(mob/user, direction) + accelerate(direction) + +/obj/effect/map/ship/proc/is_still() + return !(speed[1] || speed[2]) + +/obj/effect/map/ship/proc/get_acceleration() + return eng_control.get_total_thrust()/vessel_mass + +/obj/effect/map/ship/proc/get_speed() + return round(sqrt(speed[1]*speed[1] + speed[2]*speed[2])) + +/obj/effect/map/ship/proc/get_heading() + var/res = 0 + if(speed[1]) + if(speed[1] > 0) + res |= EAST + else + res |= WEST + if(speed[2]) + if(speed[2] > 0) + res |= NORTH + else + res |= SOUTH + return res + +/obj/effect/map/ship/proc/adjust_speed(n_x, n_y) + speed[1] = Clamp(speed[1] + n_x, -default_delay, default_delay) + speed[2] = Clamp(speed[2] + n_y, -default_delay, default_delay) + if(is_still()) + toggle_move_stars(map_z) + else + toggle_move_stars(map_z, fore_dir) + +/obj/effect/map/ship/proc/can_burn() + if (!eng_control) + return 0 + if (world.time < last_burn + 10) + return 0 + if (!eng_control.burn()) + return 0 + return 1 + +/obj/effect/map/ship/proc/get_brake_path() + if(!get_acceleration()) + return INFINITY + return max(abs(speed[1]),abs(speed[2]))/get_acceleration() + +/obj/effect/map/ship/proc/decelerate() + if(!is_still() && can_burn()) + if (speed[1]) + adjust_speed(-SIGN(speed[1]) * min(get_acceleration(),speed[1]), 0) + if (speed[2]) + adjust_speed(0, -SIGN(speed[2]) * min(get_acceleration(),speed[2])) + last_burn = world.time + +/obj/effect/map/ship/proc/accelerate(direction) + if(can_burn()) + last_burn = world.time + + if(direction & EAST) + adjust_speed(get_acceleration(), 0) + if(direction & WEST) + adjust_speed(-get_acceleration(), 0) + if(direction & NORTH) + adjust_speed(0, get_acceleration()) + if(direction & SOUTH) + adjust_speed(0, -get_acceleration()) + +/obj/effect/map/ship/process() + if(!is_still()) + var/list/deltas = list(0,0) + for(var/i=1, i<=2, i++) + if(speed[i] && world.time > last_movement[i] + default_delay - speed[i]) + deltas[i] = speed[i] > 0 ? 1 : -1 + last_movement[i] = world.time + var/turf/newloc = locate(x + deltas[1], y + deltas[2], z) + if(newloc) + Move(newloc) \ No newline at end of file diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 7c86950ba63f30dcfbeab3ff36508b48620465a8..67a1c2ce29a923c3c45fbe1817e8707428211d19 100644 GIT binary patch delta 13534 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 diff --git a/icons/obj/ship_engine.dmi b/icons/obj/ship_engine.dmi new file mode 100644 index 0000000000000000000000000000000000000000..76546be416a49274a4d20a734312e381cc2ec03b GIT binary patch literal 817 zcmV-11J3-3P)Vq#*rxVVLdg>Z0iwY9ZdTU#nBDrsqHp{rGY00001bW%=J06^y0W&i*HYkE{z zbVOxyV{&P5bZKvH004NLQ&wgYlKpfFde_@M&EWZ%SPAi5kPy6EX(jVlQNFWW`T^bn)S@f^R(8r| z@p;3imm`1&R^OmmSwP-Psxp;BH=j6&t2O8yl3G`(mV<}>H!RA%p&q0wJ?hmSV2r_< z83UTB0zhq$R(AkPXpq*e-v%%+7PNf;Y~BMHrvNr4;XH^0co)G(WM1&CfYt(;AMQys z0HTBf#;;fhkSMlXF$-%gTF4VJ~f3^TW>P)P;g8dEv!jfy>nE?9h z!F>k-OoV&jgaH~eyJ}-VAk&0^CV2n42jD|90|WxV*8{$z7TPPd{^TJQHjYgH7t6Fc9_Pgzy_V^CGF@P1~O^!-lL zBOavf$_q=f?05{aEQ#NRUpNP`C-D(;7aqTN8>90 + {{:~link('Overall status', 'note', {'state' :'status'}, null, state == 'status' ? 'selected' : null)}} + {{:~link('Details', 'note', {'state' : 'engines'}, null, state == 'engines' ? 'selected' : null)}} + + +{{if state == "engines"}} + {{if engines_info}} + {{for engines_info}} +
+
+ Engine #{{:#index + 1}}: +
+
+ {{:~link(eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : eng_reference }, null, eng_on ? 'selected' : null)}} +
+
+
+
+
+ Type: +
+
+ {{:eng_type}} +
+
+
+
+ Status: +
+
+ {{:eng_on ? 'Online' : 'Offline'}}
+ {{:eng_status}} +
+
+
+
+ Current thrust: +
+
+ {{:eng_thrust}} +
+
+
+
+ Thrust limit: +
+
+ {{:~link('', 'circle-plus', { 'limit' : 0.1, 'engine' : eng_reference }, null, null)}} + {{:~link(eng_thrust_limiter+'%', null, { 'set_limit' : 1, 'engine' : eng_reference }, null, null)}} + {{:~link('', 'circle-minus', { 'limit' : -0.1, 'engine' : eng_reference }, null, null)}} +
+
+
+ {{/for}} + {{/if}} +{{/if}} +{{if state == "status"}} +{{if engines_info}} + {{for engines_info}} +
+
+
+ Engine #{{:#index + 1}}: +
+
+ {{:~link(eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : eng_reference }, null, eng_on ? 'selected' : null)}} +
+
+
+
+ Thrust: +
+ Thrust limit: +
+
+ {{:eng_thrust}} +
+ {{:eng_thrust_limiter}}% +
+
+
+ {{/for}} + {{/if}} +{{/if}} \ No newline at end of file diff --git a/nano/templates/helm.tmpl b/nano/templates/helm.tmpl new file mode 100644 index 00000000000..1457d7a3368 --- /dev/null +++ b/nano/templates/helm.tmpl @@ -0,0 +1,119 @@ + + + + + +
+

Sector information

+
+ {{:sector}} +
+ Coordinates: {{:s_x}} : {{:s_y}} +
+ Additional information: {{:s_x}} : {{:s_y}} + {{:sector_info}} +
+
+ +
+

Flight data

+
+
+
+ Speed: +
+
+ {{:speed}} +
+
+
+
+ Acceleration: +
+
+ {{:accel}} +
+
+
+
+ Heading: +
+
+ {{:heading}} +
+
+
+
+ + +

Manual control

+
+
+
+
+ {{:~link('', 'triangle-1-nw', { 'move' : 9 }, null, null)}} + {{:~link('', 'triangle-1-n', { 'move' : 1 }, null, null)}} + {{:~link('', 'triangle-1-ne', { 'move' : 5 }, null, null)}} +
+
+ {{:~link('', 'triangle-1-w', { 'move' : 8 }, null, null)}} + {{:~link('', 'circle-close', { 'brake' : 1 }, null, null)}} + {{:~link('', 'triangle-1-e', { 'move' : 4 }, null, null)}} +
+
+ {{:~link('', 'triangle-1-sw', { 'move' : 10 }, null, null)}} + {{:~link('', 'triangle-1-s', { 'move' : 2 }, null, null)}} + {{:~link('', 'triangle-1-se', { 'move' : 6 }, null, null)}} +
+
+ +
+
+ Direct control + {{:~link(manual_control ? 'Engaged' : 'Disengaged', 'shuffle', { 'manual' : 1 }, manual_control ? 'selected' : null, null)}} +
+
+
+
+ +
+
+

Autopilot

+
+
+ {{:~link(autopilot? 'Engaged' : 'Disengaged', 'gear', { 'apilot' : 1 }, dest ? null : 'disabled' , autopilot ? 'selected' : null)}} +
+
+
+
+ Target coordinates +
+
+ {{if dest}} + {{:~link(d_x, null, { 'setx' : 1 }, null, null)}} {{:~link(d_y, null, { 'sety' : 1 }, null, null)}} + {{else}} + {{:~link('None', null, { 'sety' : 1, 'setx' : 1 }, null, null)}} + {{/if}} +
+
+ +

Navigation data

+
+ {{:~link('Save current position', 'disk', { 'add' : 'current' }, null)}} + {{:~link('Add new entry', 'document', { 'add' : 'new' }, null)}} +
+ +
+ {{if locations}} + {{for locations}} +
+ {{:name}}: + {{:x}} : {{:y}} +
+
+ {{:~link('Plot course', 'arrowreturnthick-1-e', { 'x' : x, 'y' : y }, null, null)}} + {{:~link('Remove entry', 'close', { 'remove' : reference }, null, null)}} +
+ {{/for}} + {{/if}} +
diff --git a/nano/templates/shuttle_control_console_exploration.tmpl b/nano/templates/shuttle_control_console_exploration.tmpl new file mode 100644 index 00000000000..443b3190a92 --- /dev/null +++ b/nano/templates/shuttle_control_console_exploration.tmpl @@ -0,0 +1,74 @@ +

Shuttle Status

+
+
+ {{:shuttle_status}} +
+
+
+
+
+ Drive: +
+
+ {{if shuttle_state == "idle"}} + IDLE + {{else shuttle_state == "warmup"}} + SPINNING UP + {{else shuttle_state == "in_transit"}} + ENGAGED + {{else}} + ERROR + {{/if}} +
+
+
+{{if has_docking}} +
+
+
+ Docking Status: +
+
+ {{if docking_status == "docked"}} + DOCKED + {{else docking_status == "docking"}} + {{if !docking_override}} + DOCKING + {{else}} + DOCKING-MANUAL + {{/if}} + {{else docking_status == "undocking"}} + {{if !docking_override}} + UNDOCKING + {{else}} + UNDOCKING-MANUAL + {{/if}} + {{else docking_status == "undocked"}} + UNDOCKED + {{else}} + ERROR + {{/if}} + +
+
+
+{{/if}} +
+
+ Current Destination: +
+ {{:destination_name}} +
+ {{:~link('Choose Destination', 'arrowreturn-1-s', {'pick' : '1'}, can_pick? null : 'disabled' , null)}} +
+
+

Shuttle Control

+
+
+
+ {{:~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} + {{:~link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} + {{:~link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}} +
+
+
\ No newline at end of file