Author: jtn
Date: Tue Jul 19 00:33:09 2016
New Revision: 33262
URL: http://svn.gna.org/viewcvs/freeciv?rev=33262&view=rev
Log:
More event graphics, and move some from small.spec.
The graphics used for e_* sprites that were in small.png [1, {0,1,2,5}]
have been moved to events.png. Most of the remaining icons on the second
row of small.png are currently unused and have been moved to the
right-hand side.
This events.png is targeted at the 2.6 event set; sprite choices for
events that are new since then are placeholders.
Event graphics and spec updates by GriffonSpade on the forum.
See gna patch #7439.
Modified:
trunk/data/misc/events.png
trunk/data/misc/events.spec
trunk/data/misc/small.png
trunk/data/misc/small.spec
Modified: trunk/data/misc/events.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.png?rev=33262&r1=33261&r2=33262&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/misc/events.spec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.spec?rev=33262&r1=33261&r2=33262&view=diff
==============================================================================
--- trunk/data/misc/events.spec (original)
+++ trunk/data/misc/events.spec Tue Jul 19 00:33:09 2016
@@ -28,6 +28,7 @@
0, 3, "e_city_disorder"
0, 4, "e_city_famine"
0, 5, "e_city_famine_feared"
+ 0, 5, "e_unit_built_pop_cost"
0, 6, "e_city_growth"
0, 7, "e_city_may_soon_grow"
0, 8, "e_city_aqueduct"
@@ -44,22 +45,32 @@
0, 12, "e_worklist" ; (0, 19) unused
0, 12, "e_city_radius_sq" ; (0, 20) unused
- 1, 0, "e_nuke"
-; 1, 1, "e_chem"
-; 1, 2, "e_warn"
- 1, 3, "e_global_eco"
-; 1, 4, "e_no"
+ 1, 0, "e_treaty_shared_vision"
+ 1, 1, "e_treaty_alliance"
+ 1, 2, "e_treaty_peace"
+ 1, 3, "e_treaty_ceasefire"
+ 1, 4, "e_treaty_broken"
+ 1, 5, "e_treaty_embassy"
- 1, 2, "e_ai_debug"
- 1, 2, "e_script"
- 1, 2, "e_broadcast_report"
- 1, 2, "e_report"
- 1, 2, "e_chat_msg"
- 1, 2, "e_log_error"
- 1, 2, "e_deprecation_warning"
- 1, 3, "e_log_fatal"
- 1, 3, "e_chat_error"
+ 1, 6, "e_imp_buy"
+ 1, 7, "e_imp_build"
+ 1, 8, "e_imp_auctioned"
+ 1, 9, "e_imp_sold"
+ 1, 10, "e_imp_auto"
+; 1, 11, "e_imp_destroyed"
+ 1, 12, "e_wonder_build"
+ 1, 13, "e_wonder_started"
+ 1, 14, "e_wonder_stopped"
+ 1, 15, "e_wonder_will_be_built"
+ 1, 16, "e_wonder_obsolete"
+
+ 1, 17, "e_tech_gain"
+ 1, 18, "e_tech_learned"
+ 1, 19, "e_tech_lost"
+ 1, 20, "e_tech_embassy"
+ 1, 20, "e_tech_goal"
+
2, 0, "e_hut_barb"
2, 1, "e_hut_city"
2, 2, "e_hut_gold"
@@ -68,6 +79,24 @@
2, 5, "e_hut_settler"
2, 6, "e_hut_tech"
2, 7, "e_hut_barb_city_near"
+
+ 2, 8, "e_unit_lost_att"
+ 2, 9, "e_unit_win_att"
+ 2, 9, "e_unit_did_expel" ; PLACEHOLDER
+ 2, 9, "e_unit_escaped" ; PLACEHOLDER
+ 2, 10, "e_unit_buy"
+ 2, 11, "e_unit_built"
+ 2, 12, "e_unit_lost_def"
+ 2, 12, "e_unit_lost_misc"
+ 2, 13, "e_unit_win"
+ 2, 14, "e_unit_became_vet"
+ 2, 15, "e_unit_upgraded"
+ 2, 16, "e_unit_relocated"
+ 2, 16, "e_unit_was_expelled" ; PLACEHOLDER
+ 2, 17, "e_unit_orders"
+ 2, 17, "e_unit_action_failed"
+ 2, 18, "e_unit_illegal_action"
+ 2, 19, "e_caravan_action"
3, 0, "e_my_diplomat_poison"
3, 1, "e_my_diplomat_bribe"
@@ -93,23 +122,47 @@
3, 17, "e_enemy_spy_nuke" ; use base sprite for enemy diplomats
; 3, 16, "e_enemy_diplomatic_incident"
; 3, 17, "e_enemy_diplomat_escape" ; base sprite for enemy diplomats
- 1, 4, "e_unit_illegal_action"
- 1, 5, "e_unit_was_expelled"
- 1, 6, "e_unit_did_expel"
- 1, 4, "e_unit_action_failed"
4, 0, "e_achievement"
4, 1, "e_uprising"
4, 2, "e_civil_war"
4, 3, "e_anarchy"
4, 4, "e_first_contact"
+ 4, 4, "e_diplomacy"
4, 4, "e_new_government" ; (4, 5) unused
+ 4, 4, "e_nation_selected"
+ 4, 4, "e_setting"
+ 4, 4, "e_message_wall"
+ 4, 4, "e_connection"
+ 4, 5, "e_destroyed"
4, 6, "e_low_on_funds"
- 4, 7, "e_pollution" ; copy from small.png
+ 4, 7, "e_pollution"
4, 8, "e_revolt_done"
4, 9, "e_revolt_start"
4, 10, "e_spaceship"
+
+ 4, 4, "e_vote_new"
+ 4, 5, "e_vote_aborted"
+ 4, 11, "e_vote_resolved"
- 1, 2, "e_spontaneous_extra"
- 4, 17, "e_unit_escaped"
+ 4, 12, "e_nuke"
+; 4, 13, "e_chem"
+ 4, 14, "e_spontaneous_extra" ; PLACEHOLDER
+ 4, 14, "e_ai_debug"
+ 4, 14, "e_script"
+ 4, 14, "e_broadcast_report"
+ 4, 14, "e_report"
+ 4, 14, "e_chat_msg"
+ 4, 14, "e_log_error"
+ 4, 14, "e_deprecation_warning"
+ 4, 15, "e_global_eco"
+ 4, 15, "e_log_fatal"
+ 4, 15, "e_chat_error"
+ 4, 16, "e_bad_command"
+
+ 4, 17, "e_game_start"
+ 4, 18, "e_next_year"
+ 4, 19, "e_game_end"
+ 4, 20, "e_turn_bell"
+
}
Modified: trunk/data/misc/small.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/small.png?rev=33262&r1=33261&r2=33262&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/misc/small.spec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/small.spec?rev=33262&r1=33261&r2=33262&view=diff
==============================================================================
--- trunk/data/misc/small.spec (original)
+++ trunk/data/misc/small.spec Tue Jul 19 00:33:09 2016
@@ -10,7 +10,6 @@
Alexandre Beraud <a_ber...@lemel.fr>
Jeff Mallatt <j...@codewell.com> (cooling flakes)
Davide Pagnin <nightm...@freeciv.it> (angry citizens)
- Hogne HÃ¥skjold <haskj...@gmail.com> (gold coin)
"
[file]
@@ -79,57 +78,6 @@
0, 35, "s.right_arrow"
-; Event Message Icons
-
- 1, 1, "e_caravan_action"
- 1, 1, "e_game_end"
- 1, 2, "e_game_start"
- 1, 1, "e_nation_selected"
- 1, 0, "e_destroyed"
- 1, 2, "e_turn_bell"
- 1, 2, "e_next_year"
- 1, 1, "e_imp_buy"
- 1, 1, "e_imp_build"
- 1, 1, "e_imp_auctioned"
- 1, 1, "e_imp_auto"
- 1, 1, "e_imp_sold"
- 1, 2, "e_tech_gain"
- 1, 2, "e_tech_learned"
- 1, 2, "e_tech_lost"
- 1, 2, "e_tech_embassy"
- 1, 1, "e_treaty_alliance"
- 1, 0, "e_treaty_broken"
- 1, 1, "e_treaty_ceasefire"
- 1, 1, "e_treaty_peace"
- 1, 1, "e_treaty_shared_vision"
- 1, 0, "e_unit_lost_att"
- 1, 2, "e_unit_win_att"
- 1, 1, "e_unit_buy"
- 1, 1, "e_unit_built"
- 1, 0, "e_unit_lost_def"
- 1, 2, "e_unit_win"
- 1, 2, "e_unit_became_vet"
- 1, 2, "e_unit_upgraded"
- 1, 1, "e_unit_relocated"
- 1, 1, "e_unit_orders"
- 1, 2, "e_wonder_build"
- 1, 0, "e_wonder_obsolete"
- 1, 2, "e_wonder_started"
- 1, 0, "e_wonder_stopped"
- 1, 2, "e_wonder_will_be_built"
- 1, 1, "e_diplomacy"
- 1, 1, "e_treaty_embassy"
- 1, 0, "e_bad_command"
- 1, 1, "e_setting"
- 1, 1, "e_message_wall"
- 1, 1, "e_connection"
- 1, 1, "e_tech_goal"
- 1, 0, "e_unit_lost_misc"
- 1, 1, "e_vote_new"
- 1, 2, "e_vote_resolved"
- 1, 0, "e_vote_aborted"
- 1, 1, "e_unit_built_pop_cost"
-
- 1, 11, "s.plus"
- 1, 12, "s.minus"
+ 1, 0, "s.plus"
+ 1, 1, "s.minus"
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
![[Freeciv-commits] r33262 - in /trunk/data/misc: events.png events.spec small.png small.spec](/search?l=freeciv-commits@gna.org&q=subject:%22%5C%5BFreeciv%5C-commits%5C%5D+r33262+%5C-+in+%5C%2Ftrunk%5C%2Fdata%5C%2Fmisc%5C%3A+events.png%09events.spec+small.png+small.spec%22&o=newest){kind=link}
