diff --git a/sc2/src/uqm/plandata.c b/sc2/src/uqm/plandata.c index 9c2d7f97c..06553524f 100644 --- a/sc2/src/uqm/plandata.c +++ b/sc2/src/uqm/plandata.c @@ -539,6 +539,7 @@ STAR_DESC starmap_array[] = {{1937, 9979}, MAKE_STAR (DWARF_STAR, RED_BODY, -1), 0, 1, 103}, #endif + //{{2908, 269}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), SHOFIXTI_DEFINED, 4, 82}, {{1004, 1083}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), CXX_DEFINED, 2, 27, &slyDef}, {{1776, 1395}, MAKE_STAR (DWARF_STAR, YELLOW_BODY, -1), START_COLONY_DEFINED, 0, 98}, @@ -549,6 +550,8 @@ STAR_DESC starmap_array[] = {{1752, 1450}, MAKE_STAR (DWARF_STAR, YELLOW_BODY, -1), SOL_DEFINED, 0, 129}, + {{1848, 1469}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), SHOFIXTI_DEFINED, 4, 82}, + {{1751, 1479}, MAKE_STAR (GIANT_STAR, GREEN_BODY, -1), URQUAN_WRECK_DEFINED, 1, 59}, {{1707, 1501}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 0, 52}, diff --git a/sc2/src/uqm/planets/generate/Makeinfo b/sc2/src/uqm/planets/generate/Makeinfo index 777b61e94..58f528991 100644 --- a/sc2/src/uqm/planets/generate/Makeinfo +++ b/sc2/src/uqm/planets/generate/Makeinfo @@ -4,4 +4,4 @@ uqm_CFILES="gendefault.c genand.c genburv.c genchmmr.c gencol.c gendru.c genthrad.c gentrap.c genutw.c genvault.c genvux.c genwreck.c genyeh.c genzfpscout.c genzoq.c" uqm_HFILES="genall.h gendefault.h" -uqm_CXXFILES="cxx-generator.cpp gensly-modern.cpp" +uqm_CXXFILES="cxx-generator.cpp gensly-modern.cpp genshof-modern.cpp" diff --git a/sc2/src/uqm/planets/generate/genshof.c b/sc2/src/uqm/planets/generate/genshof.c index 7025f6a35..0285a4f6e 100644 --- a/sc2/src/uqm/planets/generate/genshof.c +++ b/sc2/src/uqm/planets/generate/genshof.c @@ -129,6 +129,18 @@ GenerateShofixti_uninitNpcs (SOLARSYS_STATE *solarSys) static bool GenerateShofixti_generatePlanets (SOLARSYS_STATE *solarSys) { +#define SHOF_SUN_COORD_X ( (SWORD) 2908 ) +#define SHOF_SUN_COORD_Y ( (SWORD) 269 ) +#define SHOF_SEED MAKE_DWORD( SHOF_SUN_COORD_X, SHOF_SUN_COORD_Y ) + + RandomContext_SeedRandom( SysGenRNG, SHOF_SEED ); + + // I need to pump it a single time, because the star background gen + // eats one random value. I don't care if the background changes when + // the star moves. + (void) RandomContext_Random( SysGenRNG ); + + COUNT i; #define NUM_PLANETS 6