remove siren and related research

pjf · Jan 15, 2014 · 5b09ef4 · 5b09ef4
1 parent cc454a9
commit 5b09ef4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 35 deletions.
diff --git a/Dwarf Fortress/hack/scripts/announcement.lua b/Dwarf Fortress/hack/scripts/announcement.lua
@@ -48,7 +48,6 @@ local function eventTypeIsNotValid()
 	"greatweapon",
 	"artificer",
 	"machine",
-	"siren",
 	"steamengine",
 	"magma",
 	"greatforge",
@@ -276,9 +275,6 @@ local function announcement_artificer() dfhack.gui.showAnnouncement(
 local function announcement_machine() dfhack.gui.showAnnouncement(
     'SCIENCE DISCOVERY: MACHINE FACTORY - A dwarf discovered a way to build landmines, turrets and other defensive constructs. Industrious dwarves build these from toolkits.',
     COLOR_CYAN, true)end
-local function announcement_siren() dfhack.gui.showAnnouncement(
-    'SCIENCE DISCOVERY: ALARM SIREN - Combining pipes and pressurized air, a dwarf has invented a siren. It can be used to wake up sleeping dwarves and stop breaks, calling you dwarves to war.',
-    COLOR_CYAN, true)end
 local function announcement_steamengine() dfhack.gui.showAnnouncement(
     'SCIENCE DISCOVERY: STEAM ENGINE - Pressurized and heated water allow the production of mechanical power, which can be transfered by axles and gears.',
     COLOR_CYAN, true)end
@@ -983,7 +979,6 @@ if EventType=="golemold" then announcement_golem()
 	elseif EventType=="greatweapon" then announcement_greatweapon()
 	elseif EventType=="artificer" then announcement_artificer()
 	elseif EventType=="machine" then announcement_machine()
-	elseif EventType=="siren" then announcement_siren()
 	elseif EventType=="steamengine" then announcement_steamengine()
 	elseif EventType=="magma" then announcement_magma()
 	elseif EventType=="greatforge" then announcement_greatforge()

diff --git a/Dwarf Fortress/raw/objects/entity_default.txt b/Dwarf Fortress/raw/objects/entity_default.txt
@@ -1398,10 +1398,6 @@ embassy
 [PERMITTED_REACTION:FORCE_CARAVAN_GOBLIN]
 [PERMITTED_REACTION:FORCE_CARAVAN_DWARF_M]
 #######################################################################
-alarm siren
-	YESSIREN[PERMITTED_BUILDING:ALARM]
-YESSIREN[PERMITTED_REACTION:SIREN]
-#######################################################################
 gnomish artificer
 	YESARTIFICER-PERMITTED_BUILDING:ARTIFICERS_STUDY-
 #######################################################################
@@ -1415,7 +1411,6 @@ PERMITTED_REACTION:BLUEPRINT_biologist_ONE
 [PERMITTED_REACTION:BLUEPRINT_alchemist_ONE]
 [PERMITTED_REACTION:BLUEPRINT_artificer_ONE]
 [PERMITTED_REACTION:BLUEPRINT_machine factory_ONE]
-[PERMITTED_REACTION:BLUEPRINT_alarm siren_ONE]
 [PERMITTED_REACTION:BLUEPRINT_steam engine_ONE]
 [PERMITTED_REACTION:BLUEPRINT_liquid spawner_ONE]
 [PERMITTED_REACTION:BLUEPRINT_greatforge_ONE]
@@ -1460,10 +1455,7 @@ researchers study
 [PERMITTED_REACTION:RESEARCH_LABORATORY_MACHINE_STEP_FOUR] 
 [PERMITTED_REACTION:RESEARCH_LABORATORY_MACHINE_STEP_FIVE] 
 [PERMITTED_REACTION:RESEARCH_LABORATORY_MACHINE_STEP_SIX] 
-[PERMITTED_REACTION:RESEARCH_LABORATORY_MACHINE_STEP_SEVEN]  
-[PERMITTED_REACTION:RESEARCH_LABORATORY_SIREN_STEP_ONE] 
-[PERMITTED_REACTION:RESEARCH_LABORATORY_SIREN_STEP_TWO] 
-[PERMITTED_REACTION:RESEARCH_LABORATORY_SIREN_STEP_THREE] 
+[PERMITTED_REACTION:RESEARCH_LABORATORY_MACHINE_STEP_SEVEN]   
 [PERMITTED_REACTION:RESEARCH_LABORATORY_STEAMENGINE_STEP_ONE] 
 [PERMITTED_REACTION:RESEARCH_LABORATORY_STEAMENGINE_STEP_TWO] 
 [PERMITTED_REACTION:RESEARCH_LABORATORY_STEAMENGINE_STEP_THREE] 

diff --git a/Dwarf Fortress/raw/objects/inorganic_zmasterwork_2.txt b/Dwarf Fortress/raw/objects/inorganic_zmasterwork_2.txt
@@ -1274,7 +1274,6 @@ paper discovery
 
 [INORGANIC:ANNOUNCEMENT_ARTIFICER_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:artificer]
 [INORGANIC:ANNOUNCEMENT_MACHINE_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:machine]
-[INORGANIC:ANNOUNCEMENT_SIREN_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:siren]
 [INORGANIC:ANNOUNCEMENT_STEAMENGINE_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:steamengine]
 [INORGANIC:ANNOUNCEMENT_MAGMA_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:magma]
 [INORGANIC:ANNOUNCEMENT_GREATFORGE_DISCOVERY][USE_MATERIAL_TEMPLATE:STONE_VAPOR_TEMPLATE][STATE_NAME_ADJ:ALL_SOLID:announcement][STATE_NAME_ADJ:LIQUID:announcement][STATE_NAME_ADJ:GAS:announcement][DISPLAY_COLOR:4:4:1][SYNDROME][SYN_CLASS:\AUTO_SYNDROME][SYN_CLASS:\COMMAND][SYN_CLASS:announcement][SYN_CLASS:greatforge]

diff --git a/Dwarf Fortress/raw/objects/item_tool_masterwork.txt b/Dwarf Fortress/raw/objects/item_tool_masterwork.txt
@@ -2673,9 +2673,6 @@ need: printing plates, engraved minting plates 3x, valve, gauge, boiler, spring,
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_MACHINE_FIVE][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_MACHINE_SIX][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_MACHINE_DISCOVERY][NAME:science discovery(machine factory):science discovery(machine factory)][VALUE:25][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE]  
-[ITEM_TOOL:ITEM_TOOL_RESEARCH_SIREN_ONE][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
-[ITEM_TOOL:ITEM_TOOL_RESEARCH_SIREN_TWO][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
-[ITEM_TOOL:ITEM_TOOL_RESEARCH_SIREN_DISCOVERY][NAME:science discovery():science discovery()][VALUE:25][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE]  
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_STEAMENGINE_ONE][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_STEAMENGINE_TWO][NAME:report:reports][VALUE:1][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE] 
 [ITEM_TOOL:ITEM_TOOL_RESEARCH_STEAMENGINE_DISCOVERY][NAME:science discovery(steamengine):science discovery(steamengine)][VALUE:25][TILE:235][SIZE:1][MATERIAL_SIZE:1][UNIMPROVABLE]  

diff --git a/Dwarf Fortress/raw/objects/reaction_cheat.txt b/Dwarf Fortress/raw/objects/reaction_cheat.txt
@@ -179,7 +179,6 @@ YESSTORAGE[PRODUCT:100:10:BAR:NONE:CREATURE_MAT:MERCHANT_LICENSE:SOAP]YESSTORAGE
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_ALCHEMY_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_ARTIFICER_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_MACHINE_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
-[PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_SIREN_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_STEAMENGINE_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_MAGMA_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 
 [PRODUCT:100:1:TOOL:ITEM_TOOL_RESEARCH_GREATFORGE_DISCOVERY:INORGANIC:PAPER_DISCOVERY] 

diff --git a/Dwarf Fortress/raw/objects/reaction_masterwork2.txt b/Dwarf Fortress/raw/objects/reaction_masterwork2.txt
@@ -2171,20 +2171,6 @@ PRODUCT:10:1:TOOL:ITEM_TOOL_RESEARCH_INCONCLUSIVE:INORGANIC:PAPER
 PRODUCT:10:1:TOOL:ITEM_TOOL_RESEARCH_INCONCLUSIVE:INORGANIC:PAPER
 [SKILL:PRESSING]
 
-[REACTION:RESEARCH_LABORATORY_SIREN_STEP_ONE] //80% chance
-[NAME:Conduct research in the field of Air Pressure (I)]
-[BUILDING:BEASTLAB2:CUSTOM_NONE]
-[REAGENT:A:150:BAR:NONE:INORGANIC:BRASS]
-[DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
-[REAGENT:B:1:TRAPPARTS:NONE:NONE:NONE]
-[DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
-[REAGENT:C:150:BAR:NO_SUBTYPE:COAL:NO_MATGLOSS]
-[DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
-[PRODUCT:90:1:TOOL:ITEM_TOOL_RESEARCH_SIREN_ONE:INORGANIC:PAPER] (or blank_research with research-supply tag)
-PRODUCT:10:1:TOOL:ITEM_TOOL_RESEARCH_INCONCLUSIVE:INORGANIC:PAPER
-[SKILL:PRESSING]
-
-
 [REACTION:RESEARCH_LABORATORY_STEAMENGINE_STEP_ONE] //80% chance
 [NAME:Conduct research in the field of Steampower (I)]
 [BUILDING:BEASTLAB2:CUSTOM_NONE]
@@ -4039,7 +4025,6 @@ PRODUCT:10:1:TOOL:ITEM_TOOL_RESEARCH_INCONCLUSIVE:INORGANIC:PAPER
 [PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_ALCHEMY_FOUR:INORGANIC:PAPER] 
 -PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_ARTIFICER_SIX:INORGANIC:PAPER- 
 [PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_MACHINE_SIX:INORGANIC:PAPER] 
--PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_SIREN_TWO:INORGANIC:PAPER-
 [PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_STEAMENGINE_TWO:INORGANIC:PAPER] 
 [PRODUCT:1:1:TOOL:ITEM_TOOL_RESEARCH_MAGMA_TWO:INORGANIC:PAPER] 
 
@@ -6904,7 +6889,7 @@ was knowledge stone, caused crashes
 ###################################################################
 
 
--[REACTION:SIREN]-
+[REACTION:SIREN]
 	[NAME:Sound the alarm - Wakes sleepers]
 	[BUILDING:GARRISON:CUSTOM_A]
 	[PRODUCT:100:1:BOULDER:NONE:INORGANIC:SIREN]