API tools faq
paste
Advertisement
Liusad

Noita beta update diff 20210302

Liusad
Mar 2nd, 2021
925
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 15.81 KB | None | 0 0
raw download clone embed print report
  1. HOW TO READ: \n\n FILE CHANGED => +++ b/biome/rainforest_dark.xml
  2.  
  3. REMOVED CODE => - background_edge_priority='10'
  4.  
  5. NEW OR CHANGED CODE => + background_edge_priority='9'
  6.  
  7. ---
  8.  
  9. Actual changes below:
  10.  
  11. diff --git a/README.md b/README.md
  12. index 5556038..ffdf5ab 100644
  13. Binary files a/README.md and b/README.md differ
  14. diff --git a/entities/\_debug/debug_menu.lua b/entities/\_debug/debug_menu.lua
  15. index 05cf2d5..c78b00c 100644
  16. --- a/entities/\_debug/debug_menu.lua
  17. +++ b/entities/\_debug/debug_menu.lua
  18. @@ -413,6 +413,36 @@ main_menu_items =
  19. ConvertMaterialEverywhere( CellFactory_GetType( "acid" ), CellFactory_GetType( "blood" ) )
  20. end
  21. },
  22.  
  23. - {
  24. -     ui_name="Fungal shift water->blood",
  25. -     action = function()
  26. -       ConvertMaterialEverywhere( CellFactory_GetType( "water" ), CellFactory_GetType( "blood" ) )
  27. -     end
  28. - },
  29. - {
  30. -     ui_name="Fungal shift water->oil",
  31. -     action = function()
  32. -       ConvertMaterialEverywhere( CellFactory_GetType( "water" ), CellFactory_GetType( "oil" ) )
  33. -     end
  34. - },
  35. - {
  36. -     ui_name="Fungal shift #1",
  37. -     action = function()
  38. -       local x, y = GameGetCameraPos()
  39. -       local player_entity = EntityGetClosestWithTag( x, y, "player_unit" )
  40. -       local mat = get_held_item_material( player_entity )
  41. -       ConvertMaterialEverywhere( mat, CellFactory_GetType( "blood" ) )
  42. -     end
  43. - },
  44. - {
  45. -     ui_name="Fungal shift #2",
  46. -     action = function()
  47. -       local x, y = GameGetCameraPos()
  48. -       local player_entity = EntityGetClosestWithTag( x, y, "player_unit" )
  49. -       local mat = get_held_item_material( player_entity )
  50. -       ConvertMaterialEverywhere( mat, CellFactory_GetType( "oil" ) )
  51. -     end
  52. - },
  53.   {
  54.   ui_name="ConvertMaterialOnAreaInstantly() - test near camera",
  55.   action = function()
  56.   diff --git a/entities/buildings/dark_moon_altar.xml b/entities/buildings/dark_moon_altar.xml
  57.   index 7c9206d..ed34435 100644
  58.   --- a/entities/buildings/dark_moon_altar.xml
  59.   +++ b/entities/buildings/dark_moon_altar.xml
  60.   @@ -1,4 +1,4 @@ -<Entity tags="moon_altar"> +<Entity tags="moon_altar,moon_energy">
  61.   <LuaComponent
  62.   \_enabled="1"
  63.   execute_every_n_frame="90"
  64.   @@ -12,4 +12,14 @@
  65.   script_source_file="data/scripts/magic/dark_moon_altar_extra.lua" >
  66.   </LuaComponent>
  67. -
  68. - <LightComponent
  69. -     _tags="enabled_in_world,enabled_in_hand"
  70. -     radius="96"
  71. -     r="255"
  72. -     g="255"
  73. -     b="255"
  74. -     fade_out_time="0.2"
  75. -     >
  76. - </LightComponent>
  77.    </Entity>
  78.   \ No newline at end of file
  79.   diff --git a/entities/buildings/moon_altar.xml b/entities/buildings/moon_altar.xml
  80.   index 239ea98..44db8ff 100644
  81.   --- a/entities/buildings/moon_altar.xml
  82.   +++ b/entities/buildings/moon_altar.xml
  83.   @@ -1,4 +1,4 @@
  84.   -<Entity tags="moon_altar">
  85.   +<Entity tags="moon_altar,moon_energy">
  86.     <LuaComponent
  87.            _enabled="1"
  88.            execute_every_n_frame="90"
  89.   @@ -12,4 +12,14 @@
  90.            script_source_file="data/scripts/magic/moon_altar_extra.lua"
  91.     >
  92.        </LuaComponent>
  93. -
  94. - <LightComponent
  95. -     _tags="enabled_in_world,enabled_in_hand"
  96. -     radius="96"
  97. -     r="255"
  98. -     g="255"
  99. -     b="255"
  100. -     fade_out_time="0.2"
  101. -     >
  102. - </LightComponent>
  103.    </Entity>
  104.   \ No newline at end of file
  105.   diff --git a/entities/items/pickup/moon.xml b/entities/items/pickup/moon.xml
  106.   index ab115bc..4e6faca 100644
  107.   --- a/entities/items/pickup/moon.xml
  108.   +++ b/entities/items/pickup/moon.xml
  109.   @@ -1,4 +1,4 @@
  110.   -<Entity tags="hittable,teleportable_NOT,item_pickup" >
  111.   +<Entity tags="hittable,teleportable_NOT,item_pickup,moon_energy" >
  112.     <Base file="data/entities/base_item_projectile.xml" />
  113.     <!-- physical presence -->
  114.  
  115.  
  116. diff --git a/entities/items/pickup/musicstone.xml b/entities/items/pickup/musicstone.xml
  117. index 9b43695..165c2a2 100644
  118. --- a/entities/items/pickup/musicstone.xml
  119. +++ b/entities/items/pickup/musicstone.xml
  120. @@ -1,4 +1,4 @@ -<Entity tags="hittable,teleportable_NOT,item_physics,item_pickup" > +<Entity tags="hittable,teleportable_NOT,item_physics,item_pickup,moon_energy" >
  121. <Base file="data/entities/base_item_projectile.xml" />
  122.  
  123.     <!-- physical presence -->
  124.  
  125. @@ -140,4 +140,14 @@ ></gun_config>
  126. </AbilityComponent>
  127.  
  128. - <LightComponent
  129. -     _tags="enabled_in_world,enabled_in_hand"
  130. -     radius="12"
  131. -     r="255"
  132. -     g="255"
  133. -     b="255"
  134. -     fade_out_time="0.1"
  135. -     >
  136. - </LightComponent>
  137. -  </Entity>
  138.   diff --git a/entities/items/pickup/sun/newsun.xml b/entities/items/pickup/sun/newsun.xml
  139.   index e3a4b6d..4335cf1 100644
  140.   --- a/entities/items/pickup/sun/newsun.xml
  141.   +++ b/entities/items/pickup/sun/newsun.xml
  142.   @@ -1,4 +1,6 @@
  143.   -<Entity tags="hittable,teleportable_NOT,item_physics,seed_e" >
  144.   +<Entity tags="hittable,teleportable_NOT,seed_e" >
  145. - <StreamingKeepAliveComponent />
  146. -   <Base file="data/entities/base_item_projectile.xml" />
  147.    
  148.     <!-- physical presence -->
  149.   diff --git a/entities/items/pickup/sun/newsun_dark.xml b/entities/items/pickup/sun/newsun_dark.xml
  150.   index c537726..28c830a 100644
  151.   --- a/entities/items/pickup/sun/newsun_dark.xml
  152.   +++ b/entities/items/pickup/sun/newsun_dark.xml
  153.   @@ -1,4 +1,6 @@
  154.   -<Entity tags="hittable,teleportable_NOT,item_physics,seed_f" >
  155.   +<Entity tags="hittable,teleportable_NOT,seed_f" >
  156. - <StreamingKeepAliveComponent />
  157. -   <Base file="data/entities/base_item_projectile.xml" />
  158.    
  159.     <!-- physical presence -->
  160.   diff --git a/entities/items/pickup/sun/sunbaby.xml b/entities/items/pickup/sun/sunbaby.xml
  161.   index cb4e7c7..e61fae5 100644
  162.   --- a/entities/items/pickup/sun/sunbaby.xml
  163.   +++ b/entities/items/pickup/sun/sunbaby.xml
  164.   @@ -1,4 +1,6 @@
  165.   -<Entity tags="hittable,teleportable_NOT,item_physics,seed_d" >
  166.   +<Entity tags="hittable,teleportable_NOT,seed_d" >
  167. - <StreamingKeepAliveComponent />
  168. -   <Base file="data/entities/base_item_projectile.xml" />
  169.    
  170.     <!-- physical presence -->
  171.   @@ -18,8 +20,8 @@
  172.    
  173.     <PhysicsShapeComponent
  174.         is_circle="1"
  175.  
  176. *     radius_x="64"
  177. *     radius_y="64"
  178.  
  179. -     radius_x="42"
  180. -     radius_y="42"
  181.       >
  182.   </PhysicsShapeComponent>
  183.  
  184. diff --git a/entities/items/pickup/sun/sunegg.xml b/entities/items/pickup/sun/sunegg.xml
  185. index b1b36be..519b8a0 100644
  186. --- a/entities/items/pickup/sun/sunegg.xml
  187. +++ b/entities/items/pickup/sun/sunegg.xml
  188. @@ -1,4 +1,4 @@ -<Entity tags="hittable,teleportable_NOT,item_physics,seed_c" > +<Entity tags="hittable,teleportable_NOT,seed_c" >
  189. <Base file="data/entities/base_item_projectile.xml" />
  190.  
  191.     <!-- physical presence -->
  192.  
  193. @@ -196,4 +196,9 @@
  194. event_name="misc/sun/size_1_loop"
  195. auto_play="1">
  196. </AudioLoopComponent>
  197.  
  198. -
  199. - <CameraBoundComponent
  200. - max_count="5"
  201. - distance="2000">
  202. - </CameraBoundComponent>
  203.    </Entity>
  204.   diff --git a/entities/items/pickup/sun/sunseed.xml b/entities/items/pickup/sun/sunseed.xml
  205.   index 7b233ba..e3ae250 100644
  206.   --- a/entities/items/pickup/sun/sunseed.xml
  207.   +++ b/entities/items/pickup/sun/sunseed.xml
  208.   @@ -146,4 +146,9 @@
  209.         render_ultrabright="1"
  210.         is_emitting="1" >
  211.     </ParticleEmitterComponent>
  212. -
  213. - <CameraBoundComponent
  214. - max_count="5"
  215. - distance="2000">
  216. - </CameraBoundComponent>
  217.    </Entity>
  218.   diff --git a/entities/items/pickup/sun/sunstone.xml b/entities/items/pickup/sun/sunstone.xml
  219.   index 3116de2..42f9982 100644
  220.   --- a/entities/items/pickup/sun/sunstone.xml
  221.   +++ b/entities/items/pickup/sun/sunstone.xml
  222.   @@ -190,4 +190,9 @@
  223.         execute_every_n_frame="10"
  224.         >
  225.     </LuaComponent>
  226. -
  227. - <CameraBoundComponent
  228. - max_count="5"
  229. - distance="2000">
  230. - </CameraBoundComponent>
  231.    </Entity>
  232.   diff --git a/entities/particles/blue_dust.xml b/entities/particles/blue_dust.xml
  233.   new file mode 100644
  234.   index 0000000..ff68ea6
  235.   --- /dev/null
  236.   +++ b/entities/particles/blue_dust.xml
  237.   @@ -0,0 +1,66 @@
  238.   +<Entity>
  239. - <!-- small sparkys -->
  240. - <SpriteParticleEmitterComponent
  241. -        sprite_file="data/particles/shine_blue.xml"
  242. -        lifetime="1.5"
  243. -        randomize_lifetime.min="1.0"
  244. -        randomize_lifetime.max="2.0"
  245. -        emission_interval_min_frames="2"
  246. -        emission_interval_max_frames="30"
  247. -        count_min="1"
  248. -        count_max="1"
  249. -        additive="1"
  250. -        emissive="0"
  251. -        sprite_random_rotation="1"
  252. -        gravity.y="5"
  253. -        randomize_velocity.min_y="-10"
  254. -        randomize_velocity.max_y="10"
  255. -        randomize_velocity.min_x="-10"
  256. -        randomize_velocity.max_x="10"
  257. -        randomize_position.min_x="-150"
  258. -     randomize_position.max_x="150"
  259. -     randomize_position.min_y="-200"
  260. -     randomize_position.max_y="50"
  261. -     velocity_slowdown="0.5"
  262. -        randomize_animation_speed_coeff.min="0.667"
  263. -        randomize_animation_speed_coeff.max="1.0"
  264. -        >
  265. - </SpriteParticleEmitterComponent>
  266. -
  267. - <!-- bigger blinkys -->
  268. - <SpriteParticleEmitterComponent
  269. -        sprite_file="data/particles/tinyspark_03.xml"
  270. -        lifetime="1.5"
  271. -        randomize_lifetime.min="0.5"
  272. -        randomize_lifetime.max="2.0"
  273. -        emission_interval_min_frames="2"
  274. -        emission_interval_max_frames="80"
  275. -        additive="1"
  276. -        emissive="0"
  277. -        count_min="1"
  278. -        count_max="1"
  279. -        sprite_random_rotation="1"
  280. -        gravity.y="5"
  281. -        randomize_velocity.min_y="-10"
  282. -        randomize_velocity.max_y="10"
  283. -        randomize_velocity.min_x="-10"
  284. -        randomize_velocity.max_x="10"
  285. -        randomize_position.min_x="-100"
  286. -     randomize_position.max_x="100"
  287. -     randomize_position.min_y="-150"
  288. -     randomize_position.max_y="50"
  289. -     velocity_slowdown="0.5"
  290. -        randomize_animation_speed_coeff.min="0.667"
  291. -        randomize_animation_speed_coeff.max="1.0"
  292. -        >
  293. - </SpriteParticleEmitterComponent>
  294. -
  295. - <LightComponent
  296. -        radius="300"
  297. -        r="00"
  298. -        g="20"
  299. -        b="255"
  300. -        >
  301. - </LightComponent>
  302.   +</Entity>
  303. - diff --git a/materials.xml b/materials.xml
  304.   index efbfc1a..035e94f 100644
  305.   --- a/materials.xml
  306.   +++ b/materials.xml
  307.   @@ -5418,6 +5418,9 @@ >
  308.   </Graphics>
  309.   <StatusEffects>
  310. -     <Stains>
  311. -       <StatusEffect type="WET" />
  312. -     </Stains>
  313.         <Ingestion>
  314.             <StatusEffect type="INGESTION_DRUNK" amount="0.01" />
  315.         </Ingestion>
  316. @@ -12241,7 +12244,7 @@
  317.    <CellDataChild
  318.     _parent="aluminium"
  319.     _inherit_reactions="1"
  320.  
  321. * tags="[box2d],[solid]"
  322.  
  323. - tags="[box2d],[solid],[sunbaby_ignore_list]"
  324.   name="poop_box2d_hard"
  325.   ui_name="$mat_rock_box2d_hard"
  326.   platform_type="1"
  327.   diff --git a/schemas/schema.xml b/schemas/schema.xml
  328.   index b760207..eb815db 100644
  329.   --- a/schemas/schema.xml
  330.   +++ b/schemas/schema.xml
  331.   @@ -1,4 +1,4 @@ -<Schema hash="613831e95c898860b669bfa8eeed9bee" >
  332.  
  333. +<Schema hash="1b5fcb8e057004269f9afbce8012d765" >
  334.  
  335.    <Component component_name="AIAttackComponent" >
  336.  
  337.      <Var name="use_probability" size="4" type="int" >
  338.  
  339.      </Var>
  340.  
  341. @@ -2620,6 +2620,8 @@
  342. </Var>
  343.  
  344.      <Var name="ground_penetration_coeff" size="4" type="float" >
  345.  
  346.      </Var>
  347.  
  348. - <Var name="ground_penetration_max_durability_to_destroy" size="4" type="int" >
  349.  
  350. - </Var>
  351.  
  352.   <Var name="go_through_this_material" size="24" type="class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >" >
  353.  
  354.   </Var>
  355.  
  356.   <Var name="do_moveto_update" size="1" type="bool" >
  357.  
  358. diff --git a/scripts/buildings/sun/sun_controls.lua b/scripts/buildings/sun/sun_controls.lua
  359. index 5c5fe5c..a35cf70 100644
  360. --- a/scripts/buildings/sun/sun_controls.lua
  361. +++ b/scripts/buildings/sun/sun_controls.lua
  362. @@ -4,6 +4,7 @@ local entity_id = GetUpdatedEntityID()
  363. local x, y = EntityGetTransform( entity_id )
  364.  
  365. local targets = EntityGetInRadiusWithTag( x, y, 100, "projectile" )
  366. +local targets2 = EntityGetInRadiusWithTag( x, y, 320, "moon_energy" )
  367.  
  368. local vel_x,vel_y = 0,0
  369.  
  370. @@ -19,4 +20,18 @@ for i,v in ipairs( targets ) do
  371. end
  372. EntityKill( v )
  373. +end
  374.  
  375. - +for i,v in ipairs( targets2 ) do
  376. - local tx,ty = EntityGetTransform( v )
  377. - local test = EntityGetFirstComponent( v, "LightComponent" )
  378. -
  379. - if ( test ~= nil ) then
  380. -     local dir = 0 - math.atan2( y - ty, x - tx )
  381. -
  382. -     vel_x = math.cos( dir ) * 180
  383. -     vel_y = 0 - math.sin( dir ) * 180
  384. -
  385. -     PhysicsApplyForce( entity_id, vel_x, vel_y )
  386. - end
  387.   end
  388.   \ No newline at end of file
  389.   diff --git a/scripts/buildings/sun/sunbaby_controls.lua b/scripts/buildings/sun/sunbaby_controls.lua
  390.   index 1158c61..e7d1934 100644
  391.   --- a/scripts/buildings/sun/sunbaby_controls.lua
  392.   +++ b/scripts/buildings/sun/sunbaby_controls.lua
  393.   @@ -4,6 +4,7 @@ local entity_id = GetUpdatedEntityID()
  394.   local x, y = EntityGetTransform( entity_id )
  395.  
  396. local targets = EntityGetInRadiusWithTag( x, y, 56, "projectile" )
  397. +local targets2 = EntityGetInRadiusWithTag( x, y, 220, "moon_energy" )
  398.  
  399. local vel_x,vel_y = 0,0
  400.  
  401. @@ -19,4 +20,18 @@ for i,v in ipairs( targets ) do
  402. end
  403. EntityKill( v )
  404. +end
  405.  
  406. - +for i,v in ipairs( targets2 ) do
  407. - local tx,ty = EntityGetTransform( v )
  408. - local test = EntityGetFirstComponent( v, "LightComponent" )
  409. -
  410. - if ( test ~= nil ) then
  411. -     local dir = 0 - math.atan2( ty - y, tx - x )
  412. -
  413. -     vel_x = math.cos( dir ) * 180
  414. -     vel_y = 0 - math.sin( dir ) * 180
  415. -
  416. -     PhysicsApplyForce( entity_id, vel_x, vel_y )
  417. - end
  418.   end
  419.   \ No newline at end of file
  420.   diff --git a/scripts/magic/fungal_shift.lua b/scripts/magic/fungal_shift.lua
  421.   index 82a71ae..aea8929 100644
  422.   --- a/scripts/magic/fungal_shift.lua
  423.   +++ b/scripts/magic/fungal_shift.lua
  424.   @@ -132,6 +132,18 @@ function fungal_shift( entity, x, y, debug_no_limits )
  425.   local held_material = get_held_item_material( entity )
  426.   local from_material_name = ""
  427.  
  428. - -- if a potion is equipped, randomly use main material from potion as one of the materials
  429. - if held_material > 0 and random_nexti( rnd, 1, 100 ) <= 75 then
  430. -     if random_nexti( rnd, 1, 100 ) <= 50 then
  431. -       from = {}
  432. -       from.materials = { CellFactory_GetName(held_material) }
  433. -     else
  434. -       to = {}
  435. -       to.material = CellFactory_GetName(held_material)
  436. -     end
  437. - end
  438. -
  439. - -- apply effects
  440.   for i,it in ipairs(from.materials) do
  441.   local from_material = CellFactory_GetType( it )
  442.   local to_material = CellFactory_GetType( to.material )
  443.   @@ -140,16 +152,6 @@ function fungal_shift( entity, x, y, debug_no_limits )
  444.   from_material_name = string.upper( GameTextGetTranslatedOrNot( CellFactory_GetUIName( CellFactory_GetType( from.name_material ) ) ) )
  445.   end
  446.  
  447. *     -- if a potion is equipped, randomly use main material from potion as one of the materials
  448. *     if held_material > 0 and random_nexti( rnd, 1, 100 ) <= 75 then
  449. *       if random_nexti( rnd, 1, 100 ) <= 50 then
  450. *           from_material = held_material
  451. *           from_material_name = string.upper( GameTextGetTranslatedOrNot( CellFactory_GetUIName( from_material ) ) )
  452. *       else
  453. *           to_material = held_material
  454. *       end
  455. *     end
  456. * -- convert
  457.   if from_material ~= to_material then
  458.   print(CellFactory_GetUIName(from_material) .. " -> " .. CellFactory_GetUIName(to_material))
  459.   diff --git a/scripts/perks/perk.lua b/scripts/perks/perk.lua
  460.   index a8e4fb9..12eede0 100644
  461.   --- a/scripts/perks/perk.lua
  462.   +++ b/scripts/perks/perk.lua
  463.   @@ -212,13 +212,16 @@ function perk_pickup( entity_item, entity_who_picked, item_name, do_cosmetic_fx,
  464.   GlobalsSetValue( flag_name .. "\_PICKUP_COUNT", tostring( pickup_count ) )
  465.   -- load perk for entity_who_picked -----------------------------------
  466.  
  467. - local add_progress_flags = not GameHasFlagRun( "no_progress_flags_perk" )
  468.  
  469. * local flag_name_persistent = string.lower( flag_name )
  470. * if ( HasFlagPersistent( flag_name_persistent ) == false ) then
  471. *     GameAddFlagRun( "new_" .. flag_name_persistent )
  472.  
  473. - if add_progress_flags then
  474. -     local flag_name_persistent = string.lower( flag_name )
  475. -     if ( not HasFlagPersistent( flag_name_persistent ) ) then
  476. -       GameAddFlagRun( "new_" .. flag_name_persistent )
  477. -     end
  478. -     AddFlagPersistent( flag_name_persistent )
  479.   end
  480.   GameAddFlagRun( flag_name )
  481.  
  482. * AddFlagPersistent( flag_name_persistent )
  483.  
  484.   -- add game effect
  485.   if perk_data.game_effect ~= nil then
  486.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!