Blindly imported 31.04

Baughn · May 21, 2010 · 0faf8ba · 0faf8ba
1 parent d1b28a5
commit 0faf8ba
Show file tree

Hide file tree

Showing 262 changed files with 77,808 additions and 49,272 deletions.
diff --git a/32to64 b/32to64
@@ -0,0 +1 @@
+sed -rie 's/(^|[^a-z_A-Z])long($|[^a-z_A-Z])/\1int\2/g' *.cpp *.h
diff --git a/data/announcement/diplomatrebuffed b/data/announcement/diplomatrebuffed
diff --git a/data/announcement/end2 b/data/announcement/end2
diff --git a/data/announcement/end3 b/data/announcement/end3
diff --git a/data/announcement/end4 b/data/announcement/end4
diff --git a/data/announcement/fortressintro b/data/announcement/fortressintro
diff --git a/data/announcement/hastyking b/data/announcement/hastyking
diff --git a/data/announcement/invasion_elves b/data/announcement/invasion_elves
diff --git a/data/announcement/invasion_goblin b/data/announcement/invasion_goblin
diff --git a/data/announcement/invasion_human b/data/announcement/invasion_human
diff --git a/data/announcement/kingarrival b/data/announcement/kingarrival
diff --git a/data/announcement/merchantexit b/data/announcement/merchantexit
diff --git a/data/announcement/merchantintro b/data/announcement/merchantintro
diff --git a/data/announcement/semiend b/data/announcement/semiend
diff --git a/data/art/icon.png b/data/art/icon.png
diff --git a/data/art/mayday.png b/data/art/mayday.png
diff --git a/data/dipscript/dwarf_liaison b/data/dipscript/dwarf_liaison
diff --git a/data/dipscript/elves_firstcontact b/data/dipscript/elves_firstcontact
diff --git a/data/dipscript/elves_standard b/data/dipscript/elves_standard
diff --git a/data/dipscript/human_standard b/data/dipscript/human_standard
diff --git a/data/dipscript/human_trade b/data/dipscript/human_trade
diff --git a/data/dipscript/text/dwarf_liaison1 b/data/dipscript/text/dwarf_liaison1
diff --git a/data/dipscript/text/dwarf_liaison_bye b/data/dipscript/text/dwarf_liaison_bye
diff --git a/data/dipscript/text/elves_firstcontact1 b/data/dipscript/text/elves_firstcontact1
diff --git a/data/dipscript/text/elves_firstcontact2 b/data/dipscript/text/elves_firstcontact2
diff --git a/data/dipscript/text/elves_standard1 b/data/dipscript/text/elves_standard1
diff --git a/data/dipscript/text/elves_standard_bye b/data/dipscript/text/elves_standard_bye
diff --git a/data/dipscript/text/human_standard1 b/data/dipscript/text/human_standard1
diff --git a/data/dipscript/text/human_standard_bye b/data/dipscript/text/human_standard_bye
diff --git a/data/dipscript/text/human_trade1 b/data/dipscript/text/human_trade1
diff --git a/data/dipscript/text/human_trade_bye b/data/dipscript/text/human_trade_bye
diff --git a/data/help/a_first b/data/help/a_first
diff --git a/data/help/a_icons b/data/help/a_icons
diff --git a/data/help/a_intro b/data/help/a_intro
diff --git a/data/help/a_keys b/data/help/a_keys
diff --git a/data/help/a_main b/data/help/a_main
diff --git a/data/help/accounts b/data/help/accounts
diff --git a/data/help/building_clutter b/data/help/building_clutter
diff --git a/data/help/crafts b/data/help/crafts
diff --git a/data/help/defense b/data/help/defense
diff --git a/data/help/food b/data/help/food
diff --git a/data/help/icons b/data/help/icons
diff --git a/data/help/icons_creature b/data/help/icons_creature
diff --git a/data/help/icons_dwarf b/data/help/icons_dwarf
diff --git a/data/help/icons_items b/data/help/icons_items
diff --git a/data/help/icons_terrain b/data/help/icons_terrain
diff --git a/data/help/intro b/data/help/intro
diff --git a/data/help/living_quarters b/data/help/living_quarters
diff --git a/data/help/machines b/data/help/machines
diff --git a/data/help/main b/data/help/main
diff --git a/data/help/menu_activity_zones b/data/help/menu_activity_zones
diff --git a/data/help/menu_builditem b/data/help/menu_builditem
diff --git a/data/help/menu_buildjob b/data/help/menu_buildjob
diff --git a/data/help/menu_buildjob_animaltrap b/data/help/menu_buildjob_animaltrap
diff --git a/data/help/menu_buildjob_depot b/data/help/menu_buildjob_depot
diff --git a/data/help/menu_buildjob_door b/data/help/menu_buildjob_door
diff --git a/data/help/menu_buildjob_farmplot b/data/help/menu_buildjob_farmplot
diff --git a/data/help/menu_buildjob_lever b/data/help/menu_buildjob_lever
diff --git a/data/help/menu_buildjob_shop b/data/help/menu_buildjob_shop
diff --git a/data/help/menu_buildjob_siege b/data/help/menu_buildjob_siege
diff --git a/data/help/menu_buildjob_stockpile b/data/help/menu_buildjob_stockpile
diff --git a/data/help/menu_civlist b/data/help/menu_civlist
diff --git a/data/help/menu_designations b/data/help/menu_designations
diff --git a/data/help/menu_jobunitlist b/data/help/menu_jobunitlist
diff --git a/data/help/menu_look b/data/help/menu_look
diff --git a/data/help/menu_make_buildings b/data/help/menu_make_buildings
diff --git a/data/help/menu_manager b/data/help/menu_manager
diff --git a/data/help/menu_military b/data/help/menu_military
diff --git a/data/help/menu_nobles b/data/help/menu_nobles
diff --git a/data/help/menu_orders b/data/help/menu_orders
diff --git a/data/help/menu_professions b/data/help/menu_professions
diff --git a/data/help/menu_roomlist b/data/help/menu_roomlist
diff --git a/data/help/menu_rooms b/data/help/menu_rooms
diff --git a/data/help/menu_soldier_prefs b/data/help/menu_soldier_prefs
diff --git a/data/help/menu_squads b/data/help/menu_squads
diff --git a/data/help/menu_status b/data/help/menu_status
diff --git a/data/help/menu_status_animals b/data/help/menu_status_animals
diff --git a/data/help/menu_status_currency b/data/help/menu_status_currency
diff --git a/data/help/menu_status_justice b/data/help/menu_status_justice
diff --git a/data/help/menu_status_kitchen b/data/help/menu_status_kitchen
diff --git a/data/help/menu_status_prices b/data/help/menu_status_prices
diff --git a/data/help/menu_status_stocks b/data/help/menu_status_stocks
diff --git a/data/help/menu_status_stone b/data/help/menu_status_stone
diff --git a/data/help/menu_stockpiles b/data/help/menu_stockpiles
diff --git a/data/help/menu_viewunit b/data/help/menu_viewunit
diff --git a/data/help/menu_wages b/data/help/menu_wages
diff --git a/data/help/menus b/data/help/menus
diff --git a/data/help/mining b/data/help/mining
diff --git a/data/help/new_region b/data/help/new_region
diff --git a/data/help/outpost b/data/help/outpost
diff --git a/data/help/practice b/data/help/practice
diff --git a/data/help/r_intro b/data/help/r_intro
diff --git a/data/help/r_main b/data/help/r_main
diff --git a/data/help/r_setup_game b/data/help/r_setup_game
diff --git a/data/help/setup_game b/data/help/setup_game
diff --git a/data/help/storage b/data/help/storage
diff --git a/data/help/table_item_designations b/data/help/table_item_designations
diff --git a/data/help/table_material_values b/data/help/table_material_values
diff --git a/data/help/tables b/data/help/tables
diff --git a/data/help/technical b/data/help/technical
diff --git a/data/help/text_viewer b/data/help/text_viewer
diff --git a/data/help/text_viewer2 b/data/help/text_viewer2
diff --git a/data/help/text_viewer3 b/data/help/text_viewer3
diff --git a/data/help/trading b/data/help/trading
diff --git a/data/help/unit_profile b/data/help/unit_profile
diff --git a/data/help/water b/data/help/water
diff --git a/data/help/wood b/data/help/wood
diff --git a/data/index b/data/index
diff --git a/data/init/announcements.txt b/data/init/announcements.txt
@@ -0,0 +1,145 @@
+BOX or DO_MEGA: the announcment will appear in a box and pause the game
+P or PAUSE: the announcement will cause the game to pause
+R or RECENTER: the announcement will cause the game to recenter (if possible)
+A_D or A_DISPLAY: the announcement will be displayed in the main adventure announcement log (and on screen)
+D_D or D_DISPLAY: the announcement will be displayed in the main dwarf announcement log (and at the bottom)
+UCR or UNIT_COMBAT_REPORT: the announcement will be associated to the unit combat/hunting/sparring reports
+UCR_A or UNIT_COMBAT_REPORT_ALL_ACTIVE: the announcement will be associated to any active unit combat/hunting/sparring reports, but if there are no reports it will not create one
+
+[REACHED_PEAK:A_D:D_D:BOX]
+[ERA_CHANGE:A_D:D_D:BOX]
+[ENDGAME_EVENT_1:A_D:D_D:BOX:P:R]
+[ENDGAME_EVENT_2:A_D:D_D:BOX:P:R]
+[FEATURE_DISCOVERY:A_D:D_D:BOX:P:R]
+[STRUCK_DEEP_METAL:A_D:D_D:BOX:P:R]
+[STRUCK_MINERAL:A_D:D_D]
+[STRUCK_ECONOMIC_MINERAL:A_D:D_D]
+[COMBAT_TWIST_WEAPON:A_D:UCR]
+[COMBAT_LET_ITEM_DROP:A_D:UCR]
+[COMBAT_START_CHARGE:A_D:UCR]
+[COMBAT_SURPRISE_CHARGE:A_D:UCR]
+[COMBAT_JUMP_DODGE_PROJ:A_D:UCR]
+[COMBAT_JUMP_DODGE_STRIKE:A_D:UCR]
+[COMBAT_DODGE:A_D:UCR]
+[COMBAT_COUNTERSTRIKE:A_D:UCR]
+[COMBAT_BLOCK:A_D:UCR]
+[COMBAT_PARRY:A_D:UCR]
+[COMBAT_CHARGE_COLLISION:A_D:UCR]
+[COMBAT_CHARGE_DEFENDER_TUMBLES:A_D:UCR]
+[COMBAT_CHARGE_DEFENDER_KNOCKED_OVER:A_D:UCR]
+[COMBAT_CHARGE_ATTACKER_TUMBLES:A_D:UCR]
+[COMBAT_CHARGE_ATTACKER_BOUNCE_BACK:A_D:UCR]
+[COMBAT_CHARGE_TANGLE_TOGETHER:A_D:UCR]
+[COMBAT_CHARGE_TANGLE_TUMBLE:A_D:UCR]
+[COMBAT_CHARGE_RUSH_BY:A_D:UCR]
+[COMBAT_CHARGE_MANAGE_STOP:A_D:UCR]
+[COMBAT_CHARGE_OBSTACLE_SLAM:A_D:UCR]
+[COMBAT_WRESTLE_LOCK:A_D:UCR]
+[COMBAT_WRESTLE_CHOKEHOLD:A_D:UCR]
+[COMBAT_WRESTLE_TAKEDOWN:A_D:UCR]
+[COMBAT_WRESTLE_THROW:A_D:UCR]
+[COMBAT_WRESTLE_PINCH:A_D:UCR]
+[COMBAT_WRESTLE_GOUGE:A_D:UCR]
+[COMBAT_WRESTLE_RELEASE_LOCK:A_D:UCR]
+[COMBAT_WRESTLE_RELEASE_CHOKE:A_D:UCR]
+[COMBAT_WRESTLE_RELEASE_GRIP:A_D:UCR]
+[COMBAT_WRESTLE_STRUGGLE:A_D:UCR]
+[COMBAT_WRESTLE_RELEASE_LATCH:A_D:UCR]
+[COMBAT_WRESTLE_STRANGLE:A_D:UCR]
+[COMBAT_WRESTLE_STRANGLE_KO:A_D:UCR]
+[COMBAT_WRESTLE_ADJUST_GRIP:A_D:UCR]
+[COMBAT_SHAKE:A_D:UCR]
+[COMBAT_GRAB_TEAR:A_D:UCR]
+[COMBAT_STRIKE_DETAILS:A_D:UCR]
+[COMBAT_STRIKE_DETAILS_2:A_D:UCR]
+[COMBAT_EVENT_ENRAGED:A_D:UCR]
+[COMBAT_EVENT_STUCKIN:A_D:UCR]
+[COMBAT_EVENT_LATCH_BP:A_D:UCR]
+[COMBAT_EVENT_LATCH_GENERAL:A_D:UCR]
+[COMBAT_EVENT_PROPELLED_AWAY:A_D:UCR]
+[COMBAT_EVENT_KNOCKED_OUT:A_D:UCR]
+[COMBAT_EVENT_STUNNED:A_D:UCR]
+[COMBAT_EVENT_WINDED:A_D:UCR]
+[COMBAT_EVENT_NAUSEATED:A_D:UCR]
+[MIGRANT_ARRIVAL_NAMED:A_D:D_D:P:R]
+[MIGRANT_ARRIVAL:A_D:D_D:P:R]
+[DIG_CANCEL_WARM:A_D:D_D:P:R]
+[DIG_CANCEL_DAMP:A_D:D_D:P:R]
+[AMBUSH_DEFENDER:A_D:D_D:P:R]
+[AMBUSH_RESIDENT:A_D:D_D:P:R]
+[AMBUSH_THIEF:A_D:D_D:P:R]
+[AMBUSH_THIEF_SUPPORT_SKULKING:A_D:D_D:P:R]
+[AMBUSH_THIEF_SUPPORT_NATURE:A_D:D_D:P:R]
+[AMBUSH_THIEF_SUPPORT:A_D:D_D:P:R]
+[AMBUSH_MISCHIEVIOUS:A_D:D_D:P:R]
+[AMBUSH_SNATCHER:A_D:D_D:P:R]
+[AMBUSH_SNATCHER_SUPPORT:A_D:D_D:P:R]
+[AMBUSH_AMBUSHER_NATURE:A_D:D_D:P:R]
+[AMBUSH_AMBUSHER:A_D:D_D:P:R]
+[AMBUSH_INJURED:A_D:D_D:P:R]
+[AMBUSH_OTHER:A_D:D_D:P:R]
+[AMBUSH_INCAPACITATED:A_D:D_D:P:R]
+[CARAVAN_ARRIVAL:A_D:D_D:P:R]
+[NOBLE_ARRIVAL:A_D:D_D:P:R]
+[D_MIGRANTS_ARRIVAL:A_D:D_D:P:R]
+[D_MIGRANT_ARRIVAL:A_D:D_D:P:R]
+[D_MIGRANT_ARRIVAL_DISCOURAGED:A_D:D_D]
+[D_NO_MIGRANT_ARRIVAL:A_D:D_D]
+[ANIMAL_TRAP_CATCH:A_D:D_D:P:R]
+[ANIMAL_TRAP_ROBBED:A_D:D_D:P:R]
+[MISCHIEF_LEVER:A_D:D_D:P:R]
+[MISCHIEF_PLATE:A_D:D_D:P:R]
+[MISCHIEF_CAGE:A_D:D_D:P:R]
+[MISCHIEF_CHAIN:A_D:D_D:P:R]
+[DIPLOMAT_ARRIVAL:A_D:D_D:P:R]
+[LIAISON_ARRIVAL:A_D:D_D:P:R]
+[TRADE_DIPLOMAT_ARRIVAL:A_D:D_D:P:R]
+[CAVE_COLLAPSE:A_D:D_D:P:R]
+[BIRTH_CITIZEN:A_D:D_D:P:R]
+[BIRTH_ANIMAL:A_D:D_D]
+[STRANGE_MOOD:A_D:D_D:P:R]
+[MADE_ARTIFACT:A_D:D_D:BOX:P:R]
+[NAMED_ARTIFACT:A_D:D_D:BOX:P:R]
+[ITEM_ATTACHMENT:A_D:D_D]
+[VERMIN_CAGE_ESCAPE:A_D:D_D:P:R]
+[TRIGGER_WEB:A_D:D_D:P:R]
+[MOOD_BUILDING_CLAIMED:A_D:D_D:P:R]
+[ARTIFACT_BEGUN:A_D:D_D:P:R]
+[MEGABEAST_ARRIVAL:A_D:D_D:BOX:P:R]
+[BERSERK_CITIZEN:A_D:D_D:P:R]
+[MAGMA_DEFACES_ENGRAVING:A_D:D_D]
+[ENGRAVING_MELTS:A_D:D_D]
+[MASTERPIECE_ARCHITECTURE:A_D:D_D]
+[MASTERPIECE_CONSTRUCTION:A_D:D_D]
+[MASTER_ARCHITECTURE_LOST:A_D:D_D]
+[MASTER_CONSTRUCTION_LOST:A_D:D_D]
+[ADV_AWAKEN:A_D:D_D]
+[ADV_SLEEP_INTERRUPTED:A_D:D_D]
+[CANCEL_JOB:A_D:D_D]
+[ADV_CREATURE_DEATH:A_D:D_D:UCR_A]
+[CITIZEN_DEATH:A_D:D_D:UCR_A]
+[PET_DEATH:A_D:D_D:UCR_A]
+[FALL_OVER:A_D:UCR_A]
+[CAUGHT_IN_FLAMES:A_D:UCR_A]
+[CAUGHT_IN_WEB:A_D:UCR_A]
+[UNIT_PROJECTILE_SLAM_BLOW_APART:A_D:UCR_A]
+[UNIT_PROJECTILE_SLAM:A_D:UCR_A]
+[UNIT_PROJECTILE_SLAM_INTO_UNIT:A_D:UCR_A]
+[VOMIT:A_D:UCR_A]
+[LOSE_HOLD_OF_ITEM:A_D:UCR_A]
+[REGAIN_CONSCIOUSNESS:A_D:UCR_A]
+[FREE_FROM_WEB:A_D:UCR_A]
+[PARALYZED:A_D:UCR_A]
+[OVERCOME_PARALYSIS:A_D:UCR_A]
+[NOT_STUNNED:A_D:UCR_A]
+[EXHAUSTION:A_D:UCR_A]
+[PAIN_KO:A_D:UCR_A]
+[BREAK_GRIP:A_D:UCR_A]
+[NO_BREAK_GRIP:A_D:UCR_A]
+[BLOCK_FIRE:A_D:UCR_A]
+[BREATHE_FIRE:A_D:UCR_A]
+[SHOOT_WEB:A_D:UCR_A]
+[PULL_OUT_DROP:A_D:UCR_A]
+[STAND_UP:A_D:UCR_A]
+[MARTIAL_TRANCE:A_D:D_D]
+[MAT_BREATH:A_D:UCR_A]