From 3096ff4f7ab05b68b5554ece3184faa592d30f4b Mon Sep 17 00:00:00 2001 From: Sven Eberhardt Date: Mon, 14 Sep 2015 21:59:12 -0400 Subject: [PATCH] DeepSeaMining: Small adjustments for material, knowledge and intro. Material: More dynamite Knowledge: Add Chest Intro: Hurt sound on plane drop and sky scroll stops --- planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt | 8 ++++---- planet/Missions.ocf/DeepSeaMining.ocs/Script.c | 11 ++++++++--- .../DeepSeaMining.ocs/System.ocg/SeqIntro.c | 6 +++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt b/planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt index 56bd110c2..e9b405eb4 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt +++ b/planet/Missions.ocf/DeepSeaMining.ocs/Scenario.txt @@ -17,28 +17,28 @@ ValueOverloads=Ruby=10;Amethyst=10 [Player1] Wealth=25 Crew=Clonk=2 -Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1; +Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1;Chest=1; BaseMaterial=Clonk=25;Bread=25; BaseProduction=Clonk=25;Bread=25; [Player2] Wealth=25 Crew=Clonk=2 -Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1; +Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1;Chest=1; BaseMaterial=Clonk=25;Bread=25; BaseProduction=Clonk=25;Bread=25; [Player3] Wealth=25 Crew=Clonk=2 -Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1; +Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1;Chest=1; BaseMaterial=Clonk=25;Bread=25; BaseProduction=Clonk=25;Bread=25; [Player4] Wealth=25 Crew=Clonk=2 -Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1; +Knowledge=Flagpole=1;Foundry=1;WindGenerator=1;SteamEngine=1;Compensator=1;Sawmill=1;ChemicalLab=1;Elevator=1;Pump=1;ToolsWorkshop=1;Basement=1;WallKit=1;GoldBar=1;Loam=1;Metal=1;Axe=1;Barrel=1;Bucket=1;Dynamite=1;Hammer=1;Pickaxe=1;Pipe=1;Shovel=1;TeleGlove=1;DynamiteBox=1;Lorry=1;Chest=1; BaseMaterial=Clonk=25;Bread=25; BaseProduction=Clonk=25;Bread=25; diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/Script.c b/planet/Missions.ocf/DeepSeaMining.ocs/Script.c index 2403d6f96..a8b09efec 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/Script.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/Script.c @@ -41,7 +41,7 @@ protected func PostIntroInitialize() // NPC g_tuesday_pos = FindMainIslandPosition(0, 100, true); - npc_tuesday = CreateObjectAbove(Clonk, g_tuesday_pos[0]+20, g_tuesday_pos[1]-10); + npc_tuesday = CreateObjectAbove(Clonk, g_tuesday_pos[0]+20, g_tuesday_pos[1]-20); npc_tuesday->SetDir(DIR_Left); npc_tuesday->SetColor(0x804000); npc_tuesday->SetName("$Tuesday$"); @@ -231,9 +231,9 @@ private func InitMainIsland() pos = FindMainIslandPosition(nil, nil, true); CreateObjectAbove(Sawmill, pos[0], pos[1]); pos = FindMainIslandPosition(nil, nil, true); - CreateObjectAbove(ChemicalLab, pos[0], pos[1]); + var lab = CreateObjectAbove(ChemicalLab, pos[0], pos[1]); pos = FindMainIslandPosition(nil, nil, true); - CreateObjectAbove(ToolsWorkshop, pos[0], pos[1]); + var workshop = CreateObjectAbove(ToolsWorkshop, pos[0], pos[1]); lorry->CreateContents(Barrel, 1); lorry->CreateContents(Bucket, 1); @@ -241,6 +241,11 @@ private func InitMainIsland() lorry->CreateContents(DynamiteBox, 1); lorry->CreateContents(WallKit, 4); //lorry->CreateContents(Boompack, 1); + + lab->CreateContents(Dynamite, 5); + lab->CreateContents(DynamiteBox, 1); + + workshop->CreateContents(Metal, 5); } return; diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c index 755b8a245..e0f8ce6b2 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c @@ -8,7 +8,8 @@ func Intro_Start() // Intro starts high up in the clouds LoadScenarioSection("Intro"); SetWind(-100); - SetSkyParallax(0, 20, 20, -10, 0); + this.intro_skyscroll_xdir = -10; + SetSkyParallax(0, 20, 20, this.intro_skyscroll_xdir, 0); this.plane = CreateObjectAbove(Plane, 500, 200); this.plane->SetColor(0xa04000); @@ -113,6 +114,9 @@ func Intro_9() func Intro_10() { g_intro_sky_moving = false; + Schedule(this, "SetSkyParallax(0, 20, 20, ++this.intro_skyscroll_xdir, 0)", 10, -this.intro_skyscroll_xdir); + GetHero()->Sound("Hurt1"); + GetHero()->Sound("Hurt2"); this.plane.rdir = 0; this.plane->StartInstantFlight(this.plane->GetR(), 15); MessageBoxAll("$Intro10$", GetHero(), true); // aaaah