summaryrefslogtreecommitdiffstats
path: root/src/Generating (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-10-05Generator: Fixed missing hitbox assignment.Mattes D2-0/+4
This had caused village houses to generate too close to each other.
2015-10-04Fixed a race condition between chunk loader and generator.Mattes D1-6/+6
When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
2015-08-24Fix clang compile errorTheo Tosini1-1/+1
Clang would previously fail on debug builds due to the use of an old-style cast.
2015-08-12Fix old style casts and implicit conversionsMatti Hänninen8-110/+116
2015-07-31Unified the doxy-comment format.Mattes D17-106/+98
2015-07-29Silenced and fixed many warning messages across multiple files.Samuel Barney5-35/+29
2015-07-17Added documentation for GetLargeTreeAdjustmentSamuel Barney1-0/+1
2015-07-15Fixed tall grass trying to be placed in cold biomes.Samuel Barney1-1/+7
2015-07-13Sapling Growth UpdateSamuel Barney2-5/+95
* Growth has been slowed down * Saplings do not grow if they do not have enough space to grow * Saplings do not grow unless the light level is 9 or above * Dark Oak doesn't grow unless it is in a 2x2 Jungle Trees now will grow into a large tree when 2x2 saplings are used.
2015-07-13Switched from using std::max(std::min()) to using ClampSamuel Barney1-2/+2
2015-07-09Fixed misplaced parensSamuel Barney1-2/+2
2015-07-09Fixes compilation failures on MacOSX 10.10Samuel Barney2-44/+44
* Replace old c-style casts with c++ casts * Added `-Wno-error=old-style-cast` to Protocol18x.cpp
2015-07-07Fixed warnings generated by 64-bit MSVC.Mattes D5-22/+22
2015-06-23Generate biomes when pregenerating heights through CompositedHeiGen.Mattes D2-3/+6
Fixes #2283.
2015-06-20Added basic support for loading village prefabs from files.Mattes D16-17243/+237
2015-06-19Externalized cPrefabPiecePool self-test.Mattes D2-28/+3
2015-06-18PrefabPiecePool: Added loading from cubeset file.Mattes D4-3/+589
2015-06-13Updated prefabs from the Gallery server.Mattes D6-488/+465
2015-06-11SelfTests are registered and executed after logging framework init.Mattes D1-3/+9
Fixes #2228.
2015-06-02Fixed warnings in MSVC.Mattes D1-0/+7
It complained about undefined return values or using uninitialized variables.
2015-05-30Fixed minor cast warningtycho1-1/+1
2015-05-30Fix FreeBSD/clang errors caused by -Werrorlinnemannr1-1/+5
With FreeBSD/clang, -Werror combined with the configured warning flags yields some fatal errors, specifically related to signed conversion, 64 to 32 bit conversion, and tautological compares. CONTRIBUTORS Add myself to the contributor list src/Generating/FinishGen.cpp In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob from size_t to the difference_type of the ListOfSpawnables iterator MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the difference_type of the iterator class is 64 bit Also explicitly cast the noise expression to unsigned long so we don't get a signed conversion warning from the modulo against ListOfSpawnables.size() src/OSSupport/StackTrace.cpp FreeBSD 10 and above includes a non glibc implementation of benchmark() for which size_t, not int, is the return type. To account for this and prevent a signed conversion warning, abstract the type for numItems with a macro btsize src/StringUtils.h In StringToInteger(), correct a tautological compare warning for unsigned types with the template. If T is unsigned, comparing std::numeric_limits<T>::min() to the unsigned result is always false. That control can enter this branch in an evaluated template with an unsigned type T may also permit a signed number to be parsed and erroneously stripped of its signedness at runtime. To guard against this and avoid the warning in the case that the number parsed from the string is non-positive, return false and don't try to parse if T is unsigned and control enters the non-positive branch
2015-05-28Fix commentstycho1-1/+1
2015-05-24Fix commentstycho4-58/+58
2015-05-24Made -Weverything an error.tycho16-45/+55
2015-05-24Wolves don't spawn in rivers.Alexander Harkness1-1/+1
2015-05-23Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2-3/+3
2015-05-23Fix teststycho1-0/+2
2015-05-23Cows and rabbits no longer spawn over water.Alexander Harkness1-1/+1
Fixes #2080
2015-05-19Make -Werror disabling file onlytycho1-0/+14
Ad fix a load of warnings
2015-05-19Fixed some more warningstycho3-36/+36
2015-05-19More fixed warningstycho6-28/+40
2015-05-19Fixed compile and a few more warningstycho1-1/+6
2015-05-19Fixed a lot of warningstycho11-210/+196
2015-05-18Fix the health of animalsLukas Pioch1-0/+1
2015-05-09CheckBasicStyle: checks spaces around * and &.Mattes D1-1/+1
2015-05-09More style checking.Mattes D18-24/+24
Spaces around some operators are checked.
2015-04-21Changed default MaxThreshold valueSTRWarrior1-1/+1
There is now really a difference between open and dense parts
2015-04-21Calculate threshold for each column in a chunk instead for the whole chunkSTRWarrior1-2/+1
2015-04-20Changed Nether composition to change the threshold from a cubic noiseSTRWarrior2-7/+7
2015-04-19Fixed typo in NetherForts initializationSTRWarrior1-1/+1
The S in NetherForts was missing
2015-04-19GlowStone: Changed order of initialization of member variablesSTRWarrior1-2/+2
2015-04-19Fixed styleSTRWarrior1-2/+2
2015-04-19Added GlowStone finisherSTRWarrior3-1/+139
2015-03-21Style fixesworktycho1-15/+15
2015-03-20Correct world height validations.Tommy Santerre2-2/+2
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255
2015-03-11Changed pipeline character from >> to |tycho2-15/+15
2015-03-11Fixed style and removed false positivestycho1-4/+9
Relaxed the rules for < followed by an && and removed rule for < following an &&
2015-03-10Fixed Sequence Generator for IntGenTycho2-12/+24
2015-03-08Added parenthesis around the comparisonsSTRWarrior1-2/+2
2015-03-08Added proper trees to Mesa biomesSTRWarrior1-6/+10
Mesa only has small apple trees.
2015-03-08Added grass/course dirt layer on MesaPlateauF(M)STRWarrior1-0/+14
2015-03-01Removed trailing whitespaceSTRWarrior1-1/+1
2015-03-01Replaced IntNoiseXX with IntNoiseXXIntSTRWarrior1-2/+2
2015-03-01Replaced cFinishGenPtr with std::make_sharedSTRWarrior1-1/+1
2015-03-01Fixed StyleTycho2-13/+15
Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
2015-03-01Added pipelining syntax for generatorsTycho2-16/+63
2015-03-01Steppy HeiGen: Fixed Linux compilation.Mattes D1-1/+1
2015-03-01Added Steppy height generator.Mattes D3-1/+409
2015-02-28Made the minimum vine level configurableSTRWarrior3-4/+7
2015-02-28Implemented a vines finisher that creates vines in jungle biomesSTRWarrior3-0/+119
2015-02-25Ice finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior1-26/+19
2015-02-25Snow finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior1-22/+14
2015-01-27Replaced atoi() with StringToInteger().Mattes D1-2/+1
2015-01-23Fixed defect #43665 in Coverity list.Kirill Kirilenko1-0/+11
2015-01-23Fixed defect #73101 in Coverity list.Kirill Kirilenko1-1/+13
2015-01-23Fixed defect #43671 in Coverity list.Kirill Kirilenko1-0/+4
2014-12-24Refactored all player block placing to go through hooks.Mattes D2-14/+14
Fixes #1618.
2014-12-21cEndGen: Fixed unitialized member variables.Mattes D1-1/+3
Fixes CID 43671.
2014-12-21cNoise3DComposable: Fixed unitialized member variables.Mattes D1-1/+3
Fixes CID 43665.
2014-12-13WormNestCaves occasionally generates sandstone around the caveSTRWarrior1-3/+22
Only when the block around the cave is sand.
2014-12-11Fixed DungeonRooms edges not generating sometimes.Mattes D1-2/+2
2014-12-10Added a cWorld:PrepareChunk function.Mattes D2-31/+63
It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
2014-12-07Reduced river heightSTRWarrior1-2/+2
Rivers would exceed the water height quite often
2014-12-07Fixed error message in cFinishGenPassiveMobsSTRWarrior1-1/+1
It would send an error message when trying to spawn mobs in a desert
2014-12-05FinishGenPassiveMobs: Cosmetic changes.Mattes D2-30/+33
2014-12-05formatting and default spawn percentagep-mcgowan1-1/+2
2014-12-05BasicStyle: Added missing braces to control statements.Mattes D1-2/+8
2014-12-05reformatp-mcgowan1-9/+5
2014-12-05restructure, with logic this timep-mcgowan1-5/+13
2014-12-05restructured random animals, added check for desert (update as per wiki)p-mcgowan1-19/+17
2014-12-05handle non-vanilla dimensionsp-mcgowan1-2/+2
2014-12-05handle non-vanilla dimensionsp-mcgowan1-2/+3
2014-12-05formatting fixesp-mcgowan1-4/+11
2014-12-04format blocks and randomizingp-mcgowan2-9/+9
2014-12-04last doxy fixp-mcgowan1-3/+3
2014-12-04awful comment fixing, randomizer fixp-mcgowan2-19/+32
2014-12-03clearing CheckBasicStyle.lua messagesp-mcgowan2-28/+28
2014-12-03class description and doxy-commentingp-mcgowan2-5/+8
2014-12-03doxy-commentingp-mcgowan1-3/+3
2014-12-03forgot initializerp-mcgowan1-1/+5
2014-12-02typos and oversights for lua and CIp-mcgowan1-1/+5
2014-12-02fastRandom unusedp-mcgowan1-1/+0
2014-12-02indentation, repeatable random, small correctionsp-mcgowan1-98/+93
2014-12-02fix comments after replacing spaces with tabsp-mcgowan1-4/+4
2014-12-02animal terrain finisherp-mcgowan2-187/+187
2014-12-02animal terrain finisherp-mcgowan2-0/+241
2014-12-02Fixed forgotten semicolonSTRWarrior1-1/+1
2014-12-02Using IntNoise3DInt instead of IntNoise3DSTRWarrior1-1/+1
2014-12-02Suggestions by xoftSTRWarrior1-3/+3
Using IntNoise3D to prevent needless floating point math
2014-12-02reformat for lua and CIp-mcgowan2-6/+9
2014-12-02formatting and commenting fixesp-mcgowan2-6/+6
2014-12-01cacti no longer spawn outside of desert variantsp-mcgowan2-1/+16
2014-12-01Using static cast for Dungeon spawnersSTRWarrior1-1/+1
2014-12-01Using static cast for MineShaft spawnersSTRWarrior1-1/+1
2014-12-01Mineshaft spawners now spawn cave spidersSTRWarrior1-1/+4
2014-12-01Dungeons spawners now spawn mobsSTRWarrior1-1/+22
25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
2014-12-01Simplefied SoulsandRimsSTRWarrior1-36/+6
Replaced two for loops with a single if
2014-12-01Added better soulsand rimsSTRWarrior4-11/+106
As a finisher called SoulsandRims
2014-12-01DistortedHeightmap: Added missing initialization.Mattes D1-0/+2
This was probably the original cause for the "empty chunks". Fixes #1433.
2014-12-01Noise3D: Fixed missing initialization.Mattes D1-1/+3
This should fix terrain being at Y=0 or Y=255 for the spawn chunk. Fixes #1433.
2014-11-30Hopefully fixed random build failsSTRWarrior1-1/+1
2014-11-30Fixed nether ceilingSTRWarrior1-1/+1
2014-11-27CompoGenBiomal: Fixed signed vs unsigned comparison.Mattes D1-1/+1
2014-11-27Fixed BlockStringToType return value.Mattes D1-3/+3
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
2014-11-26Merge remote-tracking branch 'origin-master' into c++11Tiger Wang27-1514/+1554
2014-11-23Added TwoHeights shape generator.Mattes D5-8/+162
This is a faster shape generator that can generate overhangs and has biome awareness.
2014-11-23Removed unnecessary #includesTiger Wang1-1/+0
2014-11-23Noise3D generator: Enlarged averaging to avoid steep beach slopes.Mattes D2-4/+4
2014-11-20BiomalNoise3D generator: finished all biomes.Mattes D1-66/+74
2014-11-20CompoGenBiomal: Fixed sealevel offset.Mattes D1-1/+1
2014-11-20CompoGenBiomal: Fixed sealevel not generating properly.Mattes D1-1/+2
2014-11-20Generators: Unified SeaLevel into a single variable.Mattes D3-70/+3
It is shared between shape generators and composition generators and there's no sense in having two different values for those.
2014-11-20Noise3D generators: Changed noise generator to InterpolNoise.Mattes D2-10/+10
2014-11-19cInterpolNoise: Implemented optimized 2D generating.Mattes D2-8/+56
2014-11-18Added a cInterpolNoise template for faster noise generator.Mattes D2-4/+54
Used an instance of it in the Noise3D generator.
2014-11-18Moved all Noise-related files into a separate folder.Mattes D16-16/+11
2014-11-17Added cImprovedNoise implementation.Mattes D2-36/+7
2014-11-16Changed commentSTRWarrior1-1/+1
Suggestion by xoft
2014-11-16BiomalNoise3D: Added more biomes.Mattes D1-13/+65
2014-11-15Generator: Fixed crash with trees too high.Mattes D1-2/+7
2014-11-15Snow generator: Fixed failure at top of the world.Mattes D1-1/+1
2014-11-15ChunkDesc: Fixed comment about indexing.Mattes D1-1/+1
2014-11-15DungeonRooms: Changed to work with the new shape generators.Mattes D1-10/+15
2014-11-14Noise3D: Added jungles.Mattes D1-0/+2
2014-11-13Noise3D: Added oceans.Mattes D1-0/+3
2014-11-13Gen refactor: Implemented CompositedHeiGen.Mattes D9-217/+141
This fixes crashes in the Village generator due to the missing generator.
2014-11-13First implementation for the LargeOakTreeSTRWarrior2-2/+110
2014-11-12Generator: Shape initial refactoring.Mattes D23-1346/+1356
The code compiles, but several structure generators are broken, crash on start.
2014-11-10BiomalNoise3D: Added a few biomes.Mattes D1-5/+8
2014-11-10TallGrassGenerator: Fixed crash when too highSTRWarrior1-0/+5
2014-11-10Added BiomalNoise3D shape generator.Mattes D4-29/+369
2014-11-09Noise3d Generator: Fixed unused function error.Mattes D1-1/+1
2014-11-09Noise3D generator: rewritten from scratch.Mattes D2-78/+145
Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable.
2014-11-06Noise3D CompoGen: Fixed missing initialization.Mattes D1-0/+2
2014-11-04MinMax heigen: Reduced the number of octaves.Mattes D1-2/+0
They didn't affect the terrain that much anyway.
2014-11-04Added MinMax height generator.Mattes D1-0/+207
Fixes #1578.
2014-11-03Fixed a missing endline.Mattes D1-1/+5
2014-11-03Added a (disabled) perf test for biome generators.Mattes D1-0/+46
2014-11-03HeiGen: Moved construction to the end of file.Mattes D1-75/+75
This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
2014-11-02Grown biomes: fixed Linux build.Mattes D1-3/+3
2014-11-02Grown biomes: Unified with GrownProt biomes.Mattes D3-159/+595
Also fixed a Zoom filter randomness.
2014-11-01GrownProt: Added the rest of rare and M biomes.Mattes D2-14/+91
2014-11-01GrownProt biome gen: Added biome edges.Mattes D2-2/+162
2014-10-31GrownProt biomes: added alterations.Mattes D3-130/+192
2014-10-30QtBiomeVisualiser: Added a prototyping int generator flavor.Mattes D4-53/+1253
This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
2014-10-29Grown biomes: made biomes smaller, made beaches smaller.Mattes D1-11/+8
2014-10-27Comment alignment.Alexander Harkness2-8/+8
2014-10-27CheckBasicStyle'dAlexander Harkness2-28/+28
2014-10-27Fixed more warnings.Alexander Harkness1-14/+14
It's ugly though.
2014-10-27Another switch.Alexander Harkness1-0/+5
2014-10-27Fix missing biomes in enum.Alexander Harkness1-0/+5
2014-10-27Fixed remaining warnings.Alexander Harkness1-5/+5
2014-10-27Actually fixed the warning.Alexander Harkness1-20/+9
2014-10-27Test warning fix.Alexander Harkness1-0/+11
2014-10-27cIntGen: Added a virtual destructor.Mattes D1-0/+4
2014-10-27Removed too advanced C++11 features.Mattes D2-32/+28
We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet.
2014-10-26IntGen: Attempt at fixing Linux compilation.Mattes D1-13/+13
2014-10-26BioGenGrown: Smaller biomes, add land to map center.Mattes D2-16/+13
2014-10-26Fixed a copypasta error in cIntGenAddToOcean.Mattes D1-4/+4
2014-10-26Added a missing header to CMakeLists.Mattes D1-0/+1
2014-10-26Added new biomegen: GrownMattes D2-0/+1047
2014-10-23Removed iniFile library from linux dependencies.Mattes D2-2/+2
2014-10-23Merged IniFile into main MCS sources.Mattes D9-9/+9
2014-10-23En masse NULL -> nullptr replaceTiger Wang14-44/+44
2014-10-22ComposableGenerator: Removed nullptr initializers.Mattes D1-3/+3
2014-10-20En masse NULL -> nullptr replaceTiger Wang14-44/+44
2014-10-20Fixed #1550Julian Laubstein1-6/+6
2014-10-19TwoLevel BioGen: fixed swapped inside and outside biomes.Mattes D1-1/+1
2014-10-19Migrated random generators to std::randomTiger Wang1-1/+1
2014-10-19Mountain height gen: Added ditches.Mattes D2-8/+16
2014-10-19Generator: Rewritten to use SharedPtrs.Mattes D18-181/+145
2014-10-16BioGen: Fixed a compiler warning.Mattes D1-2/+2
2014-10-16Reversed wrong fix for #1517.STRWarrior1-8/+2
2014-10-15Reversed the order of the lootSTRWarrior1-7/+15
For some reason the rare items weren't generating at all. Added forgotten Golden Apple
2014-10-15Added loot to dungeons.STRWarrior1-1/+27
2014-10-09DistortedHeightmap: Fixed crash on number rounding.Mattes D1-4/+5
Fixes #1521.
2014-10-08Added comments to the GetAcaciaTreeImage functionSTRWarrior1-0/+18
2014-10-08Using array with possible directions.STRWarrior1-8/+9
2014-10-08Added AcaciaTrees for the savanna biomesSTRWarrior1-5/+56
2014-10-04Fixes #1503 - No gravel is being generatedwin32re1-1/+1
2014-09-28Fixed compilationSTRWarrior1-1/+10
2014-09-28Added Granite, Diorite and Andesite to the NaturalPatches generator.STRWarrior3-7/+37
2014-09-27BioGen: TwoLevel is now fully settable in INI.madmaxoft2-44/+31
2014-09-25TwoLevel BioGen: reads params from INI file.madmaxoft1-9/+26
2014-09-22Made it compile with clangChris Darnell2-3/+3
2014-09-17Voronoi biomegen: Added JitterSize and OddRowOffset.madmaxoft1-71/+77
2014-09-17Added first test to show the object can be createdTycho1-0/+1
2014-09-05WorldStorage no longer queues chunks into generator.Mattes D1-0/+2
2014-09-05Rewritten chunk status to specify whether the chunk is in queue.Mattes D2-1/+6
This fixes #1370.
2014-09-05BiomeMultiCache is not used for simple generators.Mattes D1-21/+22
2014-09-05Fixed style.Mattes D3-9/+13
2014-09-03ChunkGenerator: Log world seed when creating a new one.madmaxoft1-3/+14
2014-09-03change to linear calculationDayBr3ak2-9/+7
2014-09-03adapting formatDayBr3ak3-7/+14
2014-09-03re-add the missing "s" too cChunkCoordsWithBoolListLO1ZB2-5/+5
2014-09-03hopefully the last commit for removing y-coord from chunks. :)LO1ZB2-11/+17
2014-09-02forgot this oneDayBr3ak2-2/+2
2014-09-02opting for size_tDayBr3ak2-5/+5
2014-09-02fixing memory leakDayBr3ak1-4/+5
2014-09-02changing implem, using vectorsDayBr3ak2-98/+23
2014-09-02adding config file entry #381DayBr3ak1-1/+10
2014-09-02adding the multicache behaviorDayBr3ak3-4/+119
2014-09-01added multicache class definitionDayBr3ak1-0/+35
2014-09-01fix possibility of a twice generated chunkLO1ZB1-1/+2
2014-08-29fix chunk regeneratingLO1ZB1-8/+0
2014-08-28remove y-coord from chunksLO1ZB2-9/+9
2014-08-27DungeonRooms: Fixed an off-by-one error.Mattes D1-2/+2
2014-08-27More basic style fixes.Mattes D1-2/+2
2014-08-27DungeonRooms: Added a height probability distribution function.Mattes D3-9/+19
2014-08-27DungeonRooms: Added the spawner in the center of the room.Mattes D1-0/+15
2014-08-26DungeonRooms: Chests are never placed next to each other.Mattes D1-22/+27
2014-08-26DungeonRooms: Random pattern for floors.Mattes D1-1/+32
2014-08-26DungeonRooms: Replaced explicit switch with CanBeTerraformed().Mattes D1-11/+3
2014-08-26Added initial dungeon rooms finisher.Mattes D4-0/+289
2014-08-21Added initializers for class members.Mattes D3-1/+11
As reported by Coverity, these weren't initialized.
2014-08-18SwamplandM: Fixed sometimes having no mountains.STRWarrior1-1/+1
2014-08-10Bunch of tweaks:STRWarrior3-15/+15
Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors
2014-08-10Added NaturalPatches generatorSTRWarrior1-0/+22
It generates gravel and dirt.
2014-08-10Added NetherOreNests.STRWarrior1-0/+15
It generates Nether Quarts.
2014-08-10Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior3-53/+83
2014-08-10Removed an old and outdated comment.STRWarrior1-2/+0
2014-08-04CheckBasicStyle: multi-level indent change.madmaxoft2-5/+6
2014-08-03VillageGen: Fixed a typo in commentSTRWarrior1-1/+1
2014-08-02Added proper trees and height for SwamplandM biomeSTRWarrior3-2/+4
2014-07-30SuggestionsSTRWarrior1-2/+2
2014-07-30Moved GetRoofedForestTreeImage content to GetDarkoakTreeImageSTRWarrior2-66/+55
2014-07-30Fixed doxy commentSTRWarrior1-1/+1
2014-07-30Fixed comment at the end of a for-loopSTRWarrior1-1/+1
2014-07-30Fixed compiling using ClangSTRWarrior1-4/+2
2014-07-30Added RoofedForest trees.STRWarrior2-2/+73
Could still be improved allot.
2014-07-30PreSimulator: Added configurations.STRWarrior3-6/+30
You can now choose if it should pregenerate something or not
2014-07-30Fixed FinishGen.h types.madmaxoft1-2/+2
2014-07-30Changed size_t to 'unsigned long'Howaner1-2/+2
2014-07-30Fixed compile error with clang.Howaner1-2/+2
2014-07-29Added cBlockInfo::CanBeTerraformed and made finishers use itSTRWarrior2-44/+6
I might have forgotten some of them though
2014-07-29Slight cleanup after portalsTiger Wang1-1/+1
2014-07-29Some finishing touchesSTRWarrior2-2/+2
Removed whitespace fixed dead bush comment
2014-07-29Fixed comment above cFinishGenSingleTopBlockSTRWarrior1-1/+1
2014-07-29SingleTopBlock: All blocktypes and biometypes get initialized properlySTRWarrior1-2/+14
2014-07-28Using suggestionsSTRWarrior1-25/+20
2014-07-28Forgot Mesa Plateau biome.STRWarrior1-0/+1
2014-07-28Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior3-20/+82
Now accepts a vector of biomes and a vector of allowed blocks.
2014-07-28DistortedHeightmap: Now generates gravel in deep ocean.STRWarrior1-1/+1
2014-07-27NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior1-1/+1
2014-07-27Updated NetherForts' weights.madmaxoft1-2/+2
2014-07-27RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft3-20/+93
The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
2014-07-27RoughRavines: Added per-height radius modifier. Ledges!madmaxoft1-32/+73
2014-07-27Removed forgotten commentSTRWarrior1-1/+1
2014-07-27Made nether ceiling smooth.STRWarrior1-1/+8
2014-07-27RoughRavines: More settings - size, width, roughnessmadmaxoft3-23/+84
2014-07-27Added a ceiling to disguise the bedrock above it.STRWarrior1-1/+9
2014-07-27NetherClumpFoliage: Fixed assertSTRWarrior1-8/+39
2014-07-27Updated NetherFort prefabs to latest Gallery content.madmaxoft1-37/+752
2014-07-27RoughRavines: Initial generator implementation.madmaxoft4-3/+264
This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
2014-07-25Tweaks to NetherClumpFoliageSTRWarrior1-34/+6
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
2014-07-25Speed up the NetherClumpFoliage finisher.STRWarrior1-8/+9
Using IntNoiseXX instead of CubicNoiseXX.
2014-07-24Removed redundant semicolons and re-added warningarchshift1-1/+1
2014-07-23TallGrass: Less grass on mountains.STRWarrior1-0/+11
2014-07-23Fixed possible crash in the NetherClumpFoliage finisher.STRWarrior1-0/+5
2014-07-22Extreme Hills M variant only spawn with grass and stoneSTRWarrior1-1/+1
Removed gravel.
2014-07-22Updated prefabs to current Gallery content.madmaxoft3-226/+243
2014-07-21ExtremeHillsPlus and ExtremeHills spawn with grass onlySTRWarrior1-12/+2
Turns out only the M variants have stone and gravel in them.
2014-07-21Style: Normalized to no spaces before closing parenthesis.madmaxoft4-9/+9
2014-07-21Fixed a missing enter.STRWarrior1-0/+1
2014-07-21Removed y for-loop.STRWarrior1-27/+27
Only the top block now gets long grass.
2014-07-21Fixed indentationSTRWarrior1-12/+12
2014-07-20Changed CubicNoiseXX to IntNoiseXXSTRWarrior2-40/+49
Added some comments
2014-07-20Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior3-17/+34
Better grass density Added double tall grass.
2014-07-20Fixed warningsSTRWarrior2-5/+4
2014-07-20First attempt for a new foliage finisherSTRWarrior3-0/+74
2014-07-19Fixed style: spaces after commas.madmaxoft4-9/+9
2014-07-19Trees.cpp: removed unused "debug" fieldsarchshift1-7/+1
2014-07-19Subdirs: Only add_library if not using MSVCarchshift2-4/+8
2014-07-19Generating/Prefabs/CMakeLists.txt: Replaced glob with list of filesarchshift1-5/+22
2014-07-19Generating/CMakeLists.txt: Replaced glob with list of filesarchshift1-5/+54
2014-07-18Fixed spaces before commas.madmaxoft2-4/+4
2014-07-18Generator: removed rnd definitions that are never readarchshift2-2/+0
2014-07-17Fixed code style in Trees.cpp.madmaxoft1-24/+24
The src folder now has zero BasicStyle violations.
2014-07-17Fixed tabs used for alignment.madmaxoft5-22/+22
2014-07-17Basic style fixes.madmaxoft11-25/+25
2014-07-17Normalized comments.madmaxoft31-258/+258
This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-15Added missing member initialization to cGridStructGen.madmaxoft1-0/+1
Fixes CID 68228.
2014-07-13CopyPaste Errorworktycho1-1/+1
Fixes CID 70460.
2014-07-13Another COpyPaste Errorworktycho1-1/+1
Fixes CID 70461
2014-07-13Fix CopyPaste error that ment a_MaxRelX wasdn't checkedworktycho1-1/+1
Fixes CID 70464
2014-07-10Removed lilypad from plains village prefabs.madmaxoft1-7/+8
2014-07-08Updated generator prefabs to current Gallery contents.madmaxoft3-7/+8
2014-06-26Check GridSize for 0worktycho1-0/+10
Fixes CID 68226 and CID 66437
2014-06-23Prefabs don't draw into chunk if they don't intersect.madmaxoft1-0/+11
2014-06-21Added a TestRails generator.madmaxoft5-0/+667
This is for debugging purposes only.
2014-06-21Fixed a caching bug in GridStructGen.madmaxoft1-2/+2
The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use.
2014-06-21Updated prefabs to the latest Gallery content.madmaxoft4-2049/+2644
2014-06-20Updated all prefabs to current Gallery content.madmaxoft2-650/+824
2014-06-20Optimized Voronoi calculation.madmaxoft2-9/+19
Fixes #818.
2014-06-19Nullify deleted pointers.archshift3-0/+6
2014-06-16Merge branch 'master' of github.com:mc-server/MCServerTycho18-373/+508
2014-06-16Fixed a copypasta error in WormNestCaves generator settings.madmaxoft1-1/+1
2014-06-16Updated the SandFlatRoofVillage prefabs.madmaxoft1-288/+381
2014-06-15Added random offsets to cGridStructGen.madmaxoft17-85/+127
Fixes #740.
2014-06-11Roads in villages are made out of wooden planks if they generate on water.STRWarrior1-4/+17
2014-06-11Revert "Initial Mesa Bryce implementation."madmaxoft4-116/+4
This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4.
2014-06-10Initial Mesa Bryce implementation.madmaxoft4-4/+116
2014-06-09Added an experimental height generator, Mountains.madmaxoft2-0/+87
2014-06-08Fixed E_META_...Typos in BlockID.hnarroo1-78/+78
2014-06-07docs/Generator: Added the easy Finishers.madmaxoft1-1/+13
2014-06-07Added RainbowRoads finisher generator.madmaxoft5-3/+1594
2014-06-05SuggestionsTiger Wang1-1/+1
2014-06-04Fixed a NetherFinisher bugTiger Wang3-24/+9
2014-06-01Update UnderwaterBase prefabs.madmaxoft1-12/+378
Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
2014-06-01Updated UnderwaterBase prefabs.madmaxoft1-103/+123
2014-06-01Updated AlchemistVillage prefabs.madmaxoft1-103/+105
2014-05-31Implemented end and nether portalsTiger Wang4-19/+4
2014-05-31Added an initial version of the underwater base generator.madmaxoft5-0/+2103
2014-05-31Updated PlainsVillage prefabs.madmaxoft1-73/+85
2014-05-31Fixed a memory leak in VillagGen.madmaxoft1-0/+5
2014-05-30Updated PlainsVillage and AlchemistVillage.madmaxoft2-239/+1270
2014-05-29Fixed a memory leak in cPOCPieceGeneratormadmaxoft1-0/+5
2014-05-28Fixed a memory leak in cPrefabPiecePool.madmaxoft2-1/+34
The pool pieces weren't freed upon pool destruction.
2014-05-27Added AlchemistVillage prefabs (Thanks, KingsCraftAu).madmaxoft3-9/+3007
2014-05-27Fixed testing weights in PlainsVillages.madmaxoft1-3/+3
2014-05-27cPieceGenerator chooses starting pieces based on weights.madmaxoft4-1/+44
Fixes #1033.
2014-05-27Biome generators: biome lists can contain spaces.madmaxoft1-1/+1
2014-05-26Fixed prefab test initialization.madmaxoft1-0/+3
2014-05-25Added support for Miners' Village.madmaxoft10-2234/+4438
The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027.
2014-05-24Added Japanese village prefabs.madmaxoft5-4/+2442
2014-05-23Fixed Mineshaft system size.Mattes D1-1/+1
2014-05-23Auto-enlargement for cGridStructGen cache.Mattes D1-0/+9
2014-05-22Updated plains village prefabs.madmaxoft1-186/+171
Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
2014-05-22Villages have min and max density setting.madmaxoft5-17/+110
Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020.
2014-05-22Updated plains village prefabs.madmaxoft1-44/+43
The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
2014-05-21Changed desert village roads to gravel.madmaxoft1-1/+1
2014-05-21Added second kind of desert village (FlatRoof).madmaxoft3-4/+1535
2014-05-18Updated SandVillage prefabs to latest Gallery content.madmaxoft1-12/+12
This fixes sand village generation.
2014-05-17Village roads are drawn properly.madmaxoft2-8/+35
2014-05-17Village houses are height-adjusted onto the terrain.madmaxoft5-7/+67
2014-05-17Updated PlainsVillage prefabs to the latest Gallery contents.madmaxoft1-2265/+2892
2014-05-15Fixed a NULL ptr failure in GridStructGen.madmaxoft2-9/+42
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15Changed village generator defaults to more reasonable values.madmaxoft1-2/+2
2014-05-15Changed village road generation to use multiple prefabs.madmaxoft3-39/+38
2014-05-15VillageGen rewritten using BFSPieceGenerator.madmaxoft5-412/+406
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15cPrefab can be constructed in code.madmaxoft2-0/+51
2014-05-12VillageGen: Added well placement and the general algorithm description.madmaxoft3-6/+152
2014-05-12More switch warnings.archshift1-7/+27
2014-05-12Fixed a few more switch warnings.archshift1-15/+13
2014-05-11Initial VillageGen implementation.madmaxoft6-0/+5807
WIP, doesn't generate anything yet. Ref.: 740.
2014-05-09Removed unused constants from MineShafts and Ravines.Mattes D2-9/+0
2014-05-09Removed an unused NetherFortGen variable.Mattes D1-6/+0
2014-05-09Removed an unused macro.Mattes D1-7/+0
2014-05-09Fixed MSVC 64-bit build warnings.Mattes D5-10/+22
2014-05-09Ravines rewritten using cGridStructGen.Mattes D2-182/+40
Ref.: #987.
2014-05-09cWormNestCaves rewritten using cGridStructGen.Mattes D2-223/+29
Ref.: #987.
2014-05-09Mineshafts generator rewritten to use GridStructGen.Mattes D2-156/+33
2014-05-08Fixed cGridStructGen.Mattes D1-18/+6
Now cNetherFortGen works with the new architecture.
2014-05-08Fixed MSVC 64-bit build warnings.Mattes D5-10/+22
2014-05-07cNetherFortGen uses cGridStructGen.madmaxoft5-264/+42
WIP, this doesn't work properly yet.
2014-05-07Initial cPrefabPiecePool refactoring.madmaxoft2-0/+196
Ref.: #986.
2014-05-06Initial cGridStructGen refactoring.madmaxoft2-0/+262
Ref.: #987.
2014-05-05Changed cPieceGenerator to support pairings.madmaxoft3-57/+104
Fixes #982.
2014-05-05Prefabs can specify that they don't want flooring.madmaxoft1-30/+33
Previously the flag was ignored.
2014-04-27Removed unneeded assertTycho1-1/+1
Fixed CID 43610
2014-04-25Cmake generated projects for IDEs include headers in project files.archshift2-0/+2
2014-04-23Updated NetherFort prefabs to latest Gallery content.madmaxoft1-7/+29
2014-04-22Updated NetherFort prefabs from the Gallery server.madmaxoft1-274/+785
2014-04-21Added prefab hitboxes.madmaxoft3-11/+138
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
2014-04-18Small style changesjfhumann1-1/+1
2014-04-18Did some static analysis, fixed some bugs and optimized a lot of codejfhumann3-24/+29
2014-04-18Added performance test of the nether fort generator.madmaxoft2-0/+35
2014-04-17Added area flooring.madmaxoft1-1/+42
Fixes #743.
2014-04-17Added Prefab initializers to SELFTEST code.madmaxoft1-1/+13
2014-04-17Prefabs can have per-piece per-placement weights.madmaxoft5-32/+752
Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents.
2014-04-15Added support for per-piece per-placement weights in cPieceGenerator.madmaxoft2-28/+48
Ref.: #753.
2014-04-15NetherFortPrefabs: Fixed a connector in MidStaircase.madmaxoft1-1/+1
2014-04-12Updated the NetherFort prefabs to current Gallery contents.madmaxoft3-1958/+3329
Code exported from the Gallery server by the GalExport plugin.
2014-03-30Added all current NetherFort prefabs.madmaxoft1-3/+1547
2014-03-30Added asserts for critical data in cPrefab.madmaxoft1-0/+4
2014-03-30Re-fixed nether fort piece count check.madmaxoft1-2/+2
2014-03-30NetherForts have a minimum number of pieces.madmaxoft1-2/+5
The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces.
2014-03-29cPrefab now uses a struct for block type definition in CharMap.madmaxoft2-10/+102
As suggested by worktycho in 7b585290fccd3dc074b1f9feef0af754ab3dd632, instead of packing the two values into a single int, they're packed into a struct. Also added a test code for the prefab parsing in SELF_TEST.
2014-03-28NetherFortGen: Added several more prefabs.madmaxoft2-2/+783
Also extended the defauls MaxDepth value to 12.
2014-03-28Implemented the msSpongePrint merge strategy.madmaxoft1-3/+3
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
2014-03-28NetherFort: Added BalconyTee2 prefab.madmaxoft1-29/+158
2014-03-28Fixed a memory leak in NetherFortGen.madmaxoft1-0/+7
2014-03-28Sponged the netherfort balcony prefab.madmaxoft1-30/+31
This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks.
2014-03-28Initial NetherFortGen import.madmaxoft7-2/+699
Simple fortresses of 2 different rooms will generate.
2014-03-28Fixed Prefab's rotations.madmaxoft2-7/+39
2014-03-28Add missing ChunkDesc import.Howaner1-1/+1
2014-03-27cPrefab can draw itself into a cChunkDesc.madmaxoft2-6/+9
2014-03-26Prefabs support connectors, rotations and merge strategy.madmaxoft2-3/+72
2014-03-25Added a basic cPrefab class.madmaxoft2-0/+222
Can be defined in the source by GalExport's cpp output.
2014-03-25BlockArea: Switched internal coords to Vector3i.madmaxoft1-3/+3
2014-03-21Implemented faster upscaling using templates.madmaxoft5-14/+14
Fixes #819.
2014-03-14Fixed xofts issuesTycho1-2/+2
2014-03-12Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho1-1/+1
2014-03-12Fixed printf format compatabiltyTycho1-5/+4
2014-03-12Fixed missing comment terminator.madmaxoft1-1/+1
2014-03-11Fixed a load of format string errorsTycho1-2/+2
2014-03-11Fixed Warnings in PieceGeneratorTycho2-9/+9
2014-03-10Removed debugging output.madmaxoft1-1/+3
Kept it commented-out for later revisions, if needed.
2014-03-10POCPieces: Added height.madmaxoft1-17/+20
Now the pieces connect in different heights, too, creating a true 3D maze.
2014-03-09A working POCPiece generator.madmaxoft5-6/+359
2014-03-09cPieceGenerator: New connectors are added to the free pool.madmaxoft2-9/+30
2014-03-09PieceGenerator can connect two connectors of the same type.madmaxoft2-60/+338
Also added extensive debugging output and a test.
2014-03-09Added the first skeleton code for PieceGenerator.madmaxoft2-0/+545
This is a WIP and won't work / isn't used at all.
2014-03-07WarningsTycho2-1/+3
2014-03-01ChunkDesc warns about StructureGen's deprecation.madmaxoft1-0/+2
2014-03-01Unified StructureGens and FinisherGens.madmaxoft10-163/+128
Now they are all Finishers. Fixes #398.
2014-03-01g_BlockXXX => cBlockInfo::XXXandrew1-3/+3
2014-02-20Thread safe cMap managerandrew1-9/+0
2014-02-19Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2-3/+3
2014-02-19Add new Trees (without Generator)Howaner2-0/+24
2014-02-09Fixed compile and some warnings in MSVSTiger Wang1-9/+0
2014-02-03Fogot to save BiogenTycho1-4/+4
2014-02-03Fixed Compile errorsTycho1-1/+1
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03Increased Type safety of BiomesTycho3-8/+8
Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-01-31Added cChunkDest::UpdateHeightmap()madmaxoft2-17/+48
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-25dded dependecy on Blocks to GeneratorTycho1-1/+1
2014-01-25Mob bugfixesTiger Wang1-0/+2
* Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563
2014-01-25Fixed a generator bugTiger Wang1-1/+6
2014-01-19Added Inifile and OSSupport LinkingTycho1-0/+2
2014-01-18Alpha-sorted the finishers.madmaxoft1-4/+4
2014-01-18Fixed errors.STRWarrior2-2/+2
2014-01-18Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior3-10/+10
2014-01-18Some tweaks.STRWarrior1-5/+18
Everything generates more often. Fire can only spawn on ForeverBurning blocks.
2014-01-18Fixed bug where only brown mushrooms would spawn.STRWarrior1-3/+3
2014-01-18It now actualy works.STRWarrior1-20/+42
2014-01-17First attempt at creating a clumb version NetherFinisher.STRWarrior2-22/+63
2014-01-10Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft8-49/+87
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
2014-01-10Fixed generator adding values to ini file.madmaxoft2-1/+3
2014-01-10Added cFinishGenNetherSprinkleFoliage.STRWarrior3-2/+73
2014-01-10Fixed recurring pattern.STRWarrior1-1/+1
2014-01-09Fixed chunk borders.STRWarrior1-3/+3
2014-01-09Composition generator creating moved to a separate function.madmaxoft2-61/+83
Also it forces the defaults into the INI file.
2014-01-09Height generator creating moved info HeiGen.cpp.madmaxoft3-54/+82
The generator also explicitly sets the default back into the INI file.
2014-01-08Speed-up. I got about 40 extra ch/sSTRWarrior1-9/+14
2014-01-08WormNestCaves now remove soul sand.STRWarrior1-0/+1
2014-01-08NetherGen: Now generates SoulSand.STRWarrior1-1/+11
2014-01-07More MSVC warning fixes.madmaxoft1-1/+1
2014-01-07Fixed a few MSVC warnings.madmaxoft3-6/+7
2013-12-26Simplefied Extreme Hills M pattern select.STRWarrior1-11/+3
2013-12-25Extreme Hills M biomes now generate gravel, stone and grass patterns.STRWarrior1-2/+10
2013-12-25Changed tbGravel. Vanilla has 3 layers of gravel and then stone.STRWarrior1-3/+3
2013-12-25Normal extreme hills (plus) now generate a stone/grass pattern.STRWarrior1-2/+20
2013-12-25Re-added empty line.STRWarrior1-0/+1
2013-12-25This generates gravel in Extreme Hills M biomes.STRWarrior2-3/+20
2013-12-29Added function to create Tall Birch tree in BirchTreeForest biomesMike Hunsinger2-3/+49
2013-12-20Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft9-19/+23
2013-12-11moved generating to globsTycho Bickerstaff1-1/+5
2013-12-10more cmakeTycho Bickerstaff1-0/+7
2013-12-08Moved bindings-related to a Bindings subfolder.madmaxoft1-1/+1
Ref.: #407
2013-12-08moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff1-2/+4
2013-12-08reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff1-2/+2
2013-12-08fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff1-1/+1
removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725
2013-11-30Added floor pattern for MegaTaiga biomes.madmaxoft1-1/+10
2013-11-29Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft3-21/+106
2013-11-29Fixed CheckerboardBiomeGen in negative coords.madmaxoft1-2/+3
2013-11-29DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2-157/+424
This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
2013-11-28Trees will generate in the new biomes.madmaxoft2-14/+101
Only the generic trees, the special variants haven't yet been implemented.
2013-11-28Added new biomes to old composition generator.madmaxoft3-0/+141
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
2013-11-28Added new biomes to old height generators.madmaxoft4-39/+179
Now Biomal and DistortedHeight generators will work with new biomes.
2013-11-28Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft3-48/+74
This way it can be shared between MCServer and BiomeVisualiser.
2013-11-28BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2-0/+229
2013-11-27Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2-53/+28
2013-11-27Fixed the remaining derpsAlexander Harkness8-8/+8
2013-11-26Hopefully fixed last of the Linux compile errorsTiger Wang2-2/+2
2013-11-25Further attempts to fix compileTiger Wang8-8/+8
2013-11-24Attempt to fix compilationTiger Wang8-8/+8
2013-11-24Moved source to srcAlexander Harkness30-0/+11358