[Freeciv-Dev] (PR#14538) Freeciv policy on fictional nations needed
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
Subject: |
[Freeciv-Dev] (PR#14538) Freeciv policy on fictional nations needed |
|
From: |
"Daniel Markstedt" <himasaram@xxxxxxxx> |
|
Date: |
Tue, 17 Jan 2006 20:47:03 -0800 |
|
Reply-to: |
bugs@xxxxxxxxxxx |
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14538 >
This version of the patch will remove the Krev flag as well, while
leaving the 'Fictional' group intact.
I would like to make these changes to HEAD and S2_1 in a day or so.
-Daniel
Index: doc/README.nations
===================================================================
--- doc/README.nations (revision 11470)
+++ doc/README.nations (working copy)
@@ -12,6 +12,7 @@
http://www.freeciv.org/index.php/Nations
+
----------------------------------------------------------------------
How to add a Nation:
--------------------
@@ -62,6 +63,8 @@
Here is yet another list of nations files; again add your nation
(data/nation/<nationname>.ruleset) to it.
+
+
----------------------------------------------------------------------
How to add a Flag:
------------------
@@ -151,6 +154,8 @@
provides a convenient place for us to grab the sprite name. See the
section on How to Contribute in the Freeciv wiki for more instructions.
+
+
----------------------------------------------------------------------
Contents and Style:
-------------------
@@ -158,19 +163,27 @@
What nations can be added to Freeciv?
=====================================
+A nation in Freeciv should preferrably be a current independent country
+or a historical kingdom or realm. A nation that is currently governed
+by another political entity or in other ways lacks complete independence
+could be made a Freeciv nation, but must never be listed as "modern"
+(see 'Nation grouping' below.)
+
+Fictional content may not be added unless full permission is granted by
+the original author.
+
+
+Nation grouping
+===============
+
Freeciv supports a classification of nations in an unlimited number of
-groups. We currently have Ancient, Medieval, Modern, African, American,
-Asian, European, Oceanian and Fictional groups. Modern nations are
-existing (independent) states; ancient and medieval nations should have
-had an independent dynasty or state in ancient or medieval times,
-respectively; fictional nations are those that are products of the
-fantasy of an author. When adding fictional nations, you must make
-sure names and flags are copyrighted in a GPL-compatible way.
+groups and every nation should be assigned to at least one. We currently
+have Ancient, Medieval, Modern, African, American, Asian, European and
+Oceanian groups. Modern nations are existing and politically independent
+countries; a nation listed as ancient or medieval should have had an
+independent dynasty or state in ancient or medieval times respectively.
-A nation should be added to at least one relevant group, preferably
-two or more if appropriate.
-
Nation naming
=============
@@ -353,4 +366,4 @@
At this point, it is useful to put one city per line, only.
Finally, don't forget to leave a blank line feed in the end of your nation
-ruleset.
\ No newline at end of file
+ruleset.
Index: data/default/nations.ruleset
===================================================================
--- data/default/nations.ruleset (revision 11470)
+++ data/default/nations.ruleset (working copy)
@@ -97,10 +97,8 @@
*include "nation/ukrainian.ruleset"
*include "nation/lithuanian.ruleset"
*include "nation/kenyan.ruleset"
-*include "nation/dunedain.ruleset"
*include "nation/vietnamese.ruleset"
*include "nation/thai.ruleset"
-*include "nation/mordor.ruleset"
*include "nation/bavarian.ruleset"
*include "nation/brazilian.ruleset"
*include "nation/irish.ruleset"
@@ -126,9 +124,7 @@
*include "nation/austrian.ruleset"
*include "nation/belgian.ruleset"
*include "nation/colombian.ruleset"
-*include "nation/elvish.ruleset"
*include "nation/galician.ruleset"
-*include "nation/hobbits.ruleset"
*include "nation/indonesian.ruleset"
*include "nation/kampuchean.ruleset"
*include "nation/malaysian.ruleset"
Index: data/nation/Makefile.am
===================================================================
--- data/nation/Makefile.am (revision 11470)
+++ data/nation/Makefile.am (working copy)
@@ -40,10 +40,8 @@
cuban.ruleset \
czech.ruleset \
danish.ruleset \
- dunedain.ruleset \
dutch.ruleset \
egyptian.ruleset \
- elvish.ruleset \
english.ruleset \
estonian.ruleset \
ethiopian.ruleset \
@@ -57,7 +55,6 @@
greek.ruleset \
hellenic.ruleset \
hittite.ruleset \
- hobbits.ruleset \
hungarian.ruleset \
icelandic.ruleset \
illyrian.ruleset \
@@ -87,7 +84,6 @@
mayan.ruleset \
mexican.ruleset \
mongol.ruleset \
- mordor.ruleset \
newzealand.ruleset \
nigerian.ruleset \
norwegian.ruleset \
Index: data/misc/shields.spec
===================================================================
--- data/misc/shields.spec (revision 11470)
+++ data/misc/shields.spec (working copy)
@@ -47,9 +47,7 @@
"f.shield.cuba", "flags/cuba-shield"
"f.shield.czech", "flags/czech-shield"
"f.shield.denmark", "flags/denmark-shield"
- "f.shield.dunedain", "flags/dunedain-shield"
"f.shield.egypt", "flags/egypt-shield"
- "f.shield.elves", "flags/elves-shield"
"f.shield.england", "flags/england-shield"
"f.shield.estonia", "flags/estonia-shield"
"f.shield.ethiopia", "flags/ethiopia-shield"
@@ -63,7 +61,6 @@
"f.shield.greece", "flags/greece-shield"
"f.shield.greenland", "flags/greenland-shield"
"f.shield.hittite", "flags/hittite-shield"
- "f.shield.hobbits", "flags/hobbits-shield"
"f.shield.holland", "flags/netherlands-shield"
"f.shield.hungary", "flags/hungary-shield"
"f.shield.iceland", "flags/iceland-shield"
@@ -82,7 +79,6 @@
"f.shield.kampuchea", "flags/kampuchea-shield"
"f.shield.kenya", "flags/kenya-shield"
"f.shield.korea", "flags/korea-shield"
- "f.shield.krev", "flags/krev-shield"
"f.shield.latvia", "flags/latvia-shield"
"f.shield.libya", "flags/libya-shield"
"f.shield.lithuania", "flags/lithuania-shield"
@@ -95,7 +91,6 @@
"f.shield.maya", "flags/maya-shield"
"f.shield.mexico", "flags/mexico-shield"
"f.shield.mongolia", "flags/mongolia-shield"
- "f.shield.mordor", "flags/mordor-shield"
"f.shield.myanmar", "flags/myanmar-shield"
"f.shield.nato", "flags/nato-shield"
"f.shield.netherlands", "flags/netherlands-shield"
Index: data/misc/flags.spec
===================================================================
--- data/misc/flags.spec (revision 11470)
+++ data/misc/flags.spec (working copy)
@@ -47,9 +47,7 @@
"f.cuba", "flags/cuba"
"f.czech", "flags/czech"
"f.denmark", "flags/denmark"
- "f.dunedain", "flags/dunedain"
"f.egypt", "flags/egypt"
- "f.elves", "flags/elves"
"f.england", "flags/england"
"f.estonia", "flags/estonia"
"f.ethiopia", "flags/ethiopia"
@@ -63,7 +61,6 @@
"f.greece", "flags/greece"
"f.greenland", "flags/greenland" ; used by Inuit
"f.hittite", "flags/hittite"
- "f.hobbits", "flags/hobbits"
"f.holland", "flags/netherlands" ; backward compatabiliy
"f.hungary", "flags/hungary"
"f.iceland", "flags/iceland"
@@ -82,7 +79,6 @@
"f.kampuchea", "flags/kampuchea"
"f.kenya", "flags/kenya"
"f.korea", "flags/korea"
- "f.krev", "flags/krev"
"f.latvia", "flags/latvia"
"f.libya", "flags/libya"
"f.lithuania", "flags/lithuania"
@@ -95,7 +91,6 @@
"f.maya", "flags/maya"
"f.mexico", "flags/mexico"
"f.mongolia", "flags/mongolia"
- "f.mordor", "flags/mordor"
"f.myanmar", "flags/myanmar"
"f.nato", "flags/nato"
"f.netherlands", "flags/netherlands"
Index: data/flags/Makefile.am
===================================================================
--- data/flags/Makefile.am (revision 11470)
+++ data/flags/Makefile.am (working copy)
@@ -38,8 +38,6 @@
cuba.png \
czech.png \
denmark.png \
- dunedain.png \
- elves.png \
egypt.png \
england.png \
estonia.png \
@@ -54,7 +52,6 @@
greece.png \
greenland.png \
hittite.png \
- hobbits.png \
hungary.png \
iceland.png \
illyria.png \
@@ -72,7 +69,6 @@
kampuchea.png \
kenya.png \
korea.png \
- krev.png \
latvia.png \
libya.png \
lithuania.png \
@@ -85,7 +81,6 @@
maya.png \
mexico.png \
mongolia.png \
- mordor.png \
myanmar.png \
nato.png \
netherlands.png \
@@ -179,8 +174,6 @@
cuba-shield.png \
czech-shield.png \
denmark-shield.png \
- dunedain-shield.png \
- elves-shield.png \
egypt-shield.png \
england-shield.png \
estonia-shield.png \
@@ -195,7 +188,6 @@
greece-shield.png \
greenland-shield.png \
hittite-shield.png \
- hobbits-shield.png \
hungary-shield.png \
iceland-shield.png \
illyria-shield.png \
@@ -213,7 +205,6 @@
kampuchea-shield.png \
kenya-shield.png \
korea-shield.png \
- krev-shield.png \
latvia-shield.png \
libya-shield.png \
lithuania-shield.png \
@@ -226,7 +217,6 @@
maya-shield.png \
mexico-shield.png \
mongolia-shield.png \
- mordor-shield.png \
myanmar-shield.png \
nato-shield.png \
netherlands-shield.png \
@@ -320,9 +310,7 @@
cuba.svg \
czech.svg \
denmark.svg \
- dunedain.svg \
egypt.svg \
- elves.svg \
england.svg \
estonia.svg \
ethiopia.svg \
@@ -336,7 +324,6 @@
greece.svg \
greenland.svg \
hittite.svg \
- hobbits.svg \
hungary.svg \
iceland.svg \
illyria.svg \
@@ -354,7 +341,6 @@
kampuchea.svg \
kenya.svg \
korea.svg \
- krev.svg \
latvia.svg \
libya.svg \
lithuania.svg \
@@ -367,7 +353,6 @@
maya.svg \
mexico.svg \
mongolia.svg \
- mordor.svg \
myanmar.svg \
nato.svg \
netherlands.svg \
Index: data/flags/credits
===================================================================
--- data/flags/credits (revision 11470)
+++ data/flags/credits (working copy)
@@ -14,16 +14,10 @@
- Byzantium, Constantine: by Nikos Mavrogiannopoulos
- Cartago: by Daniel Markstedt, based on a concept by Matt Jecrell, using
Phoenicia flag by Vasco Alexandre Da Silva Costa as base
- - Cheyenne, Krev: from the Worms tileset by Arturo Espinosa-Aldama
+ - Cheyenne: from the Worms tileset by Arturo Espinosa-Aldama
- Cornwall, Mars, Phoenicia, Silesia, St. Patrick: by
Vasco Alexandre Da Silva Costa, based on various PD clip art images
- - Dunedain: by Paul Zastoupil
- - Elves: by Jason Short; concept by Paul Zastoupil
- - Hobbits: Old flag by Jason Short; clip art by Nicu Buculei; concept by
- Dave Martucci. New flag by Daniel Markstedt using PD clip art and based
- on the concept of the pre-SVG flag.
- Illyria: by William Allen Simpson
- - Mordor: by Jason Short; concept by Paul Zastoupil
- Roman: by Daniel Markstedt using PD clipart and based on the original by
Vasco Alexandre Da Silva Costa
- Sapmi: by Dean Tersigni
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in (revision 11470)
+++ po/POTFILES.in (working copy)
@@ -223,10 +223,8 @@
data/nation/cuban.ruleset
data/nation/czech.ruleset
data/nation/danish.ruleset
-data/nation/dunedain.ruleset
data/nation/dutch.ruleset
data/nation/egyptian.ruleset
-data/nation/elvish.ruleset
data/nation/english.ruleset
data/nation/estonian.ruleset
data/nation/ethiopian.ruleset
@@ -240,7 +238,6 @@
data/nation/greek.ruleset
data/nation/hellenic.ruleset
data/nation/hittite.ruleset
-data/nation/hobbits.ruleset
data/nation/hungarian.ruleset
data/nation/icelandic.ruleset
data/nation/illyrian.ruleset
@@ -270,7 +267,6 @@
data/nation/mayan.ruleset
data/nation/mexican.ruleset
data/nation/mongol.ruleset
-data/nation/mordor.ruleset
data/nation/newzealand.ruleset
data/nation/nigerian.ruleset
data/nation/norwegian.ruleset
|
|
