Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial implementation of pet evolution system + Pet DB conversion to YAML #3544

Merged
merged 66 commits into from Mar 26, 2019
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
af70dab
Initial implementation of pet evolution system
secretdataz Feb 12, 2018
205e511
Fixed some small issues found by @Atemo
Lemongrass3110 Oct 4, 2018
fb49f32
Updated gitattributes
Lemongrass3110 Oct 4, 2018
9feaa68
Converted pet_db.yml's encoding
secretdataz Oct 10, 2018
95e3437
Fixed pet evolving process consuming all required unstackable items. …
secretdataz Oct 13, 2018
1d3a70d
Corrected some incorrect IDs
secretdataz Jan 9, 2019
3487d9b
Merge branch 'master' into feature/pet_evolution
Lemongrass3110 Mar 3, 2019
8bcb564
Synchronized pet database with master branch
secretdataz Mar 4, 2019
6f94302
Reverted auto synced files
Lemongrass3110 Mar 3, 2019
a5289ff
Removed php converter
Lemongrass3110 Mar 3, 2019
615fdcc
Fixed random header order and duplicates
Lemongrass3110 Mar 3, 2019
58c9582
Partial conversion to the new yaml functions
Lemongrass3110 Mar 4, 2019
285b08f
Removed name and jname copies of mob db
Lemongrass3110 Mar 7, 2019
5fce22f
Removed empty scripts
Lemongrass3110 Mar 7, 2019
306f846
Removed useless curlies from scripts
Lemongrass3110 Mar 7, 2019
ca37fbe
Switched scripts to multi line strings
Lemongrass3110 Mar 7, 2019
46b21ad
Fixed quest pets without food
Lemongrass3110 Mar 7, 2019
488dc52
Fixed memleaks
Lemongrass3110 Mar 7, 2019
202e5c4
Removed non pre-renewal entries
Lemongrass3110 Mar 7, 2019
83015c3
Implemented official pet egg handling
Lemongrass3110 Mar 9, 2019
d9eb300
Small cleanup for pet_no_gvg
Lemongrass3110 Mar 9, 2019
e28ead8
Cleaned up clif
Lemongrass3110 Mar 9, 2019
e01a5ea
Fixed pet evolution itself
Lemongrass3110 Mar 9, 2019
f67a0c5
Implemented autofeeding correctly
Lemongrass3110 Mar 9, 2019
b457a39
Follow up to f67a0c5
Lemongrass3110 Mar 9, 2019
2876736
Added a missing return statement
Lemongrass3110 Mar 9, 2019
6e776fd
Fixed egg being visible after evolution
Lemongrass3110 Mar 9, 2019
37b6731
Added some more missing pet eggs
Lemongrass3110 Mar 9, 2019
11900b2
Added mandatory node check
Lemongrass3110 Mar 12, 2019
a577f11
Added some missing range checks
Lemongrass3110 Mar 13, 2019
2a38f93
Removed intimacy node
Lemongrass3110 Mar 13, 2019
b5ad5e7
Renamed item requirements node
Lemongrass3110 Mar 13, 2019
b2d7942
Made speed optional
Lemongrass3110 Mar 13, 2019
0da583c
Dropped TalkConvertClass
Lemongrass3110 Mar 13, 2019
ef7aebe
Removed unused food item entries
Lemongrass3110 Mar 13, 2019
72e2589
Converted item ids to aegis names
Lemongrass3110 Mar 13, 2019
4abf8b9
Converted mob ids to aegis names
Lemongrass3110 Mar 13, 2019
3ec6b41
Fixed documentation headers
Lemongrass3110 Mar 13, 2019
8bff00b
Merge branch 'master' into feature/pet_evolution
Lemongrass3110 Mar 13, 2019
39b988d
Merge branch 'master' into feature/pet_evolution
Lemongrass3110 Mar 17, 2019
4ee51d8
Added csv2yaml implementation
Lemongrass3110 Mar 17, 2019
b2a9d8f
Added missing license header
Lemongrass3110 Mar 18, 2019
c9d5002
Made SpecialPerformance optional
Lemongrass3110 Mar 18, 2019
03116cb
Made IntimacyStart optional
Lemongrass3110 Mar 18, 2019
bfe8321
Made IntimacyOverfed optional
Lemongrass3110 Mar 18, 2019
fc88c7a
Made HungryDelay optional
Lemongrass3110 Mar 18, 2019
9011edc
Added missing default descriptions
Lemongrass3110 Mar 18, 2019
299c775
Moved old custom pet attributes to import
Lemongrass3110 Mar 18, 2019
2ea0173
Made IntimacyOwnerDie optional
Lemongrass3110 Mar 18, 2019
0977a67
Small cleanups
aleos89 Mar 19, 2019
85dd7f3
Made IntimacyHungry optional
Lemongrass3110 Mar 19, 2019
7a01fff
Removed Speed
Lemongrass3110 Mar 19, 2019
5b223cb
Reverted pre-renewal feeding values
Lemongrass3110 Mar 19, 2019
dcc5cac
Follow up to 7a01fff
Lemongrass3110 Mar 19, 2019
6e78272
Small cleanups
aleos89 Mar 20, 2019
c43ba30
More cleanups
aleos89 Mar 20, 2019
ac36a66
Small revert of node checks
aleos89 Mar 20, 2019
225153f
Minor cleanup to variable usage
aleos89 Mar 20, 2019
f0d5967
Thanks CI
aleos89 Mar 20, 2019
0f88a56
Small cleanup
Lemongrass3110 Mar 22, 2019
078e2e3
Fixed a egg state bug
Lemongrass3110 Mar 22, 2019
1e5849a
Fixed a compiler warning in csv2yaml
Lemongrass3110 Mar 22, 2019
b4649c7
Fixed active pet data after mob_db reload
aleos89 Mar 23, 2019
719678e
Added a missing return value
aleos89 Mar 23, 2019
ed775c1
Free pet support bonuses from memory
aleos89 Mar 23, 2019
484897d
Final header details
aleos89 Mar 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
@@ -1,5 +1,6 @@
* text=auto
*.c diff=cpp
*.cpp diff=cpp
*.yml diff
*.sln merge=union
*.vcproj merge=union
*.vcxproj merge=union
Expand Down
12 changes: 12 additions & 0 deletions conf/battle/feature.conf
Expand Up @@ -71,6 +71,18 @@ feature.achievement: on
// Requires: 2017-02-08bRagexeRE or later
feature.equipswitch: on

