Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Merchant faction is now under the "Space Traders Guild"

Browse Source
This commit is contained in:
Allanis 2013-10-12 17:05:26 +01:00
parent 673b83ea6a
commit be6dcf3beb
3 changed files with 83 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dat/faction.xml
View File

@ -4,7 +4,7 @@
<player>0</player> <player>0</player>
<allies> <allies>
<ally>Militia</ally> <ally>Militia</ally>
<ally>Merchant</ally> <ally>Trader</ally>
</allies> </allies>
<enemies> <enemies>
<enemy>Pirate</enemy> <enemy>Pirate</enemy>
@ -13,7 +13,8 @@
<enemy>Collective</enemy> <enemy>Collective</enemy>
</enemies> </enemies>
</faction> </faction>
<faction name="Merchant"> <faction name="Trader">
<longname>Space Traders Guild</longname>
<player>0</player> <player>0</player>
<allies> <allies>
<ally>Militia</ally> <ally>Militia</ally>
@ -42,7 +43,7 @@
<player>0</player> <player>0</player>
<allies> <allies>
<ally>Independent</ally> <ally>Independent</ally>
<ally>Merchant</ally> <ally>Trader</ally>
</allies> </allies>
<enemies> <enemies>
<enemy>Pirate</enemy> <enemy>Pirate</enemy>
@ -56,7 +57,7 @@
<ally>Draktharr</ally> <ally>Draktharr</ally>
<ally>Soromid</ally> <ally>Soromid</ally>
<ally>Tex'nus</ally> <ally>Tex'nus</ally>
<ally>Merchant</ally> <ally>Trader</ally>
</allies> </allies>
<enemies> <enemies>
<enemy>Pirate</enemy> <enemy>Pirate</enemy>
@ -115,7 +116,7 @@
<player>0</player> <player>0</player>
<allies> <allies>
<ally>Empire</ally> <ally>Empire</ally>
<ally>Merchant</ally> <ally>Trader</ally>
</allies> </allies>
<enemies> <enemies>
<enemy>Pirate</enemy> <enemy>Pirate</enemy>
@ -128,7 +129,7 @@
<player>0</player> <player>0</player>
<allies> <allies>
<ally>Empire</ally> <ally>Empire</ally>
<ally>Merchant</ally> <ally>Trader</ally>
</allies> </allies>
<enemies> <enemies>
<enemy>Pirate</enemy> <enemy>Pirate</enemy>

18
dat/fleet.xml
View File

@ -14,23 +14,23 @@
<pilot chance="100">Goddard</pilot> <pilot chance="100">Goddard</pilot>
</pilots> </pilots>
</fleet> </fleet>
<fleet name="Merchant Llama"> <fleet name="Trader Llama">
<ai>merchant</ai> <ai>Trader</ai>
<faction>Merchant</faction> <faction>Trader</faction>
<pilots> <pilots>
<pilot chance="100">Llama</pilot> <pilot chance="100">Llama</pilot>
</pilots> </pilots>
</fleet> </fleet>
<fleet name="Merchant Mule"> <fleet name="Trader Mule">
<ai>merchant</ai> <ai>Trader</ai>
<faction>Merchant</faction> <faction>Trader</faction>
<pilots> <pilots>
<pilot chance="100">Mule</pilot> <pilot chance="100">Mule</pilot>
</pilots> </pilots>
</fleet> </fleet>
<fleet name="Sml Merchant Convoy"> <fleet name="Sml Trader Convoy">
<ai>merchant</ai> <ai>Trader</ai>
<faction>Merchant</faction> <faction>Trader</faction>
<pilots> <pilots>
<pilot chance="80">Llama</pilot> <pilot chance="80">Llama</pilot>
<pilot chance="80">Llama</pilot> <pilot chance="80">Llama</pilot>

134
dat/ssys.xml
View File

