diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index e198666a..d83759ea 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-10 21:22 -commit: a3c20c52 (main) -subject: Pilots: Now / Why / In its hold / Last steps on the pilot page; pilots' trades in the trade log (rem-server c658c42) +date: 2026-11-10 21:43 +commit: 49bca0f3 (main) +subject: Merge clans: Player window page Clan (members, bank & depot, ranks, log, diplomacy, NPC profile, upkeep), clan tag, clan system rules tree: clean build: OK diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 459ef452..f45e08c0 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml index 6d2e1cb9..f8058d7a 100644 --- a/EXE/remui/base.rml +++ b/EXE/remui/base.rml @@ -433,6 +433,11 @@
{{ sys_title }}
{{ sys_line }}
{{ claim_text }}
Claims this system for you, for good. You can build here then.
+
+
War: {{ sys_war_fire ? 'fire' : 'hold' }}
Fire: the platforms shoot at pilots of clans at war with yours and the stations shut them out - over the objects' own rules.
+
Allies: {{ sys_ally_safe ? 'safe' : 'by rules' }}
Safe: the platforms spare pilots of allied clans and the open stations let them dock.
+
+
Give to the clan
Your clan owns this system then: members manage it by their rank's right Claims, the whole clan counts as its owner (platforms, docking). It cannot be taken back.
Name this system
diff --git a/EXE/remui/player.rml b/EXE/remui/player.rml index 2e309961..9c4faca7 100644 --- a/EXE/remui/player.rml +++ b/EXE/remui/player.rml @@ -30,6 +30,37 @@ .coin-log .row .c2.plus { color: #5fd08a; } .coin-log .row .c3 { width: 80dp; } .coin-log .row .c4 { flex: 1; color: #8197ad; } + /* the page Clan */ + .clan-head { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; } + .clan-head .tagname { font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 22dp; letter-spacing: 0.8dp; } + .clan-head .sw { width: 14dp; height: 14dp; margin-right: 10dp; border: 1dp #dbe6f0; } + .clan-head .chip { margin-left: 10dp; } + .clan-head .spacer { flex: 1; } + .swatches { display: flex; flex-direction: row; margin: 4dp 0 10dp 0; } + .swatches .sw { width: 26dp; height: 18dp; margin-right: 6dp; border: 1dp #24405c; } + .swatches .sw.selected { border: 2dp #f2b13c; } + .cl-table .row .c1 { flex: 1; } + .cl-table .row .c2 { width: 120dp; color: #8197ad; } + .cl-table .row .c3 { width: 170dp; text-align: right; font-family: "IBM Plex Mono"; color: #8197ad; } + .cl-table .row .c3.on { color: #6fd08c; } + .cl-table .row .c3.war { color: #ef6a5b; } + .hint.debt { color: #ef6a5b; } + .cl-table .row .btn.small { padding: 0dp 6dp; margin: 0 4dp; } + .cl-table .head .c1 { flex: 1; } .cl-table .head .c2 { width: 120dp; } .cl-table .head .c3 { width: 170dp; text-align: right; } + .cl-log .row .c1 { width: 130dp; font-family: "IBM Plex Mono"; color: #8197ad; } + .cl-log .row .c2 { width: 130dp; } + .cl-log .row .c3 { flex: 1; width: auto; color: #b9cbe0; text-align: left; font-family: Barlow; margin-left: 10dp; } + .cl-items .row .c1 { flex: 1; } + .cl-items .row .c3 { width: 80dp; text-align: right; font-family: "IBM Plex Mono"; } + .amount { display: flex; flex-direction: row; align-items: center; margin: 8dp 0; } + .amount .label { margin-right: 10dp; color: #8197ad; } + .amount input.range { flex: 1; margin-right: 10dp; } + .amount .v { width: 70dp; text-align: right; font-family: "IBM Plex Mono"; margin-right: 10dp; } + .right { display: flex; flex-direction: row; align-items: center; padding: 5dp 8dp; margin-bottom: 2dp; border-left: 3dp #24405c; background-color: #5cc8f008; } + .right.on { border-left-color: #f2b13c; } + .right .n { flex: 1; } + .limits { display: flex; flex-direction: row; margin-top: 8dp; } + .limits .namefield { flex: 1; margin-right: 12dp; } @@ -47,6 +78,7 @@
Skills
Account bank
REM Coin
+
Clan
@@ -117,6 +149,200 @@
+ + +
+

Clan

+
A clan is your own faction: members with ranks, a clan bank and a clan depot. Membership is per character.
+
+

Invitations

+
+
+
+ {{ i.a }}{{ i.b }} + Join + Decline +
+
+
+
+

Found a clan

+
Tag
+
Name
+
Colour
+
+
Found for {{ cl_cost }} credits
The credits come from your ship. You lead the clan; invite pilots afterwards.
+
{{ cl_msg }}
+
+ +
+
+
+ {{ cl_head }} + + Rank {{ cl_me }} + Clan bank {{ cl_bank }} +
+
+
Members
+
Bank & depot
+
Ranks
+
Log
+
Diplomacy
+
NPC profile
+
Clan
+
+ + +
+
+
PilotRankOnline
+
+
+ {{ m.a }}{{ m.b }}{{ m.c }} +
+
+
+
Right click a member: rank, leader, remove.
+
Invite pilot
Invite
The pilot must be online; the invitation stays open for two days.
+
Leave the clan
The leader hands the clan over first (right click a member: Make the leader).
+
+ + +
+
+

Clan bank

+
{{ cl_bank }}
+
Amount
+
+
Pay in
Moves the amount from your ship's credits into the clan bank.
+
Take out
Moves the amount from the clan bank to your ship (your rank's daily limit).
+
+
{{ cl_limits }}
+
{{ cl_upkeep }}
+

Your cargo

+
+
+
Dock at a base to store items.
+
Nothing in the hold.
+
{{ r.a }}{{ r.c }}
+
+
+
+
+

Clan depot

+
+
ItemAmount
+
+
The clan depot is empty.
+
{{ r.a }}{{ r.c }}
+
+
+
+ Amount + + {{ cl_qty_text }} +
Max
+
+
+
Store in the clan depot
Moves the amount of the cargo item you picked into the clan depot - at any base.
+
Take to the hold
Moves the amount of the depot item you picked into your hold (your rank's daily limit).
+
+
+
+ + +
+
+
+
+
{{ r.a }}{{ r.b }}
+
+
+
Only the leader changes the ranks. The leader has every right.
+
+
+
Name
+
{{ x.a }}{{ x.on ? 'yes' : 'no' }}
+
+
Credits / day
+
Items / day
+
+
-1: no limit, 0: nothing.
+
Save the rank
+
+
+ + +
+
+
+
Nothing yet.
+
{{ l.a }}{{ l.b }}{{ l.c }}
+
+
+
Refresh
+
+ + +
+
Founded {{ cl_founded }}.
+
Colour
+
+
Description
+
Save
+
+

Disband

+
Ends the clan for good - the clan bank and the clan depot are lost. Type the tag to confirm.
+
Tag
Disband
+
+
+ + +
+
+
ClanStancesRelation
+
+
No other clans yet.
+
+ {{ r.a }}{{ r.b }}{{ r.c }} +
+
+
+
{{ cl_rel_info }}
+
+
Ally
An alliance holds once both clans say ally: green for each other, their stations and platforms let you be.
+
Neutral
Ends an alliance, offers peace in a war (the war ends when no side keeps it).
+
Declare war
News at once; the war begins after the delay. Red for each other, your clan's platforms fire at them, your stations shut them out. PVE characters are never part of a war.
+
+
{{ cl_diplo_costs }} Only between players - NPCs keep their own reputations.
+
+ + +
+
{{ cl_prof_info }}
+
+
FactionProfileYours now
+
+
+ {{ p.a }} + ← + {{ p.b }} + → + {{ p.c }} +
+
+
+
+
{{ cl_adopt_text }}
Sets your NPC reputations to the profile. Taken whole you carry the clan's tag where your faction was. Free once after the profile changed.
+
Drop the tag
+
Save the profile
+
Undo
+
+
The Nomads are hostile to everyone - they are no part of a profile. The tag stays until you drop it or leave the clan.
+
+
{{ cl_msg }}
+