Skip to content

Commit ff8a522

Browse files
RaycomsRaycoms
committed
Ally documentation
1 parent b881fa8 commit ff8a522

File tree

5 files changed

+63
-45
lines changed

5 files changed

+63
-45
lines changed

‎src/main/java/com/minecolonies/core/client/gui/townhall/WindowAlliancePage.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ public WindowAlliancePage(final BuildingTownHall.View building)
6666
indirectConnections = findPaneOfTypeByID(LIST_INDIRECT, ScrollingList.class);
6767
connectionEvents = findPaneOfTypeByID(LIST_EVENTS, ScrollingList.class);
6868

69+
if (building.getColony().getConnectionManager().getConnectionEvents().isEmpty() && building.getColony().getConnectionManager().getDirectlyConnectedColonies().isEmpty())
70+
{
71+
findPaneByID("missingconnections").show();
72+
findPaneByID("activeconnections").hide();
73+
}
74+
else
75+
{
76+
findPaneByID("missingconnections").hide();
77+
findPaneByID("activeconnections").show();
78+
}
79+
6980
directConnectionData = new ArrayList<>(building.getColony().getConnectionManager().getDirectlyConnectedColonies().values());
7081
indirectConnectionData = new ArrayList<>(building.getColony().getConnectionManager().getIndirectlyConnectedColonies().values());
7182

‎src/main/resources/assets/minecolonies/gui/townhall/layoutalliance.xml‎

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11
<window size="524 243" >
22
<layout source="minecolonies:gui/townhall/windowtownhall.xml"/>
33

