New REM client: REM-Client 6d86e5a, 64-bit (base manager: Modules tab with production - recipe per module, cycles, power and crew of the station (module bases M6); Galactic Market as a page of the base manager instead of its own window, updates by itself, no NPC prices)
This commit is contained in:
+27
-35
@@ -2,6 +2,7 @@
|
||||
<head>
|
||||
<title>Base manager</title>
|
||||
<link type="text/rcss" href="rem.rcss"/>
|
||||
<link type="text/rcss" href="market.rcss"/>
|
||||
<style>
|
||||
/* pages: one or two columns that fill the content area */
|
||||
.page { flex: 1; display: flex; flex-direction: row; min-height: 0; }
|
||||
@@ -104,8 +105,8 @@
|
||||
.stats .v.txt { font-family: "Saira SemiCondensed"; font-size: 15dp; white-space: nowrap; overflow: hidden; }
|
||||
</style>
|
||||
</head>
|
||||
<body class="window" data-model="base">
|
||||
<div class="win-head">
|
||||
<body class="window">
|
||||
<div class="win-head" data-model="base">
|
||||
<img class="head-ico" src="3db:INTERFACE/NEURONET/ICONS/rem_base.3db"/><span class="title">BASE MANAGER</span><span class="sl">\\\</span>
|
||||
<span class="loc">{{ base_name }}</span>
|
||||
<span class="spacer"></span>
|
||||
@@ -114,10 +115,10 @@
|
||||
<span class="close" data-action="close">×</span>
|
||||
</div>
|
||||
<div class="win-main">
|
||||
<div class="nav">
|
||||
<div class="nav" data-model="base">
|
||||
<div class="item" data-class-active="page == 0" data-action="page" data-arg="0"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_cargo.3db"/><span>Depot</span><span class="badge" data-if="depot.size > 0">{{ depot.size }}</span></div>
|
||||
<div class="item" data-class-active="page == 1" data-action="page" data-arg="1"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_cargo.3db"/><span>All depots</span></div>
|
||||
<div class="item" data-action="open-market"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_economy.3db"/><span>Galactic Market</span><div class="tip">Buy and sell orders, the order book, prices and their history (opens the market window).</div></div>
|
||||
<div class="item" data-class-active="page == 2" data-action="page" data-arg="2"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_economy.3db"/><span>Galactic Market</span><div class="tip">Buy and sell orders, the order book, prices and their history.</div></div>
|
||||
<div class="sep"></div>
|
||||
<div class="item" data-class-active="page == 4" data-action="page" data-arg="4"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_crafting.3db"/><span>Crafting</span><span class="badge" data-if="craft_jobs.size > 0">{{ craft_jobs.size }}</span></div>
|
||||
<div class="item" data-class-active="page == 5" data-action="page" data-arg="5"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_rank.3db"/><span>Research</span><span class="badge" data-if="research_jobs.size > 0">{{ research_jobs.size }}</span></div>
|
||||
@@ -126,7 +127,7 @@
|
||||
<div class="item" data-class-active="page == 7" data-action="page" data-arg="7"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_ships.3db"/><span>Drones</span><span class="badge" data-if="drones.size > 0">{{ drones.size }}</span></div>
|
||||
<div class="item" data-class-active="page == 8" data-action="page" data-arg="8"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_cargo.3db"/><span>Couriers</span></div>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="content" id="base-pages" data-model="base">
|
||||
<div class="blocked" data-if="blocked != 0">
|
||||
<div class="t">{{ blocked_title }}</div>
|
||||
<div>{{ blocked_text }}</div>
|
||||
@@ -188,35 +189,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ================================================= MARKET -->
|
||||
<div class="page col" data-if="blocked == 0 && page == 2">
|
||||
<div class="blocked" data-if="market_state == 0">
|
||||
<div class="t">No galactic market here</div>
|
||||
<div class="hint">The galactic market is open on trade hubs only.</div>
|
||||
</div>
|
||||
<div class="colm" data-if="market_state != 0">
|
||||
<div class="col-h"><h3>Galactic market</h3><span class="hint">{{ listings.size }} offers</span></div>
|
||||
<input class="text search" type="text" data-value="filter" maxlength="40"/>
|
||||
<div class="table grow">
|
||||
<div class="head"><span class="c1">Item</span><span class="c3">Amount</span><span class="c4">Price / unit</span><span class="c2">Seller</span><span class="c2">Trade hub</span></div>
|
||||
<div class="body">
|
||||
<div class="empty" data-if="listings.size == 0">{{ market_state < 0 ? 'Waiting for the server...' : 'No offers.' }}</div>
|
||||
<div class="row" data-for="r : listings" data-class-selected="r.selected" data-action="pick-listing" data-attr-data-arg="r.key">
|
||||
<span class="c1">{{ r.a }}</span><span class="c3">{{ r.b }}</span><span class="c4">{{ r.c }}</span><span class="c2">{{ r.d }}</span><span class="c2">{{ r.e }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hint" style="margin-top: 8dp;">{{ listing_pick == '' ? 'Pick an offer in the table.' : listing_pick }}</div>
|
||||
<div class="amount">
|
||||
<span class="label">Amount</span>
|
||||
<input class="range" type="range" min="1" step="1" data-attr-max="amount_max" data-value="amount"/>
|
||||
<span class="v">{{ amount_text }}</span>
|
||||
<div class="btn" data-action="amount-max">Max</div>
|
||||
</div>
|
||||
<div class="actions"><div class="btn primary" data-action="market-buy">Buy<div class="tip">Buys the amount; it goes into the depot on the seller's trade hub.</div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ================================================= SELL -->
|
||||
<div class="page" data-if="blocked == 0 && page == 3">
|
||||
<div class="colm gap">
|
||||
@@ -486,6 +458,23 @@
|
||||
<div class="actions"><div class="btn primary" data-action="mod-deliver">Deliver<div class="tip">Hands the amount of the picked ware from your hold to the module.</div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- a production module (M6): its recipes -->
|
||||
<div class="colm" data-if="mod_mode == 4">
|
||||
<div class="table grow">
|
||||
<div class="head"><span class="c1">Recipe</span><span class="c2">Cycle</span><span class="c3">Needs</span></div>
|
||||
<div class="body">
|
||||
<div class="empty" data-if="mrecipes.size == 0">No recipe for this module in the catalog.</div>
|
||||
<div class="row" data-for="r : mrecipes" data-class-selected="r.selected" data-action="pick-mrecipe" data-attr-data-arg="r.key"><span class="c1">{{ r.a }}</span><span class="c2">{{ r.b }}</span><span class="c3">{{ r.c }}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="label" style="margin-top: 8dp;">Per cycle</div>
|
||||
<div class="ware" data-for="w : mrecipe_wares"><span>{{ w.a }}</span><span class="n">{{ w.b }}</span></div>
|
||||
<div class="hint" style="margin-top: 6dp;">{{ mod_prod_line }}</div>
|
||||
<div class="actions" data-if="obj_edit">
|
||||
<div class="btn" data-class-primary="mod_can_recipe" data-action="mod-recipe">{{ mod_recipe_text }}<div class="tip">The module makes the picked recipe from the next cycle on.</div></div>
|
||||
<div class="btn" data-action="mod-recipe-stop">Stop<div class="tip">The module stops; nothing is lost.</div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="actions" data-if="obj_edit && mod_mode >= 2"><div class="btn danger" data-class-primary="mod_remove_armed" data-action="mod-remove">{{ mod_remove_text }}<div class="tip">Takes the module out of the slot. Modules are no wares yet: what went into it is lost.</div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -702,8 +691,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- GALACTIC MARKET: the market window's view (market.rml between PANE and /PANE, its model
|
||||
"market"), put in by rem_ui_base.cpp; shown in place of the pages above -->
|
||||
<div class="content mkt" id="mkt-pane" data-model="market" style="display: none;"></div>
|
||||
</div>
|
||||
<div class="win-foot">
|
||||
<div class="win-foot" data-model="base">
|
||||
<span class="key">Esc</span><span class="hint">close</span>
|
||||
<span class="status">{{ status }}</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user