onilink_

Untitled

Mar 12th, 2020
1,520
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 56.73 KB | None | 0 0
  1. Mise à jour 54a9ddd..053a1ce
  2. Extraction des fichiers: 100% (812/812), fait.
  3. Fast-forward
  4. CMakeLists.txt.user | 2 +-
  5. centauri/alive/alive.cpp | 306 +++++++++-----
  6. centauri/alive/alive.h | 32 +-
  7. centauri/alive/invincible.cpp | 2 +-
  8. centauri/alive/invincible.h | 14 +-
  9. centauri/alive/tangible.cpp | 10 +-
  10. centauri/alive/tangible.h | 24 +-
  11. centauri/app/app.cpp | 42 +-
  12. centauri/app/client/process_messages.cpp | 4 +-
  13. centauri/app/game.h | 2 +-
  14. centauri/app/game_interface.cpp | 122 +++---
  15. centauri/app/game_interface.h | 11 +-
  16. centauri/app/game_state.cpp | 86 +++-
  17. centauri/app/game_state.h | 2 +-
  18. centauri/app/netplay_base.cpp | 10 +-
  19. centauri/app/server/process_critical_message.cpp | 2 +-
  20. centauri/app/state_game.cpp | 3 +
  21. centauri/assets_api/armor.cpp | 82 +++-
  22. centauri/assets_api/armor.h | 44 +-
  23. centauri/assets_api/assets_loader.cpp | 24 +-
  24. centauri/assets_api/background.cpp | 4 +-
  25. centauri/assets_api/background.h | 5 +-
  26. centauri/assets_api/biome.cpp | 3 +-
  27. centauri/assets_api/biome.h | 7 +-
  28. centauri/assets_api/biome2.cpp | 5 +-
  29. centauri/assets_api/biome2.h | 7 +-
  30. centauri/assets_api/block.cpp | 17 +-
  31. centauri/assets_api/block.h | 6 +-
  32. centauri/assets_api/bow.cpp | 11 +-
  33. centauri/assets_api/bow.h | 50 +--
  34. centauri/assets_api/breeding.cpp | 3 +-
  35. centauri/assets_api/breeding.h | 5 +-
  36. centauri/assets_api/bullet.cpp | 22 +-
  37. centauri/assets_api/bullet.h | 15 +-
  38. centauri/assets_api/bulletSpawn.cpp | 3 +-
  39. centauri/assets_api/bulletSpawn.h | 4 +-
  40. centauri/assets_api/chest.cpp | 4 +-
  41. centauri/assets_api/chest.h | 5 +-
  42. centauri/assets_api/craft.cpp | 5 +-
  43. centauri/assets_api/craft.h | 4 +-
  44. centauri/assets_api/damager.cpp | 12 +-
  45. centauri/assets_api/damager.h | 6 +-
  46. centauri/assets_api/dimension.cpp | 3 +-
  47. centauri/assets_api/dimension.h | 4 +-
  48. centauri/assets_api/donjon.cpp | 27 +-
  49. centauri/assets_api/donjon.h | 25 +-
  50. centauri/assets_api/donjon_spawns.cpp | 8 +-
  51. centauri/assets_api/drop.cpp | 16 +-
  52. centauri/assets_api/drop.h | 31 +-
  53. centauri/assets_api/drop_table.h | 3 +-
  54. centauri/assets_api/dynamic_rope.cpp | 8 +-
  55. centauri/assets_api/dynamic_rope.h | 4 +-
  56. centauri/assets_api/edible.cpp | 7 +-
  57. centauri/assets_api/edible.h | 4 +-
  58. centauri/assets_api/explosion.cpp | 7 +-
  59. centauri/assets_api/explosion.h | 4 +-
  60. centauri/assets_api/family_table.cpp | 4 +-
  61. centauri/assets_api/family_table.h | 5 +-
  62. centauri/assets_api/fire.cpp | 11 +-
  63. centauri/assets_api/fire.h | 8 +-
  64. centauri/assets_api/ground.cpp | 9 +-
  65. centauri/assets_api/ground.h | 5 +-
  66. centauri/assets_api/gun.cpp | 16 +-
  67. centauri/assets_api/gun.h | 4 +-
  68. centauri/assets_api/loot_table.cpp | 4 +-
  69. centauri/assets_api/loot_table.h | 5 +-
  70. centauri/assets_api/monster.cpp | 20 +-
  71. centauri/assets_api/monster.h | 15 +-
  72. centauri/assets_api/object.cpp | 23 +-
  73. centauri/assets_api/object.h | 14 +-
  74. centauri/assets_api/ore.cpp | 9 +-
  75. centauri/assets_api/ore.h | 6 +-
  76. centauri/assets_api/particles.cpp | 14 +-
  77. centauri/assets_api/particles.h | 10 +-
  78. centauri/assets_api/preference_table.cpp | 4 +-
  79. centauri/assets_api/preference_table.h | 5 +-
  80. centauri/assets_api/shield.cpp | 11 +-
  81. centauri/assets_api/shield.h | 6 +-
  82. centauri/assets_api/sound.cpp | 5 +-
  83. centauri/assets_api/sound.h | 11 +-
  84. centauri/assets_api/spawn.cpp | 5 +-
  85. centauri/assets_api/spawn.h | 9 +-
  86. centauri/assets_api/special_craft.cpp | 5 +-
  87. centauri/assets_api/special_craft.h | 4 +-
  88. centauri/assets_api/spell_system.cpp | 6 +-
  89. centauri/assets_api/spell_system.h | 5 +-
  90. centauri/assets_api/static_container.h | 60 ++-
  91. centauri/assets_api/throw.cpp | 11 +-
  92. centauri/assets_api/throw.h | 5 +-
  93. centauri/assets_api/trail.cpp | 58 +++
  94. centauri/assets_api/trail.h | 34 ++
  95. centauri/assets_api/tree.cpp | 14 +-
  96. centauri/assets_api/tree.h | 5 +-
  97. centauri/assets_api/triggerable.cpp | 10 +-
  98. centauri/assets_api/triggerable.h | 6 +-
  99. centauri/assets_api/weapon.cpp | 11 +-
  100. centauri/assets_api/weapon.h | 4 +-
  101. centauri/attributes/attr_identifier.h | 2 +-
  102. centauri/attributes/attrib_list.cpp | 2 +-
  103. centauri/attributes/attrib_list.h | 4 +-
  104. centauri/attributes/attribute.cpp | 22 +-
  105. centauri/attributes/attribute.h | 19 +-
  106. centauri/attributes/attribute_netplay.cpp | 2 +-
  107. centauri/attributes/attribute_ui.cpp | 2 +-
  108. centauri/attributes/attribute_ui.h | 2 +-
  109. centauri/attributes/boulder_trap.cpp | 2 +-
  110. centauri/attributes/boulder_trap.h | 2 +-
  111. centauri/attributes/bullet_burst.cpp | 2 +-
  112. centauri/attributes/bullet_burst.h | 2 +-
  113. centauri/attributes/circular_saw.cpp | 2 +-
  114. centauri/attributes/circular_saw.h | 2 +-
  115. centauri/attributes/closable.cpp | 21 +-
  116. centauri/attributes/closable.h | 2 +-
  117. centauri/attributes/container.cpp | 10 +-
  118. centauri/attributes/container.h | 4 +-
  119. centauri/attributes/core/mechanical_craft.cpp | 2 +-
  120. centauri/attributes/core/mechanical_craft.h | 2 +-
  121. centauri/attributes/core/soul_container.cpp | 36 ++
  122. centauri/attributes/core/soul_container.h | 18 +
  123. centauri/attributes/core/special_craft.cpp | 2 +-
  124. centauri/attributes/core/special_craft.h | 2 +-
  125. centauri/attributes/core/ui_subprotocol.cpp | 2 +-
  126. centauri/attributes/core/ui_subprotocol.h | 2 +-
  127. centauri/attributes/cyclic.cpp | 2 +-
  128. centauri/attributes/cyclic.h | 2 +-
  129. centauri/attributes/effects_analyzer.cpp | 2 +-
  130. centauri/attributes/effects_analyzer.h | 2 +-
  131. centauri/attributes/emit_ambiant_sound.cpp | 2 +-
  132. centauri/attributes/emit_ambiant_sound.h | 2 +-
  133. centauri/attributes/emit_light.cpp | 2 +-
  134. centauri/attributes/emit_light.h | 7 +-
  135. centauri/attributes/emit_sound.cpp | 2 +-
  136. centauri/attributes/emit_sound.h | 2 +-
  137. centauri/attributes/gear.cpp | 130 ++++--
  138. centauri/attributes/gear.h | 11 +-
  139. centauri/attributes/gear_craft_station.cpp | 20 +-
  140. centauri/attributes/gear_craft_station.h | 4 +-
  141. centauri/attributes/gear_one_way.cpp | 9 +-
  142. centauri/attributes/gear_one_way.h | 2 +-
  143. centauri/attributes/gear_pressure_plate.cpp | 2 +-
  144. centauri/attributes/gear_pressure_plate.h | 2 +-
  145. centauri/attributes/gear_switch.cpp | 6 +-
  146. centauri/attributes/gear_switch.h | 2 +-
  147. centauri/attributes/get_damages.cpp | 2 +-
  148. centauri/attributes/get_damages.h | 2 +-
  149. centauri/attributes/hamster_wheel.cpp | 5 +-
  150. centauri/attributes/hamster_wheel.h | 2 +-
  151. centauri/attributes/incubator.cpp | 2 +-
  152. centauri/attributes/incubator.h | 2 +-
  153. centauri/attributes/inflict_damages.cpp | 132 ++++--
  154. centauri/attributes/inflict_damages.h | 2 +-
  155. centauri/attributes/lockable.cpp | 10 +-
  156. centauri/attributes/lockable.h | 4 +-
  157. centauri/attributes/pet_house.cpp | 3 +-
  158. centauri/attributes/pet_house.h | 2 +-
  159. centauri/attributes/pipe_conveyor.cpp | 19 +-
  160. centauri/attributes/pipe_conveyor.h | 2 +-
  161. centauri/attributes/pipenet_spiritual.cpp | 846 +++++++++++++++++++++++++++++++++++++
  162. centauri/attributes/pipenet_spiritual.h | 133 ++++++
  163. centauri/attributes/receptacle.cpp | 2 +-
  164. centauri/attributes/receptacle.h | 2 +-
  165. centauri/attributes/retractable.cpp | 2 +-
  166. centauri/attributes/retractable.h | 2 +-
  167. centauri/attributes/soul_container.cpp.bkp | 389 +++++++++++++++++
  168. centauri/attributes/soul_container.h.bpk | 87 ++++
  169. centauri/attributes/soul_dispenser.cpp | 385 +++++++++++++++++
  170. centauri/attributes/soul_dispenser.h | 82 ++++
  171. centauri/attributes/soul_gate.cpp | 790 +++++++++++++++++++++++++++++++++++
  172. centauri/attributes/soul_gate.h | 119 ++++++
  173. centauri/attributes/soul_harvester.cpp | 386 +++++++++++++++++
  174. centauri/attributes/soul_harvester.h | 81 ++++
  175. centauri/attributes/special_craft.cpp | 10 +-
  176. centauri/attributes/special_craft.h | 4 +-
  177. centauri/attributes/structures/object_connection.h | 15 -
  178. centauri/attributes/switch.cpp | 4 +-
  179. centauri/attributes/switch.h | 2 +-
  180. centauri/attributes/teleport.cpp | 2 +-
  181. centauri/attributes/teleport.h | 2 +-
  182. centauri/attributes/track_saw.cpp | 4 +-
  183. centauri/attributes/track_saw.h | 2 +-
  184. centauri/attributes/turret.cpp | 2 +-
  185. centauri/attributes/turret.h | 2 +-
  186. centauri/attributes/wind_wheel.cpp | 11 +-
  187. centauri/attributes/wind_wheel.h | 2 +-
  188. centauri/audio/sound_merge.cpp | 2 +-
  189. centauri/bullet/ammo.h | 2 +-
  190. centauri/bullet/attribute.cpp | 39 +-
  191. centauri/bullet/attribute.h | 29 +-
  192. centauri/bullet/base.cpp | 42 +-
  193. centauri/bullet/base.h | 22 +-
  194. centauri/bullet/bullet_death.h | 2 +-
  195. centauri/bullet/motion/follow_target.cpp | 3 +-
  196. centauri/bullet/renderer/render_laser.cpp | 21 +-
  197. centauri/bullet/spear.cpp | 13 +-
  198. centauri/bullet/spear.h | 2 +-
  199. centauri/camera/camera.h | 3 +
  200. centauri/camera/follows.cpp | 107 +++--
  201. centauri/camera/follows.h | 21 +-
  202. centauri/cell.h | 35 +-
  203. centauri/character/action/base.cpp | 27 +-
  204. centauri/character/action/base.h | 41 +-
  205. centauri/character/action/npc.cpp | 18 +-
  206. centauri/character/action/npc.h | 12 +-
  207. centauri/character/action/player.cpp | 49 ++-
  208. centauri/character/action/player.h | 23 +-
  209. centauri/character/armor.cpp | 1218 +++++++++++++++++++++++++++++++++++++++++-------------
  210. centauri/character/armor.h | 154 ++++---
  211. centauri/character/attract.cpp | 2 +-
  212. centauri/character/boomerang.cpp | 32 +-
  213. centauri/character/boomerang.h | 17 +-
  214. centauri/character/bow.cpp | 10 +-
  215. centauri/character/brain/base.h | 14 +-
  216. centauri/character/brain/brain_skill_preview.cpp | 509 +++++++++++++++++++++++
  217. centauri/character/brain/brain_skill_preview.h | 51 +++
  218. centauri/character/brain/npc.cpp | 4 +-
  219. centauri/character/brain/npc.h | 6 +-
  220. centauri/character/brain/npc_freed.cpp | 4 +-
  221. centauri/character/brain/npc_freed.h | 4 +-
  222. centauri/character/brain/player.cpp | 6 +-
  223. centauri/character/brain/player.h | 12 +-
  224. centauri/character/char_afterglow_gfx.cpp | 68 +++
  225. centauri/character/char_afterglow_gfx.h | 32 ++
  226. centauri/character/character.cpp | 223 ++++++++--
  227. centauri/character/character.h | 25 +-
  228. centauri/character/character_base.cpp | 746 ++++++++++++++++++++++-----------
  229. centauri/character/character_base.h | 103 +++--
  230. centauri/character/eaten_food_state.h | 2 +-
  231. centauri/character/edible.cpp | 2 +-
  232. centauri/character/fsm.h | 101 +++++
  233. centauri/character/fsm_generic_state.h | 23 ++
  234. centauri/character/fsm_player_state.cpp | 145 +++++++
  235. centauri/character/fsm_player_state.h | 47 +++
  236. centauri/character/gun.cpp | 12 +-
  237. centauri/character/npc.cpp | 32 +-
  238. centauri/character/npc.h | 6 +-
  239. centauri/character/persistant_data.cpp | 197 ++++++---
  240. centauri/character/persistant_data.h | 35 +-
  241. centauri/character/pick_up_list.h | 2 +-
  242. centauri/character/player_inventories.h | 2 +-
  243. centauri/character/sfx.cpp | 6 -
  244. centauri/character/sfx.h | 5 -
  245. centauri/character/shield.cpp | 6 +-
  246. centauri/character/states/dash.cpp | 52 ++-
  247. centauri/character/states/dash.h | 24 +-
  248. centauri/character/states/dash_strike.cpp | 152 +++++++
  249. centauri/character/states/dash_strike.h | 30 ++
  250. centauri/character/states/dash_strike_air.cpp | 259 ++++++++++++
  251. centauri/character/states/dash_strike_air.h | 38 ++
  252. centauri/character/states/dash_strike_charged.cpp | 156 +++++++
  253. centauri/character/states/dash_strike_charged.h | 30 ++
  254. centauri/character/states/dash_strike_down.cpp | 208 ++++++++++
  255. centauri/character/states/dash_strike_down.h | 35 ++
  256. centauri/character/states/demon_fang.cpp | 16 -
  257. centauri/character/states/demon_fang.h | 15 -
  258. centauri/character/states/dive.cpp | 98 +++--
  259. centauri/character/states/dive.h | 28 +-
  260. centauri/character/states/diveShock.cpp | 9 +-
  261. centauri/character/states/diveShock.h | 15 +-
  262. centauri/character/states/doubleSlice.cpp | 24 +-
  263. centauri/character/states/doubleSlice.h | 4 +-
  264. centauri/character/states/idle.cpp | 92 +++--
  265. centauri/character/states/idle.h | 17 +-
  266. centauri/character/states/jump_slice.cpp | 102 +++++
  267. centauri/character/states/jump_slice.h | 26 ++
  268. centauri/character/states/jumping.cpp | 44 +-
  269. centauri/character/states/jumping.h | 23 +-
  270. centauri/character/states/lightning_thrust.cpp | 32 +-
  271. centauri/character/states/lightning_thrust.h | 4 +-
  272. centauri/character/states/moveBack.cpp | 2 +-
  273. centauri/character/states/moveBack.h | 10 +-
  274. centauri/character/states/project.cpp | 53 +++
  275. centauri/character/states/project.h | 19 +
  276. centauri/character/states/project_up.cpp | 189 +++++++++
  277. centauri/character/states/project_up.h | 35 ++
  278. centauri/character/states/running.cpp | 75 +++-
  279. centauri/character/states/running.h | 18 +-
  280. centauri/character/states/sliceDownUp.cpp | 69 ----
  281. centauri/character/states/sliceDownUp.h | 18 -
  282. centauri/character/states/sonic_thrust.cpp | 44 +-
  283. centauri/character/states/sonic_thrust.h | 4 +-
  284. centauri/character/states/state.h | 45 --
  285. centauri/character/states/sword_rain.cpp | 30 +-
  286. centauri/character/states/sword_rain.h | 4 +-
  287. centauri/character/states/tempest.cpp | 107 +++--
  288. centauri/character/states/tempest.h | 27 +-
  289. centauri/character/states/thrust.cpp | 189 +++++----
  290. centauri/character/states/thrust.h | 34 +-
  291. centauri/character/states/tiger_fang.cpp | 246 +++++++++++
  292. centauri/character/states/tiger_fang.h | 36 ++
  293. centauri/character/states/tornade.cpp | 25 +-
  294. centauri/character/states/tornade.h | 4 +-
  295. centauri/character/substates/dash_strike_sub.cpp | 521 +++++++++++++++++++++++
  296. centauri/character/substates/dash_strike_sub.h | 83 ++++
  297. centauri/character/sword.cpp | 427 +++++++++++++++----
  298. centauri/character/sword.h | 15 +
  299. centauri/character/test.h | 2 +-
  300. centauri/character/throw.cpp | 26 +-
  301. centauri/character/unlocked_skills.cpp | 63 +++
  302. centauri/character/unlocked_skills.h | 39 ++
  303. centauri/core/creature_type.h | 28 --
  304. centauri/core/damage.cpp | 129 +++---
  305. centauri/core/damage.h | 87 ++--
  306. centauri/core/drop.h | 14 +-
  307. centauri/core/gem.h | 22 -
  308. centauri/core/hit.h | 9 +-
  309. centauri/core/hit_force.cpp | 116 ++++++
  310. centauri/core/hit_force.h | 36 ++
  311. centauri/core/item.cpp | 3 +-
  312. centauri/core/item.h | 57 ++-
  313. centauri/core/modifier.cpp | 95 +----
  314. centauri/core/modifier.h | 97 +----
  315. centauri/core/monster.cpp | 135 ------
  316. centauri/core/monster.h | 121 +-----
  317. centauri/core/monster_rarity.h | 2 +-
  318. centauri/core/monster_spawn.cpp | 11 +
  319. centauri/core/monster_spawn.h | 6 +
  320. centauri/core/object_io.cpp | 97 +++++
  321. centauri/core/object_io.h | 47 +++
  322. centauri/core/particle.cpp | 33 --
  323. centauri/core/particle.h | 38 +-
  324. centauri/core/quest.h | 42 +-
  325. centauri/core/rarity.cpp | 32 ++
  326. centauri/core/rarity.h | 7 +-
  327. centauri/core/resistance.cpp | 26 +-
  328. centauri/core/resistance.h | 32 +-
  329. centauri/core/skills.cpp | 293 +++++--------
  330. centauri/core/skills.h | 231 +++++++----
  331. centauri/core/skills_deprecated.cpp | 225 ++++++++++
  332. centauri/core/skills_deprecated.h | 94 +++++
  333. centauri/core/spawn_params.h | 4 +-
  334. centauri/core/suffix.cpp | 157 ++-----
  335. centauri/core/suffix.h | 167 +-------
  336. centauri/core/tooltip.h | 9 +
  337. centauri/core/trail_particles.h | 11 +
  338. centauri/core/trigger.h | 45 +-
  339. centauri/core/weight.cpp | 10 +
  340. centauri/core/weight.h | 7 +
  341. centauri/csteam/matchmaking.cpp | 2 +-
  342. centauri/damager/attribute.cpp | 2 +-
  343. centauri/damager/attribute.h | 2 +-
  344. centauri/damager/damager.h | 6 +-
  345. centauri/damages/damage_digits.h | 2 +-
  346. centauri/damages/damage_zone_base.cpp | 93 ++++-
  347. centauri/damages/damage_zone_base.h | 28 +-
  348. centauri/damages/damage_zone_circular.cpp | 21 +-
  349. centauri/damages/damage_zone_circular.h | 2 +-
  350. centauri/deco/breeder.h | 2 +-
  351. centauri/deco/chest.cpp | 2 +-
  352. centauri/deco/chest.h | 2 +-
  353. centauri/deco/crystal.h | 2 +-
  354. centauri/deco/decoration.cpp | 2 +-
  355. centauri/deco/decoration.h | 13 +-
  356. centauri/deco/door.cpp | 9 +-
  357. centauri/deco/door.h | 2 +-
  358. centauri/deco/portal.h | 2 +-
  359. centauri/deco/regen_table.h | 2 +-
  360. centauri/deco/snake_door.h | 2 +-
  361. centauri/deco/special_craft.h | 2 +-
  362. centauri/deco/trap.h | 2 +-
  363. centauri/donjon2/generator.h | 36 +-
  364. centauri/donjon2/room.h | 2 +-
  365. centauri/donjon2/room_type.h | 16 -
  366. centauri/enum/action_triggered.h | 12 +
  367. centauri/{core/attribute.h => enum/attribute_kind.h} | 4 +
  368. centauri/{core/biome.cpp => enum/biome_type_deprecated.cpp} | 2 +-
  369. centauri/{core/biome.h => enum/biome_type_deprecated.h} | 6 +-
  370. centauri/enum/character_state.h | 42 ++
  371. centauri/enum/creature_type.h | 24 ++
  372. centauri/enum/damage_type.h | 19 +
  373. centauri/enum/decoration_trigger_kind.h | 31 ++
  374. centauri/{core => enum}/difficulty.cpp | 4 +-
  375. centauri/{core => enum}/difficulty.h | 5 +-
  376. centauri/enum/donjon_gen_guid_mode.h | 9 +
  377. centauri/enum/donjon_room_type.h | 14 +
  378. centauri/enum/enum.h | 14 +
  379. centauri/enum/event_request_type.h | 9 +
  380. centauri/enum/game_flags.h | 8 +
  381. centauri/{core => enum}/gem.cpp | 3 +-
  382. centauri/enum/gem.h | 21 +
  383. centauri/enum/hit_deco.h | 11 +
  384. centauri/enum/key.h | 59 +++
  385. centauri/enum/modifier_type.cpp | 93 +++++
  386. centauri/enum/modifier_type.h | 87 ++++
  387. centauri/enum/monster_index.cpp | 134 ++++++
  388. centauri/enum/monster_index.h | 119 ++++++
  389. centauri/enum/object_connection.cpp | 45 ++
  390. centauri/enum/object_connection.h | 29 ++
  391. centauri/{core => enum}/object_type.cpp | 8 +-
  392. centauri/{core => enum}/object_type.h | 7 +-
  393. centauri/enum/particle_type.cpp | 36 ++
  394. centauri/enum/particle_type.h | 33 ++
  395. centauri/enum/projection_power.cpp | 50 +++
  396. centauri/enum/projection_power.h | 33 ++
  397. centauri/enum/quest_type.h | 31 ++
  398. centauri/{alive/reversable.cpp => enum/side_orientable.cpp} | 13 +-
  399. centauri/{alive/reversable.h => enum/side_orientable.h} | 7 +-
  400. centauri/enum/skill_level.cpp | 67 +++
  401. centauri/enum/skill_level.h | 33 ++
  402. centauri/{core => enum}/spawn_time.h | 0
  403. centauri/{core => enum}/spawn_type.cpp | 0
  404. centauri/{core => enum}/spawn_type.h | 5 +-
  405. centauri/enum/suffix_type.cpp | 129 ++++++
  406. centauri/enum/suffix_type.h | 139 +++++++
  407. centauri/enum/weight.cpp | 32 ++
  408. centauri/enum/weight.h | 25 ++
  409. centauri/enum/window_type.h | 34 ++
  410. centauri/event/event_spawn_ball.h | 2 +-
  411. centauri/game/block_template.h | 8 +-
  412. centauri/game/builder_tools.cpp | 2 +-
  413. centauri/game/cmd.cpp | 28 +-
  414. centauri/game/console.cpp | 20 +-
  415. centauri/game/event_request.h | 15 +-
  416. centauri/game/global_frame.cpp | 2 +-
  417. centauri/game/global_time.cpp | 2 +-
  418. centauri/game/global_time.h | 2 +-
  419. centauri/game/interact.cpp | 123 ++----
  420. centauri/game/interact.h | 27 +-
  421. centauri/game/netmsg.cpp | 2 +-
  422. centauri/game/netmsg.h | 6 +-
  423. centauri/game/netplay.h | 4 +-
  424. centauri/game/serialize_dimension.cpp | 4 +-
  425. centauri/game/time.cpp | 2 +-
  426. centauri/game/title.cpp | 7 +-
  427. centauri/gfx/catch_effect.cpp | 9 +-
  428. centauri/gfx/catch_effect.h | 4 +-
  429. centauri/gfx/despawn.h | 2 +-
  430. centauri/gfx/gfx.cpp | 88 ++--
  431. centauri/gfx/gfx.h | 7 +-
  432. centauri/gfx/particle_collider.cpp | 2 +-
  433. centauri/gfx/particle_system.cpp | 10 +-
  434. centauri/gfx/recall_effect.cpp | 2 +-
  435. centauri/gfx/recall_effect.h | 2 +-
  436. centauri/gfx/spawn.h | 2 +-
  437. centauri/gfx/trail.cpp | 235 +++++++++++
  438. centauri/gfx/trail.h | 64 +++
  439. centauri/globals.cpp | 12 +
  440. centauri/globals.h | 3 +
  441. centauri/gui/buttons_window.cpp | 15 +-
  442. centauri/gui/buttons_window.h | 9 +-
  443. centauri/gui/debug_infos.cpp | 4 +-
  444. centauri/gui/deprecated/craft_bullet.cpp | 12 +-
  445. centauri/gui/deprecated/inventory_window.cpp | 29 +-
  446. centauri/gui/deprecated/inventory_window.h | 1 +
  447. centauri/gui/deprecated/keybinding.cpp | 2 +
  448. centauri/gui/deprecated/special_craft.cpp | 7 +
  449. centauri/gui/deprecated/widgets.cpp | 2 +
  450. centauri/gui/dialog_window.cpp | 48 +++
  451. centauri/gui/dialog_window.h | 33 ++
  452. centauri/gui/effects_watcher.cpp | 2 +-
  453. centauri/gui/incubator_ui.cpp | 2 +-
  454. centauri/gui/inventory_ui.cpp | 436 +++++--------------
  455. centauri/gui/inventory_ui.h | 89 ++--
  456. centauri/gui/magic_creation.cpp | 278 +++++++------
  457. centauri/gui/magic_creation.h | 9 +-
  458. centauri/gui/pet_house_ui.cpp | 4 +-
  459. centauri/gui/skills_window.cpp | 88 ++--
  460. centauri/gui/skills_window.h | 4 +-
  461. centauri/gui/tab_inventory.cpp | 376 +++++++++++++++++
  462. centauri/gui/tab_inventory.h | 71 ++++
  463. centauri/gui/tab_skills.cpp | 740 +++++++++++++++++++++++++++++++++
  464. centauri/gui/tab_skills.h | 95 +++++
  465. centauri/gui/transform_window.cpp | 8 +-
  466. centauri/gui/ui_utils.cpp | 12 +
  467. centauri/gui/ui_utils.h | 8 +
  468. centauri/gui/window.cpp | 78 +++-
  469. centauri/gui/window.h | 57 ++-
  470. centauri/input/character_input.cpp | 2 +-
  471. centauri/input/character_input.h | 19 +-
  472. centauri/input/input.cpp | 4 +-
  473. centauri/input/input.h | 9 +-
  474. centauri/input/input_base.cpp | 2 +-
  475. centauri/input/input_base.h | 4 +-
  476. centauri/input/keybinding.cpp | 49 +--
  477. centauri/input/keybinding.h | 57 +--
  478. centauri/inventory/generate_drops.cpp | 2 +-
  479. centauri/inventory/inventory.cpp | 7 +-
  480. centauri/inventory/item.cpp | 2 +-
  481. centauri/inventory/itemSlot.cpp | 16 +-
  482. centauri/inventory/itemSlot.h | 2 +-
  483. centauri/inventory/item_attribute.cpp | 8 +-
  484. centauri/log/journal.h | 2 +-
  485. centauri/magic/bullet.h | 2 +-
  486. centauri/magic/dragon.cpp | 7 +-
  487. centauri/magic/dragon.h | 4 +-
  488. centauri/magic/heal.h | 2 +-
  489. centauri/magic/lightning.h | 2 +-
  490. centauri/magic/magma.cpp | 7 +-
  491. centauri/magic/magma.h | 4 +-
  492. centauri/magic/meteor.cpp | 7 +-
  493. centauri/magic/meteor.h | 2 +-
  494. centauri/magic/spells/arcane.cpp | 6 +-
  495. centauri/magic/spells/arcane.h | 2 +-
  496. centauri/magic/spells/bullet.cpp | 2 +-
  497. centauri/magic/spells/bullet.h | 2 +-
  498. centauri/magic/spells/dragon.cpp | 4 +-
  499. centauri/magic/spells/meteor.cpp | 4 +-
  500. centauri/magic/spells/meteor.h | 2 +-
  501. centauri/magic/spells/spike.cpp | 9 +-
  502. centauri/magic/spells/sun.cpp | 6 +-
  503. centauri/magic/spells/sun.h | 2 +-
  504. centauri/magic/spike.cpp | 5 +-
  505. centauri/magic/spike.h | 4 +-
  506. centauri/magic/spikeSpell.h | 2 +-
  507. centauri/minimap/chunk.cpp | 6 +-
  508. centauri/minimap/minimap.cpp | 2 +-
  509. centauri/minimap/minimap.h | 2 +-
  510. centauri/monsters/aliens/{standard.cpp => alien.cpp} | 201 +++++----
  511. centauri/monsters/aliens/{standard.h => alien.h} | 36 +-
  512. centauri/monsters/aliens/{brutal.cpp => alien_brutal.cpp} | 189 ++++-----
  513. centauri/monsters/aliens/{brutal.h => alien_brutal.h} | 33 +-
  514. centauri/monsters/aliens/{mage.cpp => alien_mage.cpp} | 121 +++---
  515. centauri/monsters/aliens/{mage.h => alien_mage.h} | 30 +-
  516. centauri/monsters/aliens/drone.cpp | 10 +-
  517. centauri/monsters/aliens/drone.h | 2 +-
  518. centauri/monsters/aliens/king.cpp | 18 +-
  519. centauri/monsters/aliens/king.h | 2 +-
  520. centauri/monsters/aliens_surface/bird.cpp | 148 ++++---
  521. centauri/monsters/aliens_surface/bird.h | 47 ++-
  522. centauri/monsters/aliens_surface/brain.cpp | 20 +-
  523. centauri/monsters/aliens_surface/brain.h | 2 +-
  524. centauri/monsters/aliens_surface/lizard.cpp | 395 ++++--------------
  525. centauri/monsters/aliens_surface/lizard.h | 56 ++-
  526. centauri/monsters/aliens_surface/mosquito.cpp | 173 ++++----
  527. centauri/monsters/aliens_surface/mosquito.h | 50 ++-
  528. centauri/monsters/aliens_surface/rex.cpp | 296 ++++++-------
  529. centauri/monsters/aliens_surface/rex.h | 79 ++--
  530. centauri/monsters/aliens_surface/tripod.cpp | 185 +++++----
  531. centauri/monsters/aliens_surface/tripod.h | 50 ++-
  532. centauri/monsters/boss/beta_armor.cpp | 50 ++-
  533. centauri/monsters/boss/beta_armor.h | 5 +-
  534. centauri/monsters/boss/chick_mutant.cpp | 16 +-
  535. centauri/monsters/boss/chick_mutant.h | 2 +-
  536. centauri/monsters/boss/dragon.cpp | 120 +++---
  537. centauri/monsters/boss/dragon.h | 2 +-
  538. centauri/monsters/boss/leaf_girl.cpp | 15 +-
  539. centauri/monsters/boss/leaf_girl.h | 2 +-
  540. centauri/monsters/boss/lich.cpp | 2 +-
  541. centauri/monsters/boss/lich.h | 2 +-
  542. centauri/monsters/boss/shadow_armor.cpp | 52 ++-
  543. centauri/monsters/boss/shadow_armor.h | 5 +-
  544. centauri/monsters/boss/sword.cpp | 46 ++-
  545. centauri/monsters/boss/sword.h | 2 +-
  546. centauri/monsters/boss/trex.cpp | 34 +-
  547. centauri/monsters/boss/trex.h | 2 +-
  548. centauri/monsters/cave/bat.cpp | 54 ++-
  549. centauri/monsters/cave/bat.h | 37 +-
  550. centauri/monsters/cave/crawler.cpp | 383 ++++-------------
  551. centauri/monsters/cave/crawler.h | 49 ++-
  552. centauri/monsters/cave/creep.cpp | 160 +++----
  553. centauri/monsters/cave/creep.h | 44 +-
  554. centauri/monsters/cave/ghost.cpp | 25 +-
  555. centauri/monsters/cave/ghost.h | 11 +-
  556. centauri/monsters/cave/mimic.cpp | 185 ++++-----
  557. centauri/monsters/cave/mimic.h | 36 +-
  558. centauri/monsters/cave/skeleton.cpp | 149 +++----
  559. centauri/monsters/cave/skeleton.h | 40 +-
  560. centauri/monsters/create.cpp | 14 +-
  561. centauri/monsters/desert/scorpion.cpp | 251 +++--------
  562. centauri/monsters/desert/scorpion.h | 46 ++-
  563. centauri/monsters/desert/worm.h | 23 +-
  564. centauri/monsters/desert/worm_head.cpp | 8 +-
  565. centauri/monsters/desert/worm_head.h | 41 +-
  566. centauri/monsters/desert/worm_part.cpp | 7 +-
  567. centauri/monsters/desert/worm_part.h | 19 +-
  568. centauri/monsters/flying_monster.cpp | 11 +
  569. centauri/monsters/flying_monster.h | 16 +
  570. centauri/monsters/forest/boar.cpp | 111 +++--
  571. centauri/monsters/forest/boar.h | 36 +-
  572. centauri/monsters/forest/chenille.cpp | 123 +++---
  573. centauri/monsters/forest/chenille.h | 41 +-
  574. centauri/monsters/forest/guardian.cpp | 233 ++++-------
  575. centauri/monsters/forest/guardian.h | 31 +-
  576. centauri/monsters/forest/leaf_lion.cpp | 293 ++++---------
  577. centauri/monsters/forest/leaf_lion.h | 42 +-
  578. centauri/monsters/forest/naga.cpp | 77 ++--
  579. centauri/monsters/forest/naga.h | 42 +-
  580. centauri/monsters/forest/raptor.cpp | 301 +++-----------
  581. centauri/monsters/forest/raptor.h | 54 ++-
  582. centauri/monsters/hell/butcher.cpp | 103 +++--
  583. centauri/monsters/hell/butcher.h | 35 +-
  584. centauri/monsters/hell/devourer.cpp | 861 ++++++++++++++++++++++++++++----------
  585. centauri/monsters/hell/devourer.h | 94 +++--
  586. centauri/monsters/hell/golem.cpp | 183 ++++----
  587. centauri/monsters/hell/golem.h | 49 +--
  588. centauri/monsters/hell/helldog.cpp | 135 +++---
  589. centauri/monsters/hell/helldog.h | 43 +-
  590. centauri/monsters/hell/lava_hand.cpp | 23 +-
  591. centauri/monsters/hell/lava_hand.h | 10 +-
  592. centauri/monsters/land_monster.cpp | 53 +++
  593. centauri/monsters/land_monster.h | 13 +-
  594. centauri/monsters/monks/monk_boss.cpp | 20 +-
  595. centauri/monsters/monks/monk_boss.h | 10 +-
  596. centauri/monsters/monks/monk_boss/beam.cpp | 4 +-
  597. centauri/monsters/monks/monk_boss/lightning.cpp | 4 +-
  598. centauri/monsters/monks/monk_claw.cpp | 135 +++---
  599. centauri/monsters/monks/monk_claw.h | 34 +-
  600. centauri/monsters/monks/monk_hand.cpp | 177 ++++----
  601. centauri/monsters/monks/monk_hand.h | 53 ++-
  602. centauri/monsters/monks/monk_rapier.cpp | 312 ++++----------
  603. centauri/monsters/monks/monk_rapier.h | 51 +--
  604. centauri/monsters/monks/monk_spear.cpp | 125 +++---
  605. centauri/monsters/monks/monk_spear.h | 52 +--
  606. centauri/monsters/monster.cpp | 116 +++++-
  607. centauri/monsters/monster.h | 42 +-
  608. centauri/monsters/monster_breeder_association.cpp | 8 +
  609. centauri/monsters/monster_breeder_association.h | 40 ++
  610. centauri/monsters/monster_fall_state.h | 205 +++++++++
  611. centauri/monsters/monster_get_drop.cpp | 2 +-
  612. centauri/monsters/monster_jump_state.h | 205 +++++++++
  613. centauri/monsters/monster_mount.h | 119 ++++++
  614. centauri/monsters/monster_state_interface.h | 44 ++
  615. centauri/monsters/monster_wheel_association.cpp | 137 ++++++
  616. centauri/monsters/monster_wheel_association.h | 79 ++++
  617. centauri/monsters/mountain/eagle.cpp | 819 +++++++++++++++++++++++++++++++-----
  618. centauri/monsters/mountain/eagle.h | 94 +++--
  619. centauri/monsters/mountain/yeti.cpp | 112 +++--
  620. centauri/monsters/mountain/yeti.h | 42 +-
  621. centauri/monsters/passive/crystal.cpp | 13 +-
  622. centauri/monsters/passive/crystal.h | 5 +-
  623. centauri/monsters/passive/dimensional_breach.cpp | 15 +-
  624. centauri/monsters/passive/dimensional_breach.h | 5 +-
  625. centauri/monsters/pets/phenix.cpp | 7 +-
  626. centauri/monsters/pets/phenix.h | 2 +-
  627. centauri/monsters/pets/pumpkin.cpp | 2 +
  628. centauri/monsters/pets/pumpkin.h | 59 ++-
  629. centauri/monsters/pets/shiba.cpp | 2 +
  630. centauri/monsters/pets/shiba.h | 2 +-
  631. centauri/monsters/plain/chicken.cpp | 298 ++++++-------
  632. centauri/monsters/plain/chicken.h | 103 +++--
  633. centauri/monsters/plain/cow.cpp | 329 +++++++--------
  634. centauri/monsters/plain/cow.h | 73 ++--
  635. centauri/monsters/plain/repty.cpp | 1083 ++++++++++++++++++++++++++++++++++++++++--------
  636. centauri/monsters/plain/repty.h | 80 +++-
  637. centauri/monsters/plain/slime.cpp | 437 +++++++++++---------
  638. centauri/monsters/plain/slime.h | 64 ++-
  639. centauri/monsters/plain/wisp.cpp | 6 +-
  640. centauri/monsters/plain/wisp.h | 15 +-
  641. centauri/monsters/plain/zombi.cpp | 223 ++++------
  642. centauri/monsters/plain/zombi.h | 43 +-
  643. centauri/monsters/texture_manager.cpp | 10 +-
  644. centauri/netplay/network.h | 10 +-
  645. centauri/netplay/steam_network.cpp | 8 +-
  646. centauri/object.h | 2 +-
  647. centauri/object/ball.cpp | 14 +-
  648. centauri/object/ball.h | 2 +-
  649. centauri/object/boomerang.cpp | 5 +-
  650. centauri/object/boomerang.h | 4 +-
  651. centauri/object/catch_gem.cpp | 14 +-
  652. centauri/object/catch_gem.h | 4 +-
  653. centauri/object/dropped.cpp | 2 +-
  654. centauri/object/dropped.h | 2 +-
  655. centauri/object/dynamic_rope.h | 4 +-
  656. centauri/object/experience.cpp | 8 +-
  657. centauri/object/experience.h | 4 +-
  658. centauri/object/explosion.h | 2 +-
  659. centauri/object/grenade.cpp | 22 +-
  660. centauri/object/grenade.h | 28 +-
  661. centauri/object/necro_orb.cpp | 7 +-
  662. centauri/object/necro_orb.h | 4 +-
  663. centauri/object/seed_harvest.h | 2 +-
  664. centauri/object/soul.cpp | 6 +-
  665. centauri/object/stalactite.cpp | 5 +-
  666. centauri/object/stalactite.h | 2 +-
  667. centauri/object/thrown_base.h | 2 +-
  668. centauri/object/thrown_item.h | 2 +-
  669. centauri/object/tree_plain.h | 4 +-
  670. centauri/physics/dynamic.h | 2 +-
  671. centauri/physics/dynamicForSlopes.h | 2 +-
  672. centauri/physics/dynamicObject.h | 2 +-
  673. centauri/procedural/generator.cpp | 2 +-
  674. centauri/procedural/map_cleaner.cpp | 2 +-
  675. centauri/procedural/procedural.cpp | 9 +-
  676. centauri/procedural/surface_builder/biome.cpp | 2 +-
  677. centauri/quest/quest.cpp | 6 +-
  678. centauri/quest/subquest.h | 5 +-
  679. centauri/quest/unlock_skill.cpp | 40 +-
  680. centauri/quest/unlock_skill.h | 17 +-
  681. centauri/random.h | 25 +-
  682. centauri/render/background/base.h | 2 +-
  683. centauri/render/blocks.cpp | 32 +-
  684. centauri/render/blocks.h | 12 +-
  685. centauri/render/context_renderer.cpp | 17 +-
  686. centauri/render/context_renderer.h | 5 +-
  687. centauri/render/decoration.cpp | 13 +-
  688. centauri/render/decoration.h | 4 +-
  689. centauri/render/fire.cpp | 33 +-
  690. centauri/serialize/userdata.cpp | 2 +-
  691. centauri/serialize/userdata.h | 2 +-
  692. centauri/sfx/global.cpp | 5 +-
  693. centauri/sfx/global.h | 10 +-
  694. centauri/spawn/drops.cpp | 5 +-
  695. centauri/spawn/manager.cpp | 2 +-
  696. centauri/spawn/manager.h | 4 +-
  697. centauri/spawn/persistant.h | 4 +-
  698. centauri/spawn/spawn.cpp | 2 +-
  699. centauri/spawn/spawn.h | 2 +-
  700. centauri/spawn/spawner.h | 2 +-
  701. centauri/spell/spell_system.h | 2 +-
  702. centauri/stateMachine.h | 101 -----
  703. centauri/suffix/alteration.cpp | 6 +-
  704. centauri/tools.cpp | 20 +
  705. centauri/tools.h | 8 +-
  706. centauri/translations.h | 40 +-
  707. centauri/ui/layout.cpp | 8 +
  708. centauri/ui/layout_hbox.cpp | 32 +-
  709. centauri/ui/layout_vbox.cpp | 18 +-
  710. centauri/ui/push_button.cpp | 6 +-
  711. centauri/ui/spinbox.cpp | 6 +
  712. centauri/ui/tab_widget.h | 3 +-
  713. centauri/ui/widget.cpp | 4 +
  714. centauri/ui/widget.h | 15 +-
  715. centauri/ui_custom/combo_keys.cpp | 45 ++
  716. centauri/ui_custom/combo_keys.h | 58 +++
  717. centauri/ui_custom/player_equipment.cpp | 3 +-
  718. centauri/ui_custom/required_currency.cpp | 23 ++
  719. centauri/ui_custom/required_currency.h | 1 +
  720. centauri/ui_custom/skill_tree.cpp | 169 ++++++++
  721. centauri/ui_custom/skill_tree.h | 82 ++++
  722. centauri/ui_custom/skin.cpp | 189 ++++++++-
  723. centauri/ui_custom/skin.h | 25 ++
  724. centauri/ui_custom/world_frame.cpp | 119 +++++-
  725. centauri/ui_custom/world_frame.h | 36 +-
  726. centauri/utils/chunk_manager.cpp | 2 +-
  727. centauri/utils/chunk_manager.h | 2 +-
  728. centauri/utils/global_timer.h | 23 ++
  729. centauri/weather/particles/lava_heat.cpp | 2 +-
  730. centauri/weather/particles/snow.cpp | 2 +-
  731. centauri/weather/particles/wind.cpp | 4 +-
  732. centauri/world/chunk_map.h | 19 +-
  733. centauri/world/context.cpp | 30 +-
  734. centauri/world/context.h | 20 +-
  735. centauri/world/fire_simulation.cpp | 2 +-
  736. centauri/world/iterator.cpp | 32 +-
  737. centauri/world/manager.cpp | 2 +-
  738. centauri/world/manager.h | 2 +-
  739. config.cpp | 2 +-
  740. config.h | 10 +-
  741. gd/caves/gd_geodes.h | 85 ++++
  742. gd/energy/gd_ac_dc.h | 173 ++++++++
  743. gd/energy/gd_electricity.h | 168 ++++++++
  744. gd/{wires => energy}/gd_electromagnets.h | 0
  745. gd/energy/gd_elemental_energy.h | 213 ++++++++++
  746. gd/energy/gd_interactive_systems.h | 127 ++++++
  747. gd/energy/gd_magitech.h | 123 ++++++
  748. gd/energy/gd_soul_circuits.h | 98 +++++
  749. gd/energy/gd_soul_farming.h | 61 +++
  750. gd/energy/gd_soul_invokation.h | 138 +++++++
  751. gd/energy/gd_souls_devices.h | 97 +++++
  752. gd/energy/gd_souls_network.h | 355 ++++++++++++++++
  753. gd/energy/gd_vacuum_tube.h | 28 ++
  754. gd/{wires => energy}/gd_wires_energy.h | 0
  755. gd/{wires => energy}/gd_wires_wood_farm.h | 0
  756. gd/energy/generators/gd_alternator.h | 65 +++
  757. gd/energy/generators/gd_full_wave_rectifier.h | 110 +++++
  758. gd/energy/generators/gd_magnet.h | 46 +++
  759. gd/energy/generators/gd_solenoid.h | 93 +++++
  760. gd/factories/gd_factories_ideas.h | 64 +++
  761. gd/factories/gd_rare_earths.h | 63 +++
  762. gd/farming/gd_beekeeping.h | 55 +++
  763. gd/farming/gd_cursed_food.h | 69 ++++
  764. gd/{ => farming}/gd_farming.h | 0
  765. gd/farming/gd_farming_rarities.h | 72 ++++
  766. gd/farming/gd_rare_food.h | 64 +++
  767. gd/gd_bugs.h | 14 +
  768. gd/gd_monsters.h | 56 +++
  769. gd/gd_pathfinding.h | 85 ++++
  770. gd/gd_restore_world_save.h | 71 ++++
  771. gd/gd_space.h | 49 +++
  772. gd/gd_tech.h | 2 +-
  773. gd/gd_todo_list.h | 678 ++++++++++++++++++++++++++----
  774. gd/gd_todo_sorted.h | 245 +++++++++++
  775. gd/gd_ui_v2.h | 49 +++
  776. gd/magic/gd_magic_creation_v2.h | 12 +
  777. gd/minigames/gd_minigames.h | 190 +++++++--
  778. gd/modding/gd_modding_entries.h | 66 +--
  779. gd/modding/gd_moding_packages.h | 149 +++++++
  780. gd/netplay/gd_networking_theory.h | 137 ++++++
  781. gd/netplay/gd_subprotocol.h | 123 ++++++
  782. gd/player/gd_combos.h | 32 +-
  783. gd/progress/gd_hammers_armors_tiers.h | 104 +++++
  784. gd/progress/gd_progress_wip.h | 41 ++
  785. gd/tech/gd_mecanical_gears.h | 33 +-
  786. gd/trailer/gd_trailer_sequences.h | 63 +++
  787. gd/village/Bordel/gd_village_buildings.h | 15 +-
  788. gd/village/gd_navmesh_npc.h | 64 +++
  789. gd/village/gd_village_tech.h | 65 +++
  790. gd/wires/gd_electricity.h | 62 ---
  791. main.cpp | 34 +-
  792. object.cpp | 10 +-
  793. 789 files changed, 30293 insertions(+), 10927 deletions(-)
Advertisement
Add Comment
Please, Sign In to add comment