Skip to content
Snippets Groups Projects
  1. May 30, 2018
  2. May 29, 2018
    • Pregmodder's avatar
    • Pregmodder's avatar
      Merge branch 'fixes' into 'pregmod-master' · e9bf040a
      Pregmodder authored
      Fix
      
      Closes #156
      
      See merge request pregmodfan/fc-pregmod!2087
      e9bf040a
    • kopareigns's avatar
      fix · 843b0cd6
      kopareigns authored
      843b0cd6
    • Pregmodder's avatar
      fixes · ffc3d5c9
      Pregmodder authored
      ffc3d5c9
    • Pregmodder's avatar
      Merge branch 'pregmod-master' into 'pregmod-master' · 10e6b1ae
      Pregmodder authored
      Pregmod v1023-8
      
      See merge request pregmodfan/fc-pregmod!2086
      10e6b1ae
    • Pregmodder's avatar
      fixes · 073f1981
      Pregmodder authored
      073f1981
    • Pregmodder's avatar
      Merge branch 'fixes' into 'pregmod-master' · 84686ece
      Pregmodder authored
      Fix
      
      Closes #154
      
      See merge request pregmodfan/fc-pregmod!2085
      84686ece
    • kopareigns's avatar
      fix · 274a8807
      kopareigns authored
      274a8807
    • Pregmodder's avatar
      Merge branch 'pregmod-master' into 'pregmod-master' · 3c25dbd8
      Pregmodder authored
      Hocking up The Black Market and Childhood Fertility Induced NCS
      
      See merge request pregmodfan/fc-pregmod!2083
      3c25dbd8
    • x's avatar
      Requested drops and change · c61e2d2c
      x authored
      c61e2d2c
    • x's avatar
    • x's avatar
      e6483676
    • x's avatar
      b4a6952b
    • Pregmodder's avatar
      Merge branch 'fixes' into 'pregmod-master' · b2017bc4
      Pregmodder authored
      Fixes
      
      Closes #153
      
      See merge request pregmodfan/fc-pregmod!2084
      b2017bc4
    • kopareigns's avatar
      Fix · 46fc49c1
      kopareigns authored
      46fc49c1
    • Pregmodder's avatar
      Merge branch 'pregmod-master' into 'pregmod-master' · 0bddf640
      Pregmodder authored
      Minor Fixes And Formatting
      
      See merge request pregmodfan/fc-pregmod!2082
      0bddf640
    • klorpa's avatar
      Commit Message · 290b9068
      klorpa authored
      290b9068
    • Pregmodder's avatar
      Merge branch 'fixes' into 'pregmod-master' · 108a72b3
      Pregmodder authored
      Wording fixes
      
      Closes #152
      
      See merge request pregmodfan/fc-pregmod!2081
      108a72b3
    • kopareigns's avatar
      Wording · 3b527b27
      kopareigns authored
      3b527b27
    • Pregmodder's avatar
      Merge branch 'inducedncs-ncsmod' into 'pregmod-master' · 3535e2d6
      Pregmodder authored
      Inducedncs ncsmod
      
      See merge request pregmodfan/fc-pregmod!2067
      3535e2d6
    • kidkinster's avatar
      induced NCS, returned ++butt and clear hostage · e9f966ae
      kidkinster authored
      1]  Re-added the slave butt pluses that got removed somehow.
      2]  Added Hostage unsetting.
      
      -	modified:   src/uncategorized/pRivalryActions.tw
      -	modified:   src/uncategorized/pRivalryHostage.tw
      e9f966ae
    • kidkinster's avatar
      NCS merge request changes - feedback from pregmod · 562b0824
      kidkinster authored
      1]  Removed the NCS variables from several different files and dropped
          them in the correct file: src/utility/slaveCreationWidgets.tw
      2]  Tweaked display for slave swap, 'old' in
          $slaves[_m].slaveName's old body was bought by ...
      3]  Gated purchase of NCS behind loli-mode.
      4]  Gated description of NCS behind min slave age < 16.
      5]  Updated Black Market sales pitch to take into account how accepting
          the world is of loli slaves. (Basicaly, Yup, or Nope).
      6]  Added NCS var copying for body swap code.
      7]  Changed Arcade report to affect assets like the dairy but weaker if
          the slave has NCS, instead of completely blocked.
      8]  Corrected Dariy report code which wasn't halving the boob growth for
          NCS but instead, zeroing it (now it halves it).
      9]  Removed NCS interactions from the Rival hostage code.
      10] Added NCS var copying for relative recruit.
      11] Removed NCS var defaulting from long term effects.
      12] Completely revised the text display for surger degredation for NCS
          treatment applied, fixing several logic/flow problems and better
          wording.
      
      -	modified:   src/pregmod/generateChild.tw
      -	modified:   src/pregmod/huskSlaveSwap.tw
      -	modified:   src/pregmod/incubatorRetrievalWorkaround.tw
      -	modified:   src/pregmod/theBlackMarket.tw
      -	modified:   src/pregmod/widgets/bodyswapWidgets.tw
      -	modified:   src/uncategorized/arcadeReport.tw
      -	modified:   src/uncategorized/dairyReport.tw
      -	modified:   src/uncategorized/generateXXSlave.tw
      -	modified:   src/uncategorized/generateXYSlave.tw
      -	modified:   src/uncategorized/pRivalryActions.tw
      -	modified:   src/uncategorized/reRelativeRecruiter.tw
      -	modified:   src/uncategorized/saLongTermEffects.tw
      -	modified:   src/uncategorized/surgeryDegradation.tw
      -	modified:   src/utility/slaveCreationWidgets.tw
      562b0824
    • kidkinster's avatar
      Induced NCS, ready for rebase for pull request; · 99fd7e1a
      kidkinster authored
      1]  Added/expanded comments.
      2]  Fixed encyclopedia text.
      3]  Expanded the quickList and applied it to the incubator room, adding
          sorts specific to the incubator like #children, preg week, etc.
      4]  Added the hard coded setting of variables $activeSlave.inducedNCS
          and $activeSlave.NCSyouthening, as incubator slaves weren't getting
          the null/0 settings needed.
      5]  Added logic to the incubator to support NCS in the incubator, --
          even though it's not yet included or inheritable.  This is mostly
          just marking territory for if/when NCS inheritability or incubator
          integration comes up.
      6]  Formated Orange NCS's in a lot of the text passages.
      7]  Added proper handling of the physical/not visual aging process.
      8]  Blocked Induced NCS surgery from indentured slaves.
      9]  Fleshed out the Long term effects of NCS across all the slave's
          body parts.  This is now set up to allow us to make things go
          faster or slower for balancing.
      10] Incuded NCS age/visual appearance texts in slave summary and
          description passages.
      11] Minor random typos and bug fixes.
      99fd7e1a
    • kidkinster's avatar
      Induced NCS branch Initial commit. · 500deaaf
      kidkinster authored
      Added devNotes for the changes, and concepts.
      
      Implemented a simplistic black market illegal wares section and a global
      var list for it, defaulted to include the childhoodFertilityInducedNCS
      entry.  Fixed some cannot-afford price coloration issues in existing FS
      tech portion of the black market.
      
      Ensured that all arcologies start with the arcology variable:
      childFertilityInducedNCSResearch set to zero.
      
      Added encyclopedia entry for Induced NCS.
      Flushed out encyclopedia entry for Black Market.
      
      Added $pronounCap, $pronoun, $possessiveCap, $possessive and $object
      in several places it was missing.
      
      Added code to handle incubator for the *possible* case of have NCS
      inheritable, or induced in the tanks, if so then added code to ensure
      such tank slaves don't grow beyond minimum slave age average height or
      beyond 8 years old wichever is shorter.  Additionally it outright blocks
      the secondary sexual characteristic development if the tank slave has
      NCS.
      
      Modified newChildIntro, to lock the *put her on growth hromones* options
      behind a test that she doesn't have NCS.
      
      Added no-op dropouts in saAgent and physcialDevelopment for NCS slaves.
      
      Updated PMODinit widget to set Induced NCS and NCS youthening to zero on
      slaves without them.  Same for generate XX an XY slaves.
      
      Blocked Aztec slave sacrifice breast growth for NCS slaves.
      
      Added backwards compatibility updates.
      
      RESS Rival actions and generic events, updated events that grow to grow
      less or not at all, and that shrink to shrink more for NCS slaves.  Also
      for any that affect precocious puberty, increases were amplified while
      decreases were dampened for NCS slaves.
      
      Update Arcade report to block asset growth due to milking for NCS
      slaves.
      
      Updated Dairy report to reduce amount and likelyhood of asset growth due
      to milking for NCS slaves.
      
      Added guarded remote surgery option for applying induced NCS to healthy
      slaves that currently lack it.  Surgery affects slave health strongly
      but also can have effects on her body for the first set of treatments.
      
      Updated saDiet, saDrugs, saGetMilked, saHormoneEffects and saLongTermEffects
      to block, or have less asset growth effects (and less likely).  Also to
      more asset shrinkage effects (and more likely).  All the while,
      increasing or limiting decreases to precocious puberty for NCS slaves,
      including some verbage changes.
      
      Added specific youthening regiments for NCS slaves, wherin older slaves
      will lose aging effects, secondary characteristics and height until
      reaching an apparent visual age of about 8, while younger slaves will
      simply undo any height or asset gains from other sources.
      
      -	new file:   devNotes/inducedNCS.txt
      -	modified:   src/events/intro/initNationalities.tw
      -	modified:   src/gui/Encyclopedia/encyclopedia.tw
      -	modified:   src/init/storyInit.tw
      -	modified:   src/pregmod/incubatorReport.tw
      -	modified:   src/pregmod/newChildIntro.tw
      -	modified:   src/pregmod/physicalDevelopment.tw
      -	modified:   src/pregmod/saAgent.tw
      -	modified:   src/pregmod/theBlackMarket.tw
      -	modified:   src/pregmod/widgets/pregmodWidgets.tw
      -	modified:   src/pregmod/widgets/slaveSummaryWidgets.tw
      -	modified:   src/societies/aztec/slaveSacrifice.tw
      -	modified:   src/uncategorized/BackwardsCompatibility.tw
      -	modified:   src/uncategorized/RESS.tw
      -	modified:   src/uncategorized/arcadeReport.tw
      -	modified:   src/uncategorized/dairyReport.tw
      -	modified:   src/uncategorized/generateXXSlave.tw
      -	modified:   src/uncategorized/generateXYSlave.tw
      -	modified:   src/uncategorized/genericPlotEvents.tw
      -	modified:   src/uncategorized/pRivalryActions.tw
      -	modified:   src/uncategorized/remoteSurgery.tw
      -	modified:   src/uncategorized/saDiet.tw
      -	modified:   src/uncategorized/saDrugs.tw
      -	modified:   src/uncategorized/saGetMilked.tw
      -	modified:   src/uncategorized/saHormoneEffects.tw
      -	modified:   src/uncategorized/saLongTermEffects.tw
      -	modified:   src/uncategorized/surgeryDegradation.tw
      500deaaf
    • Pregmodder's avatar
      Merge branch 'pregmod-master' into 'pregmod-master' · 2fca83f9
      Pregmodder authored
      Resync prior to induced NCS merge
      
      See merge request pregmodfan/fc-pregmod!2080
      2fca83f9
    • Pregmodder's avatar
      fix · 57573683
      Pregmodder authored
      57573683
    • Pregmodder's avatar
    • Pregmodder's avatar
      tweaks · 0b76f145
      Pregmodder authored
      0b76f145
    • Pregmodder's avatar
      Merge branch 'fixes' into 'pregmod-master' · a9fb88c9
      Pregmodder authored
      Tattoo fixes and updates
      
      See merge request pregmodfan/fc-pregmod!2079
      a9fb88c9
    • kopareigns's avatar
      Unrelated spelling fixes · aca51844
      kopareigns authored
      aca51844
    • kopareigns's avatar
      Remove tattoos · d2103002
      kopareigns authored
      d2103002
Loading