Merge remote-tracking branch 'upstream/master'

Author: MEXAHOTABOP

raws/v50/creature_large_temperate.txt

@@ -2251,7 +2251,7 @@ Moose were sponsored by the generous contributions of the Bay 12 community.
 
 	Silophant - "one of these once bit my sister"
 	"Beware the room with a moose."
-	A moose once bit my sister. / Mynd you, moose bites kan be pretty nasti...
+	A m°°se once bit my sister. / Mynd you, m°°se bites kan be pretty nasti...
 
 [CREATURE:MOOSE]
 	[DESCRIPTION:A large mammal with great antlers and a large nose. It lives in temperate forests.]

raws/v50/creature_standard.txt

@@ -2206,6 +2206,7 @@ creature_standard
 	[NAME:dragon:dragons:draconic]
 	[CASTE_NAME:dragon:dragons:draconic]
 	[CREATURE_TILE:'D'][COLOR:2:0:0]
+	[CHILD:10][CHILDNAME:dragon hatchling:dragon hatchlings]
 	[PETVALUE:10000]
 	[PET_EXOTIC]
 	[TRAINABLE]
@@ -2267,6 +2268,7 @@ creature_standard
 	[USE_MATERIAL_TEMPLATE:PUS:PUS_TEMPLATE]
 	[PUS:LOCAL_CREATURE_MAT:PUS:LIQUID]
 	[BODY_SIZE:0:0:6000]
+	[BODY_SIZE:10:0:5000000]
 	[BODY_SIZE:1000:0:25000000]
 	[BODY_APPEARANCE_MODIFIER:LENGTH:90:95:98:100:102:105:110]
 	[BODY_APPEARANCE_MODIFIER:HEIGHT:90:95:98:100:102:105:110]

raws/v50/graphics_classic.txt

@@ -2493,3 +2493,71 @@ graphics_classic
 [ASCII_RECTANGLE:SINGLE:6:0:1:ANNOUNCEMENT_ALERT:HUNTING]
 	[ASCII_GRAPHICS:'H':2:0:1:ANNOUNCEMENT_ALERT:HUNTING:1:1]
 	[ASCII_GRAPHICS:'!':2:0:1:ANNOUNCEMENT_ALERT:HUNTING:2:1]
+
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_CREATE_CREATURE]
+	[ASCII_GRAPHICS:'+':7:0:1:ARENA_CREATE_CREATURE:1:1]
+	[ASCII_GRAPHICS:'M':6:0:0:ARENA_CREATE_CREATURE:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_INCREASE_TEAM]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_INCREASE_TEAM:1:1]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_INCREASE_TEAM:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_DECREASE_TEAM]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_DECREASE_TEAM:1:1]
+	[ASCII_GRAPHICS:'-':4:0:1:ARENA_DECREASE_TEAM:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_INCREASE_SKILL]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_INCREASE_SKILL:1:1]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_INCREASE_SKILL:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_DECREASE_SKILL]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_DECREASE_SKILL:1:1]
+	[ASCII_GRAPHICS:'-':4:0:1:ARENA_DECREASE_SKILL:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_INCREASE_EQUIPMENT]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_INCREASE_EQUIPMENT:1:1]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_INCREASE_EQUIPMENT:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_DECREASE_EQUIPMENT]
+	[ASCII_GRAPHICS:'#':7:0:1:ARENA_DECREASE_EQUIPMENT:1:1]
+	[ASCII_GRAPHICS:'-':4:0:1:ARENA_DECREASE_EQUIPMENT:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_CONDITION_ASSIGNED]
+	[ASCII_GRAPHICS:'>':2:0:1:ARENA_CONDITION_ASSIGNED:1:1]
+	[ASCII_GRAPHICS:'<':2:0:1:ARENA_CONDITION_ASSIGNED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_CONDITION_UNASSIGNED]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS]
+	[ASCII_GRAPHICS:247:1:0:1:ARENA_FLUIDS:1:1]
+	[ASCII_GRAPHICS:247:4:0:1:ARENA_FLUIDS:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:0:ARENA_FLUIDS_WATER_UNSELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_WATER_UNSELECTED:1:1]
+	[ASCII_GRAPHICS:247:1:0:1:ARENA_FLUIDS_WATER_UNSELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS_WATER_SELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_WATER_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:1:0:1:ARENA_FLUIDS_WATER_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:0:ARENA_FLUIDS_MAGMA_UNSELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_MAGMA_UNSELECTED:1:1]
+	[ASCII_GRAPHICS:247:4:0:1:ARENA_FLUIDS_MAGMA_UNSELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS_MAGMA_SELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_MAGMA_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:4:0:1:ARENA_FLUIDS_MAGMA_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:0:ARENA_FLUIDS_SNOW_UNSELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_SNOW_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:7:0:1:ARENA_FLUIDS_SNOW_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS_SNOW_SELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_SNOW_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:7:0:1:ARENA_FLUIDS_SNOW_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:0:ARENA_FLUIDS_MUD_UNSELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_MUD_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:6:0:0:ARENA_FLUIDS_MUD_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS_MUD_SELECTED]
+	[ASCII_GRAPHICS:'+':2:0:0:ARENA_FLUIDS_MUD_SELECTED:1:1]
+	[ASCII_GRAPHICS:247:6:0:0:ARENA_FLUIDS_MUD_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:0:ARENA_FLUIDS_REMOVE_UNSELECTED]
+	[ASCII_GRAPHICS:'>':4:0:1:ARENA_FLUIDS_REMOVE_UNSELECTED:1:1]
+	[ASCII_GRAPHICS:'<':4:0:1:ARENA_FLUIDS_REMOVE_UNSELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_FLUIDS_REMOVE_SELECTED]
+	[ASCII_GRAPHICS:'>':4:0:1:ARENA_FLUIDS_REMOVE_SELECTED:1:1]
+	[ASCII_GRAPHICS:'<':4:0:1:ARENA_FLUIDS_REMOVE_SELECTED:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_WEATHER]
+	[ASCII_GRAPHICS:7:6:0:1:ARENA_WEATHER:1:1]
+	[ASCII_GRAPHICS:7:7:0:1:ARENA_WEATHER:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_CREATE_TREE]
+	[ASCII_GRAPHICS:'+':6:0:0:ARENA_CREATE_TREE:1:1]
+	[ASCII_GRAPHICS:'T':2:0:0:ARENA_CREATE_TREE:2:1]
+[ASCII_RECTANGLE:SINGLE:7:0:1:ARENA_ENTER_AMOUNT]
+	[ASCII_GRAPHICS:'#':7:0:1:STOCKPILE_TOOL_ENTER_AMOUNT:1:1]
+	[ASCII_GRAPHICS:'?':3:0:1:STOCKPILE_TOOL_ENTER_AMOUNT:2:1]

