API tools faq
paste
Liusad

Untitled

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