Merge: update with default

merge-requests/13/merge
Riasan 6 years ago
commit 5601d84d60

@ -90,7 +90,7 @@
type="I32" /> type="I32" />
</branch> </branch>
<branch name="FACTION_POINTS_" <branch name="FACTION_POINTS_"
count="6"> count="7">
<!-- game_share/pvp_clan.h (0 is BeginClans and size is EndClans-BeginClans+1 --> <!-- game_share/pvp_clan.h (0 is BeginClans and size is EndClans-BeginClans+1 -->
<leaf name="VALUE" <leaf name="VALUE"
type="I32" /> type="I32" />
@ -504,7 +504,7 @@
</branch> </branch>
<!-- MAX_INVENTORY_ANIMAL --> <!-- MAX_INVENTORY_ANIMAL -->
<branch name="PACK_ANIMAL" <branch name="PACK_ANIMAL"
count="4" count="7"
clientonly="1"> clientonly="1">
<branch name="" <branch name=""
count="500"> count="500">
@ -1117,7 +1117,7 @@
type="I3" /> type="I3" />
<!-- Guild civilization allegiance (CF TPVPClan enum (pvp_clan.h) --> <!-- Guild civilization allegiance (CF TPVPClan enum (pvp_clan.h) -->
<branch name="" <branch name=""
count="6"> count="7">
<!-- from fame.h & cpp --> <!-- from fame.h & cpp -->
<leaf name="VALUE" <leaf name="VALUE"
type="S8" /> type="S8" />
@ -1527,7 +1527,7 @@
<!-- beasts --> <!-- beasts -->
<!-- MAX_INVENTORY_ANIMAL --> <!-- MAX_INVENTORY_ANIMAL -->
<branch name="BEAST" <branch name="BEAST"
count="4" count="7"
atomic="1"> atomic="1">
<!-- Atomic, for correct Bar Management on client --> <!-- Atomic, for correct Bar Management on client -->
<leaf name="UID" <leaf name="UID"
@ -1625,7 +1625,7 @@
type="S8" /> type="S8" />
<!-- value where the guards kill you on sight --> <!-- value where the guards kill you on sight -->
<branch name="PLAYER" <branch name="PLAYER"
count="6"> count="7">
<!-- from fame.h & cpp --> <!-- from fame.h & cpp -->
<leaf name="VALUE" <leaf name="VALUE"
type="S8" /> type="S8" />

Binary file not shown.
Loading…
Cancel
Save