raws/v50/graphics_flows.txt

@@ -0,0 +1,53 @@
+graphics_flows
+
+[OBJECT:GRAPHICS]
+
+[TILE_GRAPHICS:EVENT_FLOWS:0:0:FLOW_MIASMA:1]
+[TILE_GRAPHICS:EVENT_FLOWS:0:1:FLOW_MIASMA:2]
+[TILE_GRAPHICS:EVENT_FLOWS:0:2:FLOW_MIASMA:3]
+[TILE_GRAPHICS:EVENT_FLOWS:0:3:FLOW_MIASMA:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:1:0:FLOW_DUST:1]
+[TILE_GRAPHICS:EVENT_FLOWS:1:1:FLOW_DUST:2]
+[TILE_GRAPHICS:EVENT_FLOWS:1:2:FLOW_DUST:3]
+[TILE_GRAPHICS:EVENT_FLOWS:1:3:FLOW_DUST:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:2:0:FLOW_WATER_MIST:1]
+[TILE_GRAPHICS:EVENT_FLOWS:2:1:FLOW_WATER_MIST:2]
+[TILE_GRAPHICS:EVENT_FLOWS:2:2:FLOW_WATER_MIST:3]
+[TILE_GRAPHICS:EVENT_FLOWS:2:3:FLOW_WATER_MIST:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:3:0:FLOW_LAVA_MIST:1]
+[TILE_GRAPHICS:EVENT_FLOWS:3:1:FLOW_LAVA_MIST:2]
+[TILE_GRAPHICS:EVENT_FLOWS:3:2:FLOW_LAVA_MIST:3]
+[TILE_GRAPHICS:EVENT_FLOWS:3:3:FLOW_LAVA_MIST:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:4:0:FLOW_BOILING:1]
+[TILE_GRAPHICS:EVENT_FLOWS:4:1:FLOW_BOILING:2]
+[TILE_GRAPHICS:EVENT_FLOWS:4:2:FLOW_BOILING:3]
+[TILE_GRAPHICS:EVENT_FLOWS:4:3:FLOW_BOILING:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:5:0:FLOW_VAPOR:1]
+[TILE_GRAPHICS:EVENT_FLOWS:5:1:FLOW_VAPOR:2]
+[TILE_GRAPHICS:EVENT_FLOWS:5:2:FLOW_VAPOR:3]
+[TILE_GRAPHICS:EVENT_FLOWS:5:3:FLOW_VAPOR:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:6:0:FLOW_DRAGONFIRE:1]
+[TILE_GRAPHICS:EVENT_FLOWS:6:1:FLOW_DRAGONFIRE:2]
+[TILE_GRAPHICS:EVENT_FLOWS:6:2:FLOW_DRAGONFIRE:3]
+[TILE_GRAPHICS:EVENT_FLOWS:6:3:FLOW_DRAGONFIRE:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:7:0:FLOW_FIRE:1]
+[TILE_GRAPHICS:EVENT_FLOWS:7:1:FLOW_FIRE:2]
+[TILE_GRAPHICS:EVENT_FLOWS:7:2:FLOW_FIRE:3]
+[TILE_GRAPHICS:EVENT_FLOWS:7:3:FLOW_FIRE:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:8:0:FLOW_SMOKE:1]
+[TILE_GRAPHICS:EVENT_FLOWS:8:1:FLOW_SMOKE:2]
+[TILE_GRAPHICS:EVENT_FLOWS:8:2:FLOW_SMOKE:3]
+[TILE_GRAPHICS:EVENT_FLOWS:8:3:FLOW_SMOKE:4]
+
+[TILE_GRAPHICS:EVENT_FLOWS:9:0:FLOW_ITEM:1]
+[TILE_GRAPHICS:EVENT_FLOWS:9:1:FLOW_ITEM:2]
+[TILE_GRAPHICS:EVENT_FLOWS:9:2:FLOW_ITEM:3]
+[TILE_GRAPHICS:EVENT_FLOWS:9:3:FLOW_ITEM:4]