FILES ----- items\generic\unsorted\sapling.sapling items\guns\unsorted\ptester.gun items\guns\unsorted\test.lua items\guns\unsorted\bow\bow.gun items\staves\scistaff\scistaff.staff monsters\flying\circlestate.lua monsters\flying\wanderstate.lua plants\trees\desert\foliage\elegant\elegant.modularfoliage recipes\anvil\basicshield.recipe recipes\spinningwheel\apexcommanderchest.recipe recipes\spinningwheel\apexcommanderlegs.recipe recipes\spinningwheel\apexnavychest.recipe recipes\spinningwheel\apexnavylegs.recipe recipes\spinningwheel\apexofficerchest.recipe recipes\spinningwheel\apexofficerlegs.recipe recipes\spinningwheel\apexspecialistchest.recipe recipes\spinningwheel\apexspecialistlegs.recipe recipes\spinningwheel\aquakimonochest.recipe recipes\spinningwheel\aquakimonolegs.recipe recipes\spinningwheel\aquamonkchest.recipe recipes\spinningwheel\aquamonklegs.recipe recipes\spinningwheel\aquatraditionalchest.recipe recipes\spinningwheel\aquatraditionallegs.recipe recipes\spinningwheel\aquatraineechest.recipe recipes\spinningwheel\aquatraineelegs.recipe recipes\spinningwheel\avianadventurerchest.recipe recipes\spinningwheel\avianadventurerlegs.recipe recipes\spinningwheel\aviancommonerchest.recipe recipes\spinningwheel\aviancommonerlegs.recipe recipes\spinningwheel\avianfancychest.recipe recipes\spinningwheel\avianfancylegs.recipe recipes\spinningwheel\avianworkerchest.recipe recipes\spinningwheel\avianworkerlegs.recipe recipes\spinningwheel\floranfurnivourchest.recipe recipes\spinningwheel\floranfurnivourlegs.recipe recipes\spinningwheel\floranhunterchest.recipe recipes\spinningwheel\floranhunterlegs.recipe recipes\spinningwheel\floranleafchest.recipe recipes\spinningwheel\floranleaflegs.recipe recipes\spinningwheel\floranpeltchest.recipe recipes\spinningwheel\floranpeltlegs.recipe recipes\spinningwheel\floransurvivalistchest.recipe recipes\spinningwheel\floransurvivalistlegs.recipe recipes\spinningwheel\humanconceptchest.recipe recipes\spinningwheel\humanconceptlegs.recipe recipes\spinningwheel\humancoolchest.recipe recipes\spinningwheel\humancoollegs.recipe recipes\spinningwheel\humansweatervestchest.recipe recipes\spinningwheel\humansweatervestlegs.recipe recipes\spinningwheel\humanworkoutchest.recipe recipes\spinningwheel\humanworkoutlegs.recipe recipes\spinningwheel\robocraftsmenchest.recipe recipes\spinningwheel\robocraftsmenlegs.recipe recipes\spinningwheel\robomerchantchest.recipe recipes\spinningwheel\robomerchantlegs.recipe recipes\spinningwheel\robonoblechest.recipe recipes\spinningwheel\robonoblelegs.recipe recipes\spinningwheel\robopeasantchest.recipe recipes\spinningwheel\robopeasantlegs.recipe recipes\weapons\tier3\frostshield.recipe DIFFS ----- items\generic\unsorted\sapling.sapling 5c5 < "shortdescription" : "Strange Seed", --- > "shortdescription" : "Sapling", items\guns\unsorted\ptester.gun 15c15 < "fireTime" : 0.2, --- > "fireTime" : 1.0, 18c18 < "projectileType" : "firepart1", --- > "projectileType" : "bullet-1", 21c21 < "color" : [10, 255, 10] --- > "power" : 1 26c26,28 < } --- > }, > > "scripts" : [ "/items/guns/unsorted/test.lua" ] items\guns\unsorted\test.lua 2c2 < print "OMG init~!" --- > world.logInfo("firableItem: init") 6c6 < print "OMG trigger fired~!" --- > world.logInfo("firableItem: fireTriggered") 10,14c10 < print "OMG trigger started~!" < end < < function startTriggered() < print "OMG trigger started~!" --- > world.logInfo("firableItem: startTriggered") 18c14 < print "OMG stop trying to shoot me~!" --- > world.logInfo("firableItem: attemptedFire") 22c18 < print "OMG thanks for stopping~!" --- > world.logInfo("firableItem: endFire") 26c22 < print "OMG charging it up~!" --- > world.logInfo("firableItem: triggerWindup") 30c26 < print "OMG takatakataka~!" --- > world.logInfo("firableItem: continueFire") 34c30 < print "OMG cooling off~!" --- > world.logInfo("firableItem: triggerCooldown") items\guns\unsorted\bow\bow.gun 14c14 < "fireTime" : 0.65, --- > "fireTime" : 0.25, items\staves\scistaff\scistaff.staff 52c52,54 < } --- > }, > > "scripts" : [ "/items/guns/unsorted/test.lua" ] monsters\flying\circlestate.lua 11c11 < yOffset = entity.randomizeParameterRange("circleOffsetYRange"), --- > yOffset = entity.randomizeParameterRange("circleOffsetYRange") 14a15,20 > function circleState.enteringState(stateData) > if not self.circleYOffsetFactor then > self.circleYOffsetFactor = 1 > end > end > 24a31,46 > --Lower circle height if we're near ceiling > for i, ceilingSensorIndex in ipairs({ 3, 2, 1 }) do > local sensor = self.sensors.ceilingSensors.collisionTrace[ceilingSensorIndex] > if sensor.value then > self.circleYOffsetFactor = self.circleYOffsetFactor - 0.75 * dt > end > end > --Also keep adding height > if self.circleYOffsetFactor < 1 then > self.circleYOffsetFactor = self.circleYOffsetFactor + dt > end > --Don't go too low > if self.circleYOffsetFactor < 0.1 then > self.circleYOffsetFactor = 0.1 > end > 26c48 < toTarget[2] = toTarget[2] + stateData.yOffset --- > toTarget[2] = toTarget[2] + stateData.yOffset * self.circleYOffsetFactor monsters\flying\wanderstate.lua 35a36,43 > > --Avoid ceiling > for i, ceilingSensorIndex in ipairs({ 3, 2, 1 }) do > local sensor = self.sensors.ceilingSensors.collisionTrace[ceilingSensorIndex] > if sensor.value then > movement[2] = movement[2] - 0.6 * entity.configParameter("wanderRiseSpeed") > end > end plants\trees\desert\foliage\elegant\elegant.modularfoliage 73c73 < "bx" : -53, --- > "bx" : -57, 79,80c79,80 < "image" : "", < "backimage" : "crown3.png", --- > "image" : "crown3.png", > "backimage" : "", 82c82 < "bx" : -54, --- > "bx" : -72, recipes\anvil\basicshield.recipe 7c7 < "groups" : [ "anvil", "armor", "all" ] --- > "groups" : [ "anvil", "armors", "all" ] recipes\spinningwheel\apexcommanderchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\apexcommanderlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\apexnavychest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\apexnavylegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "pants" ] --- > "groups" : [ "spinningwheel", "armors", "pants" ] recipes\spinningwheel\apexofficerchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\apexofficerlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "pants" ] --- > "groups" : [ "spinningwheel", "armors", "pants" ] recipes\spinningwheel\apexspecialistchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\apexspecialistlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "pants" ] --- > "groups" : [ "spinningwheel", "armors", "pants" ] recipes\spinningwheel\aquakimonochest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\aquakimonolegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\aquamonkchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\aquamonklegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\aquatraditionalchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\aquatraditionallegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\aquatraineechest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\aquatraineelegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\avianadventurerchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\avianadventurerlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\aviancommonerchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\aviancommonerlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\avianfancychest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\avianfancylegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\avianworkerchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\avianworkerlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\floranfurnivourchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\floranfurnivourlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\floranhunterchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\floranhunterlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\floranleafchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\floranleaflegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\floranpeltchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\floranpeltlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\floransurvivalistchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\floransurvivalistlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\humanconceptchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\humanconceptlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\humancoolchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\humancoollegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\humansweatervestchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\humansweatervestlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\humanworkoutchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\humanworkoutlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\robocraftsmenchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\robocraftsmenlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\robomerchantchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\robomerchantlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\robonoblechest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\robonoblelegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\spinningwheel\robopeasantchest.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "chest" ] --- > "groups" : [ "spinningwheel", "armors", "chest" ] recipes\spinningwheel\robopeasantlegs.recipe 6c6 < "groups" : [ "spinningwheel", "armor", "legs" ] --- > "groups" : [ "spinningwheel", "armors", "legs" ] recipes\weapons\tier3\frostshield.recipe 7c7 < "groups" : [ "metalworkstation", "armor", "all" ] --- > "groups" : [ "metalworkstation", "armors", "all" ]