4-
<text id="desc" size="170 10" textalign="MIDDLE" pos="95 60" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.connectioneventlist.desc)"/>
5-
<list id="connectioneventlist" size="160 140" pos="98 70">
6-
<box size="100% 40" linewidth="1">
7-
<text id="name" size="140 12" pos="2 1" color="black"/>
8-
<text id="desc" size="140 12" pos="2 10" color="black"/>
9-
10-
<button id="acceptally" size="86 17" label="$(com.minecolonies.core.gui.connectioneventlist.accept_ally)" pos="2 22"
11-
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
12-
</box>
13-
</list>
14-
15-
16-
<text id="desc" size="170 10" textalign="MIDDLE" pos="260 25" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.colonylist.direct.desc)"/>
17-
<list id="directcolonylist" size="170 80" pos="263 35">
18-
<box size="100% 40" linewidth="1">
19-
<text id="name" size="140 12" pos="2 1" color="black"/>
20-
<text id="distance" size="80 12" pos="70 10" color="black"/>
21-
<text id="state" size="100% 12" pos="2 10" color="black"/>
22-
23-
<button id="requestally" size="86 17" label="$(com.minecolonies.core.gui.colonylist.request_ally)" pos="2 22"
24-
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
25-
<button id="startfeud" size="71 17" label="$(com.minecolonies.core.gui.colonylist.start_feud)" pos="90 22"
26-
source="minecolonies:textures/gui/builderhut/builder_button_medium_small.png" color="black" textscale="0.8"/>
27-
28-
<button id="setneutral" size="86 17" label="$(com.minecolonies.core.gui.colonylist.set_neutral)" pos="2 22"
29-
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" visible="false" textscale="0.8"/>
30-
</box>
31-
</list>
32-
<text id="desc" size="170 10" textalign="MIDDLE" pos="260 120" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.colonylist.indirect.desc)"/>
33-
<list id="indirectcolonylist" size="164 80" pos="263 135">
34-
<box size="100% 40" linewidth="1">
35-
<text id="name" size="140 12" pos="2 1" color="black"/>
36-
<text id="distance" size="80 12" pos="70 10" color="black"/>
37-
<text id="state" size="100% 12" pos="2 10" color="black"/>
38-
39-
<button id="requestally" size="86 17" label="$(com.minecolonies.core.gui.colonylist.request_ally)" pos="2 22"
40-
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
41-
<button id="startfeud" size="64 17" label="$(com.minecolonies.core.gui.colonylist.start_feud)" pos="90 22"
42-
source="minecolonies:textures/gui/builderhut/builder_button_small.png" color="black" textscale="0.8"/>
43-
44-
<button id="setneutral" size="86 17" label="$(com.minecolonies.core.gui.colonylist.set_neutral)" pos="2 22"
45-
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" visible="false" textscale="0.8"/>
46-
</box>
47-
</list>
4+
<view id="missingconnections">
5+
<text id="howto" size="160 140" pos="100 60" label="$(com.minecolonies.core.gui.connectioneventlist.howto)" color="black"/>
6+
<image source="minecolonies:textures/gui/ifihadsome.png" size="125 175" pos="280 35"/>
7+
</view>
8+
9+
<view id ="activeconnections">
10+
<text id="desc" size="170 10" textalign="MIDDLE" pos="95 60" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.connectioneventlist.desc)"/>
11+
<list id="connectioneventlist" size="160 140" pos="98 70">
12+
<box size="100% 40" linewidth="1">
13+
<text id="name" size="140 12" pos="2 1" color="black"/>
14+
<text id="desc" size="140 12" pos="2 10" color="black"/>
15+
16+
<button id="acceptally" size="86 17" label="$(com.minecolonies.core.gui.connectioneventlist.accept_ally)" pos="2 22"
17+
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
18+
</box>
19+
</list>
20+
21+
22+
<text id="desc" size="170 10" textalign="MIDDLE" pos="260 25" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.colonylist.direct.desc)"/>
23+
<list id="directcolonylist" size="170 80" pos="263 35">
24+
<box size="100% 40" linewidth="1">
25+
<text id="name" size="140 12" pos="2 1" color="black"/>
26+
<text id="distance" size="80 12" pos="70 10" color="black"/>
27+
<text id="state" size="100% 12" pos="2 10" color="black"/>
28+
29+
<button id="requestally" size="86 17" label="$(com.minecolonies.core.gui.colonylist.request_ally)" pos="2 22"
30+
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
31+
<button id="startfeud" size="71 17" label="$(com.minecolonies.core.gui.colonylist.start_feud)" pos="90 22"
32+
source="minecolonies:textures/gui/builderhut/builder_button_medium_small.png" color="black" textscale="0.8"/>
33+
34+
<button id="setneutral" size="86 17" label="$(com.minecolonies.core.gui.colonylist.set_neutral)" pos="2 22"
35+
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" visible="false" textscale="0.8"/>
36+
</box>
37+
</list>
38+
<text id="desc" size="170 10" textalign="MIDDLE" pos="260 120" color="black" textscale="1.0" label="$(com.minecolonies.core.gui.colonylist.indirect.desc)"/>
39+
<list id="indirectcolonylist" size="164 80" pos="263 135">
40+
<box size="100% 40" linewidth="1">
41+
<text id="name" size="140 12" pos="2 1" color="black"/>
42+
<text id="distance" size="80 12" pos="70 10" color="black"/>
43+
<text id="state" size="100% 12" pos="2 10" color="black"/>
44+
45+
<button id="requestally" size="86 17" label="$(com.minecolonies.core.gui.colonylist.request_ally)" pos="2 22"
46+
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" textscale="0.8"/>
47+
<button id="startfeud" size="64 17" label="$(com.minecolonies.core.gui.colonylist.start_feud)" pos="90 22"
48+
source="minecolonies:textures/gui/builderhut/builder_button_small.png" color="black" textscale="0.8"/>
49+
50+
<button id="setneutral" size="86 17" label="$(com.minecolonies.core.gui.colonylist.set_neutral)" pos="2 22"
51+
source="minecolonies:textures/gui/builderhut/builder_button_medium.png" color="black" visible="false" textscale="0.8"/>
52+
</box>
53+
</list>
54+
</view>
4855

4956
</window>

‎src/main/resources/assets/minecolonies/lang/manual_en_us.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2988,7 +2988,7 @@
29882988
"com.minecolonies.core.gui.colonylist.travel.really": "Do you really want to travel to %s? [YES]",
29892989
"com.minecolonies.core.gui.connectioneventlist.desc": "Connection Event List",
29902990
"com.minecolonies.core.gui.connectioneventlist.accept_ally": "Accept Alliance",
2991-
2991+
"com.minecolonies.core.gui.connectioneventlist.howto": "How to build an Alliance: \n\n - Build a Gatehouse in your colony.\n\n- Ensure the target colony also has a Gatehouse.\n\n- Place colony signs between the two Gatehouses to create a connection.",
29922992
"com.minecolonies.core.gui.connectionevent.ally_request": "§2Requested an Alliance!",
29932993
"com.minecolonies.core.gui.connectionevent.ally_confirmed": "§2Confirmed the Alliance!",
29942994
"com.minecolonies.core.gui.connectionevent.feud_started": "§4Declared a Feud!",

‎src/main/resources/assets/minecolonies/textures/gui/ifihadsome.png‎

141 KB
Loading

‎src/main/resources/assets/minecolonies/textures/ifihadsome.png‎

141 KB
Loading

0 commit comments

Comments
 (0)