@ -2,11 +2,11 @@
<Systems> <Systems>
<ssys name="Draygar"> <ssys name="Draygar">
<fleets> <fleets>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Sml Merchant Convoy</fleet> <fleet chance="50">Sml Trader Convoy</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="40">Draktharr Ancestor</fleet> <fleet chance="40">Draktharr Ancestor</fleet>
<fleet chance="60">Draktharr Vendetta</fleet> <fleet chance="60">Draktharr Vendetta</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
@ -36,7 +36,7 @@
<ssys name="NGC-7723"> <ssys name="NGC-7723">
<fleets> <fleets>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Pirate Admonisher</fleet> <fleet chance="50">Pirate Admonisher</fleet>
<fleet chance="30">Pirate Hyena Pack</fleet> <fleet chance="30">Pirate Hyena Pack</fleet>
<fleet chance="40">Pirate Ancestor</fleet> <fleet chance="40">Pirate Ancestor</fleet>
@ -64,10 +64,10 @@
<fleet chance="40">Draktharr Ancestor</fleet> <fleet chance="40">Draktharr Ancestor</fleet>
<fleet chance="20">Draktharr Goddard</fleet> <fleet chance="20">Draktharr Goddard</fleet>
<fleet chance="30">Draktharr Sml Force</fleet> <fleet chance="30">Draktharr Sml Force</fleet>
<fleet chance="60">Merchant Mule</fleet> <fleet chance="60">Trader Mule</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
</fleets> </fleets>
<jumps> <jumps>
@ -91,7 +91,7 @@
</ssys> </ssys>
<ssys name="NGC-7414"> <ssys name="NGC-7414">
<fleets> <fleets>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
</fleets> </fleets>
@ -113,8 +113,8 @@
<ssys name="NGC-7690"> <ssys name="NGC-7690">
<fleets> <fleets>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
<fleet chance="30">Pirate Admonisher</fleet> <fleet chance="30">Pirate Admonisher</fleet>
<fleet chance="20">Pirate Hyena Pack</fleet> <fleet chance="20">Pirate Hyena Pack</fleet>
@ -140,9 +140,9 @@
</ssys> </ssys>
<ssys name="NGC-7693"> <ssys name="NGC-7693">
<fleets> <fleets>
<fleet chance="30">Merchant Mule</fleet> <fleet chance="30">Trader Mule</fleet>
<fleet chance="30">Pirate Hyena</fleet> <fleet chance="30">Pirate Hyena</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="40">Empire Pacifier</fleet> <fleet chance="40">Empire Pacifier</fleet>
<fleet chance="50">Pirate Admonisher</fleet> <fleet chance="50">Pirate Admonisher</fleet>
<fleet chance="30">Pirate Hyena Pack</fleet> <fleet chance="30">Pirate Hyena Pack</fleet>
@ -194,7 +194,7 @@
<ssys name="NGC-7968"> <ssys name="NGC-7968">
<fleets> <fleets>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Pirate Admonisher</fleet> <fleet chance="30">Pirate Admonisher</fleet>
<fleet chance="40">Pirate Ancestor</fleet> <fleet chance="40">Pirate Ancestor</fleet>
<fleet chance="50">Pirate Vendetta</fleet> <fleet chance="50">Pirate Vendetta</fleet>
@ -268,9 +268,9 @@
<ssys name="NGC-7273"> <ssys name="NGC-7273">
<fleets> <fleets>
<fleet chance="70">Empire Lancelot</fleet> <fleet chance="70">Empire Lancelot</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
<fleet chance="40">Empire Admonisher</fleet> <fleet chance="40">Empire Admonisher</fleet>
</fleets> </fleets>
@ -295,8 +295,8 @@
</ssys> </ssys>
<ssys name="Dune"> <ssys name="Dune">
<fleets> <fleets>
<fleet chance="60">Merchant Llama</fleet> <fleet chance="60">Trader Llama</fleet>
<fleet chance="60">Merchant Mule</fleet> <fleet chance="60">Trader Mule</fleet>
<fleet chance="30">Pirate Admonisher</fleet> <fleet chance="30">Pirate Admonisher</fleet>
<fleet chance="20">Pirate Hyena Pack</fleet> <fleet chance="20">Pirate Hyena Pack</fleet>
<fleet chance="20">Pirate Vendetta</fleet> <fleet chance="20">Pirate Vendetta</fleet>
@ -323,8 +323,8 @@
</ssys> </ssys>
<ssys name="Coriolis"> <ssys name="Coriolis">
<fleets> <fleets>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
@ -354,10 +354,10 @@
</ssys> </ssys>
<ssys name="Cygnus"> <ssys name="Cygnus">
<fleets> <fleets>
<fleet chance="60">Merchant Mule</fleet> <fleet chance="60">Trader Mule</fleet>
<fleet chance="60">Merchant Mule</fleet> <fleet chance="60">Trader Mule</fleet>
<fleet chance="60">Merchant Llama</fleet> <fleet chance="60">Trader Llama</fleet>
<fleet chance="30">Sml Merchant Convoy</fleet> <fleet chance="30">Sml Trader Convoy</fleet>
<fleet chance="50">Empire Lancelot</fleet> <fleet chance="50">Empire Lancelot</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
<fleet chance="40">Empire Admonisher</fleet> <fleet chance="40">Empire Admonisher</fleet>
@ -386,12 +386,12 @@
</ssys> </ssys>
<ssys name="Tau Prime"> <ssys name="Tau Prime">
<fleets> <fleets>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="40">Sml Merchant Convoy</fleet> <fleet chance="40">Sml Trader Convoy</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
<fleet chance="50">Empire Lancelot</fleet> <fleet chance="50">Empire Lancelot</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
@ -422,7 +422,7 @@
</ssys> </ssys>
<ssys name="NGC-7549"> <ssys name="NGC-7549">
<fleets> <fleets>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>
</fleets> </fleets>
@ -494,9 +494,9 @@
</ssys> </ssys>
<ssys name="NGC-7291"> <ssys name="NGC-7291">
<fleets> <fleets>
<fleet chance="60">Merchant Llama</fleet> <fleet chance="60">Trader Llama</fleet>
<fleet chance="60">Collective Drone</fleet> <fleet chance="60">Collective Drone</fleet>
<fleet chance="80">Merchant Mule</fleet> <fleet chance="80">Trader Mule</fleet>
<fleet chance="50">Collective Sml Swarm</fleet> <fleet chance="50">Collective Sml Swarm</fleet>
<fleet chance="50">Empire Sml Defense</fleet> <fleet chance="50">Empire Sml Defense</fleet>
<fleet chance="60">Empire Lancelot</fleet> <fleet chance="60">Empire Lancelot</fleet>
@ -525,9 +525,9 @@
</ssys> </ssys>
<ssys name="Borla"> <ssys name="Borla">
<fleets> <fleets>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="40">Merchant Mule</fleet> <fleet chance="40">Trader Mule</fleet>
<fleet chance="70">Pirate Hyena</fleet> <fleet chance="70">Pirate Hyena</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
<fleet chance="40">Empire Pacifier</fleet> <fleet chance="40">Empire Pacifier</fleet>
@ -558,10 +558,10 @@
<ssys name="Mizar"> <ssys name="Mizar">
<fleets> <fleets>
<fleet chance="60">Pirate Hyena</fleet> <fleet chance="60">Pirate Hyena</fleet>
<fleet chance="40">Merchant Mule</fleet> <fleet chance="40">Trader Mule</fleet>
<fleet chance="40">Merchant Mule</fleet> <fleet chance="40">Trader Mule</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="40">Empire Pacifier</fleet> <fleet chance="40">Empire Pacifier</fleet>
<fleet chance="30">Pirate Admonisher</fleet> <fleet chance="30">Pirate Admonisher</fleet>
<fleet chance="40">Empire Admonisher</fleet> <fleet chance="40">Empire Admonisher</fleet>
@ -612,12 +612,12 @@
</ssys> </ssys>
<ssys name="Draconis"> <ssys name="Draconis">
<fleets> <fleets>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
<fleet chance="30">Empire Lancelot</fleet> <fleet chance="30">Empire Lancelot</fleet>
<fleet chance="30">Sml Merchant Convoy</fleet> <fleet chance="30">Sml Trader Convoy</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>
</fleets> </fleets>
@ -641,8 +641,8 @@
</ssys> </ssys>
<ssys name="NGC-6938"> <ssys name="NGC-6938">
<fleets> <fleets>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="20">Merchant Mule</fleet> <fleet chance="20">Trader Mule</fleet>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
<fleet chance="30">Pirate Ancestor</fleet> <fleet chance="30">Pirate Ancestor</fleet>
@ -665,11 +665,11 @@
</ssys> </ssys>
<ssys name="Alteris"> <ssys name="Alteris">
<fleets> <fleets>
<fleet chance="40">Sml Merchant Convoy</fleet> <fleet chance="40">Sml Trader Convoy</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="60">Pirate Hyena</fleet> <fleet chance="60">Pirate Hyena</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>
<fleet chance="10">Pirate Hyena Pack</fleet> <fleet chance="10">Pirate Hyena Pack</fleet>
<fleet chance="40">Pirate Ancestor</fleet> <fleet chance="40">Pirate Ancestor</fleet>
@ -704,8 +704,8 @@
<fleets> <fleets>
<fleet chance="70">Empire Lancelot</fleet> <fleet chance="70">Empire Lancelot</fleet>
<fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Trader Llama</fleet>
<fleet chance="50">Empire Pacifier</fleet> <fleet chance="50">Empire Pacifier</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>
<fleet chance="40">Pirate Vendetta</fleet> <fleet chance="40">Pirate Vendetta</fleet>
@ -804,11 +804,11 @@
<ssys name="Eridani"> <ssys name="Eridani">
<fleets> <fleets>
<fleet chance="80">Empire Lancelot</fleet> <fleet chance="80">Empire Lancelot</fleet>
<fleet chance="40">Merchant Mule</fleet> <fleet chance="40">Trader Mule</fleet>
<fleet chance="40">Merchant Mule</fleet> <fleet chance="40">Trader Mule</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="30">Sml Merchant Convoy</fleet> <fleet chance="30">Sml Trader Convoy</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>
<fleet chance="20">Pirate Vendetta</fleet> <fleet chance="20">Pirate Vendetta</fleet>
@ -860,10 +860,10 @@
</ssys> </ssys>
<ssys name="Delta Pavonis"> <ssys name="Delta Pavonis">
<fleets> <fleets>
<fleet chance="40">Sml Merchant Convoy</fleet> <fleet chance="40">Sml Trader Convoy</fleet>
<fleet chance="60">Pirate Hyena</fleet> <fleet chance="60">Pirate Hyena</fleet>
<fleet chance="40">Merchant Llama</fleet> <fleet chance="40">Trader Llama</fleet>
<fleet chance="50">Merchant Mule</fleet> <fleet chance="50">Trader Mule</fleet>
<fleet chance="40">Empire Admonisher</fleet> <fleet chance="40">Empire Admonisher</fleet>
<fleet chance="20">Empire Pacifier</fleet> <fleet chance="20">Empire Pacifier</fleet>
<fleet chance="80">Empire Lancelot</fleet> <fleet chance="80">Empire Lancelot</fleet>
@ -920,11 +920,11 @@
<fleets> <fleets>
<fleet chance="70">Goddard Goddard</fleet> <fleet chance="70">Goddard Goddard</fleet>
<fleet chance="50">Goddard Goddard</fleet> <fleet chance="50">Goddard Goddard</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Merchant Llama</fleet> <fleet chance="30">Trader Llama</fleet>
<fleet chance="30">Merchant Mule</fleet> <fleet chance="30">Trader Mule</fleet>
<fleet chance="30">Merchant Mule</fleet> <fleet chance="30">Trader Mule</fleet>
<fleet chance="30">Sml Merchant Convoy</fleet> <fleet chance="30">Sml Trader Convoy</fleet>
<fleet chance="50">Empire Lancelot</fleet> <fleet chance="50">Empire Lancelot</fleet>
<fleet chance="30">Pirate Ancestor</fleet> <fleet chance="30">Pirate Ancestor</fleet>
<fleet chance="20">Pirate Admonisher</fleet> <fleet chance="20">Pirate Admonisher</fleet>