shit

1 files changed, 56 insertions, 28 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 70630dd..5184136 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -28,6 +28,10 @@ void story(Mob *callee){
 	callee->alive = false;
 }
 
+/*
+ *	Gens
+ */
+
 float gen_worldSpawnHill1(float x){
 	return (float)(pow(2,(-x+200)/5) + GEN_MIN);
 }
@@ -50,30 +54,46 @@ void worldSpawnHill1_hillBlock(Mob *callee){
 
 static Arena *a;
 void worldSpawnHill2_infoSprint(Mob *callee){
-	callee->alive = false;
-	a = new Arena(currentWorld,player);
-	a->setBackground(BG_FOREST);
-	a->setBGM("assets/music/embark.wav");
-	ui::toggleWhiteFast();
-	ui::waitForCover();
-	currentWorld = a;
-	ui::toggleWhiteFast();
+	
+	ui::dialogBox(player->name,":Sure:Nah",false,"This page would like to take you somewhere.");
+	ui::waitForDialog();
+	switch(ui::dialogOptChosen){
+	case 1:
+		ui::dialogBox(player->name,NULL,true,"Cool.");
+		callee->alive = false;
+		a = new Arena(currentWorld,player);
+		a->setBackground(BG_FOREST);
+		a->setBGM("assets/music/embark.wav");
+		ui::toggleWhiteFast();
+		ui::waitForCover();
+		currentWorld = a;
+		ui::toggleWhiteFast();
+		break;
+	case 2:
+	default:
+		ui::dialogBox(player->name,NULL,false,"Okay then.");
+		break;
+	}
+	
 	//ui::dialogBox("B-) ",NULL,true,"Press \'Shift\' to run!");
 }
 
-void worldSpawnHill3_itemGet(Mob *callee){
-	ui::dialogBox("B-) ",NULL,true,"Right click to pick up items!");
-	callee->alive = false;
-}
-
-void worldSpawnHill3_itemSee(Mob *callee){
-	ui::dialogBox("B-) ",NULL,true,"Press \'e\' to open your inventory!");
-	callee->alive = false;
+int worldSpawnHill2_Quest2(NPC *callee){
+	ui::dialogBox(callee->name,NULL,false,"Yo.");
+	ui::waitForDialog();
+	return 0;
 }
 
-void worldSpawnHill3_leave(Mob *callee){
-	ui::dialogBox("B-) ",NULL,true,"Now jump in this hole, and let your journey begin :)");
-	callee->alive = false;
+int worldSpawnHill2_Quest1(NPC *callee){
+	ui::dialogBox(callee->name,":Cool.",false,"Did you know that I\'m the coolest NPC in the world?");
+	ui::waitForDialog();
+	if(ui::dialogOptChosen == 1){
+		ui::dialogBox(callee->name,NULL,false,"Yeah, it is.");
+		currentWorld->getAvailableNPC()->addAIFunc(worldSpawnHill2_Quest2,true);
+		ui::waitForDialog();
+		return 0;
+	}
+	return 1;
 }
 
 /*
@@ -93,6 +113,8 @@ static World *worldSpawnHill1;
 static World *worldSpawnHill2;
 static World *worldSpawnHill3;
 
+static IndoorWorld *worldSpawnHill2_Building1;
+
 /*
  *	initEverything() start
  */
@@ -109,17 +131,18 @@ void initEverything(void){
 	worldSpawnHill2 = new World();
 	worldSpawnHill2->generate(700);
 	worldSpawnHill2->setBackground(BG_FOREST);
-	worldSpawnHill2->setBGM("assets/music/embark.wav");
-	worldSpawnHill2->addMob(MS_TRIGGER,-400,0,worldSpawnHill2_infoSprint);
+	worldSpawnHill2->setBGM("assets/music/ozone.wav");
+	worldSpawnHill2->addMob(MS_PAGE,-400,0,worldSpawnHill2_infoSprint);
 
 	worldSpawnHill3 = new World();
 	worldSpawnHill3->generateFunc(1000,gen_worldSpawnHill3);
 	worldSpawnHill3->setBackground(BG_FOREST);
 	worldSpawnHill3->setBGM("assets/music/embark.wav");
-	worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet);
-	worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee);
+	//worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet);
+	//worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee);
 	worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300);
-	worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
+	//worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
+
 	worldSpawnHill3->addHole(800,1000);
 	
 	worldSpawnHill1->toRight = worldSpawnHill2;
@@ -133,7 +156,6 @@ void initEverything(void){
 
 	//playerSpawnHill->addMob(MS_TRIGGER,player->loc.x,0,story);
 
-	//worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
 	//playerSpawnHill->addStructure(STRUCTURET,FOUNTAIN,(rand()%120*HLINE)+100*HLINE,100,test,iw);
 	//playerSpawnHill->addStructure(STRUCTURET,HOUSE2,(rand()%120*HLINE)+300*HLINE,100,test,iw);
 
@@ -141,13 +163,19 @@ void initEverything(void){
 	//playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);*/
 
 
-	currentWorld = worldSpawnHill1;
+	worldSpawnHill2_Building1 = new IndoorWorld();
+	worldSpawnHill2_Building1->generate(300);
+	worldSpawnHill2_Building1->setBackground(BG_WOODHOUSE);
+	worldSpawnHill2_Building1->setBGM("assets/music/theme_jazz.wav");
+
+	worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill2_Building1);
+	worldSpawnHill2->getAvailableNPC()->addAIFunc(worldSpawnHill2_Quest1,false);
 	
 	player = new Player();
 	player->spawn(200,100);
-	
+
+	currentWorld = worldSpawnHill1;	
 	currentWorld->bgmPlay(NULL);
-	
 	atexit(destroyEverything);
 }