Permalink
Browse files

Merge branch 'master' of https://github.com/pioneerspacesim/pioneer.git

… into PL
  • Loading branch information...
2 parents 75f90ef + 50c1ace commit 6bc362941b8f0b47cf4f697b1d20b6cc83585d67 @radius75 radius75 committed Oct 1, 2012
View
@@ -1,12 +1,13 @@
Alpha 27
* New features
- * The settings screen is now acessible from the main menu (#1187, #1512)
- * There's now an option to enable texture compression (#1522)
+ * Factions, with custom goods illegality and colour coding (#1505)
* New mission type, Scout (get paid to scan particular planets) (#1348, #779)
* New view modes (Left/Right/Top/Bottom, Cockpit Front/Rear) (#1454, #1539, #1544)
NOTE -- view mode controls are bound to Numeric Keypad by default
(they can be rebound in the View tab of the Settings screen)
+ * The settings screen is now acessible from the main menu (#1187, #1512)
+ * There's now an option to enable texture compression (#1522)
* Minor changes and tweaks
* Smooth zoom animation in World, System, Sector and Galactic views (#1170)
@@ -0,0 +1,10 @@
+local f = Faction:new('Independent')
+ :description_short('Worlds without a group allegience')
+ :description('Free and independent worlds, self governing and either self reliant or striving for it.')
+ :foundingDate(2900.0)
+ :expansionRate(2.0)
+ :military_name('Independent Space Fleet')
+ :police_name('Police')
+ :colour(1.0,1.0,0.4)
+
+f:add_to_factions('Independent')
@@ -0,0 +1,20 @@
+local f = Faction:new('Federation')
+ :description_short('The historical birthplace of humankind')
+ :description([[Sol is a fine joint]])
+ :govtype('EARTHDEMOC')
+ :homeworld(0,0,0,0,4)
+ :foundingDate(3050.0)
+ :expansionRate(1.0)
+ :military_name('United Nations Space Force')
+ :police_name('Police')
+ :colour(0.4,0.4,1.0)
+
+f:illegal_goods_probability('ANIMAL_MEAT',75) -- fed/cis
+f:illegal_goods_probability('LIVE_ANIMALS',75) -- fed/cis
+f:illegal_goods_probability('HAND_WEAPONS',100) -- fed
+f:illegal_goods_probability('BATTLE_WEAPONS',50) --fed/cis
+f:illegal_goods_probability('NERVE_GAS',100)--fed/cis
+f:illegal_goods_probability('NARCOTICS',100)--fed
+f:illegal_goods_probability('SLAVES',100)--fed/cis
+
+f:add_to_factions('Federation')
View
@@ -0,0 +1,20 @@
+local f = Faction:new('Confederation of Independent Systems')
+ :description_short('Socially democratic grouping of independent Star Systems')
+ :description('Socially democratic grouping of independent Star Systems, I dunno, added them because they seem hard coded into the politics.')
+ :govtype('CISSOCDEM')
+ :homeworld(6,12,0,1,3)
+ :foundingDate(3125.0)
+ :expansionRate(1.0)
+ :military_name('Confederation Fleet')
+ :police_name('Confederal Police')
+ :colour(0.4,1.0,0.4)
+
+f:illegal_goods_probability('ANIMAL_MEAT',75) -- fed/cis
+f:illegal_goods_probability('LIVE_ANIMALS',75) -- fed/cis
+f:illegal_goods_probability('HAND_WEAPONS',25) -- cis
+f:illegal_goods_probability('BATTLE_WEAPONS',50) --fed/cis
+f:illegal_goods_probability('NERVE_GAS',100)--fed/cis
+f:illegal_goods_probability('NARCOTICS',86)--cis
+f:illegal_goods_probability('SLAVES',100)--fed/cis
+
+f:add_to_factions('CIS')
View
@@ -0,0 +1,19 @@
+local f = Faction:new('Red')
+ :description_short('Not Blue')
+ :description('The RED team are not Blue')
+ :govtype('EMPIRERULE')
+ :homeworld(4,-9,-16,0,16)
+ :foundingDate(3150.0)
+ :expansionRate(3.0)
+ :military_name('Red Fleet')
+ :police_name('Red Right Hands')
+ :colour(1.0,0.4,0.4)
+
+f:illegal_goods_probability('LIQUOR',88) -- independent/empire
+f:illegal_goods_probability('HAND_WEAPONS',50) -- empire/etc
+f:illegal_goods_probability('BATTLE_WEAPONS',100) --empire/etc
+f:illegal_goods_probability('NERVE_GAS',90)--empire
+f:illegal_goods_probability('NARCOTICS',50)--empire
+f:illegal_goods_probability('SLAVES',94)--empire
+
+f:add_to_factions('Red')
View
@@ -1056,6 +1056,8 @@ ECONOMY_TYPE
Economy type:
ALLEGIANCE
Allegiance:
+FACTION
+ Faction:
POPULATION
Population:
OVER_N_BILLION
Oops, something went wrong.

0 comments on commit 6bc3629

Please sign in to comment.