Shit

diff --cc Changelog
index 61dee12a72147288a0e95970ea0c6e8c01bd73ff,44e0bfc2aeee45592751ae945a80f2e67b544fac..0a4490494520c80b5fec3a10eea40a4e80274c18
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -387,4 -387,24 +387,28 @@@
        - continued to document header files through doxygen
        - added border to dialogBox
        - fix entity movement handling; npcs stop when you talk to them
-       - added sword animation?
++<<<<<<< HEAD
++      - added sword animation?
++=======
+       - added sword animation?
+ 
+ 12/9/2015,
+ 12/10/2015:
+ ===========
+ 
+       - added sound effects
+       - fixed disappearing building
+       - began actually plotting areas
+       - fixed layer switching-ish
+       - added passive dialogs
+       - began working on particles stuffses
+       - improved village spawning
+ 
+ 12/11/2015:
+ ===========
+ 
+       - plotted out a tutorial-ish area in game
+       - imrpoved BGM handling
+       - continued work on particles, made a fountain
+       - added sanic
++>>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3

diff --cc assets/items/flashlight_off.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8f6f2047ba3c2df2e7723f4869da57260626e206
new file mode 100644 (file)
Binary files differ

diff --cc config/items.h
index 1bd9111edc9db036028144a054f8e9d3467ef724,9012ff69c13260de3bfd9f1c87c59727137b3f17..ee1024cf9f60cbfe0e2d6676eebd7de621989a7e
--- 1/config/items.h
--- 2/config/items.h
+++ b/config/items.h
@@@ -29,10 -29,10 +29,10 @@@ ID PLAYER_BA
  ID FLASHLIGHT         
        NAME "Flashlight" 
        TYPE TOOL 
--      WIDTH HLINE*2 
--      HEIGHT HLINE*4 
++      WIDTH HLINE*4 
++      HEIGHT HLINE*8 
        STACKSIZE 1 
--      TEX "assets/items/ITEM_TEST.png" 
++      TEX "assets/items/flashlight_off.png" 
        ENI
  
  ID SWORD_WOOD         

diff --cc src/gameplay.cpp
index 856b39701900883973a301d85396a85d9bdd3e97,74414d705a073c54ad93cd538137f68bcb4eacbd..a9d29c452deca6c42b47d4ef9f843c7092d874d7
--- 1/src/gameplay.cpp
--- 2/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@@ -57,88 -63,70 +63,70 @@@ void worldSpawnHill3_itemSee(Mob *calle
        callee->alive = false;
  }
  
- float playerSpawnHillFunc(float x){
-       return (float)(pow(2,(-x+200)/5) + 80);
+ void worldSpawnHill3_leave(Mob *callee){
+       ui::dialogBox("B-) ",NULL,true,"Now jump in this hole, and let your journey begin :)");
+       callee->alive = false;
  }
  
- static World *test;
- static World *playerSpawnHill;
- static IndoorWorld *iw;
+ /*
+  *    new world 
+  *    gen
+  *    setbackground
+  *    setbgm
+  *    add...
+  * 
+  */
  
- void destroyEverything(void);
+ /*
+  *    World definitions
+  */
+ 
+ static World *worldSpawnHill1;
+ static World *worldSpawnHill2;
+ static World *worldSpawnHill3;
  
+ /*
+  *    initEverything() start
+  */
+ 
+ void destroyEverything(void);
  void initEverything(void){
-       //FILE *load;
-       
-       /*
-        *      World creation:
-       */
-       
-       test=new World();
-       
-       test->generate(SCREEN_WIDTH*2);
-       test->setBackground(BG_FOREST);
-       test->setBGM("assets/music/embark.wav");
-       
-       test->addHole(100,150);
-       test->addLayer(400);
-       
-       playerSpawnHill=new World();
-       playerSpawnHill->setBackground(BG_FOREST);
-       playerSpawnHill->setBGM("assets/music/embark.wav");
-       
-       /*if((load=fopen("world.dat","rb"))){
-               playerSpawnHill->load(load);
-               fclose(load);
-       }else{*/
-               playerSpawnHill->generateFunc(1280,playerSpawnHillFunc);
-       //}
- 
-       /*
-        *      Setup the current world, making the player initially spawn in `test`.
-       */
-       
-       currentWorld=playerSpawnHill;
-       
-       playerSpawnHill->toRight=test;
-       test->toLeft=playerSpawnHill;
-       
-       /*
-        *      Create the player.
-       */
+ 
+       worldSpawnHill1 = new World();
+       worldSpawnHill1->generateFunc(400,gen_worldSpawnHill1);
+       worldSpawnHill1->setBackground(BG_FOREST);
+       worldSpawnHill1->setBGM("assets/music/embark.wav");
+       worldSpawnHill1->addMob(MS_TRIGGER,0,0,worldSpawnHill1_hillBlock);
+ 
+       worldSpawnHill2 = new World();
+       worldSpawnHill2->generate(700);
+       worldSpawnHill2->setBackground(BG_FOREST);
+       worldSpawnHill2->setBGM("assets/music/embark.wav");
+       worldSpawnHill2->addMob(MS_TRIGGER,-400,0,worldSpawnHill2_infoSprint);
        
-       player=new Player();
-       player->spawn(-1000,200);
+       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->addObject(TEST_ITEM,false,"",-200,300);
++      worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300);
+       worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
+       worldSpawnHill3->addHole(800,1000);
        
-       /*
-        *      Create a structure (this will create villagers when spawned).
-       */
+       worldSpawnHill1->toRight = worldSpawnHill2;
+       worldSpawnHill2->toLeft = worldSpawnHill1;
        
-       iw=new IndoorWorld();
-       iw->setBackground(BG_WOODHOUSE);
-       iw->generate(200);
-       iw->addMob(MS_TRIGGER,0,0,CUTSCENEEE2);
+       worldSpawnHill2->toRight = worldSpawnHill3;
+       worldSpawnHill3->toLeft = worldSpawnHill2;
        
-       /*
-        *      Spawn some entities.
-       */
- 
-       playerSpawnHill->addMob(MS_TRIGGER,player->loc.x,0,story);
- 
-       playerSpawnHill->addStructure(STRUCTURET,(rand()%120*HLINE),100,test,iw);
-       playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);
+       currentWorld = worldSpawnHill1;
        
-       playerSpawnHill->addObject(SWORD_WOOD, false, "", 480,200);
-       playerSpawnHill->addObject(FLASHLIGHT, false, "", 500,200);
-       playerSpawnHill->addObject(PLAYER_BAG, false, "", 520,200);
-       playerSpawnHill->addObject(TEST_ITEM, false, "", 540,200);
+       player = new Player();
+       player->spawn(200,100);
        
-       test->addMob(MS_RABBIT,200,100);
-       test->addMob(MS_BIRD,-500,500);
+       currentWorld->bgmPlay(NULL);
        
-       playerSpawnHill->npc[0]->addAIFunc(giveTestQuest,false);
-       
-       currentWorld->bgmPlay();
        atexit(destroyEverything);
  }