// Pet evolution (Note 1)
// Requires: 2014-10-08aRagexe or later
feature.petevolution: on

// Automatic Pet Feeding (Note 1)
// Requires: 2014-10-08aRagexe or later
feature.petautofeed: on

// At which rate should pet autofeeding trigger? (Note 2)
// Default: 89
feature.pet_autofeed_rate: 89
Atemo marked this conversation as resolved.
Show resolved Hide resolved

// Homunculues Autofeeding (Note 1)
// Requires: 2017-09-20bRagexeRE or later
feature.homunculus_autofeed: on
Expand Down
11 changes: 4 additions & 7 deletions conf/battle/pet.conf
Expand Up @@ -21,10 +21,6 @@ pet_friendly_rate: 100
// The rate at which a pet will become hungry. (Note 2)
pet_hungry_delay_rate: 100

// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
pet_hungry_friendly_decrease: 5

// Does the pet need its equipment before it does its skill? (Note 1)
pet_equip_required: yes

Expand All @@ -39,9 +35,6 @@ pet_damage_support: no
// At max (1000) support rate is 150%.
pet_support_min_friendly: 900

// Same as above, but this is to use the pet_script field with official pet abilities.
pet_equip_min_friendly: 900

// Whether or not the pet's will use skills. (Note 1)
// Note: Offensive pet skills need at least pet_attack_support or
// pet_damage_support to work (they trigger while the pet is attacking).
Expand Down Expand Up @@ -81,3 +74,7 @@ pet_ignore_infinite_def: yes

// Whether or not the pet will continue to attack when the master is dead. (Note 1)
pet_master_dead: no

// Send auto-feed notice even if the client setting is OFF (Note 1)
// Official: yes
pet_autofeed_always: yes
60 changes: 0 additions & 60 deletions db/import-tmpl/pet_db.txt

This file was deleted.