New REM client: REM-Client bcdd352, 64-bit (module bases: Modules tab in the base manager - slots, building, delivering wares; docking at player-built stations with Deck and Bar, the top bar after the modules, the commodity dealer opens the station's market; themes reach every element, theme designer with ini import / export; Galactic Market in the base manager opens the market window; countermeasures drop by themselves on a REM server; nav map tool menu and bookmarks on the server; mouse buttons bind again in the options; HUD editor fixes; PM tabs stay one when the partner goes AFK)
This commit is contained in:
+50
-3
@@ -119,8 +119,7 @@
|
||||
<div class="nav">
|
||||
<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-class-active="page == 2" data-action="page" data-arg="2"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_economy.3db"/><span>Market</span></div>
|
||||
<div class="item" data-class-active="page == 3" data-action="page" data-arg="3"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_economy.3db"/><span>Sell</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="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>
|
||||
@@ -401,10 +400,11 @@
|
||||
<div class="hint">{{ obj_line }}</div>
|
||||
<div class="bar" data-if="obj_bar >= 0" style="margin-top: 8dp;"><div class="fill" data-style-width="obj_bar + '%'"></div></div>
|
||||
</div>
|
||||
<div class="subtabs" data-if="obj_picked && (obj_site || obj_edit)">
|
||||
<div class="subtabs" data-if="obj_picked && (obj_site || obj_edit || mod_has)">
|
||||
<div class="tab" data-if="obj_site" data-class-active="sys_view == 0" data-action="sys-view" data-arg="0">Wares</div>
|
||||
<div class="tab" data-class-active="sys_view == 1" data-action="sys-view" data-arg="1">Rules</div>
|
||||
<div class="tab" data-if="!obj_site && obj_edit" data-class-active="sys_view == 2" data-action="sys-view" data-arg="2">Loadout</div>
|
||||
<div class="tab" data-if="!obj_site && mod_has" data-class-active="sys_view == 3" data-action="sys-view" data-arg="3">Modules</div>
|
||||
</div>
|
||||
<!-- wares of a site -->
|
||||
<div class="pane" data-if="obj_site && sys_view == 0">
|
||||
@@ -444,6 +444,53 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- modules of a station with slots -->
|
||||
<div class="page" data-if="obj_picked && !obj_site && mod_has && sys_view == 3">
|
||||
<div class="colm gap">
|
||||
<div class="table grow">
|
||||
<div class="head"><span class="c1">Slot</span><span class="c2">Module</span><span class="c3">State</span></div>
|
||||
<div class="body">
|
||||
<div class="row" data-for="r : mslots" data-class-selected="r.selected" data-action="pick-mslot" 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="hint" style="margin-top: 8dp;">{{ mod_hint }}</div>
|
||||
</div>
|
||||
<div class="colm">
|
||||
<div class="panel">
|
||||
<div class="t">{{ mod_title }}</div>
|
||||
<div class="hint">{{ mod_line }}</div>
|
||||
<div class="bar" data-if="mod_bar >= 0" style="margin-top: 8dp;"><div class="fill" data-style-width="mod_bar + '%'"></div></div>
|
||||
</div>
|
||||
<!-- an empty slot: the modules that fit -->
|
||||
<div class="colm" data-if="mod_mode == 1">
|
||||
<div class="table grow">
|
||||
<div class="head"><span class="c1">Module</span><span class="c2">Price</span><span class="c3"></span></div>
|
||||
<div class="body">
|
||||
<div class="empty" data-if="mtypes.size == 0">Nothing fits this slot.</div>
|
||||
<div class="row" data-for="r : mtypes" data-class-selected="r.selected" data-class-short="r.short" data-action="pick-mtype" 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;">Wares</div>
|
||||
<div class="hint" data-if="mtype_wares.size == 0">No wares needed.</div>
|
||||
<div class="ware" data-for="w : mtype_wares"><span>{{ w.a }}</span><span class="n">{{ w.b }}</span></div>
|
||||
<div class="actions" data-if="obj_edit"><div class="btn" data-class-primary="mod_can_build" data-action="mod-build">{{ mod_build_text }}<div class="tip">Puts the module into the slot (the price from your money); then deliver its wares.</div></div></div>
|
||||
</div>
|
||||
<!-- a module waiting for wares -->
|
||||
<div class="colm" data-if="mod_mode == 2">
|
||||
<div class="table grow">
|
||||
<div class="head"><span class="c1">Ware</span><span class="c2">Delivered</span><span class="c3">In hold</span></div>
|
||||
<div class="body">
|
||||
<div class="row" data-for="r : mneeds" data-class-selected="r.selected" data-action="pick-mneed" 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 data-if="mod_can_deliver">
|
||||
<div class="amount"><span class="label">Amount</span><input class="range" type="range" min="1" step="1" data-attr-max="mod_qty_max" data-value="mod_qty"/><span class="v">{{ mod_qty_text }}</span></div>
|
||||
<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>
|
||||
<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>
|
||||
<!-- loadout of a built object (its owner) -->
|
||||
<div class="page" data-if="obj_picked && !obj_site && obj_edit && sys_view == 2">
|
||||
<div class="colm gap">
|
||||
|
||||
Reference in New Issue
Block a user