diff options
| -rw-r--r-- | Changelog | 23 | ||||
| -rw-r--r-- | include/entities.h | 4 | ||||
| -rw-r--r-- | include/world.h | 3 | ||||
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | src/entities.cpp | 143 | ||||
| -rw-r--r-- | src/ui.cpp | 193 | ||||
| -rw-r--r-- | src/world.cpp | 29 | ||||
| -rw-r--r-- | xml/playerSpawnHill2.xml | 2 |
8 files changed, 249 insertions, 150 deletions
@@ -798,3 +798,26 @@ - game can run on *BSD systems.. - fixed abort bug on exit - added light that follows player + +3/21/2016, +3/22/2016: +========== + + - andy did stuff + + ~ 6 month Changelog-aversary! + +3/23/2016: +========== + + - flickery lights + - ui font loading is smooth + - entities can be flung + +3/24/2016: +========== + + - npcs walking through worlds? + - found brazzier glitch + - merchants inside stalls + - z renders???? diff --git a/include/entities.h b/include/entities.h index 442219c..3b13ce3 100644 --- a/include/entities.h +++ b/include/entities.h @@ -151,6 +151,7 @@ public: bool near; // Causes name to display bool canMove; // Enables movement + bool canJape; // Enables world leaving bool right,left; // Direction faced by Entity bool alive; bool hit; @@ -201,12 +202,13 @@ public: void sspawn(float x,float y); }; -class NPC : public Entity{ +class NPC : public Entity { public: std::vector<int (*)(NPC *)>aiFunc; int dialogIndex; NPC(); + NPC(NPC *n); ~NPC(); void addAIFunc(int (*func)(NPC *),bool preload); diff --git a/include/world.h b/include/world.h index 51fbbfd..dd06469 100644 --- a/include/world.h +++ b/include/world.h @@ -144,7 +144,7 @@ protected: * of elements provided by the function. */ - std::vector<WorldData> worldData; + std::vector<WorldData> worldData; /** * Starting x coordinate. @@ -433,6 +433,7 @@ public: */ World *goWorldLeft(Player *p); + bool goWorldLeft( NPC *e ); /** * Attempts to let the player enter the right-linked world specified by @@ -77,7 +77,7 @@ World *currentWorld = NULL, * The player object. */ -Player *player; +Player *player; /** * TODO diff --git a/src/entities.cpp b/src/entities.cpp index c047eff..e97464e 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -41,32 +41,32 @@ void initEntity(){ void getRandomName(Entity *e){ unsigned int tempNum,max=0; char *bufs; - + std::ifstream names ("assets/names_en-us",std::ios::in); - + names.seekg(0,names.beg); - + bufs = new char[32]; - + for(;!names.eof();max++) names.getline(bufs,32); - + tempNum = rand() % max; names.seekg(0,names.beg); for(unsigned int i=0;i<tempNum;i++) names.getline(bufs,32); - + names.close(); - + switch(bufs[0]){ default : case 'm': e->gender = MALE; break; case 'f': e->gender = FEMALE;break; } - + strcpy(e->name,bufs+1); - + delete[] bufs; } @@ -75,7 +75,7 @@ void Entity::spawn(float x, float y){ //spawns the entity you pass to it based o loc.y = y; vel.x = 0; vel.y = 0; - + alive = true; right = true; left = false; @@ -83,29 +83,29 @@ void Entity::spawn(float x, float y){ //spawns the entity you pass to it based o //canMove = true; ground = false; hit = false; - + ticksToUse = 0; - + if(!maxHealth)health = maxHealth = 1; - + if(type==MOBT){ if(Mobp(this)->subtype == MS_BIRD){ Mobp(this)->init_y=loc.y; } } - + name = new char[32]; getRandomName(this); - + followee = NULL; } Player::Player(){ //sets all of the player specific traits on object creation width = HLINE * 10; height = HLINE * 15; - + type = PLAYERT; //set type to player - subtype = 0; + subtype = 0; health = maxHealth = 100; speed = 1; canMove = true; @@ -130,18 +130,18 @@ Player::~Player(){ NPC::NPC(){ //sets all of the NPC specific traits on object creation width = HLINE * 10; height = HLINE * 16; - + type = NPCT; //sets type to npc subtype = 0; health = maxHealth = 100; - + maxHealth = health = 100; canMove = true; - + tex = new Texturec(1,"assets/NPC.png"); inv = new Inventory(NPC_INV_SIZE); - + randDialog = rand() % RAND_DIALOG_COUNT - 1; dialogIndex = 0; } @@ -150,7 +150,7 @@ NPC::~NPC(){ while(!aiFunc.empty()){ aiFunc.pop_back(); } - + delete inv; delete tex; delete[] name; @@ -159,22 +159,22 @@ NPC::~NPC(){ Merchant::Merchant(){ //sets all of the Merchant specific traits on object creation width = HLINE * 10; height = HLINE * 16; - + type = MERCHT; //sets type to merchant subtype = 0; health = maxHealth = 100; - + maxHealth = health = 100; canMove = true; trade.reserve(100); currTrade = 0; - + //tex = new Texturec(1,"assets/NPC.png"); //inv = new Inventory(NPC_INV_SIZE); //inv = new Inventory(1); - + //randDialog = rand() % RAND_DIALOG_COUNT - 1; dialogIndex = 0; } @@ -183,7 +183,7 @@ Merchant::~Merchant(){ /*while(!aiFunc.empty()){ aiFunc.pop_back(); }*/ - + //delete inv; //delete tex; //delete[] name; @@ -191,18 +191,18 @@ Merchant::~Merchant(){ Structures::Structures(){ //sets the structure type health = maxHealth = 1; - + alive = false; near = false; - + name = NULL; - + //inv = NULL; canMove = false; } Structures::~Structures(){ delete tex; - + if(name) delete[] name; } @@ -210,10 +210,10 @@ Structures::~Structures(){ Mob::Mob(int sub){ type = MOBT; aggressive = false; - + maxHealth = health = 50; canMove = true; - + switch((subtype = sub)){ case MS_RABBIT: width = HLINE * 10; @@ -241,7 +241,7 @@ Mob::Mob(int sub){ tex = new Texturec(1,"assets/items/ITEM_PAGE.png"); break; } - + inv = new Inventory(NPC_INV_SIZE); } Mob::~Mob(){ @@ -259,7 +259,7 @@ Object::Object(){ canMove = false; maxHealth = health = 1; - + tex = NULL; inv = NULL; } @@ -288,7 +288,7 @@ Object::~Object(){ void Object::reloadTexture(void){ if(tex) delete tex; - + tex = new Texturec(1,getItemTexturePath(iname)); width = getItemWidth(iname); height = getItemHeight(iname); @@ -297,10 +297,10 @@ void Object::reloadTexture(void){ void Entity::draw(void){ //draws the entities glPushMatrix(); glColor3ub(255,255,255); - + if ( !alive ) return; - + if(type==NPCT){ if(NPCp(this)->aiFunc.size()){ glColor3ub(255,255,0); @@ -363,7 +363,7 @@ void Entity::draw(void){ //draws the entities tex->bind(0); break; } - } + } break; default: glActiveTexture(GL_TEXTURE0); @@ -395,7 +395,7 @@ void NPC:: wander( int timeRun ) { static int direction; - + if ( followee ) { if ( loc.x < followee->loc.x - 40 ) direction = 1; @@ -403,25 +403,28 @@ wander( int timeRun ) direction = -1; else direction = 0; - + vel.x = .018 * HLINE * direction; } else if ( ticksToUse == 0 ) { ticksToUse = timeRun; - + vel.x = .008 * HLINE; direction = (getRand() % 3 - 1); - + if ( direction == 0 ) ticksToUse *= 2; - + vel.x *= direction; } - + + if( vel.x < 0) + currentWorld->goWorldLeft( this ); + ticksToUse--; } void NPC::addAIFunc(int (*func)(NPC *),bool preload){ - if(preload){ // Preload AI functions so that they're given after + if(preload){ // Preload AI functions so that they're given after // the current dialog box is closed AIpreload.push_back(func); AIpreaddr.push_back(this); @@ -437,14 +440,14 @@ void NPC::interact(){ //have the npc's interact back to the player std::thread([this]{ int (*func)(NPC *); loc.y += 5; - + canMove=false; left = (player->loc.x < loc.x); right = !left; - + if(aiFunc.size()){ func=aiFunc.front(); - + if(!func(this)){ if(aiFunc.size())aiFunc.erase(aiFunc.begin()); } @@ -525,17 +528,17 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){ bsubtype = sub; dim2 dim; - + /* * tempN is the amount of entities that will be spawned in the village. Currently the village * will spawn bewteen 2 and 7 villagers for the starting hut. */ //unsigned int tempN = (getRand() % 5 + 2); - + if ( textureLoc.empty() ) textureLoc = inWorld->sTexLoc[sub]; - + switch(sub){ case STALL_MARKET: tex = new Texturec({ textureLoc }); @@ -551,7 +554,7 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){ inv = NULL; break; } - + return 0; } @@ -565,7 +568,7 @@ void Mob::wander(int timeRun){ static int direction; //variable to decide what direction the entity moves static unsigned int heya=0,hi=0; static bool YAYA = false; - + if ( followee ) { if ( loc.x < followee->loc.x - 40 ) direction = 1; @@ -573,11 +576,11 @@ void Mob::wander(int timeRun){ direction = -1; else direction = 0; - + vel.x = .018 * HLINE * direction; return; } - + if(aggressive && !YAYA && player->loc.x + (width / 2) > loc.x && player->loc.x + (width / 2) < loc.x + width && player->loc.y + (height / 3) > loc.y && player->loc.y + (height / 3) < loc.y + height ){ @@ -586,7 +589,7 @@ void Mob::wander(int timeRun){ a->setStyle(""); a->setBackground( WorldBGType::Forest ); a->setBGM("assets/music/embark.wav"); - + ui::toggleWhiteFast(); YAYA = true; ui::waitForCover(); @@ -595,7 +598,7 @@ void Mob::wander(int timeRun){ ui::toggleWhiteFast(); } } - + switch(subtype){ case MS_RABBIT: if(!ticksToUse){ @@ -654,16 +657,16 @@ void Player::save(void){ data.append(std::to_string((int)health) + "\n"); data.append(std::to_string((int)maxHealth) + "\n"); data.append(std::to_string((int)tickCount) + "\n"); - + data.append(std::to_string((int)inv->items.size()) + "\n"); for(auto &i : inv->items) data.append(std::to_string((int)i.count) + "\n" + std::to_string((int)i.id) + "\n"); - + data.append((std::string)(currentXML.c_str() + 4) + "\n"); - + data.append("dOnE\0"); out.write(data.c_str(),data.size()); - out.close(); + out.close(); } void Player::sspawn(float x,float y){ @@ -671,21 +674,21 @@ void Player::sspawn(float x,float y){ uint count; std::ifstream in ("xml/main.dat",std::ios::in | std::ios::binary); spawn(x,y); - + if(in.good()){ std::istringstream data; std::string ddata; std::streampos len; - + in.seekg(0,std::ios::end); len = in.tellg(); in.seekg(0,std::ios::beg); - + std::vector<char> buf (len,'\0'); in.read(buf.data(),buf.size()); - + data.rdbuf()->pubsetbuf(buf.data(),buf.size()); - + std::getline(data,ddata); loc.x = std::stoi(ddata); std::getline(data,ddata); @@ -696,7 +699,7 @@ void Player::sspawn(float x,float y){ maxHealth = std::stoi(ddata); std::getline(data,ddata); tickCount = std::stoi(ddata); - + std::getline(data,ddata); for(i = std::stoi(ddata);i;i--){ std::getline(data,ddata); @@ -704,10 +707,10 @@ void Player::sspawn(float x,float y){ std::getline(data,ddata); inv->items.push_back(item_t{count,(uint)std::stoi(ddata)}); } - + std::getline(data,ddata); currentWorld = loadWorldFromXMLNoSave(ddata.c_str()); - + in.close(); } } @@ -33,8 +33,8 @@ extern bool gameRunning; extern unsigned int tickCount; /* - * Freetype variables, and a GLuint for referencing rendered letters. -*/ + * Freetype variables + */ static FT_Library ftl; static FT_Face ftf; @@ -45,8 +45,16 @@ typedef struct { vec2 ad; } FT_Info; -static std::vector<FT_Info> ftdat ( 93, { { 0, 0 }, { 0, 0 }, { 0, 0 } } ); -static std::vector<GLuint> ftex ( 93, 0 ); +static std::vector<FT_Info> ftdat16 ( 93, { { 0, 0 }, { 0, 0 }, { 0, 0 } } ); +static std::vector<GLuint> ftex16 ( 93, 0 ); +static bool ft16loaded = false; + +static std::vector<FT_Info> ftdat24 ( 93, { { 0, 0 }, { 0, 0 }, { 0, 0 } } ); +static std::vector<GLuint> ftex24 ( 93, 0 ); +static bool ft24loaded = false; + +static auto *ftdat = &ftdat16; +static auto *ftex = &ftex16; static unsigned char fontColor[4] = {255,255,255,255}; @@ -97,10 +105,61 @@ void Menu::gotoParent(){ } void Menu::gotoChild(){ - if(child == NULL){ - currentMenu = NULL; - }else{ - currentMenu = child; + currentMenu = child; +} + +void loadFontSize( unsigned int size, std::vector<GLuint> &tex, std::vector<FT_Info> &dat ) +{ + FT_Set_Pixel_Sizes(ftf,0,size); + + /* + * Pre-render 'all' the characters. + */ + + glDeleteTextures( 93, tex.data() ); + glGenTextures( 93, tex.data() ); // Generate new texture name/locations? + + for(char i=33;i<126;i++){ + + /* + * Load the character from the font family file. + */ + + if ( FT_Load_Char ( ftf, i, FT_LOAD_RENDER ) ) + UserError( "Error! Unsupported character " + i ); + + /* + * Transfer the character's bitmap (?) to a texture for rendering. + */ + + glBindTexture(GL_TEXTURE_2D,tex[i-33]); + glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S ,GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T ,GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER ,GL_LINEAR ); + glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER ,GL_LINEAR ); + glPixelStorei(GL_UNPACK_ALIGNMENT,1); + + /* + * The just-created texture will render red-on-black if we don't do anything to it, so + * here we create a buffer 4 times the size and transform the texture into an RGBA array, + * making it white-on-black. + */ + + + std::vector<uint32_t> buf ( ftf->glyph->bitmap.width * ftf->glyph->bitmap.rows, 0xFFFFFFFF ); + + for( unsigned int j = buf.size(); j--; ) + buf[j] ^= !ftf->glyph->bitmap.buffer[j] ? buf[j] : 0; + + dat[i - 33].wh.x = ftf->glyph->bitmap.width; + dat[i - 33].wh.y = ftf->glyph->bitmap.rows; + dat[i - 33].bl.x = ftf->glyph->bitmap_left; + dat[i - 33].bl.y = ftf->glyph->bitmap_top; + dat[i - 33].ad.x = ftf->glyph->advance.x >> 6; + dat[i - 33].ad.y = ftf->glyph->advance.y >> 6; + + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, ftf->glyph->bitmap.width, ftf->glyph->bitmap.rows, + 0, GL_RGBA, GL_UNSIGNED_BYTE, buf.data() ); } } @@ -158,7 +217,7 @@ namespace ui { std::cout<<"Error! Couldn't initialize freetype."<<std::endl; abort(); } - fontSize = 0; + #ifdef DEBUG DEBUG_printf("Initialized FreeType2.\n",NULL); #endif // DEBUG @@ -166,6 +225,8 @@ namespace ui { battleStart = Mix_LoadWAV("assets/sounds/frig.wav"); sanic = Mix_LoadWAV("assets/sounds/sanic.wav"); //Mix_Volume(1,50); + + fontSize = 0; } void destroyFonts(void){ @@ -189,6 +250,8 @@ namespace ui { #ifdef DEBUG DEBUG_printf("Using font %s\n",ttf); #endif // DEBUG + ft16loaded = false; + ft24loaded = false; } /* @@ -196,63 +259,21 @@ namespace ui { */ void setFontSize(unsigned int size){ - mtx.lock(); - unsigned int i,j; - - fontSize=size; - FT_Set_Pixel_Sizes(ftf,0,fontSize); - - /* - * Pre-render 'all' the characters. - */ - - glDeleteTextures(93,ftex.data()); // delete[] any already-rendered textures - glGenTextures(93,ftex.data()); // Generate new texture name/locations? - - for(i=33;i<126;i++){ - - /* - * Load the character from the font family file. - */ - - if(FT_Load_Char(ftf,i,FT_LOAD_RENDER)){ - std::cout<<"Error! Unsupported character "<<(char)i<<" ("<<i<<")."<<std::endl; - abort(); + if ( size == 16 ) { + if( !ft16loaded ) { + loadFontSize( fontSize = size, ftex16, ftdat16 ); + ft16loaded = true; } - - /* - * Transfer the character's bitmap (?) to a texture for rendering. - */ - - glBindTexture(GL_TEXTURE_2D,ftex[i-33]); - glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S ,GL_CLAMP_TO_EDGE); - glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T ,GL_CLAMP_TO_EDGE); - glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER ,GL_LINEAR ); - glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER ,GL_LINEAR ); - glPixelStorei(GL_UNPACK_ALIGNMENT,1); - - /* - * The just-created texture will render red-on-black if we don't do anything to it, so - * here we create a buffer 4 times the size and transform the texture into an RGBA array, - * making it white-on-black. - */ - - - std::vector<uint32_t> buf ( ftf->glyph->bitmap.width * ftf->glyph->bitmap.rows, 0 ); - - for( j = 0; j < buf.size(); j++ ) - buf[j] = 0x00FFFFFF | (ftf->glyph->bitmap.buffer[j] ? (0xFF << 24) : 0); - - ftdat[i-33].wh.x=ftf->glyph->bitmap.width; - ftdat[i-33].wh.y=ftf->glyph->bitmap.rows; - ftdat[i-33].bl.x=ftf->glyph->bitmap_left; - ftdat[i-33].bl.y=ftf->glyph->bitmap_top; - ftdat[i-33].ad.x=ftf->glyph->advance.x>>6; - ftdat[i-33].ad.y=ftf->glyph->advance.y>>6; - - glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA,ftf->glyph->bitmap.width,ftf->glyph->bitmap.rows,0,GL_RGBA,GL_UNSIGNED_BYTE,buf.data()); + ftex = &ftex16; + ftdat = &ftdat16; + } else if ( size == 24 ){ + if ( !ft24loaded ) { + loadFontSize( fontSize = size, ftex24, ftdat24 ); + ft24loaded = true; + } + ftex = &ftex24; + ftdat = &ftdat24; } - mtx.unlock(); } /* @@ -286,16 +307,16 @@ namespace ui { * Get the width and height of the rendered character. */ - c1={(float)floor(x)+ftdat[c-33].bl.x, - (float)floor(y)+ftdat[c-33].bl.y}; - c2=ftdat[c-33].wh; + c1={(float)floor(x)+(*ftdat)[c-33].bl.x, + (float)floor(y)+(*ftdat)[c-33].bl.y}; + c2=(*ftdat)[c-33].wh; /* * Draw the character: */ glEnable(GL_TEXTURE_2D); - glBindTexture(GL_TEXTURE_2D,ftex[c-33]); + glBindTexture(GL_TEXTURE_2D,(*ftex)[c-33]); glPushMatrix(); glTranslatef(0,-c2.y,0); glBegin(GL_QUADS); @@ -309,7 +330,7 @@ namespace ui { glDisable(GL_TEXTURE_2D); // return the width. - return ftdat[c-33].ad; + return (*ftdat)[c-33].ad; } /* @@ -383,7 +404,7 @@ namespace ui { width += fontSize / 2; break; default: - width += ftdat[i].wh.x + fontSize * 0.1f; + width += (*ftdat)[i].wh.x + fontSize * 0.1f; break; } } while(s[++i]); @@ -656,9 +677,9 @@ namespace ui { } } if(fadeIntensity == 255 || dialogPassive){ - //setFontSize(24); + setFontSize(24); putStringCentered(offset.x,offset.y,rtext.c_str()); - //setFontSize(16); + setFontSize(16); } }else if(dialogMerchant){ //static int dispItem; @@ -1255,6 +1276,9 @@ EXIT: mouse.x = premouse.x + offset.x - ( SCREEN_WIDTH / 2 ); mouse.y = ( offset.y + SCREEN_HEIGHT / 2 ) - premouse.y; + static vec2 fr; + static Entity *ig; + while(SDL_PollEvent(&e)){ switch(e.type){ @@ -1269,6 +1293,14 @@ EXIT: premouse.y=e.motion.y; break; + case SDL_MOUSEBUTTONUP: + if(ig) { + ig->vel.x = (fr.x - mouse.x) / 50.0f; + ig->vel.y = (fr.y - mouse.y) / 50.0f; + ig = NULL; + } + break; + // mouse clicks case SDL_MOUSEBUTTONDOWN: // right click advances dialog @@ -1277,6 +1309,17 @@ EXIT: // left click uses item if ( ( e.button.button & SDL_BUTTON_LEFT ) && !dialogBoxExists ) player->inv->usingi = true; + + for ( auto &e : currentWorld->entity ) { + if( mouse.x > e->loc.x && mouse.x < e->loc.x + e->width && + mouse.y > e->loc.y && mouse.y < e->loc.y + e->height ) { + e->vel.y = .05; + fr = mouse; + ig = e; + break; + } + } + break; case SDL_MOUSEWHEEL: if (e.wheel.y < 0){ @@ -1481,6 +1524,12 @@ EXIT: std::cout << "Took screenshot" << std::endl; break; + case SDLK_UP: + player->inv->setSelectionUp(); + break; + case SDLK_DOWN: + player->inv->setSelectionDown(); + break; default: break; } diff --git a/src/world.cpp b/src/world.cpp index 0e0b8aa..ee2c33a 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -314,7 +314,10 @@ update( Player *p, unsigned int delta ) e->loc.y += e->vel.y * delta; // dont let structures move? - if ( e->type != STRUCTURET && e->canMove ) { + if ( e->type == STRUCTURET ) + e->canMove = true; + + if ( e->canMove ) { e->loc.x += e->vel.x * delta; // update boolean directions @@ -823,15 +826,11 @@ singleDetect( Entity *e ) */ if(e->loc.x < worldStart){ // Left bound - e->vel.x=0; e->loc.x=(float)worldStart + HLINE / 2; - }else if(e->loc.x + e->width + HLINE > worldStart + worldStart * -2){ // Right bound - e->vel.x=0; e->loc.x=worldStart + worldStart * -2 - e->width - HLINE; - } } } @@ -1027,6 +1026,24 @@ goWorldLeft( Player *p ) return this; } +bool World:: +goWorldLeft( NPC *e ) +{ + // check if entity is at world edge + if( !toLeft.empty() && e->loc.x < worldStart + HLINE * 15.0f ) { + + currentWorldToLeft->addNPC(e->loc.x,e->loc.y); + e->alive = false; + + currentWorldToLeft->npc.back()->loc.x = 0; + currentWorldToLeft->npc.back()->loc.y = GROUND_HEIGHT_MAXIMUM; + + return true; + } + + return false; +} + World *World:: goWorldRight( Player *p ) { @@ -1421,6 +1438,8 @@ World *loadWorldFromPtr( World *ptr ) currentWorldToRight = loadWorldFromXML( tmp->toRight ); loadedRight = false; + std::cout<<tmp->npc.back()->name<<std::endl; + return tmp; } diff --git a/xml/playerSpawnHill2.xml b/xml/playerSpawnHill2.xml index 8d3d328..4829087 100644 --- a/xml/playerSpawnHill2.xml +++ b/xml/playerSpawnHill2.xml @@ -4,6 +4,8 @@ <generation type="Random" width="1000" /> <structure type="5" inside="playerSpawnHill1_Building1.xml"/> + <npc name="Swag" x="0" /> + <link left="playerSpawnHill1.xml" /> </World> |