API tools faq
paste
Advertisement
Liusad

Noita beta update diff 20210223

Liusad
Feb 23rd, 2021
980
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Lua 19.46 KB | None | 0 0
raw download clone embed print report
  1. HOW TO READ:
  2.  
  3. FILE CHANGED => +++ b/biome/rainforest_dark.xml
  4.  
  5. REMOVED CODE => - background_edge_priority="10"
  6.  
  7. NEW OR CHANGED CODE => + background_edge_priority="9"
  8.  
  9. ---
  10.  
  11. Actual changes below:
  12. diff --git a/entities/animals/boss*centipede/sampo_init.lua b/entities/animals/boss_centipede/sampo_init.lua
  13. index e84b99a..358661f 100644
  14. --- a/entities/animals/boss_centipede/sampo_init.lua
  15. +++ b/entities/animals/boss_centipede/sampo_init.lua
  16. @@ -10,7 +10,7 @@ if( orb_count > MAX_ORB_NAMES ) then orb_count = MAX_ORB_NAMES end
  17. local orb_name = "$item_mcguffin*" .. tostring(orb*count)
  18. local orb_desc = "$itemdesc_mcguffin*" .. tostring(orb_count)
  19.  
  20. -if( GameGetOrbCountThisRun() >= 33 ) then
  21. +if( GameGetOrbCountThisRun() > 33 ) then
  22. orb_name = "$item_mcguffin_33"
  23.     orb_desc = "$itemdesc_mcguffin_33"
  24. end
  25. diff --git a/entities/animals/boss_ghost/death.lua b/entities/animals/boss_ghost/death.lua
  26. index dd463cc..1a618e4 100644
  27. --- a/entities/animals/boss_ghost/death.lua
  28. +++ b/entities/animals/boss_ghost/death.lua
  29. @@ -5,7 +5,7 @@ function death( damage_type_bit_field, damage_message, entity_thats_responsible,
  30. local x, y = EntityGetTransform( entity_id )
  31. EntityLoad( "data/entities/items/pickup/heart_fullhp.xml", x, y )
  32.  
  33. - EntityLoad( "data/entities/items/pickup/sunseed.xml", x + 16, y )
  34.  
  35. * EntityLoad( "data/entities/items/pickup/sun/sunseed.xml", x + 16, y )
  36.   AddFlagPersistent( "miniboss_ghost" )
  37.   end
  38.   \ No newline at end of file
  39.   diff --git a/entities/animals/boss_wizard/death.lua b/entities/animals/boss_wizard/death.lua
  40.   index dc5a62f..118ef6e 100644
  41.   --- a/entities/animals/boss_wizard/death.lua
  42.   +++ b/entities/animals/boss_wizard/death.lua
  43.   @@ -10,7 +10,7 @@ function death( damage_type_bit_field, damage_message, entity_thats_responsible,
  44.   local pw = check_parallel_pos( x )
  45.   SetRandomSeed( pw, 30 )
  46.  
  47. - local opts = { "DUPLICATE", "RANDOM_SPELL", "RANDOM_PROJECTILE", "RANDOM_MODIFIER", "RANDOM_STATIC_PROJECTILE", "DRAW_RANDOM", "DRAW_RANDOM_X3", "DRAW_3_RANDOM" }
  48.  
  49. * local opts = { "DUPLICATE", "RANDOM_SPELL", "RANDOM_PROJECTILE", "RANDOM_MODIFIER", "RANDOM_STATIC_PROJECTILE", "DRAW_RANDOM", "DRAW_RANDOM_X3", "DRAW_3_RANDOM", "NOLLA", "RESET" }
  50.   local rnd = Random( 1, #opts )
  51.   if flag_status then
  52.   diff --git a/entities/items/books/book_s_b.xml b/entities/items/books/book_s_b.xml
  53.   index 06bec78..02b1908 100644
  54.   --- a/entities/items/books/book_s_b.xml
  55.   +++ b/entities/items/books/book_s_b.xml
  56.   @@ -15,13 +15,13 @@ ></PhysicsImageShapeComponent>
  57.   <UIInfoComponent
  58.  
  59. -       name="$item_book_s_b"
  60.  
  61. *       name="$item_book_s_a"
  62.         >
  63.       </UIInfoComponent>
  64.  
  65.       <ItemComponent
  66.         ui_sprite="data/items_gfx/book_s.png"
  67.  
  68. -       item_name="$item_book_s_b"
  69.  
  70. *       item_name="$item_book_s_a"
  71.   ui_description="$itemdesc_book_s_b" >
  72.   </ItemComponent>
  73.   @@ -31,7 +31,7 @@ ></SpriteComponent>
  74.   <AbilityComponent
  75.  
  76. -       ui_name="$item_book_s_b"
  77.  
  78. *       ui_name="$item_book_s_a"
  79.   >         </AbilityComponent>
  80.     </Base>
  81.   diff --git a/entities/items/books/book_s_c.xml b/entities/items/books/book_s_c.xml
  82.   index d4147f5..4cd661c 100644
  83.   --- a/entities/items/books/book_s_c.xml
  84.   +++ b/entities/items/books/book_s_c.xml
  85.   @@ -15,13 +15,13 @@
  86.         ></PhysicsImageShapeComponent>
  87.    
  88.         <UIInfoComponent
  89.  
  90. -       name="$item_book_s_c"
  91.  
  92. *       name="$item_book_s_a"
  93.         >
  94.       </UIInfoComponent>
  95.  
  96.       <ItemComponent
  97.         ui_sprite="data/items_gfx/book_s.png"
  98.  
  99. -       item_name="$item_book_s_c"
  100.  
  101. *       item_name="$item_book_s_a"
  102.   ui_description="$itemdesc_book_s_c" >
  103.   </ItemComponent>
  104.   @@ -31,7 +31,7 @@ ></SpriteComponent>
  105.   <AbilityComponent
  106.  
  107. -       ui_name="$item_book_s_c"
  108.  
  109. *       ui_name="$item_book_s_a"
  110.   >         </AbilityComponent>
  111.     </Base>
  112.   diff --git a/entities/items/books/book_s_d.xml b/entities/items/books/book_s_d.xml
  113.   index ee81367..d1985cf 100644
  114.   --- a/entities/items/books/book_s_d.xml
  115.   +++ b/entities/items/books/book_s_d.xml
  116.   @@ -15,13 +15,13 @@
  117.         ></PhysicsImageShapeComponent>
  118.    
  119.         <UIInfoComponent
  120.  
  121. -       name="$item_book_s_d"
  122.  
  123. *       name="$item_book_s_a"
  124.         >
  125.       </UIInfoComponent>
  126.  
  127.       <ItemComponent
  128.         ui_sprite="data/items_gfx/book_s.png"
  129.  
  130. -       item_name="$item_book_s_d"
  131.  
  132. *       item_name="$item_book_s_a"
  133.   ui_description="$itemdesc_book_s_d" >
  134.   </ItemComponent>
  135.   @@ -31,7 +31,7 @@ ></SpriteComponent>
  136.   <AbilityComponent
  137.  
  138. -       ui_name="$item_book_s_d"
  139.  
  140. *       ui_name="$item_book_s_a"
  141.   >         </AbilityComponent>
  142.     </Base>
  143.   diff --git a/entities/items/books/book_s_e.xml b/entities/items/books/book_s_e.xml
  144.   index 705cf3a..3511cc4 100644
  145.   --- a/entities/items/books/book_s_e.xml
  146.   +++ b/entities/items/books/book_s_e.xml
  147.   @@ -15,13 +15,13 @@
  148.         ></PhysicsImageShapeComponent>
  149.    
  150.         <UIInfoComponent
  151.  
  152. -       name="$item_book_s_e"
  153.  
  154. *       name="$item_book_s_a"
  155.         >
  156.       </UIInfoComponent>
  157.  
  158.       <ItemComponent
  159.         ui_sprite="data/items_gfx/book_s.png"
  160.  
  161. -       item_name="$item_book_s_e"
  162.  
  163. *       item_name="$item_book_s_a"
  164.   ui_description="$itemdesc_book_s_e" >
  165.   </ItemComponent>
  166.   @@ -31,7 +31,7 @@ ></SpriteComponent>
  167.   <AbilityComponent
  168.  
  169. -       ui_name="$item_book_s_e"
  170.  
  171. *       ui_name="$item_book_s_a"
  172.   >         </AbilityComponent>
  173.     </Base>
  174.   diff --git a/entities/player_base.xml b/entities/player_base.xml
  175.   index ad5ff78..1786128 100644
  176.   --- a/entities/player_base.xml
  177.   +++ b/entities/player_base.xml
  178.   @@ -87,6 +87,7 @@
  179.        flying_recharge_removal_frames="8"
  180.        gravity="0"
  181.        buoyancy_check_offset_y="-7"
  182. * send_transform_update_message="1"
  183.   > </CharacterDataComponent>
  184.  
  185. <GenomeDataComponent
  186. diff --git a/entities/projectiles/bomb.xml b/entities/projectiles/bomb.xml
  187. index eb39d93..6ef6eb5 100644
  188. --- a/entities/projectiles/bomb.xml
  189. +++ b/entities/projectiles/bomb.xml
  190. @@ -22,7 +22,7 @@
  191. explosion_radius="60"
  192. explosion_sprite="data/particles/explosion_128.xml"
  193. explosion_sprite_lifetime="0"
  194.  
  195. -        load_this_entity="data/entities/particles/particle_explosion/main_gunpowder_large.xml,data/entities/misc/loose_ground.xml"
  196.  
  197. *        load_this_entity="data/entities/particles/particle_explosion/main_gunpowder_large.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  198.            create_cell_probability="40"
  199.            hole_destroy_liquid="0"
  200.            hole_enabled="1"
  201.   diff --git a/entities/projectiles/bomb_holy.xml b/entities/projectiles/bomb_holy.xml
  202.   index ad40277..9040d96 100644
  203.   --- a/entities/projectiles/bomb_holy.xml
  204.   +++ b/entities/projectiles/bomb_holy.xml
  205.   @@ -22,7 +22,7 @@
  206.   explosion_radius="180"
  207.   explosion_sprite="data/particles/explosion_128.xml"
  208.   explosion_sprite_lifetime="0"
  209.  
  210. -       load_this_entity="data/entities/particles/particle_explosion/main_large_radius.xml,data/entities/misc/loose_ground.xml"
  211.  
  212. *       load_this_entity="data/entities/particles/particle_explosion/main_large_radius.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  213.   create_cell_probability="40"
  214.   hole_destroy_liquid="0"
  215.   hole_enabled="1"
  216.   diff --git a/entities/projectiles/deck/black_hole.xml b/entities/projectiles/deck/black_hole.xml
  217.   index d4d144e..dd1b520 100644
  218.   --- a/entities/projectiles/deck/black_hole.xml
  219.   +++ b/entities/projectiles/deck/black_hole.xml
  220.   @@ -110,7 +110,8 @@
  221.   <CellEaterComponent
  222.   radius="12"
  223.  
  224. -     eat_dynamic_physics_bodies="1"
  225.  
  226. *     eat_dynamic_physics_bodies="1"
  227. *     ignored_material="gem_box2d_yellow_sun"
  228.       >
  229.   </CellEaterComponent>
  230.  
  231. diff --git a/entities/projectiles/deck/death_cross_big_explosion.xml b/entities/projectiles/deck/death_cross_big_explosion.xml
  232. index f71d5ac..2e84d7b 100644
  233. --- a/entities/projectiles/deck/death_cross_big_explosion.xml
  234. +++ b/entities/projectiles/deck/death_cross_big_explosion.xml
  235. @@ -33,7 +33,7 @@
  236. hole_image=""
  237. particle_effect="0"
  238. damage_mortals="0"
  239.  
  240. -
  241.  
  242. *        load_this_entity="data/entities/misc/explosion_was_here.xml"
  243.   physics_explosion_power.min="0"
  244.   physics_explosion_power.max="0"
  245.   physics_throw_enabled="0"
  246.   diff --git a/entities/projectiles/deck/explosion_giga.xml b/entities/projectiles/deck/explosion_giga.xml
  247.   index 633bb83..9cf9282 100644
  248.   --- a/entities/projectiles/deck/explosion_giga.xml
  249.   +++ b/entities/projectiles/deck/explosion_giga.xml
  250.   @@ -30,7 +30,7 @@
  251.   camera_shake="60"
  252.   explosion_radius="250"
  253.   explosion_sprite="data/particles/explosion_032.xml"
  254.  
  255. - load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml"
  256.  
  257. * load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml,data/entities/misc/explosion_was_here.xml"
  258.   explosion_sprite_lifetime="0"
  259.   create_cell_probability="5"
  260.   hole_destroy_liquid="0"
  261.   diff --git a/entities/projectiles/deck/meteor.xml b/entities/projectiles/deck/meteor.xml
  262.   index 1267b21..32f4727 100644
  263.   --- a/entities/projectiles/deck/meteor.xml
  264.   +++ b/entities/projectiles/deck/meteor.xml
  265.   @@ -47,7 +47,7 @@
  266.   create_cell_probability="100"
  267.   create_cell_material="fire"
  268.   hole_destroy_liquid="0"
  269.  
  270. -      load_this_entity="data/entities/particles/particle_explosion/main.xml,data/entities/misc/loose_ground.xml"
  271.  
  272. *      load_this_entity="data/entities/particles/particle_explosion/main.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  273.          ray_energy="7500000"
  274.          hole_enabled="1"
  275.          hole_image="data/temp/explosion_hole.png"
  276.   diff --git a/entities/projectiles/deck/meteor_green.xml b/entities/projectiles/deck/meteor_green.xml
  277.   index 90b4b50..3ab8a4a 100644
  278.   --- a/entities/projectiles/deck/meteor_green.xml
  279.   +++ b/entities/projectiles/deck/meteor_green.xml
  280.   @@ -42,7 +42,7 @@
  281.   create_cell_material="fire"
  282.   hole_destroy_liquid="0"
  283.   damage="1.0"
  284.  
  285. -      load_this_entity="data/entities/particles/particle_explosion/main_green.xml"
  286.  
  287. *      load_this_entity="data/entities/particles/particle_explosion/main_green.xml,data/entities/misc/explosion_was_here.xml"
  288.          ray_energy="7500000"
  289.          hole_enabled="1"
  290.          hole_image="data/temp/explosion_hole.png"
  291.   diff --git a/entities/projectiles/deck/meteor_rain_meteor.xml b/entities/projectiles/deck/meteor_rain_meteor.xml
  292.   index 4ec6e1d..f806491 100644
  293.   --- a/entities/projectiles/deck/meteor_rain_meteor.xml
  294.   +++ b/entities/projectiles/deck/meteor_rain_meteor.xml
  295.   @@ -57,7 +57,7 @@
  296.   create_cell_probability="100"
  297.   create_cell_material="fire"
  298.   hole_destroy_liquid="0"
  299.  
  300. -      load_this_entity="data/entities/particles/particle_explosion/main.xml,data/entities/misc/loose_ground.xml"
  301.  
  302. *      load_this_entity="data/entities/particles/particle_explosion/main.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  303.          ray_energy="7500000"
  304.          hole_enabled="1"
  305.          hole_image="data/temp/explosion_hole.png"
  306.   diff --git a/entities/projectiles/deck/nuke.xml b/entities/projectiles/deck/nuke.xml
  307.   index 35e2d8a..a865c54 100644
  308.   --- a/entities/projectiles/deck/nuke.xml
  309.   +++ b/entities/projectiles/deck/nuke.xml
  310.   @@ -43,7 +43,7 @@
  311.   camera_shake="60"
  312.   explosion_radius="250"
  313.   explosion_sprite="data/particles/explosion_032.xml"
  314.  
  315. - load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml"
  316.  
  317. * load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml,data/entities/misc/explosion_was_here.xml"
  318.   explosion_sprite_lifetime="0"
  319.   create_cell_probability="5"
  320.   hole_destroy_liquid="0"
  321.   diff --git a/entities/projectiles/deck/thunder_blast.xml b/entities/projectiles/deck/thunder_blast.xml
  322.   index 210bc8e..156d273 100644
  323.   --- a/entities/projectiles/deck/thunder_blast.xml
  324.   +++ b/entities/projectiles/deck/thunder_blast.xml
  325.   @@ -34,7 +34,7 @@
  326.   camera_shake="30.5"
  327.   explosion_radius="28"
  328.   explosion_sprite="data/particles/explosion_032_electric.xml"
  329.  
  330. -      load_this_entity="data/entities/particles/particle_explosion/main_blue.xml,data/entities/misc/loose_ground.xml"
  331.  
  332. *      load_this_entity="data/entities/particles/particle_explosion/main_blue.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  333.          explosion_sprite_lifetime="0"
  334.          ray_energy="700000"
  335.          create_cell_probability="0"
  336.   diff --git a/entities/projectiles/meteor_green.xml b/entities/projectiles/meteor_green.xml
  337.   index 20ea945..b87c002 100644
  338.   --- a/entities/projectiles/meteor_green.xml
  339.   +++ b/entities/projectiles/meteor_green.xml
  340.   @@ -42,7 +42,7 @@
  341.   create_cell_material="fire"
  342.   hole_destroy_liquid="0"
  343.   damage="10"
  344.  
  345. -      load_this_entity="data/entities/particles/particle_explosion/main_green.xml,data/entities/misc/loose_ground.xml"
  346.  
  347. *      load_this_entity="data/entities/particles/particle_explosion/main_green.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  348.          ray_energy="7500000"
  349.          hole_enabled="1"
  350.          hole_image="data/temp/explosion_hole.png"
  351.   diff --git a/entities/projectiles/thunderball.xml b/entities/projectiles/thunderball.xml
  352.   index 5b131e5..a31aea0 100644
  353.   --- a/entities/projectiles/thunderball.xml
  354.   +++ b/entities/projectiles/thunderball.xml
  355.   @@ -41,7 +41,7 @@
  356.   camera_shake="30.5"
  357.   explosion_radius="50"
  358.   explosion_sprite="data/particles/explosion_032_electric.xml"
  359.  
  360. - load_this_entity="data/entities/particles/particle_explosion/main_blue.xml,data/entities/misc/loose_ground.xml"
  361.  
  362. * load_this_entity="data/entities/particles/particle_explosion/main_blue.xml,data/entities/misc/loose_ground.xml,data/entities/misc/explosion_was_here.xml"
  363.   explosion_sprite_lifetime="0.0"
  364.   create_cell_probability="4"
  365.   create_cell_material="plasma_fading"
  366.   diff --git a/entities/projectiles/ultimate_killer_explosion.xml b/entities/projectiles/ultimate_killer_explosion.xml
  367.   index 37e2364..2d9a98a 100644
  368.   --- a/entities/projectiles/ultimate_killer_explosion.xml
  369.   +++ b/entities/projectiles/ultimate_killer_explosion.xml
  370.   @@ -29,7 +29,7 @@
  371.   damage="1"
  372.   explosion_radius="305"
  373.   explosion_sprite="data/particles/explosion_040_poof.xml"
  374.  
  375. - load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml"
  376.  
  377. * load_this_entity="data/entities/particles/particle_explosion/main_large.xml,data/entities/misc/loose_chunks.xml,data/entities/misc/explosion_was_here.xml"
  378.   explosion_sprite_lifetime="0"
  379.   explosion_sprite_random_rotation="0"
  380.   create_cell_probability="20"
  381.   diff --git a/materials.xml b/materials.xml
  382.   index 3680fe6..ed1d899 100644
  383.   --- a/materials.xml
  384.   +++ b/materials.xml
  385.   @@ -12379,6 +12379,39 @@
  386.   color="ff5787E7" >
  387.   </Graphics>
  388.   </CellDataChild>
  389. *
  390. * <CellDataChild
  391. *     _parent="gem_box2d"
  392. *     _inherit_reactions="1"
  393. *     name="gem_box2d_yellow_sun"
  394. * ui_name="$mat_gem_box2d_red"
  395. * gfx_glow_color="0xffff9919"
  396. * gfx_glow="255"
  397. * wang_color="ffff9919"
  398. * show_in_creative_mode="0"
  399. * solid_gravity_scale="0"
  400. * durability="15"
  401. * >
  402. *     <Graphics
  403. * color="ffffc74e" >
  404. * </Graphics>
  405. * </CellDataChild>
  406. *
  407. * <CellDataChild
  408. *     _parent="gem_box2d"
  409. *     _inherit_reactions="1"
  410. *     name="gem_box2d_red_float"
  411. * ui_name="$mat_gem_box2d_red"
  412. * gfx_glow_color="0xFFFF0000"
  413. * wang_color="fffd2d7d"
  414. * show_in_creative_mode="0"
  415. * solid_gravity_scale="0.2"
  416. * durability="15"
  417. * >
  418. *     <Graphics
  419. * color="ffE72850" >
  420. * </Graphics>
  421. * </CellDataChild>
  422.    
  423.      <CellDataChild
  424.         _parent="gem_box2d"
  425.   diff --git a/scripts/biome_scripts.lua b/scripts/biome_scripts.lua
  426.   index 3a2a03e..a3abf0d 100644
  427.   --- a/scripts/biome_scripts.lua
  428.   +++ b/scripts/biome_scripts.lua
  429.   @@ -101,8 +101,8 @@ function parallel_check( x, y )
  430.            
  431.             SetRandomSeed( x + 35, y - 253 )
  432.  
  433.  
  434. -       local r = Random( 1, 100 )
  435. -       local rx = Random( 0, 512 )
  436.  
  437. *       r = Random( 1, 100 )
  438. *       rx = Random( 0, 512 )
  439.   if ( r >= 98 ) then
  440.   print( "ALCHEMIST AT " .. tostring( x + rx ) .. ", " .. tostring( y ) )
  441.   diff --git a/scripts/biomes/pyramid_top.lua b/scripts/biomes/pyramid_top.lua
  442.   index 1ec99f4..2441823 100644
  443.   --- a/scripts/biomes/pyramid_top.lua
  444.   +++ b/scripts/biomes/pyramid_top.lua
  445.   @@ -37,4 +37,5 @@ end
  446.   function spawn_orb(x, y)
  447.   EntityLoad( "data/entities/items/orbs/orb_01.xml", x, y )
  448.   EntityLoad( "data/entities/items/books/book_01.xml", x+24, y )
  449. * EntityLoad( "data/entities/buildings/sun/spot_1.xml", x+24, y )
  450.   end
  451.   \ No newline at end of file
  452.   diff --git a/scripts/gun/gun_actions.lua b/scripts/gun/gun_actions.lua
  453.   index 1af6dd2..0266e9c 100644
  454.   --- a/scripts/gun/gun_actions.lua
  455.   +++ b/scripts/gun/gun_actions.lua
  456.   @@ -4010,7 +4010,7 @@ actions =
  457.   description = "$actiondesc_nolla",
  458.   sprite = "data/ui_gfx/gun_actions/nolla.png",
  459.   sprite_unidentified = "data/ui_gfx/gun_actions/spread_reduce_unidentified.png",
  460.  
  461. -     spawn_requires_flag = "card_unlocked_duplicate",
  462.  
  463. *     spawn_requires_flag = "card_unlocked_mestari",
  464.   related_extra_entities = { "data/entities/misc/nolla.xml" },
  465.   type = ACTION_TYPE_MODIFIER,
  466.   spawn_level = "2,4,5,6,10", -- LIFETIME_DOWN
  467.   @@ -4201,8 +4201,8 @@ actions =
  468.   c.extra_entities = c.extra_entities .. "data/entities/particles/gold_sparks.xml,"
  469.  
  470. -               local money = money - damage
  471. -               local moneyspent = moneyspent + damage
  472.  
  473. *               money = money - damage
  474. *               moneyspent = moneyspent + damage
  475.                 ComponentSetValue2( dcomp, "money", money )
  476.                 ComponentSetValue2( dcomp, "money_spent", moneyspent )
  477.  
  478.  
  479. @@ -9428,7 +9428,7 @@ actions =
  480. description = "$actiondesc_reset",
  481. sprite = "data/ui_gfx/gun_actions/reset.png",
  482. sprite_unidentified = "data/ui_gfx/gun_actions/bomb_unidentified.png",
  483.  
  484. -     spawn_requires_flag = "card_unlocked_maths",
  485.  
  486. *     spawn_requires_flag = "card_unlocked_mestari",
  487.   type = ACTION_TYPE_UTILITY,
  488.   recursive = true,
  489.   spawn_level = "10", -- BOMB
  490.   diff --git a/scripts/lib/utilities.lua b/scripts/lib/utilities.lua
  491.   index 2962481..3a2895a 100644
  492.   --- a/scripts/lib/utilities.lua
  493.   +++ b/scripts/lib/utilities.lua
  494.   @@ -440,7 +440,12 @@ function shoot_projectile_from_projectile( who_shot, entity_file, x, y, vel_x, v
  495.   local entity_id = EntityLoad( entity_file, x, y )
  496.   local herd_id = get_herd_id( who_shot )
  497.  
  498. - GameShootProjectile( who_shot, x, y, x+vel_x, y+vel_y, entity_id )
  499.  
  500. * local who_shot_creature = 0
  501. * edit_component( who_shot, "ProjectileComponent", function(comp,vars)
  502. *     who_shot_creature = ComponentGetValue2( comp, "mWhoShot" )
  503. * end)
  504. *
  505. * GameShootProjectile( who_shot_creature, x, y, x+vel_x, y+vel_y, entity_id )
  506.   edit_component( entity_id, "ProjectileComponent", function(comp,vars)
  507.   vars.mWhoShot = component_get_value_int( who_shot, "ProjectileComponent", "mWhoShot", 0 )
  508.   diff --git a/scripts/projectiles/worm_shot_slowdown.lua b/scripts/projectiles/worm_shot_slowdown.lua
  509.   index 0356b1b..3ec51e1 100644
  510.   --- a/scripts/projectiles/worm_shot_slowdown.lua
  511.   +++ b/scripts/projectiles/worm_shot_slowdown.lua
  512.   @@ -18,7 +18,7 @@ edit_component( entity_id, "VelocityComponent", function(vcomp,vars)
  513.   end
  514.   if ( f_id ~= nil ) and ( f_x ~= nil ) and ( f_y ~= nil ) then
  515.  
  516. -     local dist = get_distance2( x, y, f_x, f_y )
  517.  
  518. *     dist = get_distance2( x, y, f_x, f_y )
  519.   if ( dist < radius ) then
  520.   local tx,ty = f_x,f_y
  521.   @@ -38,7 +38,7 @@ edit_component( entity_id, "VelocityComponent", function(vcomp,vars)
  522.   end
  523.   if ( c_id ~= nil ) and ( c_x ~= nil ) and ( c_y ~= nil ) then
  524.  
  525. -     local dist = get_distance2( x, y, c_x, c_y )
  526.  
  527. *     dist = get_distance2( x, y, c_x, c_y )
  528.  
  529.       if ( dist < radius ) then
  530.         local tx,ty = c_x,c_y
  531.  
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!